Module: wine Branch: master Commit: b0e95d27a9f816ba3319ce5e48e51f175f44713c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e95d27a9f816ba3319ce5e48...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Sat Dec 15 14:43:30 2012 +0000
dsound: Indentation fix.
---
dlls/dsound/buffer.c | 8 +++----- dlls/dsound/primary.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cf4d2ec..e8fc5f3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -607,11 +607,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (!p2) x2 = 0;
- if((p1 && ((BYTE*)p1 < This->buffer->memory || - (BYTE*)p1 >= This->buffer->memory + This->buflen)) || - (p2 && ((BYTE*)p2 < This->buffer->memory || - (BYTE*)p2 >= This->buffer->memory + This->buflen))) - return DSERR_INVALIDPARAM; + if((p1 && ((BYTE*)p1 < This->buffer->memory || (BYTE*)p1 >= This->buffer->memory + This->buflen)) || + (p2 && ((BYTE*)p2 < This->buffer->memory || (BYTE*)p2 >= This->buffer->memory + This->buflen))) + return DSERR_INVALIDPARAM;
if (x1 || x2) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0964f9b..3ac928b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -293,9 +293,9 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) else device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];
- FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->playpos = 0; + FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(device->mix_buffer, device->mix_buffer_len, 0); + device->playpos = 0;
if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && @@ -1085,11 +1085,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * return DSERR_PRIOLEVELNEEDED; }
- if((p1 && ((BYTE*)p1 < device->buffer || - (BYTE*)p1 >= device->buffer + device->buflen)) || - (p2 && ((BYTE*)p2 < device->buffer || - (BYTE*)p2 >= device->buffer + device->buflen))) - return DSERR_INVALIDPARAM; + if ((p1 && ((BYTE*)p1 < device->buffer || (BYTE*)p1 >= device->buffer + device->buflen)) || + (p2 && ((BYTE*)p2 < device->buffer || (BYTE*)p2 >= device->buffer + device->buflen))) + return DSERR_INVALIDPARAM;
return DS_OK; }