January 2007 - Wine-Commits

Paul Vriens : ole32/tests: Cast-qual warnings fixes.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 3d2baaa6cf9919291ff7b976bdefa16cbb81c707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2baaa6cf9919291ff7b976b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 08:04:35 2007 +0100 ole32/tests: Cast-qual warnings fixes. --- dlls/ole32/tests/propvariant.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index c811eaa..f1cbc76 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -199,8 +199,8 @@ static void test_validtypes(void) static void test_copy(void) { - static const char szTestString[] = "Test String"; - static const WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + static char szTestString[] = "Test String"; + static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -217,7 +217,7 @@ static void test_copy(void) ok(hr == S_OK, "PropVariantClear(...VT_BSTR...) failed\n"); propvarSrc.vt = VT_LPWSTR; - U(propvarSrc).pwszVal = (LPWSTR)wszTestString; + U(propvarSrc).pwszVal = wszTestString; hr = PropVariantCopy(&propvarDst, &propvarSrc); ok(hr == S_OK, "PropVariantCopy(...VT_LPWSTR...) failed\n"); ok(!lstrcmpW(U(propvarSrc).pwszVal, U(propvarDst).pwszVal), "Wide string not copied properly\n"); @@ -226,7 +226,7 @@ static void test_copy(void) memset(&propvarSrc, 0, sizeof(propvarSrc)); propvarSrc.vt = VT_LPSTR; - U(propvarSrc).pszVal = (LPSTR)szTestString; + U(propvarSrc).pszVal = szTestString; hr = PropVariantCopy(&propvarDst, &propvarSrc); ok(hr == S_OK, "PropVariantCopy(...VT_LPSTR...) failed\n"); ok(!strcmp(U(propvarSrc).pszVal, U(propvarDst).pszVal), "String not copied properly\n");

1 0

Kirill K. Smirnov : explorer/systray: Some code cleanup.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 3456e5627aac55a2234067ddc4f7caf38d1bc657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3456e5627aac55a2234067ddc… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Fri Jan 12 04:48:52 2007 +0300 explorer/systray: Some code cleanup. --- programs/explorer/systray.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 7fc66fd..ee2a1aa 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -123,7 +123,6 @@ static LRESULT WINAPI adaptor_wndproc(HW case WM_LBUTTONDBLCLK: case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: - { /* notify the owner hwnd of the message */ WINE_TRACE("relaying 0x%x\n", msg); ret = PostMessage(icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg); @@ -133,8 +132,7 @@ static LRESULT WINAPI adaptor_wndproc(HW "notification icon, removing automatically\n"); DestroyWindow(window); } - return 0; - } + break; case WM_NCDESTROY: SetWindowLongPtr(window, GWLP_USERDATA, 0); @@ -143,9 +141,12 @@ static LRESULT WINAPI adaptor_wndproc(HW DestroyIcon(icon->image); HeapFree(GetProcessHeap(), 0, icon); break; + + default: + return DefWindowProc(window, msg, wparam, lparam); } - return DefWindowProc(window, msg, wparam, lparam); + return 0; }

1 0

