ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi/tests: Fix some more wow64 test failures.

Browse Source
This commit is contained in:
Hans Leidekker 2010-07-22 11:49:28 +02:00 committed by Alexandre Julliard
parent c4511481db
commit c4bf9fb710
3 changed files with 286 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dlls/msi/tests/automation.c
View File

@ -32,6 +32,9 @@
#include "wine/test.h" #include "wine/test.h"
static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static const char *msifile = "winetest-automation.msi"; static const char *msifile = "winetest-automation.msi";
@ -199,6 +202,29 @@ static const msi_summary_info summary_info[] =
ADD_INFO_FILETIME(PID_LASTPRINTED, &systemtime) ADD_INFO_FILETIME(PID_LASTPRINTED, &systemtime)
}; };
static void init_functionpointers(void)
{
HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll");
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
#define GET_PROC(dll, func) \
p ## func = (void *)GetProcAddress(dll, #func); \
if(!p ## func) \
trace("GetProcAddress(%s) failed\n", #func);
GET_PROC(hadvapi32, RegDeleteKeyExA)
GET_PROC(hkernel32, IsWow64Process)
#undef GET_PROC
}
static LONG delete_key_portable( HKEY key, LPCSTR subkey, REGSAM access )
{
if (pRegDeleteKeyExA)
return pRegDeleteKeyExA( key, subkey, access, 0 );
return RegDeleteKeyA( key, subkey );
}
/* /*
* Database Helpers * Database Helpers
*/ */
@ -2334,30 +2360,30 @@ static void test_Installer_Products(BOOL bProductInstalled)
/* Delete a registry subkey, including all its subkeys (RegDeleteKey does not work on keys with subkeys without /* Delete a registry subkey, including all its subkeys (RegDeleteKey does not work on keys with subkeys without
* deleting the subkeys first) */ * deleting the subkeys first) */
static UINT delete_registry_key(HKEY hkeyParent, LPCSTR subkey) static UINT delete_registry_key(HKEY hkeyParent, LPCSTR subkey, REGSAM access)
{ {
UINT ret; UINT ret;
CHAR *string = NULL; CHAR *string = NULL;
HKEY hkey; HKEY hkey;
DWORD dwSize; DWORD dwSize;
ret = RegOpenKey(hkeyParent, subkey, &hkey); ret = RegOpenKeyEx(hkeyParent, subkey, 0, access, &hkey);
if (ret != ERROR_SUCCESS) return ret; if (ret != ERROR_SUCCESS) return ret;
ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL); ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL);
if (ret != ERROR_SUCCESS) return ret; if (ret != ERROR_SUCCESS) return ret;
if (!(string = HeapAlloc(GetProcessHeap(), 0, ++dwSize))) return ERROR_NOT_ENOUGH_MEMORY; if (!(string = HeapAlloc(GetProcessHeap(), 0, ++dwSize))) return ERROR_NOT_ENOUGH_MEMORY;
while (RegEnumKeyA(hkey, 0, string, dwSize) == ERROR_SUCCESS) while (RegEnumKeyA(hkey, 0, string, dwSize) == ERROR_SUCCESS)
delete_registry_key(hkey, string); delete_registry_key(hkey, string, access);
RegCloseKey(hkey); RegCloseKey(hkey);
HeapFree(GetProcessHeap(), 0, string); HeapFree(GetProcessHeap(), 0, string);
RegDeleteKeyA(hkeyParent, subkey); delete_key_portable(hkeyParent, subkey, access);
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
/* Find a specific registry subkey at any depth within the given key and subkey and return its parent key. */ /* Find a specific registry subkey at any depth within the given key and subkey and return its parent key. */
static UINT find_registry_key(HKEY hkeyParent, LPCSTR subkey, LPCSTR findkey, HKEY *phkey) static UINT find_registry_key(HKEY hkeyParent, LPCSTR subkey, LPCSTR findkey, REGSAM access, HKEY *phkey)
{ {
UINT ret; UINT ret;
CHAR *string = NULL; CHAR *string = NULL;
@ -2368,7 +2394,7 @@ static UINT find_registry_key(HKEY hkeyParent, LPCSTR subkey, LPCSTR findkey, HK
*phkey = 0; *phkey = 0;
ret = RegOpenKey(hkeyParent, subkey, &hkey); ret = RegOpenKeyEx(hkeyParent, subkey, 0, access, &hkey);
if (ret != ERROR_SUCCESS) return ret; if (ret != ERROR_SUCCESS) return ret;
ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL); ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL);
if (ret != ERROR_SUCCESS) return ret; if (ret != ERROR_SUCCESS) return ret;
@ -2382,7 +2408,7 @@ static UINT find_registry_key(HKEY hkeyParent, LPCSTR subkey, LPCSTR findkey, HK
*phkey = hkey; *phkey = hkey;
found = TRUE; found = TRUE;
} }
else if (find_registry_key(hkey, string, findkey, phkey) == ERROR_SUCCESS) found = TRUE; else if (find_registry_key(hkey, string, findkey, access, phkey) == ERROR_SUCCESS) found = TRUE;
} }
if (*phkey != hkey) RegCloseKey(hkey); if (*phkey != hkey) RegCloseKey(hkey);
@ -2400,6 +2426,11 @@ static void test_Installer_InstallProduct(void)
DWORD num, size, type; DWORD num, size, type;
int iValue, iCount; int iValue, iCount;
IDispatch *pStringList = NULL; IDispatch *pStringList = NULL;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
create_test_files(); create_test_files();
@ -2483,7 +2514,7 @@ static void test_Installer_InstallProduct(void)
ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); ok(delete_pf("msitest\\filename", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -2511,40 +2542,45 @@ static void test_Installer_InstallProduct(void)
RegCloseKey(hkey); RegCloseKey(hkey);
res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); res = delete_key_portable(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
/* Remove registry keys written by RegisterProduct standard action */ /* Remove registry keys written by RegisterProduct standard action */
res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}"); res = delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", access);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656"); res = delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656", access);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = find_registry_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData", "05FA3C1F65B896A40AC00077F34EF203", &hkey); res = find_registry_key(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData", "05FA3C1F65B896A40AC00077F34EF203", access, &hkey);
ok(res == ERROR_SUCCESS || ok(res == ERROR_SUCCESS ||
broken(res == ERROR_FILE_NOT_FOUND), /* win9x */ broken(res == ERROR_FILE_NOT_FOUND), /* win9x */
"Expected ERROR_SUCCESS, got %d\n", res); "Expected ERROR_SUCCESS, got %d\n", res);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
res = delete_registry_key(hkey, "05FA3C1F65B896A40AC00077F34EF203"); res = delete_registry_key(hkey, "05FA3C1F65B896A40AC00077F34EF203", access);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegCloseKey(hkey); RegCloseKey(hkey);
res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); res = delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203", access);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
} }
else else
{ {
/* win9x defaults to a per-machine install. */ /* win9x defaults to a per-machine install. */
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); delete_key_portable(HKEY_LOCAL_MACHINE,
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203", access);
} }
/* Remove registry keys written by PublishProduct standard action */ /* Remove registry keys written by PublishProduct standard action */
res = RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey); res = RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = delete_registry_key(hkey, "Products\\05FA3C1F65B896A40AC00077F34EF203"); res = delete_registry_key(hkey, "Products\\05FA3C1F65B896A40AC00077F34EF203", KEY_ALL_ACCESS);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegDeleteKeyA(hkey, "UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656"); res = RegDeleteKeyA(hkey, "UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656");
@ -2693,6 +2729,7 @@ START_TEST(automation)
CLSID clsid; CLSID clsid;
IUnknown *pUnk; IUnknown *pUnk;
init_functionpointers();
GetSystemTimeAsFileTime(&systemtime); GetSystemTimeAsFileTime(&systemtime);
GetCurrentDirectoryA(MAX_PATH, prev_path); GetCurrentDirectoryA(MAX_PATH, prev_path);

