Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-29 23:32:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL.

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2052d03fdf82ea9112c6ce3719936e245834eeb7 by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-13 23:41:11 +01:00 • committed by Mark Jansen
parent 7cface09ce
commit 8c80eb17f5
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 130 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

265
modules/rostests/winetests/msi/action.c
View file

@ -2522,15 +2522,10 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase
return; return;
} }
if (!expected) if (bcase)
ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val); ok_(__FILE__, line)(!strcmp(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val);
else else
{ ok_(__FILE__, line)(!strcasecmp(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val);
if (bcase)
ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val);
else
ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val);
}
} }
static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, DWORD line) static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, DWORD line)
@ -2703,17 +2698,17 @@ static void test_register_product(void)
CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); CHECK_DEL_REG_STR(hkey, "Publisher", "Wine");
CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", "");
CHECK_DEL_REG_STR(hkey, "Comments", NULL); CHECK_DEL_REG_STR(hkey, "Comments", "");
CHECK_DEL_REG_STR(hkey, "Contact", NULL); CHECK_DEL_REG_STR(hkey, "Contact", "");
CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); CHECK_DEL_REG_STR(hkey, "HelpLink", "");
CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); CHECK_DEL_REG_STR(hkey, "HelpTelephone", "");
CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); CHECK_DEL_REG_STR(hkey, "InstallLocation", "");
CHECK_DEL_REG_DWORD(hkey, "NoModify", 1); CHECK_DEL_REG_DWORD(hkey, "NoModify", 1);
CHECK_DEL_REG_STR(hkey, "Readme", NULL); CHECK_DEL_REG_STR(hkey, "Readme", "");
CHECK_DEL_REG_STR(hkey, "Size", NULL); CHECK_DEL_REG_STR(hkey, "Size", "");
CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); CHECK_DEL_REG_STR(hkey, "URLInfoAbout", "");
CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", "");
CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Language", 1033);
CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1);
@ -2745,17 +2740,17 @@ static void test_register_product(void)
CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(props, "Publisher", "Wine"); CHECK_DEL_REG_STR(props, "Publisher", "Wine");
CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", "");
CHECK_DEL_REG_STR(props, "Comments", NULL); CHECK_DEL_REG_STR(props, "Comments", "");
CHECK_DEL_REG_STR(props, "Contact", NULL); CHECK_DEL_REG_STR(props, "Contact", "");
CHECK_DEL_REG_STR(props, "HelpLink", NULL); CHECK_DEL_REG_STR(props, "HelpLink", "");
CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); CHECK_DEL_REG_STR(props, "HelpTelephone", "");
CHECK_DEL_REG_STR(props, "InstallLocation", NULL); CHECK_DEL_REG_STR(props, "InstallLocation", "");
CHECK_DEL_REG_DWORD(props, "NoModify", 1); CHECK_DEL_REG_DWORD(props, "NoModify", 1);
CHECK_DEL_REG_STR(props, "Readme", NULL); CHECK_DEL_REG_STR(props, "Readme", "");
CHECK_DEL_REG_STR(props, "Size", NULL); CHECK_DEL_REG_STR(props, "Size", "");
CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); CHECK_DEL_REG_STR(props, "URLInfoAbout", "");
CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); CHECK_DEL_REG_STR(props, "URLUpdateInfo", "");
CHECK_DEL_REG_DWORD(props, "Language", 1033); CHECK_DEL_REG_DWORD(props, "Language", 1033);
CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); CHECK_DEL_REG_DWORD(props, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); CHECK_DEL_REG_DWORD(props, "VersionMajor", 1);
@ -2785,7 +2780,7 @@ todo_wine
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &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", "");
res = RegDeleteKeyA(hkey, ""); res = RegDeleteKeyA(hkey, "");
ok(!res, "got %d\n", res); ok(!res, "got %d\n", res);
@ -2810,17 +2805,17 @@ todo_wine
CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); CHECK_DEL_REG_STR(hkey, "Publisher", "Wine");
CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", "");
CHECK_DEL_REG_STR(hkey, "Comments", NULL); CHECK_DEL_REG_STR(hkey, "Comments", "");
CHECK_DEL_REG_STR(hkey, "Contact", NULL); CHECK_DEL_REG_STR(hkey, "Contact", "");
CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); CHECK_DEL_REG_STR(hkey, "HelpLink", "");
CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); CHECK_DEL_REG_STR(hkey, "HelpTelephone", "");
CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); CHECK_DEL_REG_STR(hkey, "InstallLocation", "");
CHECK_DEL_REG_DWORD(hkey, "NoModify", 1); CHECK_DEL_REG_DWORD(hkey, "NoModify", 1);
CHECK_DEL_REG_STR(hkey, "Readme", NULL); CHECK_DEL_REG_STR(hkey, "Readme", "");
CHECK_DEL_REG_STR(hkey, "Size", NULL); CHECK_DEL_REG_STR(hkey, "Size", "");
CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); CHECK_DEL_REG_STR(hkey, "URLInfoAbout", "");
CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", "");
CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Language", 1033);
CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1);
@ -2852,17 +2847,17 @@ todo_wine
CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(props, "Publisher", "Wine"); CHECK_DEL_REG_STR(props, "Publisher", "Wine");
CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", "");
CHECK_DEL_REG_STR(props, "Comments", NULL); CHECK_DEL_REG_STR(props, "Comments", "");
CHECK_DEL_REG_STR(props, "Contact", NULL); CHECK_DEL_REG_STR(props, "Contact", "");
CHECK_DEL_REG_STR(props, "HelpLink", NULL); CHECK_DEL_REG_STR(props, "HelpLink", "");
CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); CHECK_DEL_REG_STR(props, "HelpTelephone", "");
CHECK_DEL_REG_STR(props, "InstallLocation", NULL); CHECK_DEL_REG_STR(props, "InstallLocation", "");
CHECK_DEL_REG_DWORD(props, "NoModify", 1); CHECK_DEL_REG_DWORD(props, "NoModify", 1);
CHECK_DEL_REG_STR(props, "Readme", NULL); CHECK_DEL_REG_STR(props, "Readme", "");
CHECK_DEL_REG_STR(props, "Size", NULL); CHECK_DEL_REG_STR(props, "Size", "");
CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); CHECK_DEL_REG_STR(props, "URLInfoAbout", "");
CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); CHECK_DEL_REG_STR(props, "URLUpdateInfo", "");
CHECK_DEL_REG_DWORD(props, "Language", 1033); CHECK_DEL_REG_DWORD(props, "Language", 1033);
CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); CHECK_DEL_REG_DWORD(props, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); CHECK_DEL_REG_DWORD(props, "VersionMajor", 1);
@ -2892,7 +2887,7 @@ todo_wine
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &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", "");
res = RegDeleteKeyA(hkey, ""); res = RegDeleteKeyA(hkey, "");
ok(!res, "got %d\n", res); ok(!res, "got %d\n", res);
@ -2924,17 +2919,17 @@ todo_wine
CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); CHECK_DEL_REG_STR(hkey, "Publisher", "Wine");
CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", "");
CHECK_DEL_REG_STR(hkey, "Comments", NULL); CHECK_DEL_REG_STR(hkey, "Comments", "");
CHECK_DEL_REG_STR(hkey, "Contact", NULL); CHECK_DEL_REG_STR(hkey, "Contact", "");
CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); CHECK_DEL_REG_STR(hkey, "HelpLink", "");
CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); CHECK_DEL_REG_STR(hkey, "HelpTelephone", "");
CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); CHECK_DEL_REG_STR(hkey, "InstallLocation", "");
CHECK_DEL_REG_DWORD(hkey, "NoModify", 1); CHECK_DEL_REG_DWORD(hkey, "NoModify", 1);
CHECK_DEL_REG_STR(hkey, "Readme", NULL); CHECK_DEL_REG_STR(hkey, "Readme", "");
CHECK_DEL_REG_STR(hkey, "Size", NULL); CHECK_DEL_REG_STR(hkey, "Size", "");
CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); CHECK_DEL_REG_STR(hkey, "URLInfoAbout", "");
CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", "");
CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Language", 1033);
CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1);
@ -2966,17 +2961,17 @@ todo_wine
CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(props, "Publisher", "Wine"); CHECK_DEL_REG_STR(props, "Publisher", "Wine");
CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", "");
CHECK_DEL_REG_STR(props, "Comments", NULL); CHECK_DEL_REG_STR(props, "Comments", "");
CHECK_DEL_REG_STR(props, "Contact", NULL); CHECK_DEL_REG_STR(props, "Contact", "");
CHECK_DEL_REG_STR(props, "HelpLink", NULL); CHECK_DEL_REG_STR(props, "HelpLink", "");
CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); CHECK_DEL_REG_STR(props, "HelpTelephone", "");
CHECK_DEL_REG_STR(props, "InstallLocation", NULL); CHECK_DEL_REG_STR(props, "InstallLocation", "");
CHECK_DEL_REG_DWORD(props, "NoModify", 1); CHECK_DEL_REG_DWORD(props, "NoModify", 1);
CHECK_DEL_REG_STR(props, "Readme", NULL); CHECK_DEL_REG_STR(props, "Readme", "");
CHECK_DEL_REG_STR(props, "Size", NULL); CHECK_DEL_REG_STR(props, "Size", "");
CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); CHECK_DEL_REG_STR(props, "URLInfoAbout", "");
CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); CHECK_DEL_REG_STR(props, "URLUpdateInfo", "");
CHECK_DEL_REG_DWORD(props, "Language", 1033); CHECK_DEL_REG_DWORD(props, "Language", 1033);
CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); CHECK_DEL_REG_DWORD(props, "Version", 0x1010001);
CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); CHECK_DEL_REG_DWORD(props, "VersionMajor", 1);
@ -3006,7 +3001,7 @@ todo_wine
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &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", "");
res = RegDeleteKeyA(hkey, ""); res = RegDeleteKeyA(hkey, "");
ok(!res, "got %d\n", res); ok(!res, "got %d\n", res);
@ -3111,7 +3106,7 @@ static void test_publish_product(void)
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", "");
} }
delete_key(patches, "", access); delete_key(patches, "", access);
@ -3165,7 +3160,7 @@ currentuser:
res = RegOpenKeyA(HKEY_CURRENT_USER, cuupgrades, &hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, cuupgrades, &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", "");
RegDeleteKeyA(hkey, ""); RegDeleteKeyA(hkey, "");
RegCloseKey(hkey); RegCloseKey(hkey);
@ -3192,7 +3187,7 @@ currentuser:
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", "");
} }
delete_key(patches, "", access); delete_key(patches, "", access);
@ -3250,7 +3245,7 @@ machprod:
res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machup, 0, access, &hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machup, 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", "");
res = delete_key(hkey, "", access); res = delete_key(hkey, "", access);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@ -3840,17 +3835,17 @@ static void test_publish(void)
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", NULL); CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", "");
CHECK_REG_STR(prodkey, "Comments", NULL); CHECK_REG_STR(prodkey, "Comments", "");
CHECK_REG_STR(prodkey, "Contact", NULL); CHECK_REG_STR(prodkey, "Contact", "");
CHECK_REG_STR(prodkey, "HelpLink", NULL); CHECK_REG_STR(prodkey, "HelpLink", "");
CHECK_REG_STR(prodkey, "HelpTelephone", NULL); CHECK_REG_STR(prodkey, "HelpTelephone", "");
CHECK_REG_STR(prodkey, "InstallLocation", NULL); CHECK_REG_STR(prodkey, "InstallLocation", "");
CHECK_REG_DWORD(prodkey, "NoModify", 1); CHECK_REG_DWORD(prodkey, "NoModify", 1);
CHECK_REG_STR(prodkey, "Readme", NULL); CHECK_REG_STR(prodkey, "Readme", "");
CHECK_REG_STR(prodkey, "Size", NULL); CHECK_REG_STR(prodkey, "Size", "");
CHECK_REG_STR(prodkey, "URLInfoAbout", NULL); CHECK_REG_STR(prodkey, "URLInfoAbout", "");
CHECK_REG_STR(prodkey, "URLUpdateInfo", NULL); CHECK_REG_STR(prodkey, "URLUpdateInfo", "");
CHECK_REG_DWORD(prodkey, "Language", 1033); CHECK_REG_DWORD(prodkey, "Language", 1033);
CHECK_REG_DWORD(prodkey, "Version", 0x1010001); CHECK_REG_DWORD(prodkey, "Version", 0x1010001);
CHECK_REG_DWORD(prodkey, "VersionMajor", 1); CHECK_REG_DWORD(prodkey, "VersionMajor", 1);
@ -3945,17 +3940,17 @@ static void test_publish(void)
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", NULL); CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", "");
CHECK_REG_STR(prodkey, "Comments", NULL); CHECK_REG_STR(prodkey, "Comments", "");
CHECK_REG_STR(prodkey, "Contact", NULL); CHECK_REG_STR(prodkey, "Contact", "");
CHECK_REG_STR(prodkey, "HelpLink", NULL); CHECK_REG_STR(prodkey, "HelpLink", "");
CHECK_REG_STR(prodkey, "HelpTelephone", NULL); CHECK_REG_STR(prodkey, "HelpTelephone", "");
CHECK_REG_STR(prodkey, "InstallLocation", NULL); CHECK_REG_STR(prodkey, "InstallLocation", "");
CHECK_REG_DWORD(prodkey, "NoModify", 1); CHECK_REG_DWORD(prodkey, "NoModify", 1);
CHECK_REG_STR(prodkey, "Readme", NULL); CHECK_REG_STR(prodkey, "Readme", "");
CHECK_REG_STR(prodkey, "Size", NULL); CHECK_REG_STR(prodkey, "Size", "");
CHECK_REG_STR(prodkey, "URLInfoAbout", NULL); CHECK_REG_STR(prodkey, "URLInfoAbout", "");
CHECK_REG_STR(prodkey, "URLUpdateInfo", NULL); CHECK_REG_STR(prodkey, "URLUpdateInfo", "");
CHECK_REG_DWORD(prodkey, "Language", 1033); CHECK_REG_DWORD(prodkey, "Language", 1033);
CHECK_REG_DWORD(prodkey, "Version", 0x1010001); CHECK_REG_DWORD(prodkey, "Version", 0x1010001);
CHECK_REG_DWORD(prodkey, "VersionMajor", 1); CHECK_REG_DWORD(prodkey, "VersionMajor", 1);
@ -4027,17 +4022,17 @@ static void test_publish(void)
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", NULL); CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", "");
CHECK_REG_STR(prodkey, "Comments", NULL); CHECK_REG_STR(prodkey, "Comments", "");
CHECK_REG_STR(prodkey, "Contact", NULL); CHECK_REG_STR(prodkey, "Contact", "");
CHECK_REG_STR(prodkey, "HelpLink", NULL); CHECK_REG_STR(prodkey, "HelpLink", "");
CHECK_REG_STR(prodkey, "HelpTelephone", NULL); CHECK_REG_STR(prodkey, "HelpTelephone", "");
CHECK_REG_STR(prodkey, "InstallLocation", NULL); CHECK_REG_STR(prodkey, "InstallLocation", "");
CHECK_REG_DWORD(prodkey, "NoModify", 1); CHECK_REG_DWORD(prodkey, "NoModify", 1);
CHECK_REG_STR(prodkey, "Readme", NULL); CHECK_REG_STR(prodkey, "Readme", "");
CHECK_REG_STR(prodkey, "Size", NULL); CHECK_REG_STR(prodkey, "Size", "");
CHECK_REG_STR(prodkey, "URLInfoAbout", NULL); CHECK_REG_STR(prodkey, "URLInfoAbout", "");
CHECK_REG_STR(prodkey, "URLUpdateInfo", NULL); CHECK_REG_STR(prodkey, "URLUpdateInfo", "");
CHECK_REG_DWORD(prodkey, "Language", 1033); CHECK_REG_DWORD(prodkey, "Language", 1033);
CHECK_REG_DWORD(prodkey, "Version", 0x1010001); CHECK_REG_DWORD(prodkey, "Version", 0x1010001);
CHECK_REG_DWORD(prodkey, "VersionMajor", 1); CHECK_REG_DWORD(prodkey, "VersionMajor", 1);
@ -4086,17 +4081,17 @@ static void test_publish(void)
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", NULL); CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", "");
CHECK_REG_STR(prodkey, "Comments", NULL); CHECK_REG_STR(prodkey, "Comments", "");
CHECK_REG_STR(prodkey, "Contact", NULL); CHECK_REG_STR(prodkey, "Contact", "");
CHECK_REG_STR(prodkey, "HelpLink", NULL); CHECK_REG_STR(prodkey, "HelpLink", "");
CHECK_REG_STR(prodkey, "HelpTelephone", NULL); CHECK_REG_STR(prodkey, "HelpTelephone", "");
CHECK_REG_STR(prodkey, "InstallLocation", NULL); CHECK_REG_STR(prodkey, "InstallLocation", "");
CHECK_REG_DWORD(prodkey, "NoModify", 1); CHECK_REG_DWORD(prodkey, "NoModify", 1);
CHECK_REG_STR(prodkey, "Readme", NULL); CHECK_REG_STR(prodkey, "Readme", "");
CHECK_REG_STR(prodkey, "Size", NULL); CHECK_REG_STR(prodkey, "Size", "");
CHECK_REG_STR(prodkey, "URLInfoAbout", NULL); CHECK_REG_STR(prodkey, "URLInfoAbout", "");
CHECK_REG_STR(prodkey, "URLUpdateInfo", NULL); CHECK_REG_STR(prodkey, "URLUpdateInfo", "");
CHECK_REG_DWORD(prodkey, "Language", 1033); CHECK_REG_DWORD(prodkey, "Language", 1033);
CHECK_REG_DWORD(prodkey, "Version", 0x1010001); CHECK_REG_DWORD(prodkey, "Version", 0x1010001);
CHECK_REG_DWORD(prodkey, "VersionMajor", 1); CHECK_REG_DWORD(prodkey, "VersionMajor", 1);
@ -4145,17 +4140,17 @@ static void test_publish(void)
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", NULL); CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", "");
CHECK_REG_STR(prodkey, "Comments", NULL); CHECK_REG_STR(prodkey, "Comments", "");
CHECK_REG_STR(prodkey, "Contact", NULL); CHECK_REG_STR(prodkey, "Contact", "");
CHECK_REG_STR(prodkey, "HelpLink", NULL); CHECK_REG_STR(prodkey, "HelpLink", "");
CHECK_REG_STR(prodkey, "HelpTelephone", NULL); CHECK_REG_STR(prodkey, "HelpTelephone", "");
CHECK_REG_STR(prodkey, "InstallLocation", NULL); CHECK_REG_STR(prodkey, "InstallLocation", "");
CHECK_REG_DWORD(prodkey, "NoModify", 1); CHECK_REG_DWORD(prodkey, "NoModify", 1);
CHECK_REG_STR(prodkey, "Readme", NULL); CHECK_REG_STR(prodkey, "Readme", "");
CHECK_REG_STR(prodkey, "Size", NULL); CHECK_REG_STR(prodkey, "Size", "");
CHECK_REG_STR(prodkey, "URLInfoAbout", NULL); CHECK_REG_STR(prodkey, "URLInfoAbout", "");
CHECK_REG_STR(prodkey, "URLUpdateInfo", NULL); CHECK_REG_STR(prodkey, "URLUpdateInfo", "");
CHECK_REG_DWORD(prodkey, "Language", 1033); CHECK_REG_DWORD(prodkey, "Language", 1033);
CHECK_REG_DWORD(prodkey, "Version", 0x1010001); CHECK_REG_DWORD(prodkey, "Version", 0x1010001);
CHECK_REG_DWORD(prodkey, "VersionMajor", 1); CHECK_REG_DWORD(prodkey, "VersionMajor", 1);
@ -4227,17 +4222,17 @@ static void test_publish(void)
CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "Publisher", "Wine"); CHECK_REG_STR(prodkey, "Publisher", "Wine");
CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "UninstallString", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}");
CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", NULL); CHECK_REG_STR(prodkey, "AuthorizedCDFPrefix", "");
CHECK_REG_STR(prodkey, "Comments", NULL); CHECK_REG_STR(prodkey, "Comments", "");
CHECK_REG_STR(prodkey, "Contact", NULL); CHECK_REG_STR(prodkey, "Contact", "");
CHECK_REG_STR(prodkey, "HelpLink", NULL); CHECK_REG_STR(prodkey, "HelpLink", "");
CHECK_REG_STR(prodkey, "HelpTelephone", NULL); CHECK_REG_STR(prodkey, "HelpTelephone", "");
CHECK_REG_STR(prodkey, "InstallLocation", NULL); CHECK_REG_STR(prodkey, "InstallLocation", "");
CHECK_REG_DWORD(prodkey, "NoModify", 1); CHECK_REG_DWORD(prodkey, "NoModify", 1);
CHECK_REG_STR(prodkey, "Readme", NULL); CHECK_REG_STR(prodkey, "Readme", "");
CHECK_REG_STR(prodkey, "Size", NULL); CHECK_REG_STR(prodkey, "Size", "");
CHECK_REG_STR(prodkey, "URLInfoAbout", NULL); CHECK_REG_STR(prodkey, "URLInfoAbout", "");
CHECK_REG_STR(prodkey, "URLUpdateInfo", NULL); CHECK_REG_STR(prodkey, "URLUpdateInfo", "");
CHECK_REG_DWORD(prodkey, "Language", 1033); CHECK_REG_DWORD(prodkey, "Language", 1033);
CHECK_REG_DWORD(prodkey, "Version", 0x1010001); CHECK_REG_DWORD(prodkey, "Version", 0x1010001);
CHECK_REG_DWORD(prodkey, "VersionMajor", 1); CHECK_REG_DWORD(prodkey, "VersionMajor", 1);