May 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : audio: Remove extraneous parentheses around equality comparisons.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 2cbb6f3332777f26fbd6eaf14c3737cdc2811da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbb6f3332777f26fbd6eaf14… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 9 13:24:01 2011 +0200 audio: Remove extraneous parentheses around equality comparisons. --- dlls/wineesd.drv/audio.c | 2 +- dlls/winenas.drv/audio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index f7f190c..8a3fc69 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -562,7 +562,7 @@ static int ESD_AddRingMessage(ESD_MSG_RING* mr, enum win_wm_message msg, DWORD p HANDLE hEvent = INVALID_HANDLE_VALUE; EnterCriticalSection(&mr->msg_crst); - if ((mr->msg_toget == ((mr->msg_tosave + 1) % mr->ring_buffer_size))) + if (mr->msg_toget == ((mr->msg_tosave + 1) % mr->ring_buffer_size)) { int old_ring_buffer_size = mr->ring_buffer_size; mr->ring_buffer_size += ESD_RING_BUFFER_INCREMENT; diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 0c29e48..a5768fa 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -488,7 +488,7 @@ static int NAS_AddRingMessage(MSG_RING* mr, enum win_wm_message msg, DWORD param HANDLE hEvent = INVALID_HANDLE_VALUE; EnterCriticalSection(&mr->msg_crst); - if ((mr->msg_toget == ((mr->msg_tosave + 1) % mr->ring_buffer_size))) + if (mr->msg_toget == ((mr->msg_tosave + 1) % mr->ring_buffer_size)) { int old_ring_buffer_size = mr->ring_buffer_size; mr->ring_buffer_size += NAS_RING_BUFFER_INCREMENT;

1 0

André Hentschel : winedbg: Update a comment.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 71fe9c95a4fc9edf5a19d7eb3d7479094cfc8b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fe9c95a4fc9edf5a19d7eb3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 8 21:21:48 2011 +0200 winedbg: Update a comment. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 904581d..c294f2d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #ifdef __i386__ - /* debugger/db_disasm.c */ + /* db_disasm.c */ extern void be_i386_disasm_one_insn(ADDRESS64* addr, int display); #define STEP_FLAG 0x00000100 /* single step flag */

1 0

Andrew Eikum : mmdevapi/tests: Make capture.c more easily extendible.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 631d834022833dfde3bf904f65ea92b096a6c59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=631d834022833dfde3bf904f6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:37 2011 -0500 mmdevapi/tests: Make capture.c more easily extendible. --- dlls/mmdevapi/tests/capture.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index ed497df..4ee7412 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -34,6 +34,8 @@ #include "mmdeviceapi.h" #include "audioclient.h" +static IMMDevice *dev = NULL; + static void test_uninitialized(IAudioClient *ac) { HRESULT hr; @@ -137,15 +139,23 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) IUnknown_Release(acc); } -static void test_audioclient(IAudioClient *ac) +static void test_audioclient(void) { + IAudioClient *ac; IUnknown *unk; HRESULT hr; ULONG ref; WAVEFORMATEX *pwfx, *pwfx2; REFERENCE_TIME t1, t2; + HANDLE handle; - HANDLE handle = CreateEventW(NULL, FALSE, FALSE, NULL); + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + handle = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL); ok(hr == E_POINTER, "QueryInterface(NULL) returned %08x\n", hr); @@ -290,6 +300,7 @@ static void test_audioclient(IAudioClient *ac) test_capture(ac, handle, pwfx); + IAudioClient_Release(ac); CloseHandle(handle); CoTaskMemFree(pwfx); } @@ -298,8 +309,6 @@ START_TEST(capture) { HRESULT hr; IMMDeviceEnumerator *mme = NULL; - IMMDevice *dev = NULL; - IAudioClient *ac = NULL; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -320,13 +329,8 @@ START_TEST(capture) goto cleanup; } - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); - if (ac) - { - test_audioclient(ac); - IAudioClient_Release(ac); - } + test_audioclient(); + IMMDevice_Release(dev); cleanup:

1 0

Marcus Meissner : shdocvw: Check safearray dimension too (Coverity).
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 1bb985fb277d1c39983884907728c5afde30d061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb985fb277d1c39983884907… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 7 20:36:20 2011 +0200 shdocvw: Check safearray dimension too (Coverity). --- dlls/shdocvw/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 3c0dbd2..edbd3c2 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -479,7 +479,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, LONG ind; HRESULT hres; - if(V_VT(pvaIn) != VT_ARRAY || !sa) + if(V_VT(pvaIn) != VT_ARRAY || !sa || (SafeArrayGetDim(sa) != 1)) return E_INVALIDARG; ind = 0;

1 0

Gerald Pfeifer : wineoss.drv: Use AFMT_S24_LE instead of AFMT_S24_PACKED.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 051b64b66f82801d43016068639468575dc3974e URL: http://source.winehq.org/git/wine.git/?a=commit;h=051b64b66f82801d430160686… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 8 02:04:06 2011 +0200 wineoss.drv: Use AFMT_S24_LE instead of AFMT_S24_PACKED. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b9af940..64c06cd 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -525,7 +525,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt) case 16: return AFMT_S16_LE; case 24: - return AFMT_S24_PACKED; + return AFMT_S24_LE; case 32: return AFMT_S32_LE; } @@ -1026,7 +1026,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, }else if(formats & AFMT_S32_LE){ fmt->Format.wBitsPerSample = 32; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - }else if(formats & AFMT_S24_PACKED){ + }else if(formats & AFMT_S24_LE){ fmt->Format.wBitsPerSample = 24; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{

1 0

Gerald Pfeifer : wineoss.drv: Support platforms that do not feature AFMT_FLOAT.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: bed73e9e736ef2376e762730a30ad5f2611f969c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed73e9e736ef2376e762730a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 8 02:46:37 2011 +0200 wineoss.drv: Support platforms that do not feature AFMT_FLOAT. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 64c06cd..7dec1e0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -532,6 +532,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt) return -1; } +#ifdef AFMT_FLOAT if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ @@ -540,6 +541,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt) return AFMT_FLOAT; } +#endif return -1; } @@ -1017,9 +1019,11 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(formats & AFMT_S16_LE){ fmt->Format.wBitsPerSample = 16; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; +#ifdef AFMT_FLOAT }else if(formats & AFMT_FLOAT){ fmt->Format.wBitsPerSample = 32; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; +#endif }else if(formats & AFMT_U8){ fmt->Format.wBitsPerSample = 8; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;

1 0

Gerald Pfeifer : configure: Use the -Wempty-body compiler option if present .
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 8213f5410bdae8a0148636f4f879cf1a1367522a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8213f5410bdae8a0148636f4f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 8 02:53:23 2011 +0200 configure: Use the -Wempty-body compiler option if present. --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4866321..2d6df8c 100755 --- a/configure +++ b/configure @@ -12273,6 +12273,31 @@ $as_echo "$ac_cv_cflags__Wdeclaration_after_statement" >&6; } if test $ac_cv_cflags__Wdeclaration_after_statement = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wdeclaration-after-statement" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wempty-body" >&5 +$as_echo_n "checking whether the compiler supports -Wempty-body... " >&6; } +if ${ac_cv_cflags__Wempty_body+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wempty-body" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wempty_body=yes +else + ac_cv_cflags__Wempty_body=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wempty_body" >&5 +$as_echo "$ac_cv_cflags__Wempty_body" >&6; } +if test $ac_cv_cflags__Wempty_body = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wempty-body" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; } if ${ac_cv_cflags__Wstrict_prototypes+:} false; then : diff --git a/configure.ac b/configure.ac index 057035f..eff1550 100644 --- a/configure.ac +++ b/configure.ac @@ -1728,6 +1728,7 @@ then WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) + WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter])