314
dlls/msi/tests/install.c
View File

@ -44,6 +44,8 @@ static UINT (WINAPI *pMsiSourceListGetInfoA)
(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD);
static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*);
static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
static HMODULE hsrclient = 0; static HMODULE hsrclient = 0;
static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD);
@ -3063,6 +3065,7 @@ static void init_functionpointers(void)
{ {
HMODULE hmsi = GetModuleHandleA("msi.dll"); HMODULE hmsi = GetModuleHandleA("msi.dll");
HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll");
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
#define GET_PROC(mod, func) \ #define GET_PROC(mod, func) \
p ## func = (void*)GetProcAddress(mod, #func); \ p ## func = (void*)GetProcAddress(mod, #func); \
@ -3075,6 +3078,8 @@ static void init_functionpointers(void)
GET_PROC(hmsi, MsiSourceListGetInfoA); GET_PROC(hmsi, MsiSourceListGetInfoA);
GET_PROC(hadvapi32, ConvertSidToStringSidA); GET_PROC(hadvapi32, ConvertSidToStringSidA);
GET_PROC(hadvapi32, RegDeleteKeyExA)
GET_PROC(hkernel32, IsWow64Process)
hsrclient = LoadLibraryA("srclient.dll"); hsrclient = LoadLibraryA("srclient.dll");
GET_PROC(hsrclient, SRRemoveRestorePoint); GET_PROC(hsrclient, SRRemoveRestorePoint);
@ -3484,6 +3489,13 @@ static void remove_restore_point(DWORD seq_number)
trace("Failed to remove the restore point : %08x\n", res); trace("Failed to remove the restore point : %08x\n", res);
} }
static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access )
{
if (pRegDeleteKeyExA)
return pRegDeleteKeyExA( key, subkey, access, 0 );
return RegDeleteKeyA( key, subkey );
}
static void test_MsiInstallProduct(void) static void test_MsiInstallProduct(void)
{ {
UINT r; UINT r;
@ -3491,6 +3503,8 @@ static void test_MsiInstallProduct(void)
LONG res; LONG res;
HKEY hkey; HKEY hkey;
DWORD num, size, type; DWORD num, size, type;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (on_win9x) if (on_win9x)
{ {
@ -3498,6 +3512,9 @@ static void test_MsiInstallProduct(void)
return; return;
} }
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
/* szPackagePath is NULL */ /* szPackagePath is NULL */
r = MsiInstallProductA(NULL, "INSTALL=ALL"); r = MsiInstallProductA(NULL, "INSTALL=ALL");
ok(r == ERROR_INVALID_PARAMETER, ok(r == ERROR_INVALID_PARAMETER,
@ -3538,7 +3555,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -3566,7 +3583,7 @@ static void test_MsiInstallProduct(void)
check_service_is_installed(); check_service_is_installed();
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
/* not published, reinstall */ /* not published, reinstall */
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
@ -3585,9 +3602,9 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
create_database(msifile, up_tables, sizeof(up_tables) / sizeof(msi_table)); create_database(msifile, up_tables, sizeof(up_tables) / sizeof(msi_table));
@ -3608,9 +3625,9 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
create_database(msifile, up2_tables, sizeof(up2_tables) / sizeof(msi_table)); create_database(msifile, up2_tables, sizeof(up2_tables) / sizeof(msi_table));
@ -3631,9 +3648,9 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
create_database(msifile, up3_tables, sizeof(up3_tables) / sizeof(msi_table)); create_database(msifile, up3_tables, sizeof(up3_tables) / sizeof(msi_table));
@ -3654,9 +3671,9 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
create_database(msifile, up4_tables, sizeof(up4_tables) / sizeof(msi_table)); create_database(msifile, up4_tables, sizeof(up4_tables) / sizeof(msi_table));
@ -3677,7 +3694,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
create_database(msifile, up4_tables, sizeof(up4_tables) / sizeof(msi_table)); create_database(msifile, up4_tables, sizeof(up4_tables) / sizeof(msi_table));
@ -3699,7 +3716,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
create_database(msifile, up5_tables, sizeof(up5_tables) / sizeof(msi_table)); create_database(msifile, up5_tables, sizeof(up5_tables) / sizeof(msi_table));
@ -3721,7 +3738,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
create_database(msifile, up6_tables, sizeof(up6_tables) / sizeof(msi_table)); create_database(msifile, up6_tables, sizeof(up6_tables) / sizeof(msi_table));
@ -3743,7 +3760,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
create_database(msifile, up7_tables, sizeof(up7_tables) / sizeof(msi_table)); create_database(msifile, up7_tables, sizeof(up7_tables) / sizeof(msi_table));
@ -3765,7 +3782,7 @@ static void test_MsiInstallProduct(void)
ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
r = MsiInstallProductA(msifile, "REMOVE=ALL"); r = MsiInstallProductA(msifile, "REMOVE=ALL");
@ -4766,6 +4783,8 @@ static void test_publish_registerproduct(void)
char date[MAX_PATH]; char date[MAX_PATH];
char temp[MAX_PATH]; char temp[MAX_PATH];
char keypath[MAX_PATH]; char keypath[MAX_PATH];
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
static const CHAR uninstall[] = "Software\\Microsoft\\Windows\\CurrentVersion" static const CHAR uninstall[] = "Software\\Microsoft\\Windows\\CurrentVersion"
"\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}";
@ -4787,6 +4806,9 @@ static void test_publish_registerproduct(void)
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* RegisterProduct */ /* RegisterProduct */
@ -4803,7 +4825,7 @@ static void test_publish_registerproduct(void)
res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, uninstall, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST");
@ -4833,14 +4855,14 @@ static void test_publish_registerproduct(void)
CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4);
} }
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
sprintf(keypath, userdata, usersid); sprintf(keypath, userdata, usersid);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegOpenKeyA(hkey, "InstallProperties", &props); res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */
@ -4871,26 +4893,26 @@ static void test_publish_registerproduct(void)
CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4);
} }
RegDeleteKeyA(props, ""); delete_key(props, "", access);
RegCloseKey(props); RegCloseKey(props);
res = RegOpenKeyA(hkey, "Usage", &usage); res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage);
todo_wine todo_wine
{ {
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
} }
RegDeleteKeyA(usage, ""); delete_key(usage, "", access);
RegCloseKey(usage); RegCloseKey(usage);
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, ugkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL);
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
/* RegisterProduct, machine */ /* RegisterProduct, machine */
@ -4899,10 +4921,10 @@ static void test_publish_registerproduct(void)
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, userugkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, uninstall, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST");
@ -4932,14 +4954,14 @@ static void test_publish_registerproduct(void)
CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4);
} }
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
sprintf(keypath, userdata, "S-1-5-18"); sprintf(keypath, userdata, "S-1-5-18");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegOpenKeyA(hkey, "InstallProperties", &props); res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */
@ -4970,26 +4992,26 @@ static void test_publish_registerproduct(void)
CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4);
} }
RegDeleteKeyA(props, ""); delete_key(props, "", access);
RegCloseKey(props); RegCloseKey(props);
res = RegOpenKeyA(hkey, "Usage", &usage); res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage);
todo_wine todo_wine
{ {
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
} }
RegDeleteKeyA(usage, ""); delete_key(usage, "", access);
RegCloseKey(usage); RegCloseKey(usage);
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, ugkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL);
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
error: error:
@ -5009,7 +5031,8 @@ static void test_publish_publishproduct(void)
CHAR keypath[MAX_PATH]; CHAR keypath[MAX_PATH];
CHAR temp[MAX_PATH]; CHAR temp[MAX_PATH];
CHAR path[MAX_PATH]; CHAR path[MAX_PATH];
BOOL old_installer = FALSE; BOOL wow64, old_installer = FALSE;
REGSAM access = KEY_ALL_ACCESS;
static const CHAR prodpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" static const CHAR prodpath[] = "Software\\Microsoft\\Windows\\CurrentVersion"
"\\Installer\\UserData\\%s\\Products" "\\Installer\\UserData\\%s\\Products"
@ -5034,6 +5057,9 @@ static void test_publish_publishproduct(void)
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* PublishProduct, current user */ /* PublishProduct, current user */
@ -5047,11 +5073,11 @@ static void test_publish_publishproduct(void)
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, badprod, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, badprod, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
sprintf(keypath, prodpath, usersid); sprintf(keypath, prodpath, usersid);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
if (res == ERROR_FILE_NOT_FOUND) if (res == ERROR_FILE_NOT_FOUND)
{ {
res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey);
@ -5070,20 +5096,19 @@ static void test_publish_publishproduct(void)
} }
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegOpenKeyA(hkey, "InstallProperties", &props); res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(hkey, "Patches", &patches); res = RegOpenKeyExA(hkey, "Patches", 0, access, &patches);
todo_wine todo_wine
{ {
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(patches, "AllPatches", NULL); CHECK_DEL_REG_STR(patches, "AllPatches", NULL);
} }
RegDeleteKeyA(patches, ""); delete_key(patches, "", access);
RegCloseKey(patches); RegCloseKey(patches);
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
currentuser: currentuser:
@ -5145,27 +5170,26 @@ currentuser:
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, badprod, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, badprod, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
sprintf(keypath, prodpath, "S-1-5-18"); sprintf(keypath, prodpath, "S-1-5-18");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegOpenKeyA(hkey, "InstallProperties", &props); res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(hkey, "Patches", &patches); res = RegOpenKeyExA(hkey, "Patches", 0, access, &patches);
todo_wine todo_wine
{ {
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_DEL_REG_STR(patches, "AllPatches", NULL); CHECK_DEL_REG_STR(patches, "AllPatches", NULL);
} }
RegDeleteKeyA(patches, ""); delete_key(patches, "", access);
RegCloseKey(patches); RegCloseKey(patches);
RegDeleteKeyA(hkey, ""); delete_key(hkey, "", access);
RegCloseKey(hkey); RegCloseKey(hkey);
machprod: machprod:
@ -5233,6 +5257,8 @@ static void test_publish_publishfeatures(void)
HKEY hkey; HKEY hkey;
LPSTR usersid; LPSTR usersid;
CHAR keypath[MAX_PATH]; CHAR keypath[MAX_PATH];
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
static const CHAR cupath[] = "Software\\Microsoft\\Installer\\Features" static const CHAR cupath[] = "Software\\Microsoft\\Installer\\Features"
"\\84A88FD7F6998CE40A22FB59F6B9C2BB"; "\\84A88FD7F6998CE40A22FB59F6B9C2BB";
@ -5252,6 +5278,9 @@ static void test_publish_publishfeatures(void)
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* PublishFeatures, current user */ /* PublishFeatures, current user */
@ -5265,10 +5294,10 @@ static void test_publish_publishfeatures(void)
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, featkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, featkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, classfeat, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
@ -5300,7 +5329,7 @@ static void test_publish_publishfeatures(void)
ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, featkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, featkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
@ -5358,9 +5387,14 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
{ {
LONG res; LONG res;
HKEY hkey; HKEY hkey;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
*owner = *company = NULL; *owner = *company = NULL;
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
res = RegOpenKeyA(HKEY_CURRENT_USER, res = RegOpenKeyA(HKEY_CURRENT_USER,
"Software\\Microsoft\\MS Setup (ACME)\\User Info", &hkey); "Software\\Microsoft\\MS Setup (ACME)\\User Info", &hkey);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
@ -5372,8 +5406,8 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
if (!*owner || !*company) if (!*owner || !*company)
{ {
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, res = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion", &hkey); "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
*owner = reg_get_val_str(hkey, "RegisteredOwner"); *owner = reg_get_val_str(hkey, "RegisteredOwner");
@ -5384,8 +5418,8 @@ static void get_owner_company(LPSTR *owner, LPSTR *company)
if (!*owner || !*company) if (!*owner || !*company)
{ {
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, res = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows NT\\CurrentVersion", &hkey); "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
*owner = reg_get_val_str(hkey, "RegisteredOwner"); *owner = reg_get_val_str(hkey, "RegisteredOwner");
@ -5403,6 +5437,8 @@ static void test_publish_registeruser(void)
LPSTR usersid; LPSTR usersid;
LPSTR owner, company; LPSTR owner, company;
CHAR keypath[MAX_PATH]; CHAR keypath[MAX_PATH];
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
static const CHAR keyfmt[] = static const CHAR keyfmt[] =
"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\"
@ -5418,6 +5454,9 @@ static void test_publish_registeruser(void)
create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* RegisterUser, per-user */ /* RegisterUser, per-user */
@ -5432,8 +5471,7 @@ static void test_publish_registeruser(void)
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
sprintf(keypath, keyfmt, usersid); sprintf(keypath, keyfmt, usersid);
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(props, "ProductID", "none"); CHECK_REG_STR(props, "ProductID", "none");
@ -5443,7 +5481,7 @@ static void test_publish_registeruser(void)
RegDeleteValueA(props, "ProductID"); RegDeleteValueA(props, "ProductID");
RegDeleteValueA(props, "RegCompany"); RegDeleteValueA(props, "RegCompany");
RegDeleteValueA(props, "RegOwner"); RegDeleteValueA(props, "RegOwner");
RegDeleteKeyA(props, ""); delete_key(props, "", access);
RegCloseKey(props); RegCloseKey(props);
/* RegisterUser, machine */ /* RegisterUser, machine */
@ -5453,8 +5491,7 @@ static void test_publish_registeruser(void)
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
sprintf(keypath, keyfmt, "S-1-5-18"); sprintf(keypath, keyfmt, "S-1-5-18");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(props, "ProductID", "none"); CHECK_REG_STR(props, "ProductID", "none");
@ -5464,7 +5501,7 @@ static void test_publish_registeruser(void)
RegDeleteValueA(props, "ProductID"); RegDeleteValueA(props, "ProductID");
RegDeleteValueA(props, "RegCompany"); RegDeleteValueA(props, "RegCompany");
RegDeleteValueA(props, "RegOwner"); RegDeleteValueA(props, "RegOwner");
RegDeleteKeyA(props, ""); delete_key(props, "", access);
RegCloseKey(props); RegCloseKey(props);
error: error:
@ -5487,6 +5524,8 @@ static void test_publish_processcomponents(void)
CHAR val[MAX_PATH]; CHAR val[MAX_PATH];
CHAR keypath[MAX_PATH]; CHAR keypath[MAX_PATH];
CHAR program_files_maximus[MAX_PATH]; CHAR program_files_maximus[MAX_PATH];
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
static const CHAR keyfmt[] = static const CHAR keyfmt[] =
"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\"
@ -5502,6 +5541,9 @@ static void test_publish_processcomponents(void)
create_database(msifile, ppc_tables, sizeof(ppc_tables) / sizeof(msi_table)); create_database(msifile, ppc_tables, sizeof(ppc_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
/* ProcessComponents, per-user */ /* ProcessComponents, per-user */
@ -5516,8 +5558,7 @@ static void test_publish_processcomponents(void)
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
sprintf(keypath, keyfmt, usersid, "CBABC2FDCCB35E749A8944D8C1C098B5"); sprintf(keypath, keyfmt, usersid, "CBABC2FDCCB35E749A8944D8C1C098B5");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &comp);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -5531,16 +5572,15 @@ static void test_publish_processcomponents(void)
ok(!lstrcmpiA(val, program_files_maximus), ok(!lstrcmpiA(val, program_files_maximus),
"Expected \"%s\", got \"%s\"\n", program_files_maximus, val); "Expected \"%s\", got \"%s\"\n", program_files_maximus, val);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
RegDeleteKeyA(comp, ""); delete_key(comp, "", access);
RegCloseKey(comp); RegCloseKey(comp);
sprintf(keypath, keyfmt, usersid, "241C3DA58FECD0945B9687D408766058"); sprintf(keypath, keyfmt, usersid, "241C3DA58FECD0945B9687D408766058");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &comp);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -5550,11 +5590,11 @@ static void test_publish_processcomponents(void)
ok(!lstrcmpA(val, "01\\msitest\\augustus"), ok(!lstrcmpA(val, "01\\msitest\\augustus"),
"Expected \"01\\msitest\\augustus\", got \"%s\"\n", val); "Expected \"01\\msitest\\augustus\", got \"%s\"\n", val);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
RegDeleteKeyA(comp, ""); delete_key(comp, "", access);
RegCloseKey(comp); RegCloseKey(comp);
/* ProcessComponents, machine */ /* ProcessComponents, machine */
@ -5564,8 +5604,7 @@ static void test_publish_processcomponents(void)
ok(delete_pf("msitest", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
sprintf(keypath, keyfmt, "S-1-5-18", "CBABC2FDCCB35E749A8944D8C1C098B5"); sprintf(keypath, keyfmt, "S-1-5-18", "CBABC2FDCCB35E749A8944D8C1C098B5");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &comp);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -5575,16 +5614,15 @@ static void test_publish_processcomponents(void)
ok(!lstrcmpiA(val, program_files_maximus), ok(!lstrcmpiA(val, program_files_maximus),
"Expected \"%s\", got \"%s\"\n", program_files_maximus, val); "Expected \"%s\", got \"%s\"\n", program_files_maximus, val);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
RegDeleteKeyA(comp, ""); delete_key(comp, "", access);
RegCloseKey(comp); RegCloseKey(comp);
sprintf(keypath, keyfmt, "S-1-5-18", "241C3DA58FECD0945B9687D408766058"); sprintf(keypath, keyfmt, "S-1-5-18", "241C3DA58FECD0945B9687D408766058");
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &comp);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -5594,11 +5632,11 @@ static void test_publish_processcomponents(void)
ok(!lstrcmpA(val, "01\\msitest\\augustus"), ok(!lstrcmpA(val, "01\\msitest\\augustus"),
"Expected \"01\\msitest\\augustus\", got \"%s\"\n", val); "Expected \"01\\msitest\\augustus\", got \"%s\"\n", val);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, compkey, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB");
RegDeleteKeyA(comp, ""); delete_key(comp, "", access);
RegCloseKey(comp); RegCloseKey(comp);
error: error:
@ -5615,8 +5653,9 @@ static void test_publish(void)
HKEY uninstall, prodkey; HKEY uninstall, prodkey;
INSTALLSTATE state; INSTALLSTATE state;
CHAR prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; CHAR prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}";
char date[MAX_PATH]; char date[MAX_PATH], temp[MAX_PATH];
char temp[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
static const CHAR subkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; static const CHAR subkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
@ -5629,7 +5668,10 @@ static void test_publish(void)
get_date_str(date); get_date_str(date);
GetTempPath(MAX_PATH, temp); GetTempPath(MAX_PATH, temp);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, subkey, &uninstall); if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey, 0, access, &uninstall);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest", NULL);
@ -5653,7 +5695,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* nothing published */ /* nothing published */
@ -5681,7 +5723,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* PublishProduct and RegisterProduct */ /* PublishProduct and RegisterProduct */
@ -5704,7 +5746,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@ -5755,7 +5797,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* complete install */ /* complete install */
@ -5778,7 +5820,7 @@ static void test_publish(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@ -5830,7 +5872,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* complete install */ /* complete install */
@ -5853,7 +5895,7 @@ static void test_publish(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@ -5905,7 +5947,7 @@ static void test_publish(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@ -5957,7 +5999,7 @@ static void test_publish(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@ -6009,7 +6051,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* complete install */ /* complete install */
@ -6032,7 +6074,7 @@ static void test_publish(void)
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayName", "MSITEST");
@ -6084,7 +6126,7 @@ static void test_publish(void)
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* make sure 'Program Files\msitest' is removed */ /* make sure 'Program Files\msitest' is removed */
@ -7070,12 +7112,17 @@ static void test_writeregistryvalues(void)
HKEY hkey; HKEY hkey;
DWORD type, size; DWORD type, size;
CHAR path[MAX_PATH]; CHAR path[MAX_PATH];
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest", NULL);
create_file("msitest\\augustus", 500); create_file("msitest\\augustus", 500);
create_database(msifile, wrv_tables, sizeof(wrv_tables) / sizeof(msi_table)); create_database(msifile, wrv_tables, sizeof(wrv_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
@ -7088,7 +7135,7 @@ static void test_writeregistryvalues(void)
ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(delete_pf("msitest\\augustus", TRUE), "File installed\n");
ok(delete_pf("msitest", FALSE), "File installed\n"); ok(delete_pf("msitest", FALSE), "File installed\n");
res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", 0, access, &hkey);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
size = MAX_PATH; size = MAX_PATH;
@ -7100,8 +7147,8 @@ static void test_writeregistryvalues(void)
ok(size == 15, "Expected 15, got %d\n", size); ok(size == 15, "Expected 15, got %d\n", size);
ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", access);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine"); delete_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine", access);
error: error:
DeleteFile(msifile); DeleteFile(msifile);
@ -7663,8 +7710,9 @@ static void test_MsiConfigureProductEx(void)
LONG res; LONG res;
DWORD type, size; DWORD type, size;
HKEY props, source; HKEY props, source;
CHAR keypath[MAX_PATH * 2]; CHAR keypath[MAX_PATH * 2], localpack[MAX_PATH];
CHAR localpack[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (on_win9x) if (on_win9x)
{ {
@ -7679,6 +7727,9 @@ static void test_MsiConfigureProductEx(void)
create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
/* NULL szProduct */ /* NULL szProduct */
@ -7818,7 +7869,7 @@ static void test_MsiConfigureProductEx(void)
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"); lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
@ -7861,7 +7912,7 @@ static void test_MsiConfigureProductEx(void)
lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\"); lstrcatA(keypath, "Installer\\UserData\\S-1-5-18\\Products\\");
lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"); lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &props); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ,
@ -7871,7 +7922,7 @@ static void test_MsiConfigureProductEx(void)
lstrcpyA(keypath, "SOFTWARE\\Classes\\Installer\\Products\\"); lstrcpyA(keypath, "SOFTWARE\\Classes\\Installer\\Products\\");
lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\SourceList"); lstrcatA(keypath, "84A88FD7F6998CE40A22FB59F6B9C2BB\\SourceList");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &source); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
type = REG_SZ; type = REG_SZ;
@ -8843,6 +8894,8 @@ static void test_MsiSetExternalUI(void)
static void test_feature_override(void) static void test_feature_override(void)
{ {
UINT r; UINT r;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
create_test_files(); create_test_files();
create_file("msitest\\override.txt", 1000); create_file("msitest\\override.txt", 1000);
@ -8850,6 +8903,9 @@ static void test_feature_override(void)
create_file("msitest\\notpreselected.txt", 1000); create_file("msitest\\notpreselected.txt", 1000);
create_database(msifile, fo_tables, sizeof(fo_tables) / sizeof(msi_table)); create_database(msifile, fo_tables, sizeof(fo_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
r = MsiInstallProductA(msifile, "ADDLOCAL=override"); r = MsiInstallProductA(msifile, "ADDLOCAL=override");
if (r == ERROR_INSTALL_PACKAGE_REJECTED) if (r == ERROR_INSTALL_PACKAGE_REJECTED)
{ {
@ -8899,7 +8955,7 @@ static void test_feature_override(void)
ok(delete_pf("msitest", FALSE), "directory removed\n"); ok(delete_pf("msitest", FALSE), "directory removed\n");
} }
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access);
error: error:
DeleteFileA("msitest\\override.txt"); DeleteFileA("msitest\\override.txt");
@ -9182,11 +9238,16 @@ static void test_register_font(void)
LONG ret; LONG ret;
HKEY key; HKEY key;
UINT r; UINT r;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
create_test_files(); create_test_files();
create_file("msitest\\font.ttf", 1000); create_file("msitest\\font.ttf", 1000);
create_database(msifile, font_tables, sizeof(font_tables) / sizeof(msi_table)); create_database(msifile, font_tables, sizeof(font_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
@ -9197,9 +9258,9 @@ static void test_register_font(void)
} }
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, regfont1, &key); ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, regfont1, 0, access, &key);
if (ret) if (ret)
RegOpenKeyA(HKEY_LOCAL_MACHINE, regfont2, &key); RegOpenKeyExA(HKEY_LOCAL_MACHINE, regfont2, 0, access, &key);
ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL);
ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret); ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret);
@ -9474,28 +9535,33 @@ static void test_remove_registry_values(void)
UINT r; UINT r;
LONG res; LONG res;
HKEY key; HKEY key;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
create_test_files(); create_test_files();
create_file("msitest\\registry.txt", 1000); create_file("msitest\\registry.txt", 1000);
create_database(msifile, rrv_tables, sizeof(rrv_tables) / sizeof(msi_table)); create_database(msifile, rrv_tables, sizeof(rrv_tables) / sizeof(msi_table));
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", &key); RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, NULL, 0, access, NULL, &key, NULL);
RegSetValueExA(key, "value1", 0, REG_SZ, (const BYTE *)"1", 2); RegSetValueExA(key, "value1", 0, REG_SZ, (const BYTE *)"1", 2);
RegCloseKey(key); RegCloseKey(key);
RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, NULL, 0, access, NULL, &key, NULL);
RegSetValueExA(key, "value2", 0, REG_SZ, (const BYTE *)"2", 2); RegSetValueExA(key, "value2", 0, REG_SZ, (const BYTE *)"2", 2);
RegCloseKey(key); RegCloseKey(key);
RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", &key); RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", 0, NULL, 0, access, NULL, &key, NULL);
RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8); RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8);
RegSetValueExA(key, "valueA", 0, REG_SZ, (const BYTE *)"A", 2); RegSetValueExA(key, "valueA", 0, REG_SZ, (const BYTE *)"A", 2);
RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2); RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2);
RegCloseKey(key); RegCloseKey(key);
RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", &key); RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, NULL, 0, access, NULL, &key, NULL);
RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8); RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8);
RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2); RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2);
RegCloseKey(key); RegCloseKey(key);
@ -9508,46 +9574,46 @@ static void test_remove_registry_values(void)
} }
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", &key); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, access, &key);
ok(res == ERROR_SUCCESS, "key removed\n"); ok(res == ERROR_SUCCESS, "key removed\n");
RegCloseKey(key); RegCloseKey(key);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key);
ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
res = RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, NULL, 0, access, NULL, &key, NULL);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
RegCloseKey(key); RegCloseKey(key);
r = MsiInstallProductA(msifile, "REMOVE=ALL"); r = MsiInstallProductA(msifile, "REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", &key); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, access, &key);
ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key);
ok(res == ERROR_SUCCESS, "key removed\n"); ok(res == ERROR_SUCCESS, "key removed\n");
RegCloseKey(key); RegCloseKey(key);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", &key); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", 0, access, &key);
ok(res == ERROR_SUCCESS, "key removed\n"); ok(res == ERROR_SUCCESS, "key removed\n");
RegCloseKey(key); RegCloseKey(key);
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", &key); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, access, &key);
ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n");
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", access);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", access);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine", access);
ok(!delete_pf("msitest\\registry.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest\\registry.txt", TRUE), "file not removed\n");
ok(!delete_pf("msitest", FALSE), "directory not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n");
error: error:
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", access);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", access);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", access);
RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", access);
DeleteFileA("msitest\\registry.txt"); DeleteFileA("msitest\\registry.txt");
delete_test_files(); delete_test_files();

