Francois Gouget : dsound/tests: Replace some '#if 0's with 'if (0)'s.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jan 12 05:39:04 CST 2007
Module: wine
Branch: master
Commit: e48d86308d4f3a265df759049fd35e766144b834
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48d86308d4f3a265df759049fd35e766144b834
Author: Francois Gouget <fgouget at 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");
More information about the wine-cvs
mailing list