Skip to content

W
wine-winehq
Commit ec596c06 authored by Stefan Leichter's avatar Stefan Leichter Committed by Alexandre Julliard
Browse files
Options

Fixed tests of GetFileVersionInfoSizeA for win98 / XP.

parent 3186bd23
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
dlls/version/tests/info.c
View file @ ec596c06
...@@ -32,9 +32,10 @@ static void test_info_size(void) ...@@ -32,9 +32,10 @@ static void test_info_size(void)
ok( !retval, ok( !retval,
"GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n",
retval); retval);
ok( ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError(), ok( (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) ||
"Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND expected, got 0x%08lx\n", (ERROR_INVALID_PARAMETER == GetLastError()),
GetLastError()); "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER "
"(98) expected, got 0x%08lx\n", GetLastError());
hdl = 0x55555555; hdl = 0x55555555;
SetLastError(-1L); SetLastError(-1L);
...@@ -42,9 +43,10 @@ static void test_info_size(void) ...@@ -42,9 +43,10 @@ static void test_info_size(void)
ok( !retval, ok( !retval,
"GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n",
retval); retval);
ok( ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError(), ok( (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) ||
"Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND expected, got 0x%08lx\n", (ERROR_INVALID_PARAMETER == GetLastError()),
GetLastError()); "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER "
"(98) expected, got 0x%08lx\n", GetLastError());
ok( hdl == 0L, ok( hdl == 0L,
"Handle wrong! 0L expected, got 0x%08lx\n", hdl); "Handle wrong! 0L expected, got 0x%08lx\n", hdl);
...@@ -53,9 +55,10 @@ static void test_info_size(void) ...@@ -53,9 +55,10 @@ static void test_info_size(void)
ok( !retval, ok( !retval,
"GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n",
retval); retval);
ok( ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError(), ok( (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) ||
"Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND expected, got 0x%08lx\n", (ERROR_BAD_PATHNAME == GetLastError()),
GetLastError()); "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME "
"(98) expected, got 0x%08lx\n", GetLastError());
hdl = 0x55555555; hdl = 0x55555555;
SetLastError(-1L); SetLastError(-1L);
...@@ -63,9 +66,10 @@ static void test_info_size(void) ...@@ -63,9 +66,10 @@ static void test_info_size(void)
ok( !retval, ok( !retval,
"GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n",
retval); retval);
ok( ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError(), ok( (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) ||
"Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND expected, got 0x%08lx\n", (ERROR_BAD_PATHNAME == GetLastError()),
GetLastError()); "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME "
"(98) expected, got 0x%08lx\n", GetLastError());
ok( hdl == 0L, ok( hdl == 0L,
"Handle wrong! 0L expected, got 0x%08lx\n", hdl); "Handle wrong! 0L expected, got 0x%08lx\n", hdl);
...@@ -95,9 +99,10 @@ static void test_info_size(void) ...@@ -95,9 +99,10 @@ static void test_info_size(void)
ok( !retval, ok( !retval,
"GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n", "GetFileVersionInfoSizeA result wrong! 0L expected, got 0x%08lx\n",
retval); retval);
ok( ERROR_FILE_NOT_FOUND == GetLastError(), ok( (ERROR_FILE_NOT_FOUND == GetLastError()) ||
"Last error wrong! ERROR_FILE_NOT_FOUND expected, got 0x%08lx\n", (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()),
GetLastError()); "Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND "
"(XP) expected, got 0x%08lx\n", GetLastError());
} }
START_TEST(info) START_TEST(info)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment