Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VERSION_WINETEST]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=63003
This commit is contained in:
Amine Khaldi 2014-04-26 18:16:00 +00:00
parent 4c8d114899
commit 6b13145060
3 changed files with 83 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rostests/winetests/version/CMakeLists.txt
View file

@ -8,5 +8,8 @@ list(APPEND SOURCE
add_executable(version_winetest ${SOURCE} version.rc) add_executable(version_winetest ${SOURCE} version.rc)
set_module_type(version_winetest win32cui) set_module_type(version_winetest win32cui)
add_importlibs(version_winetest version msvcrt kernel32 ntdll) add_importlibs(version_winetest version msvcrt kernel32)
if(MSVC)
add_importlibs(version_winetest ntdll)
endif()
add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all) add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all)

101
rostests/winetests/version/info.c
View file

@ -204,7 +204,7 @@ static void test_info(void)
VS_FIXEDFILEINFO *pFixedVersionInfo; VS_FIXEDFILEINFO *pFixedVersionInfo;
UINT uiLength; UINT uiLength;
char VersionString[MAX_PATH]; char VersionString[MAX_PATH];
static CHAR backslash[] = "\\"; static const char backslash[] = "\\";
DWORDLONG dwlVersion; DWORDLONG dwlVersion;
hdl = 0x55555555; hdl = 0x55555555;
@ -457,7 +457,7 @@ static void test_32bit_win(void)
HeapFree( GetProcessHeap(), 0, pVersionInfoW); HeapFree( GetProcessHeap(), 0, pVersionInfoW);
} }
static void test_VerQueryValue(void) static void test_VerQueryValueA(void)
{ {
static const char * const value_name[] = { static const char * const value_name[] = {
"Product", "CompanyName", "FileDescription", "Internal", "Product", "CompanyName", "FileDescription", "Internal",
@ -468,24 +468,24 @@ static void test_VerQueryValue(void)
UINT len, ret, translation, i; UINT len, ret, translation, i;
char buf[MAX_PATH]; char buf[MAX_PATH];
ret = GetModuleFileName(NULL, buf, sizeof(buf)); ret = GetModuleFileNameA(NULL, buf, sizeof(buf));
assert(ret); assert(ret);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
len = GetFileVersionInfoSize(buf, NULL); len = GetFileVersionInfoSizeA(buf, NULL);
ok(len, "GetFileVersionInfoSize(%s) error %u\n", buf, GetLastError()); ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError());
ver = HeapAlloc(GetProcessHeap(), 0, len); ver = HeapAlloc(GetProcessHeap(), 0, len);
assert(ver); assert(ver);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = GetFileVersionInfo(buf, 0, len, ver); ret = GetFileVersionInfoA(buf, 0, len, ver);
ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); ok(ret, "GetFileVersionInfoA error %u\n", GetLastError());
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(ret, "VerQueryValue error %u\n", GetLastError());
ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); ok(len == 4, "VerQueryValue returned %u, expected 4\n", len);
@ -495,7 +495,7 @@ static void test_VerQueryValue(void)
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ret = VerQueryValueA(ver, "String", (LPVOID*)&p, &len);
ok(!ret, "VerQueryValue should fail\n"); ok(!ret, "VerQueryValue should fail\n");
ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ||
GetLastError() == 0xdeadbeef /* NT4, W2K */, GetLastError() == 0xdeadbeef /* NT4, W2K */,
@ -506,42 +506,42 @@ static void test_VerQueryValue(void)
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, "StringFileInfo", (LPVOID*)&p, &len); ret = VerQueryValueA(ver, "StringFileInfo", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(ret, "VerQueryValue error %u\n", GetLastError());
todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, "\\StringFileInfo", (LPVOID*)&p, &len); ret = VerQueryValueA(ver, "\\StringFileInfo", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(ret, "VerQueryValue error %u\n", GetLastError());
todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); ret = VerQueryValueA(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(ret, "VerQueryValue error %u\n", GetLastError());
todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); ret = VerQueryValueA(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(ret, "VerQueryValue error %u\n", GetLastError());
todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
sprintf(buf, "\\StringFileInfo\\%08x", translation); sprintf(buf, "\\StringFileInfo\\%08x", translation);
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(ret, "VerQueryValue error %u\n", GetLastError());
todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++)
@ -550,20 +550,20 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len);
ok(ret, "VerQueryValue(%s) error %u\n", buf, GetLastError()); ok(ret, "VerQueryValueA(%s) error %u\n", buf, GetLastError());
ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u\n", len); ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u\n", len);
ok(!strcmp(value_name[i], p), "expected \"%s\", got \"%s\"\n", ok(!strcmp(value_name[i], p), "expected \"%s\", got \"%s\"\n",
value_name[i], p); value_name[i], p);
/* test partial value names */ /* test partial value names */
len = lstrlen(buf); len = lstrlenA(buf);
buf[len - 2] = 0; buf[len - 2] = 0;
p = (char *)0xdeadbeef; p = (char *)0xdeadbeef;
len = 0xdeadbeef; len = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len);
ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(!ret, "VerQueryValueA(%s) succeeded\n", buf);
ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ||
GetLastError() == 0xdeadbeef /* NT4, W2K */, GetLastError() == 0xdeadbeef /* NT4, W2K */,
"VerQueryValue returned %u\n", GetLastError()); "VerQueryValue returned %u\n", GetLastError());
@ -574,10 +574,61 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
HeapFree(GetProcessHeap(), 0, ver); HeapFree(GetProcessHeap(), 0, ver);
} }
static void test_extra_block(void)
{
WORD extra_block[] = {
72, 0, 0, 'W', 'i', 'n', 'e', 'T', 'e', 's', 't', '\0',
24, 4, 0, 'B', 'i', 'n', 'a', 'r', 'y', '\0', 0xbeef, 0xdead,
24, 4, 1, 'T', 'e', 'x', 't', '\0', 'B', '-', ')', '\0',
};
char buf[MAX_PATH];
UINT len, ret;
ULONG w;
char *ver, *p;
WORD *length;
ret = GetModuleFileNameA(NULL, buf, sizeof(buf));
ok(ret, "GetModuleFileNameA failed\n");
len = GetFileVersionInfoSizeA(buf, NULL);
ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError());
ver = HeapAlloc(GetProcessHeap(), 0, len + sizeof(extra_block) * 2);
ok(ver != NULL, "Can't allocate memory\n");
ret = GetFileVersionInfoA(buf, 0, len, ver);
ok(ret, "GetFileVersionInfoA error %u\n", GetLastError());
/* forge the string table, as windres dislike an extra block */
length = (WORD *)ver; /* see VS_VERSION_INFO_STRUCT32 for details */
memcpy(ver + *length, extra_block, sizeof(extra_block));
*length += sizeof(extra_block);
p = (char *)0xdeadbeef;
len = 0xdeadbeef;
w = 0xdeadbeef;
ret = VerQueryValueA(ver, "WineTest\\Binary", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError());
ok(len == 4, "VerQueryValue returned %u, expected 4\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
ok(memcmp(p, &w, sizeof(w)) == 0, "got 0x%08x, expected 0x%08x\n", *(PULONG)p, w);
p = (char *)0xdeadbeef;
len = 0xdeadbeef;
ret = VerQueryValueA(ver, "WineTest\\Text", (LPVOID*)&p, &len);
ok(ret, "VerQueryValue error %u\n", GetLastError());
ok(len == 4, "VerQueryValue returned %u, expected 4\n", len);
ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n");
ok(strcmp(p, "B-)") == 0, "got '%s', expected '%s'\n", p, "B-)");
HeapFree(GetProcessHeap(), 0, ver);
}
START_TEST(info) START_TEST(info)
{ {
test_info_size(); test_info_size();
test_info(); test_info();
test_32bit_win(); test_32bit_win();
test_VerQueryValue(); test_VerQueryValueA();
test_extra_block();
} }

6
rostests/winetests/version/install.c
View file

@ -34,9 +34,9 @@ static void test_find_file(void)
char filename[MAX_PATH]; char filename[MAX_PATH];
char outBuf[MAX_PATH]; char outBuf[MAX_PATH];
char windir[MAX_PATH]; char windir[MAX_PATH];
static CHAR empty[] = "", static const char empty[] = "",
regedit[] = "regedit", regedit[] = "regedit",
regedit_exe[] = "regedit.exe"; regedit_exe[] = "regedit.exe";
memset(appdir, 0, MAX_PATH); memset(appdir, 0, MAX_PATH);
memset(windir, 0, MAX_PATH); memset(windir, 0, MAX_PATH);