Skip to content

W
wine-winehq
Commit b0e95d27 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard
Browse files
Options

dsound: Indentation fix.

parent 10fb1eac
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 13 deletions
dlls/dsound/buffer.c
View file @ b0e95d27
...@@ -607,11 +607,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, ...@@ -607,11 +607,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface,
if (!p2) if (!p2)
x2 = 0; x2 = 0;
if((p1 && ((BYTE*)p1 < This->buffer->memory || if((p1 && ((BYTE*)p1 < This->buffer->memory || (BYTE*)p1 >= This->buffer->memory + This->buflen)) ||
(BYTE*)p1 >= This->buffer->memory + This->buflen)) || (p2 && ((BYTE*)p2 < This->buffer->memory || (BYTE*)p2 >= This->buffer->memory + This->buflen)))
(p2 && ((BYTE*)p2 < This->buffer->memory || return DSERR_INVALIDPARAM;
(BYTE*)p2 >= This->buffer->memory + This->buflen)))
return DSERR_INVALIDPARAM;
if (x1 || x2) if (x1 || x2)
{ {
......
dlls/dsound/primary.c
View file @ b0e95d27
...@@ -293,9 +293,9 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) ...@@ -293,9 +293,9 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
else else
device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];
FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0);
FillMemory(device->mix_buffer, device->mix_buffer_len, 0); FillMemory(device->mix_buffer, device->mix_buffer_len, 0);
device->playpos = 0; device->playpos = 0;
if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT ||
(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
...@@ -1085,11 +1085,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * ...@@ -1085,11 +1085,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void *
return DSERR_PRIOLEVELNEEDED; return DSERR_PRIOLEVELNEEDED;
} }
if((p1 && ((BYTE*)p1 < device->buffer || if ((p1 && ((BYTE*)p1 < device->buffer || (BYTE*)p1 >= device->buffer + device->buflen)) ||
(BYTE*)p1 >= device->buffer + device->buflen)) || (p2 && ((BYTE*)p2 < device->buffer || (BYTE*)p2 >= device->buffer + device->buflen)))
(p2 && ((BYTE*)p2 < device->buffer || return DSERR_INVALIDPARAM;
(BYTE*)p2 >= device->buffer + device->buflen)))
return DSERR_INVALIDPARAM;
return DS_OK; return DS_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment