msi/tests: Avoid a test failure on 64-bit.
This commit is contained in:
parent
b376f41766
commit
973821c775
|
@ -46,6 +46,7 @@ static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD);
|
|||
static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD);
|
||||
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
|
||||
static void (WINAPI *pGetSystemInfo)(LPSYSTEM_INFO);
|
||||
static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO);
|
||||
static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR, UINT);
|
||||
|
||||
static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD);
|
||||
|
@ -72,6 +73,7 @@ static void init_functionpointers(void)
|
|||
GET_PROC(hadvapi32, RegDeleteKeyExA)
|
||||
GET_PROC(hadvapi32, RegDeleteKeyExW)
|
||||
GET_PROC(hkernel32, IsWow64Process)
|
||||
GET_PROC(hkernel32, GetNativeSystemInfo)
|
||||
GET_PROC(hkernel32, GetSystemInfo)
|
||||
GET_PROC(hkernel32, GetSystemWow64DirectoryA)
|
||||
|
||||
|
@ -8283,6 +8285,7 @@ static void test_appsearch_reglocator(void)
|
|||
LPCSTR str;
|
||||
LONG res;
|
||||
UINT r, type = 0;
|
||||
SYSTEM_INFO si;
|
||||
|
||||
version = TRUE;
|
||||
if (!create_file_with_version("test.dll", MAKELONG(2, 1), MAKELONG(4, 3)))
|
||||
|
@ -8726,6 +8729,11 @@ static void test_appsearch_reglocator(void)
|
|||
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
|
||||
ok(!lstrcmpA(prop, "#-42"), "Expected \"#-42\", got \"%s\"\n", prop);
|
||||
|
||||
memset(&si, 0, sizeof(si));
|
||||
if (pGetNativeSystemInfo) pGetNativeSystemInfo(&si);
|
||||
|
||||
if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL)
|
||||
{
|
||||
size = ExpandEnvironmentStringsA("%PATH%", NULL, 0);
|
||||
if (size == 0 && GetLastError() == ERROR_INVALID_PARAMETER)
|
||||
{
|
||||
|
@ -8748,6 +8756,7 @@ static void test_appsearch_reglocator(void)
|
|||
|
||||
HeapFree(GetProcessHeap(), 0, pathvar);
|
||||
HeapFree(GetProcessHeap(), 0, pathdata);
|
||||
}
|
||||
|
||||
size = MAX_PATH;
|
||||
r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size);
|
||||
|
|
Loading…
Reference in New Issue