[PATCH 2/2] dsound: Merge two identical allocation blocks.

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

On Sun, Feb 26, 2017 at 05:42:22PM +0000, Huw Davies wrote:
> Signed-off-by: Huw Davies <huw at codeweavers.com>
> ---
>  dlls/dsound/primary.c | 16 +++-------------
>  1 file changed, 3 insertions(+), 13 deletions(-)
> 
> diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
> index ed41a5c..b10ba02 100644
> --- a/dlls/dsound/primary.c
> +++ b/dlls/dsound/primary.c
> @@ -238,19 +238,9 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx,
>          mixfloat = TRUE;
>  
>      /* reallocate emulated primary buffer */
> -    if (forcewave) {
> -        if (device->buffer)
> -            newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen);
> -        else
> -            newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen);
> -
> -        if (!newbuf) {
> -            ERR("failed to allocate primary buffer\n");
> -            return DSERR_OUTOFMEMORY;
> -        }
> -        FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0);
> -    } else if (!mixfloat) {
> -        new_buflen = frames * sizeof(float);
> +    if (forcewave || !mixfloat) {
> +        if (!forcewave)
> +            new_buflen = frames * sizeof(float);
>  
>          if (device->buffer)
>              newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen);
> -- 
> 2.10.2
> 
> 
>