msi: Rewrite the PublishFeatures test to only check the registry changes.

This commit is contained in:
James Hawkins 2008-06-18 00:54:24 -05:00 committed by Alexandre Julliard
parent 5f46dfd698
commit d8e4258d08
1 changed files with 38 additions and 89 deletions

View File

@ -2489,21 +2489,25 @@ static void test_publish_publishfeatures(void)
{ {
UINT r; UINT r;
LONG res; LONG res;
HKEY uninstall, prodkey; HKEY hkey;
INSTALLSTATE state; LPSTR usersid;
CHAR prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; CHAR keypath[MAX_PATH];
static const CHAR subkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; static const CHAR cupath[] = "Software\\Microsoft\\Installer\\Features"
"\\84A88FD7F6998CE40A22FB59F6B9C2BB";
static const CHAR udpath[] = "Software\\Microsoft\\Windows\\CurrentVersion"
"\\Installer\\UserData\\%s\\Products"
"\\84A88FD7F6998CE40A22FB59F6B9C2BB\\Features";
static const CHAR featkey[] = "Software\\Microsoft\\Windows\\CurrentVersion"
"\\Installer\\Features";
if (!pMsiQueryComponentStateA) get_user_sid(&usersid);
if (!usersid)
{ {
skip("MsiQueryComponentStateA is not available\n"); skip("ConvertSidToStringSidA is not available\n");
return; return;
} }
res = RegOpenKeyA(HKEY_LOCAL_MACHINE, subkey, &uninstall);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest", NULL);
create_file("msitest\\maximus", 500); create_file("msitest\\maximus", 500);
@ -2511,103 +2515,48 @@ static void test_publish_publishfeatures(void)
MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL);
state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); /* PublishFeatures, current user */
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature");
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo");
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
"{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
res = RegOpenKeyA(uninstall, prodcode, &prodkey);
ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
/* PublishFeatures */
r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1"); r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(pf_exists("msitest\\maximus"), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
ok(pf_exists("msitest"), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");
state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, featkey, &hkey);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
"{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
/* try to uninstall after PublishFeatures */
r = MsiInstallProductA(msifile, "REMOVE=ALL");
todo_wine todo_wine
{ {
ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res);
} }
ok(pf_exists("msitest\\maximus"), "File deleted\n");
ok(pf_exists("msitest"), "File deleted\n");
/* PublishFeatures and PublishProduct */ if (res == ERROR_SUCCESS)
r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 PUBLISH_FEATURES=1"); RegCloseKey(hkey);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(pf_exists("msitest\\maximus"), "File not installed\n");
ok(pf_exists("msitest"), "File not installed\n");
state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey);
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); CHECK_REG_STR(hkey, "feature", "");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); CHECK_REG_STR(hkey, "montecristo", "");
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); RegDeleteValueA(hkey, "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); RegDeleteValueA(hkey, "montecristo");
RegDeleteKeyA(hkey, "");
RegCloseKey(hkey);
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, sprintf(keypath, udpath, usersid);
"{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey);
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
/* PublishFeatures and RegisterProduct */ CHECK_REG_STR(hkey, "feature", "VGtfp^p+,?82@JU1j_KE");
r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 PUBLISH_FEATURES=1"); CHECK_REG_STR(hkey, "montecristo", "VGtfp^p+,?82@JU1j_KE");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
ok(pf_exists("msitest\\maximus"), "File not installed\n");
ok(pf_exists("msitest"), "File not installed\n");
state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); RegDeleteValueA(hkey, "feature");
ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); RegDeleteValueA(hkey, "montecristo");
RegDeleteKeyA(hkey, "");
RegCloseKey(hkey);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo");
ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
"{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);
ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r);
ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);
/* full install to remove */
r = MsiInstallProductA(msifile, "FULL=1");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL");
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
RegCloseKey(uninstall);
DeleteFile(msifile); DeleteFile(msifile);
DeleteFile("msitest\\maximus"); DeleteFile("msitest\\maximus");
RemoveDirectory("msitest"); RemoveDirectory("msitest");
delete_pfmsitest_files(); HeapFree(GetProcessHeap(), 0, usersid);
} }
static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name) static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name)