Francois Gouget : version/tests: Replace some '#if 0's with 'if (0)'s.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Dec 14 14:23:59 CST 2006
Module: wine
Branch: master
Commit: 65921ad1af9ef460ced5ba8588fc8450cd8f6141
URL: http://source.winehq.org/git/wine.git/?a=commit;h=65921ad1af9ef460ced5ba8588fc8450cd8f6141
Author: Francois Gouget <fgouget at free.fr>
Date: Thu Dec 14 18:10:59 2006 +0100
version/tests: Replace some '#if 0's with 'if (0)'s.
Fix the code so it compiles without warnings.
---
dlls/version/tests/info.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c
index c71ecc6..5eafa49 100644
--- a/dlls/version/tests/info.c
+++ b/dlls/version/tests/info.c
@@ -199,17 +199,18 @@ static void test_info(void)
if (pVersionInfo == 0)
return;
-#if 0
+ if (0)
+ {
/* this test crashes on WinNT4
*/
boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, 0);
- ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = 0x%08lx\n", GetLastError());
+ ok (!boolret, "GetFileVersionInfoA should have failed: GetLastError = %d\n", GetLastError());
ok ((GetLastError() == ERROR_INVALID_DATA) || (GetLastError() == ERROR_BAD_PATHNAME) ||
(GetLastError() == NO_ERROR),
"Last error wrong! ERROR_INVALID_DATA/ERROR_BAD_PATHNAME (ME)/"
- "NO_ERROR (95) expected, got 0x%08lx\n",
+ "NO_ERROR (95) expected, got 0x%08x\n",
GetLastError());
-#endif
+ }
boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, pVersionInfo );
ok (boolret, "GetFileVersionInfoA failed: GetLastError = 0x%08x\n", GetLastError());
@@ -228,12 +229,13 @@ static void test_info(void)
trace("kernel32.dll version: %s\n", VersionString);
-#if 0
+ if (0)
+ {
/* this test crashes on WinNT4
*/
boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, 0);
- ok (boolret, "VerQueryValue failed: GetLastError = 0x%08lx\n", GetLastError());
-#endif
+ ok (boolret, "VerQueryValue failed: GetLastError = 0x%08x\n", GetLastError());
+ }
cleanup:
HeapFree( GetProcessHeap(), 0, pVersionInfo);
More information about the wine-cvs
mailing list