Module: wine Branch: master Commit: b719338433d737569c56eb02e5c0e315eb32d9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b719338433d737569c56eb02e5...
Author: Hans Leidekker hans@codeweavers.com Date: Mon Oct 11 12:09:24 2010 +0200
msi/tests: Use a different product code in the automation tests.
---
dlls/msi/tests/automation.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 3100906..0ad51ea 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -42,7 +42,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const char *msifile = "winetest-automation.msi"; static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','-','a','u','t','o','m','a','t','i','o','n','.','m','s','i',0}; static const WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 }; -static const WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; +static const WCHAR szProductCode[] = { '{','8','3','7','4','5','0','f','a','-','a','3','9','b','-','4','b','c','8','-','b','3','2','1','-','0','8','b','3','9','3','f','7','8','4','b','3','}',0 }; static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-','2','E','1','A','-','4','3','6','7','-','B','7','3','4','-','4','E','B','2','B','D','A','D','6','5','6','5','}',0 }; static const WCHAR szProductInfoException[] = { 'P','r','o','d','u','c','t','I','n','f','o',',','P','r','o','d','u','c','t',',','A','t','t','r','i','b','u','t','e',0 }; static const WCHAR WINE_INSTALLPROPERTY_PACKAGENAMEW[] = {'P','a','c','k','a','g','e','N','a','m','e',0}; @@ -141,7 +141,7 @@ static const CHAR property_dat[] = "Property\tValue\n" "InstallMode\tTypical\n" "Manufacturer\tWine\n" "PIDTemplate\t12345<###-%%%%%%%>@@@@@\n" - "ProductCode\t{F1C3AF50-8B56-4A69-A00C-00773FE42F30}\n" + "ProductCode\t{837450fa-a39b-4bc8-b321-08b393f784b3}\n" "ProductID\tnone\n" "ProductLanguage\t1033\n" "ProductName\tMSITEST\n" @@ -2548,7 +2548,7 @@ static void test_Installer_InstallProduct(void)
/* Remove registry keys written by RegisterProduct standard action */ res = delete_key_portable(HKEY_LOCAL_MACHINE, - "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F1C3AF50-8B56-4A69-A00C-00773FE42F30}", + "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{837450fa-a39b-4bc8-b321-08b393f784b3}", KEY_WOW64_32KEY); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -2557,32 +2557,32 @@ static void test_Installer_InstallProduct(void) 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", access, &hkey); + "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData", "af054738b93a8cb43b12803b397f483b", access, &hkey); ok(res == ERROR_SUCCESS || broken(res == ERROR_FILE_NOT_FOUND), /* win9x */ "Expected ERROR_SUCCESS, got %d\n", res); if (res == ERROR_SUCCESS) { - res = delete_registry_key(hkey, "05FA3C1F65B896A40AC00077F34EF203", access); + res = delete_registry_key(hkey, "af054738b93a8cb43b12803b397f483b", access); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); RegCloseKey(hkey);
res = delete_key_portable(HKEY_LOCAL_MACHINE, - "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\Products\05FA3C1F65B896A40AC00077F34EF203", access); + "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\Products\af054738b93a8cb43b12803b397f483b", access); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); } else { /* win9x defaults to a per-machine install. */ delete_key_portable(HKEY_LOCAL_MACHINE, - "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\Products\05FA3C1F65B896A40AC00077F34EF203", access); + "SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\Products\af054738b93a8cb43b12803b397f483b", access); }
/* Remove registry keys written by PublishProduct standard action */ res = RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\Microsoft\Installer", &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
- res = delete_registry_key(hkey, "Products\05FA3C1F65B896A40AC00077F34EF203", KEY_ALL_ACCESS); + res = delete_registry_key(hkey, "Products\af054738b93a8cb43b12803b397f483b", KEY_ALL_ACCESS); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
res = RegDeleteKeyA(hkey, "UpgradeCodes\D8E760ECA1E276347B43E42BDBDA5656");