version/tests: Replace some '#if 0's with 'if (0)'s.
Fix the code so it compiles without warnings.
This commit is contained in:
parent
c1e7d16f40
commit
65921ad1af
|
@ -199,17 +199,18 @@ static void test_info(void)
|
||||||
if (pVersionInfo == 0)
|
if (pVersionInfo == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
#if 0
|
if (0)
|
||||||
|
{
|
||||||
/* this test crashes on WinNT4
|
/* this test crashes on WinNT4
|
||||||
*/
|
*/
|
||||||
boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, 0);
|
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) ||
|
ok ((GetLastError() == ERROR_INVALID_DATA) || (GetLastError() == ERROR_BAD_PATHNAME) ||
|
||||||
(GetLastError() == NO_ERROR),
|
(GetLastError() == NO_ERROR),
|
||||||
"Last error wrong! ERROR_INVALID_DATA/ERROR_BAD_PATHNAME (ME)/"
|
"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());
|
GetLastError());
|
||||||
#endif
|
}
|
||||||
|
|
||||||
boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, pVersionInfo );
|
boolret = GetFileVersionInfoA( "kernel32.dll", 0, retval, pVersionInfo );
|
||||||
ok (boolret, "GetFileVersionInfoA failed: GetLastError = 0x%08x\n", GetLastError());
|
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);
|
trace("kernel32.dll version: %s\n", VersionString);
|
||||||
|
|
||||||
#if 0
|
if (0)
|
||||||
|
{
|
||||||
/* this test crashes on WinNT4
|
/* this test crashes on WinNT4
|
||||||
*/
|
*/
|
||||||
boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, 0);
|
boolret = VerQueryValueA( pVersionInfo, "\\", (LPVOID *)&pFixedVersionInfo, 0);
|
||||||
ok (boolret, "VerQueryValue failed: GetLastError = 0x%08lx\n", GetLastError());
|
ok (boolret, "VerQueryValue failed: GetLastError = 0x%08x\n", GetLastError());
|
||||||
#endif
|
}
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
HeapFree( GetProcessHeap(), 0, pVersionInfo);
|
HeapFree( GetProcessHeap(), 0, pVersionInfo);
|
||||||
|
|
Loading…
Reference in New Issue