1 0

Francois Gouget : ddraw/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: d719e831ab6b1e32e7cae683aa73a513871528f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d719e831ab6b1e32e7cae683a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 9 09:03:27 2011 +0200 ddraw/tests: Add a '\n' to an ok() call. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9c01ef0..7ad7492 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3260,7 +3260,7 @@ static void fix_wndproc(HWND window, LONG_PTR proc) HRESULT hr; hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); - ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 object, hr %#x.", hr); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 object, hr %#x.\n", hr); if (FAILED(hr)) return; SetWindowLongPtrA(window, GWLP_WNDPROC, proc);

1 0

Francois Gouget : d3d9/tests: Add a '\n' to a skip() call.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: bfbc015854e112f6c66b7ea124f81c8e4b8a7c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfbc015854e112f6c66b7ea12… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 9 09:03:30 2011 +0200 d3d9/tests: Add a '\n' to a skip() call. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0aef4b8..079ac35 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2874,7 +2874,7 @@ static void test_reset_fullscreen(void) device = create_device(d3d, device_window, focus_window, TRUE); if (!device) { - skip("Unable to create device. Skipping test."); + skip("Unable to create device. Skipping test.\n"); goto cleanup; }

1 0

Francois Gouget : Assorted spelling and case fixes.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 5920de5ffb5ea42a0cddb1d52873bedb30fadd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5920de5ffb5ea42a0cddb1d52… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 9 09:03:40 2011 +0200 Assorted spelling and case fixes. --- dlls/comctl32/monthcal.c | 4 ++-- dlls/cryptnet/tests/cryptnet.c | 2 +- dlls/d3d9/tests/visual.c | 4 ++-- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 2 +- dlls/gdiplus/gdiplus.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 18 +++++++++--------- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/tests/exectest.html | 2 +- dlls/msxml3/tests/domdoc.c | 4 ++-- dlls/user.exe16/message.c | 2 +- dlls/usp10/tests/usp10.c | 4 ++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 2 +- programs/regedit/regproc.c | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5920de5ffb5ea42a0cddb…

1 0