66
dlls/msi/tests/package.c
View File

@ -37,6 +37,7 @@ static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR);
static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*);
static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD);
static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD);
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD);
@ -56,6 +57,7 @@ static void init_functionpointers(void)
GET_PROC(hadvapi32, ConvertSidToStringSidA); GET_PROC(hadvapi32, ConvertSidToStringSidA);
GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hadvapi32, RegDeleteKeyExA)
GET_PROC(hadvapi32, RegDeleteKeyExW)
GET_PROC(hkernel32, IsWow64Process) GET_PROC(hkernel32, IsWow64Process)
hsrclient = LoadLibraryA("srclient.dll"); hsrclient = LoadLibraryA("srclient.dll");
@ -96,7 +98,7 @@ static LPSTR get_user_sid(LPSTR *usersid)
} }
/* RegDeleteTreeW from dlls/advapi32/registry.c */ /* RegDeleteTreeW from dlls/advapi32/registry.c */
static LSTATUS package_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) static LSTATUS package_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey, REGSAM access)
{ {
LONG ret; LONG ret;
DWORD dwMaxSubkeyLen, dwMaxValueLen; DWORD dwMaxSubkeyLen, dwMaxValueLen;
@ -106,7 +108,7 @@ static LSTATUS package_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey)
if(lpszSubKey) if(lpszSubKey)
{ {
ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); ret = RegOpenKeyExW(hKey, lpszSubKey, 0, access, &hSubKey);
if (ret) return ret; if (ret) return ret;
} }
@ -134,12 +136,17 @@ static LSTATUS package_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey)
if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL,
NULL, NULL, NULL)) break; NULL, NULL, NULL)) break;
ret = package_RegDeleteTreeW(hSubKey, lpszName); ret = package_RegDeleteTreeW(hSubKey, lpszName, access);
if (ret) goto cleanup; if (ret) goto cleanup;
} }
if (lpszSubKey) if (lpszSubKey)
ret = RegDeleteKeyW(hKey, lpszSubKey); {
if (pRegDeleteKeyExW)
ret = pRegDeleteKeyExW(hKey, lpszSubKey, access, 0);
else
ret = RegDeleteKeyW(hKey, lpszSubKey);
}
else else
while (TRUE) while (TRUE)
{ {
@ -221,6 +228,11 @@ static void set_component_path(LPCSTR filename, MSIINSTALLCONTEXT context,
CHAR path[MAX_PATH]; CHAR path[MAX_PATH];
LPCSTR prod = NULL; LPCSTR prod = NULL;
HKEY hkey; HKEY hkey;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MultiByteToWideChar(CP_ACP, 0, guid, -1, guidW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, guid, -1, guidW, MAX_PATH);
squash_guid(guidW, squashedW); squash_guid(guidW, squashedW);
@ -259,7 +271,7 @@ static void set_component_path(LPCSTR filename, MSIINSTALLCONTEXT context,
"7D2F387510109040002000060BECB6AB", usersid); "7D2F387510109040002000060BECB6AB", usersid);
} }
RegCreateKeyA(HKEY_LOCAL_MACHINE, comppath, &hkey); RegCreateKeyExA(HKEY_LOCAL_MACHINE, comppath, 0, NULL, 0, access, NULL, &hkey, NULL);
lstrcpyA(path, CURR_DIR); lstrcpyA(path, CURR_DIR);
lstrcatA(path, "\\"); lstrcatA(path, "\\");
@ -268,7 +280,7 @@ static void set_component_path(LPCSTR filename, MSIINSTALLCONTEXT context,
RegSetValueExA(hkey, prod, 0, REG_SZ, (LPBYTE)path, lstrlenA(path)); RegSetValueExA(hkey, prod, 0, REG_SZ, (LPBYTE)path, lstrlenA(path));
RegCloseKey(hkey); RegCloseKey(hkey);
RegCreateKeyA(HKEY_LOCAL_MACHINE, prodpath, &hkey); RegCreateKeyExA(HKEY_LOCAL_MACHINE, prodpath, 0, NULL, 0, access, NULL, &hkey, NULL);
RegCloseKey(hkey); RegCloseKey(hkey);
} }
@ -280,6 +292,11 @@ static void delete_component_path(LPCSTR guid, MSIINSTALLCONTEXT context, LPSTR
CHAR squashed[MAX_PATH]; CHAR squashed[MAX_PATH];
CHAR comppath[MAX_PATH]; CHAR comppath[MAX_PATH];
CHAR prodpath[MAX_PATH]; CHAR prodpath[MAX_PATH];
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
MultiByteToWideChar(CP_ACP, 0, guid, -1, guidW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, guid, -1, guidW, MAX_PATH);
squash_guid(guidW, squashedW); squash_guid(guidW, squashedW);
@ -316,10 +333,10 @@ static void delete_component_path(LPCSTR guid, MSIINSTALLCONTEXT context, LPSTR
} }
MultiByteToWideChar(CP_ACP, 0, comppath, -1, substrW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, comppath, -1, substrW, MAX_PATH);
package_RegDeleteTreeW(HKEY_LOCAL_MACHINE, substrW); package_RegDeleteTreeW(HKEY_LOCAL_MACHINE, substrW, access);
MultiByteToWideChar(CP_ACP, 0, prodpath, -1, substrW, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, prodpath, -1, substrW, MAX_PATH);
package_RegDeleteTreeW(HKEY_LOCAL_MACHINE, substrW); package_RegDeleteTreeW(HKEY_LOCAL_MACHINE, substrW, access);
} }
static UINT do_query(MSIHANDLE hdb, const char *query, MSIHANDLE *phrec) static UINT do_query(MSIHANDLE hdb, const char *query, MSIHANDLE *phrec)
@ -7806,19 +7823,19 @@ error:
static void test_appsearch_reglocator(void) static void test_appsearch_reglocator(void)
{ {
MSIHANDLE hpkg, hdb; MSIHANDLE hpkg, hdb;
CHAR path[MAX_PATH]; CHAR path[MAX_PATH], prop[MAX_PATH];
CHAR prop[MAX_PATH]; DWORD binary[2], size, val;
DWORD binary[2];
DWORD size, val;
BOOL space, version; BOOL space, version;
HKEY hklm, classes; HKEY hklm, classes, hkcu, users;
HKEY hkcu, users; LPSTR pathdata, pathvar, ptr;
LPSTR pathdata;
LPSTR pathvar;
LPCSTR str; LPCSTR str;
LPSTR ptr;
LONG res; LONG res;
UINT r; UINT r;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
version = TRUE; version = TRUE;
if (!create_file_with_version("test.dll", MAKELONG(2, 1), MAKELONG(4, 3))) if (!create_file_with_version("test.dll", MAKELONG(2, 1), MAKELONG(4, 3)))
@ -7858,7 +7875,7 @@ static void test_appsearch_reglocator(void)
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
} }
res = RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine", &hklm); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, access, NULL, &hklm, NULL);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegSetValueA(hklm, NULL, REG_SZ, "defvalue", 8); res = RegSetValueA(hklm, NULL, REG_SZ, "defvalue", 8);
@ -8464,7 +8481,7 @@ static void test_appsearch_reglocator(void)
RegDeleteValueA(hklm, "Value15"); RegDeleteValueA(hklm, "Value15");
RegDeleteValueA(hklm, "Value16"); RegDeleteValueA(hklm, "Value16");
RegDeleteValueA(hklm, "Value17"); RegDeleteValueA(hklm, "Value17");
RegDeleteKeyA(hklm, ""); delete_key(hklm, "", access);
RegCloseKey(hklm); RegCloseKey(hklm);
RegDeleteValueA(classes, "Value1"); RegDeleteValueA(classes, "Value1");
@ -9476,13 +9493,17 @@ static void test_featureparents(void)
static void test_installprops(void) static void test_installprops(void)
{ {
MSIHANDLE hpkg, hdb; MSIHANDLE hpkg, hdb;
CHAR path[MAX_PATH]; CHAR path[MAX_PATH], buf[MAX_PATH];
CHAR buf[MAX_PATH];
DWORD size, type; DWORD size, type;
LANGID langid; LANGID langid;
HKEY hkey1, hkey2; HKEY hkey1, hkey2;
int res; int res;
UINT r; UINT r;
REGSAM access = KEY_ALL_ACCESS;
BOOL wow64;
if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64)
access |= KEY_WOW64_64KEY;
GetCurrentDirectory(MAX_PATH, path); GetCurrentDirectory(MAX_PATH, path);
lstrcat(path, "\\"); lstrcat(path, "\\");
@ -9508,8 +9529,7 @@ static void test_installprops(void)
ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf);
RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\MS Setup (ACME)\\User Info", &hkey1); RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\MS Setup (ACME)\\User Info", &hkey1);
RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey2);
RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", &hkey2);
size = MAX_PATH; size = MAX_PATH;
type = REG_SZ; type = REG_SZ;