Skip to content

W
wine-cw
Commit 79cf6468 authored by Stefan Leichter's avatar Stefan Leichter Committed by Alexandre Julliard
Browse files
Options

Fixed GetFileVersionInfoSizeA tests on NT4 platform.

parent b46a106a
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 28 deletions
dlls/version/tests/info.c
View file @ 79cf6468
...@@ -24,56 +24,58 @@ ...@@ -24,56 +24,58 @@
#include "winerror.h" #include "winerror.h"
#include "winver.h" #include "winver.h"
#define MY_LAST_ERROR -1L
#define EXPECT_BAD_PATH__NOT_FOUND \
ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \
(ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \
(ERROR_BAD_PATHNAME == GetLastError()), \
"Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME (98)/" \
"ERROR_PATH_NOT_FOUND (NT4) expected, got 0x%08lx\n", GetLastError());
#define EXPECT_INVALID__NOT_FOUND \
ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \
(ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \
(ERROR_INVALID_PARAMETER == GetLastError()), \
"Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER (98)/" \
"ERROR_PATH_NOT_FOUND (NT4) expected, got 0x%08lx\n", GetLastError());
static void test_info_size(void) static void test_info_size(void)
{ DWORD hdl, retval; { DWORD hdl, retval;
SetLastError(-1L); SetLastError(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( NULL, NULL); retval = GetFileVersionInfoSizeA( NULL, NULL);
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()) || EXPECT_INVALID__NOT_FOUND;
(ERROR_INVALID_PARAMETER == 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(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( NULL, &hdl); retval = GetFileVersionInfoSizeA( NULL, &hdl);
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()) || EXPECT_INVALID__NOT_FOUND;
(ERROR_INVALID_PARAMETER == 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);
SetLastError(-1L); SetLastError(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( "", NULL); retval = GetFileVersionInfoSizeA( "", NULL);
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()) || EXPECT_BAD_PATH__NOT_FOUND;
(ERROR_BAD_PATHNAME == 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(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( "", &hdl); retval = GetFileVersionInfoSizeA( "", &hdl);
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()) || EXPECT_BAD_PATH__NOT_FOUND;
(ERROR_BAD_PATHNAME == 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);
SetLastError(-1L); SetLastError(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( "kernel32.dll", NULL); retval = GetFileVersionInfoSizeA( "kernel32.dll", NULL);
ok( retval, ok( retval,
"GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08lx\n", "GetFileVersionInfoSizeA result wrong! <> 0L expected, got 0x%08lx\n",
...@@ -83,26 +85,27 @@ static void test_info_size(void) ...@@ -83,26 +85,27 @@ static void test_info_size(void)
GetLastError()); GetLastError());
hdl = 0x55555555; hdl = 0x55555555;
SetLastError(-1L); SetLastError(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( "kernel32.dll", &hdl); retval = GetFileVersionInfoSizeA( "kernel32.dll", &hdl);
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( NO_ERROR == GetLastError(), ok((NO_ERROR == GetLastError()) || (MY_LAST_ERROR == GetLastError()),
"Last error wrong! NO_ERROR expected, got 0x%08lx\n", "Last error wrong! NO_ERROR/0x%08lx (NT4) expected, got 0x%08lx\n",
GetLastError()); MY_LAST_ERROR, 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);
SetLastError(-1L); SetLastError(MY_LAST_ERROR);
retval = GetFileVersionInfoSizeA( "notexist.dll", NULL); retval = GetFileVersionInfoSizeA( "notexist.dll", NULL);
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()) ||
(ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()), (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) ||
(MY_LAST_ERROR == GetLastError()),
"Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND " "Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND "
"(XP) expected, got 0x%08lx\n", GetLastError()); "(XP)/0x%08lx (NT4) expected, got 0x%08lx\n", MY_LAST_ERROR, 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