Francois Gouget : d3d8/tests: Warn that tests were skipped if we could not load d3d8.dll.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: a76e6b11b0ea3ee736a3e3b6f0d92e05b27487d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76e6b11b0ea3ee736a3e3b6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 11 15:38:11 2007 +0100 d3d8/tests: Warn that tests were skipped if we could not load d3d8.dll. But report a failed test if a mandatory function is missing from it. --- dlls/d3d8/tests/d3d8_main.c | 4 ++++ dlls/d3d8/tests/device.c | 6 ++++++ dlls/d3d8/tests/surface.c | 2 +- dlls/d3d8/tests/texture.c | 2 +- dlls/d3d8/tests/volume.c | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/d3d8_main.c b/dlls/d3d8/tests/d3d8_main.c index a001f31..aee7625 100644 --- a/dlls/d3d8/tests/d3d8_main.c +++ b/dlls/d3d8/tests/d3d8_main.c @@ -107,7 +107,11 @@ START_TEST(d3d8_main) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); if (!d3d8_handle) + { + skip("Could not load d3d8.dll\n"); return; + } + ValidateVertexShader = (void*)GetProcAddress (d3d8_handle, "ValidateVertexShader" ); ValidatePixelShader = (void*)GetProcAddress (d3d8_handle, "ValidatePixelShader" ); test_ValidateVertexShader(); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b9ed2c5..8ec237e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -763,8 +763,14 @@ static void test_display_modes(void) START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + if (!d3d8_handle) + { + skip("Could not load d3d8.dll\n"); + return; + } pDirect3DCreate8 = (void *)GetProcAddress( d3d8_handle, "Direct3DCreate8" ); + ok(pDirect3DCreate8 != NULL, "Failed to get address of Direct3DCreate8\n"); if (pDirect3DCreate8) { test_display_modes(); diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 393223c..21f9dfe 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -129,7 +129,7 @@ START_TEST(surface) d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) { - trace("Could not load d3d8.dll, skipping tests\n"); + skip("Could not load d3d8.dll\n"); return; } diff --git a/dlls/d3d8/tests/texture.c b/dlls/d3d8/tests/texture.c index 500b3c8..3e0b805 100644 --- a/dlls/d3d8/tests/texture.c +++ b/dlls/d3d8/tests/texture.c @@ -110,7 +110,7 @@ START_TEST(texture) d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) { - trace("Could not load d3d8.dll, skipping tests\n"); + skip("Could not load d3d8.dll\n"); return; } diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index be4e771..5d339c3 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -129,7 +129,7 @@ START_TEST(volume) d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) { - trace("Could not load d3d8.dll, skipping tests\n"); + skip("Could not load d3d8.dll\n"); return; }

1 0

Francois Gouget : d3d9/tests: Warn that tests were skipped if we could not load d3d9.dll.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 354b9e7aaef4144047174c4afcf2a9d101ce702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=354b9e7aaef4144047174c4af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 11 15:38:47 2007 +0100 d3d9/tests: Warn that tests were skipped if we could not load d3d9.dll. But report a failed test if a mandatory function is missing from it. Also warn if the hardware capabilities force us to skip some tests. --- dlls/d3d9/tests/device.c | 6 ++++++ dlls/d3d9/tests/shader.c | 6 +++--- dlls/d3d9/tests/stateblock.c | 2 +- dlls/d3d9/tests/surface.c | 2 +- dlls/d3d9/tests/texture.c | 2 +- dlls/d3d9/tests/vertexdeclaration.c | 6 +++--- dlls/d3d9/tests/volume.c | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 88d1cf5..91fbfd5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -946,8 +946,14 @@ static void test_display_modes(void) START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); + if (!d3d9_handle) + { + skip("Could not load d3d9.dll\n"); + return; + } pDirect3DCreate9 = (void *)GetProcAddress( d3d9_handle, "Direct3DCreate9" ); + ok(pDirect3DCreate9 != NULL, "Failed to get address of Direct3DCreate9\n"); if (pDirect3DCreate9) { test_display_modes(); diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 2273673..f15ad77 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -154,7 +154,7 @@ START_TEST(shader) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; } @@ -167,11 +167,11 @@ START_TEST(shader) { test_get_set_vertex_shader(device_ptr); } - else trace("No vertex shader support, skipping test\n"); + else skip("No vertex shader support\n"); if (caps.PixelShaderVersion & 0xffff) { test_get_set_pixel_shader(device_ptr); } - else trace("No pixel shader support, skipping test\n"); + else skip("No pixel shader support\n"); } diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index bfed524..fd25e01 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1459,7 +1459,7 @@ START_TEST(stateblock) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; } diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index c76a358..06a5716 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -180,7 +180,7 @@ START_TEST(surface) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; } diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index cc48206..d34ac4b 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -109,7 +109,7 @@ START_TEST(texture) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; } diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index eafd0a4..7598e93 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -632,21 +632,21 @@ START_TEST(vertexdeclaration) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; } device_ptr = init_d3d9(); if (!device_ptr) { - trace("Failed to initialise d3d9, aborting test.\n"); + skip("Failed to initialise d3d9\n"); return; } decl_ptr = test_create_vertex_declaration(device_ptr, simple_decl); if (!decl_ptr) { - trace("Failed to create a vertex declaration, aborting test.\n"); + skip("Failed to create a vertex declaration\n"); return; } diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index 61f3ee1..e1ad947 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -126,7 +126,7 @@ START_TEST(volume) d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { - trace("Could not load d3d9.dll, skipping tests\n"); + skip("Could not load d3d9.dll\n"); return; }

1 0

Francois Gouget : tests: Add skip(), a function to warn that tests were skipped due to limitations of the environment or missing dependencies .
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: d90879f10ce0e0c16e32a77a516581c134b4671a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90879f10ce0e0c16e32a77a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 11 15:37:19 2007 +0100 tests: Add skip(), a function to warn that tests were skipped due to limitations of the environment or missing dependencies. --- include/wine/test.h | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index eed9d1a..4f2e863 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -70,6 +70,7 @@ extern int winetest_get_mainargs( char** #ifdef __GNUC__ extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ @@ -80,9 +81,11 @@ extern void winetest_trace( const char * #endif /* __GNUC__ */ #define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok +#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip #define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace #define ok ok_(__FILE__, __LINE__) +#define skip skip_(__FILE__, __LINE__) #define trace trace_(__FILE__, __LINE__) #define todo(platform) for (winetest_start_todo(platform); \ @@ -169,6 +172,7 @@ static const struct test *current_test; static LONG successes; /* number of successful tests */ static LONG failures; /* number of failures */ +static LONG skipped; /* number of skipped test chunks */ static LONG todo_successes; /* number of successful tests inside todo block */ static LONG todo_failures; /* number of failures inside todo block */ @@ -292,6 +296,18 @@ void winetest_trace( const char *msg, .. } } +void winetest_skip( const char *msg, ... ) +{ + va_list valist; + tls_data* data=get_tls_data(); + + fprintf( stdout, "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + va_start(valist, msg); + vfprintf(stdout, msg, valist); + va_end(valist); + skipped++; +} + void winetest_start_todo( const char* platform ) { tls_data* data=get_tls_data(); @@ -371,10 +387,11 @@ static int run_test( const char *name ) if (winetest_debug) { - fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n", + fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, - (failures + todo_failures != 1) ? "failures" : "failure" ); + (failures + todo_failures != 1) ? "failures" : "failure", + skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status;

1 0

Francois Gouget : dsound/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 3327c5f6ff4998cc6f7c80ca84e91d8e2405103b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3327c5f6ff4998cc6f7c80ca8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 11 15:53:41 2007 +0100 dsound/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/dsound/tests/capture.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2fb46b7..e409aee 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -645,7 +645,9 @@ static BOOL WINAPI dscenum_callback(LPGU } /* try a non PCM format */ -#if 0 + if (0) + { + /* FIXME: Why is this commented out? */ init_format(&wfx,WAVE_FORMAT_MULAW,8000,8,1); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); @@ -664,10 +666,12 @@ static BOOL WINAPI dscenum_callback(LPGU ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " "should have 0\n",ref); } -#endif + } /* Try an invalid format to test error handling */ -#if 0 + if (0) + { + /* FIXME: Remove this test altogether? */ init_format(&wfx,WAVE_FORMAT_PCM,2000000,16,2); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); @@ -680,7 +684,7 @@ static BOOL WINAPI dscenum_callback(LPGU rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc!=DS_OK,"IDirectSoundCapture_CreateCaptureBuffer() should have failed " "at 2 MHz %s\n",DXGetErrorString8(rc)); -#endif + } EXIT: if (dsco!=NULL) {

1 0

Francois Gouget : dsound/tests: The tests link with dsound. dll so use GetModuleHandle() instead of LoadLibrary().
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 42d25ef95d62e73b045c6fed4845fc8a4beb16b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d25ef95d62e73b045c6fed4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 11 15:40:08 2007 +0100 dsound/tests: The tests link with dsound.dll so use GetModuleHandle() instead of LoadLibrary(). --- dlls/dsound/tests/capture.c | 12 ++++-------- dlls/dsound/tests/ds3d8.c | 8 ++------ dlls/dsound/tests/dsound8.c | 8 ++------ dlls/dsound/tests/duplex.c | 8 ++------ dlls/dsound/tests/propset.c | 8 ++------ 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index e409aee..2fb46b7 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -645,9 +645,7 @@ static BOOL WINAPI dscenum_callback(LPGU } /* try a non PCM format */ - if (0) - { - /* FIXME: Why is this commented out? */ +#if 0 init_format(&wfx,WAVE_FORMAT_MULAW,8000,8,1); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); @@ -666,12 +664,10 @@ static BOOL WINAPI dscenum_callback(LPGU ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " "should have 0\n",ref); } - } +#endif /* Try an invalid format to test error handling */ - if (0) - { - /* FIXME: Remove this test altogether? */ +#if 0 init_format(&wfx,WAVE_FORMAT_PCM,2000000,16,2); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); @@ -684,7 +680,7 @@ static BOOL WINAPI dscenum_callback(LPGU rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc!=DS_OK,"IDirectSoundCapture_CreateCaptureBuffer() should have failed " "at 2 MHz %s\n",DXGetErrorString8(rc)); - } +#endif EXIT: if (dsco!=NULL) { diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 15f8780..0a45a7d 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -1162,12 +1162,8 @@ START_TEST(ds3d8) CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (!hDsound) { - trace("dsound.dll not found\n"); - return; - } - + hDsound = GetModuleHandleA("dsound.dll"); + ok(hDsound != NULL, "dsound.dll not loaded!\n"); trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCreate8 = (void*)GetProcAddress(hDsound, "DirectSoundCreate8"); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5391345..02373f5 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -852,12 +852,8 @@ START_TEST(dsound8) CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (!hDsound) { - trace("dsound.dll not found\n"); - return; - } - + hDsound = GetModuleHandleA("dsound.dll"); + ok(hDsound != NULL, "dsound.dll not loaded!\n"); trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCreate8 = (void*)GetProcAddress(hDsound, "DirectSoundCreate8"); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index dda7e47..d0be144 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -237,12 +237,8 @@ START_TEST(duplex) CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (!hDsound) { - trace("dsound.dll not found\n"); - goto done; - } - + hDsound = GetModuleHandleA("dsound.dll"); + ok(hDsound != NULL, "dsound.dll not loaded!\n"); trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound,"DirectSoundFullDuplexCreate"); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 3c9a3d4..21e91df 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -722,12 +722,8 @@ START_TEST(propset) CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (!hDsound) { - trace("dsound.dll not found\n"); - return; - } - + hDsound = GetModuleHandleA("dsound.dll"); + ok(hDsound != NULL, "dsound.dll not loaded!\n"); trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCreate8 = (void*)GetProcAddress(hDsound, "DirectSoundCreate8");

1 0

Francois Gouget : dsound/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: e48d86308d4f3a265df759049fd35e766144b834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48d86308d4f3a265df759049… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 11 15:53:41 2007 +0100 dsound/tests: Replace some '#if 0's with 'if (0)'s. --- dlls/dsound/tests/capture.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 23b4095..e409aee 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -645,7 +645,9 @@ static BOOL WINAPI dscenum_callback(LPGU } /* try a non PCM format */ -#if 0 + if (0) + { + /* FIXME: Why is this commented out? */ init_format(&wfx,WAVE_FORMAT_MULAW,8000,8,1); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); @@ -664,10 +666,12 @@ static BOOL WINAPI dscenum_callback(LPGU ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " "should have 0\n",ref); } -#endif + } /* Try an invalid format to test error handling */ -#if 0 + if (0) + { + /* FIXME: Remove this test altogether? */ init_format(&wfx,WAVE_FORMAT_PCM,2000000,16,2); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize=sizeof(bufdesc); @@ -680,7 +684,7 @@ static BOOL WINAPI dscenum_callback(LPGU rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc!=DS_OK,"IDirectSoundCapture_CreateCaptureBuffer() should have failed " "at 2 MHz %s\n",DXGetErrorString8(rc)); -#endif + } EXIT: if (dsco!=NULL) { @@ -706,12 +710,8 @@ START_TEST(capture) CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (!hDsound) { - trace("dsound.dll not found\n"); - return; - } - + hDsound = GetModuleHandleA("dsound.dll"); + ok(hDsound != NULL, "dsound.dll not loaded!\n"); trace("DLL Version: %s\n", get_file_version("dsound.dll")); pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound,"DirectSoundCaptureCreate");

1 0

Francois Gouget : winmm/tests: Replace some '#if 0's with 'if (0)'s.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 9279edfb033ad02cee92a289f75a357e66b12ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9279edfb033ad02cee92a289f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 11 15:35:11 2007 +0100 winmm/tests: Replace some '#if 0's with 'if (0)'s. Fix the code so it compiles without warnings. --- dlls/winmm/tests/capture.c | 20 ++++++++++++-------- dlls/winmm/tests/wave.c | 12 ++++++++---- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 1dadd82..f148df4 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -329,27 +329,29 @@ static void wave_in_test_device(int devi "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_in_error(rc)); - rc=waveInGetDevCapsA(device,0,sizeof(capsA)); + rc=waveInGetDevCapsA(device,NULL,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, "waveInGetDevCapsA(%s): MMSYSERR_INVALPARAM expected, got %s\n", dev_name(device),wave_in_error(rc)); - rc=waveInGetDevCapsW(device,0,sizeof(capsW)); + rc=waveInGetDevCapsW(device,NULL,sizeof(capsW)); ok(rc==MMSYSERR_INVALPARAM || rc==MMSYSERR_NOTSUPPORTED, "waveInGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_in_error(rc)); -#if 0 /* FIXME: this works on windows but crashes wine */ - rc=waveInGetDevCapsA(device,1,sizeof(capsA)); + if (0) + { + /* FIXME: this works on windows but crashes wine */ + rc=waveInGetDevCapsA(device,(LPWAVEINCAPSA)1,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, "waveInGetDevCapsA(%s): MMSYSERR_INVALPARAM expected, got %s\n", dev_name(device),wave_in_error(rc)); - rc=waveInGetDevCapsW(device,1,sizeof(capsW)); + rc=waveInGetDevCapsW(device,(LPWAVEINCAPSW)1,sizeof(capsW)); ok(rc==MMSYSERR_INVALPARAM || rc==MMSYSERR_NOTSUPPORTED, "waveInGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_in_error(rc)); -#endif + } rc=waveInGetDevCapsA(device,&capsA,4); ok(rc==MMSYSERR_NOERROR, @@ -572,7 +574,9 @@ static void wave_in_test_device(int devi trace("waveInOpen(%s): 6 channels not supported\n", dev_name(device)); -#if 0 /* ALSA doesn't like this */ + if (0) + { + /* FIXME: ALSA doesn't like this */ /* test if 24 bit samples supported */ wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE; wfex.Format.nChannels=2; @@ -596,7 +600,7 @@ static void wave_in_test_device(int devi } else trace("waveInOpen(%s): 24 bit samples not supported\n", dev_name(device)); -#endif + } /* test if 32 bit samples supported */ wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE; diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 1ab9a19..84a19fc 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -838,7 +838,9 @@ static void wave_out_test_device(int dev "waveOutGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_out_error(rc)); -#if 0 /* FIXME: this works on windows but crashes wine */ + if (0) + { + /* FIXME: this works on windows but crashes wine */ rc=waveOutGetDevCapsA(device,(LPWAVEOUTCAPSA)1,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, "waveOutGetDevCapsA(%s): MMSYSERR_INVALPARAM expected, got %s\n", @@ -848,7 +850,7 @@ static void wave_out_test_device(int dev ok(rc==MMSYSERR_INVALPARAM || rc==MMSYSERR_NOTSUPPORTED, "waveOutGetDevCapsW(%s): MMSYSERR_INVALPARAM or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_out_error(rc)); -#endif + } rc=waveOutGetDevCapsA(device,&capsA,4); ok(rc==MMSYSERR_NOERROR, @@ -1257,7 +1259,9 @@ static void wave_out_test_device(int dev trace("waveOutOpen(%s): 6 channels not supported\n", dev_name(device)); -#if 0 /* ALSA doesn't like this format */ + if (0) + { + /* FIXME: ALSA doesn't like this format */ /* test if 24 bit samples supported */ wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE; wfex.Format.nChannels=2; @@ -1283,7 +1287,7 @@ static void wave_out_test_device(int dev } else trace("waveOutOpen(%s): 24 bit samples not supported\n", dev_name(device)); -#endif + } /* test if 32 bit samples supported */ wfex.Format.wFormatTag=WAVE_FORMAT_EXTENSIBLE;

1 0

Ken Thomases : wined3d: Do not block waiting for occlusion query result in GetData.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 94be42eb2dc384c7c1fd33c13e448ea4b06b821b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94be42eb2dc384c7c1fd33c13… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 11 16:48:15 2007 -0600 wined3d: Do not block waiting for occlusion query result in GetData. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 32cacd6..9dafb12 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IWineD3DQueryImpl checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); TRACE("(%p) : available %d.\n", This, available); - if (available || dwGetDataFlags & WINED3DGETDATA_FLUSH) { + if (available) { GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); TRACE("(%p) : Returning %d samples.\n", This, samples);

1 0