July 2007 - Wine-Commits - list.winehq.org

James Hawkins : msi: Add tests for MsiQueryFeatureState.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: ceb4e6d4ef0e7ae7950783254c438595df967e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb4e6d4ef0e7ae7950783254… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:22:29 2007 -0700 msi: Add tests for MsiQueryFeatureState. --- dlls/msi/tests/msi.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 213 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 2aee5e1..72713c1 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -450,6 +450,218 @@ static void test_MsiQueryProductState(void) RegCloseKey(props); } +static const char table_enc85[] = +"!$%&'()*+,-.0123456789=?@ABCDEFGHIJKLMNO" +"PQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwx" +"yz{}~"; + +/* + * Encodes a base85 guid given a GUID pointer + * Caller should provide a 21 character buffer for the encoded string. + * + * returns TRUE if successful, FALSE if not + */ +static BOOL encode_base85_guid( GUID *guid, LPWSTR str ) +{ + unsigned int x, *p, i; + + p = (unsigned int*) guid; + for( i=0; i<4; i++ ) + { + x = p[i]; + *str++ = table_enc85[x%85]; + x = x/85; + *str++ = table_enc85[x%85]; + x = x/85; + *str++ = table_enc85[x%85]; + x = x/85; + *str++ = table_enc85[x%85]; + x = x/85; + *str++ = table_enc85[x%85]; + } + *str = 0; + + return TRUE; +} + +static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squashed) +{ + WCHAR guidW[MAX_PATH]; + WCHAR base85W[MAX_PATH]; + WCHAR squashedW[MAX_PATH]; + GUID guid; + HRESULT hr; + int size; + + hr = CoCreateGuid(&guid); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + + size = StringFromGUID2(&guid, (LPOLESTR)guidW, MAX_PATH); + ok(size == 39, "Expected 39, got %d\n", hr); + + WideCharToMultiByte(CP_ACP, 0, guidW, size, component, MAX_PATH, NULL, NULL); + encode_base85_guid(&guid, base85W); + WideCharToMultiByte(CP_ACP, 0, base85W, -1, comp_base85, MAX_PATH, NULL, NULL); + squash_guid(guidW, squashedW); + WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, MAX_PATH, NULL, NULL); +} + +static void test_MsiQueryFeatureState(void) +{ + HKEY userkey, localkey, compkey; + CHAR prodcode[MAX_PATH]; + CHAR prod_squashed[MAX_PATH]; + CHAR component[MAX_PATH]; + CHAR comp_base85[MAX_PATH]; + CHAR comp_squashed[MAX_PATH]; + CHAR keypath[MAX_PATH*2]; + INSTALLSTATE state; + LPSTR usersid; + LONG res; + + create_test_guid(prodcode, prod_squashed); + compose_base85_guid(component, comp_base85, comp_squashed); + get_user_sid(&usersid); + + /* NULL prodcode */ + state = MsiQueryFeatureStateA(NULL, "feature"); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* empty prodcode */ + state = MsiQueryFeatureStateA("", "feature"); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* garbage prodcode */ + state = MsiQueryFeatureStateA("garbage", "feature"); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* guid without brackets */ + state = MsiQueryFeatureStateA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", "feature"); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* guid with brackets */ + state = MsiQueryFeatureStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", "feature"); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + /* same length as guid, but random */ + state = MsiQueryFeatureStateA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93", "feature"); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* NULL szFeature */ + state = MsiQueryFeatureStateA(prodcode, NULL); + ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); + + /* empty szFeature */ + state = MsiQueryFeatureStateA(prodcode, ""); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + /* feature key does not exist yet */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Features\\"); + lstrcatA(keypath, prod_squashed); + + res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* feature key exists */ + state = MsiQueryFeatureStateA(prodcode, "feature"); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + res = RegSetValueExA(userkey, "feature", 0, REG_SZ, (const BYTE *)"", 8); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\"); + lstrcatA(keypath, usersid); + lstrcatA(keypath, "\\Products\\"); + lstrcatA(keypath, prod_squashed); + lstrcatA(keypath, "\\Features"); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &localkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state); + } + + res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaaa", 22); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)comp_base85, 21); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\"); + lstrcatA(keypath, usersid); + lstrcatA(keypath, "\\Components\\"); + lstrcatA(keypath, comp_squashed); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &compkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + } + + res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"", 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + state = MsiQueryFeatureStateA(prodcode, "feature"); + todo_wine + { + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); + } + + RegDeleteValueA(compkey, prod_squashed); + RegDeleteValueA(compkey, ""); + RegDeleteValueA(localkey, "feature"); + RegDeleteValueA(userkey, "feature"); + RegDeleteKeyA(userkey, ""); + RegCloseKey(compkey); + RegCloseKey(localkey); + RegCloseKey(userkey); +} + START_TEST(msi) { HMODULE hmod = GetModuleHandle("msi.dll"); @@ -469,4 +681,5 @@ START_TEST(msi) test_getcomponentpath(); test_filehash(); test_MsiQueryProductState(); + test_MsiQueryFeatureState(); }

1 0

James Hawkins : msi: Set the WindowsInstaller value in RegisterProduct instead of PublishProduct .
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 0e44e090c591f485776c7e3898dec5a9e7296f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e44e090c591f485776c7e389… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:21:58 2007 -0700 msi: Set the WindowsInstaller value in RegisterProduct instead of PublishProduct. --- dlls/msi/action.c | 28 +++++++++++++++++++--------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 5 +---- 4 files changed, 60 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6c857f0..37ad1ab 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3279,10 +3279,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) {'A','R','P','P','R','O','D','U','C','T','I','C','O','N',0}; static const WCHAR szProductVersion[] = {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; - static const WCHAR szInstallProperties[] = - {'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; - static const WCHAR szWindowsInstaller[] = - {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; DWORD langid; LPWSTR buffer; DWORD size; @@ -3315,12 +3311,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - rc = RegCreateKeyW(hudkey, szInstallProperties, &props); + rc = MSIREG_OpenInstallPropertiesKey(package->ProductCode,&props,TRUE); if (rc != ERROR_SUCCESS) goto end; - msi_reg_set_val_dword( props, szWindowsInstaller, 1 ); - buffer = msi_dup_property( package, INSTALLPROPERTY_PRODUCTNAMEW ); msi_reg_set_val_str( hukey, INSTALLPROPERTY_PRODUCTNAMEW, buffer ); msi_free(buffer); @@ -3806,6 +3800,7 @@ static UINT msi_write_uninstall_property_vals( MSIPACKAGE *package, HKEY hkey ) static UINT ACTION_RegisterProduct(MSIPACKAGE *package) { HKEY hkey=0; + HKEY hudkey=0, props=0; LPWSTR buffer = NULL; UINT rc; DWORD size, langid; @@ -3830,7 +3825,11 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) SYSTEMTIME systime; static const WCHAR date_fmt[] = {'%','i','%','i','%','i',0}; LPWSTR upgrade_code; - WCHAR szDate[9]; + WCHAR szDate[9]; + + /* FIXME: also need to publish if the product is in advertise mode */ + if (!msi_check_publish(package)) + return ERROR_SUCCESS; rc = MSIREG_OpenUninstallKey(package->ProductCode,&hkey,TRUE); if (rc != ERROR_SUCCESS) @@ -3892,7 +3891,18 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) RegCloseKey(hkey); - /* FIXME: call ui_actiondata */ + rc = MSIREG_OpenUserDataProductKey(package->ProductCode, &hudkey, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + + RegCloseKey(hudkey); + + rc = MSIREG_OpenInstallPropertiesKey(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + + msi_reg_set_val_dword( props, szWindowsInstaller, 1 ); + RegCloseKey(props); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 14a365e..a62f8d9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -709,6 +709,7 @@ extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 238cdd1..5787bc7 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -166,6 +166,16 @@ static const WCHAR szUserDataProd_fmt[] = { 'U','s','e','r','D','a','t','a','\\', '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s',0}; +static const WCHAR szInstallProperties_fmt[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'W','i','n','d','o','w','s','\\', +'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', +'I','n','s','t','a','l','l','e','r','\\', +'U','s','e','r','D','a','t','a','\\', +'%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', +'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; + #define SQUISH_GUID_SIZE 33 @@ -611,6 +621,35 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) return rc; } +UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) +{ + UINT rc; + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + LPWSTR usersid; + + TRACE("%s\n", debugstr_w(szProduct)); + squash_guid(szProduct, squished_pc); + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } + + sprintfW(keypath, szInstallProperties_fmt, usersid, squished_pc); + + if (create) + rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); + else + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + + msi_free(usersid); + return rc; +} + UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) { UINT rc; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f6d59c8..4cf3ca4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1683,10 +1683,7 @@ static void test_publish(void) ok(pf_exists("msitest"), "File not installed\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - } + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);

1 0

James Hawkins : msi: Unpublish the product when it is entirely removed.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 624bbbe78a68598003eb906ddc1839a250bed340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624bbbe78a68598003eb906dd… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:20:54 2007 -0700 msi: Unpublish the product when it is entirely removed. --- dlls/msi/action.c | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 3 ++ dlls/msi/registry.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 40 +++++++--------------------------- 4 files changed, 114 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c9d4fa8..0911a29 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3885,10 +3885,60 @@ static UINT ACTION_InstallExecute(MSIPACKAGE *package) return execute_script(package,INSTALL_SCRIPT); } +static UINT msi_unpublish_product(MSIPACKAGE *package) +{ + LPWSTR remove = NULL; + LPWSTR *features = NULL; + BOOL full_uninstall = TRUE; + MSIFEATURE *feature; + + static const WCHAR szRemove[] = {'R','E','M','O','V','E',0}; + static const WCHAR szAll[] = {'A','L','L',0}; + + remove = msi_dup_property(package, szRemove); + if (!remove) + return ERROR_SUCCESS; + + features = msi_split_string(remove, ','); + if (!features) + { + msi_free(remove); + ERR("REMOVE feature list is empty!\n"); + return ERROR_FUNCTION_FAILED; + } + + if (!lstrcmpW(features[0], szAll)) + full_uninstall = TRUE; + else + { + LIST_FOR_EACH_ENTRY(feature, &package->features, MSIFEATURE, entry) + { + if (feature->Action != INSTALLSTATE_ABSENT) + full_uninstall = FALSE; + } + } + + if (!full_uninstall) + goto done; + + MSIREG_DeleteProductKey(package->ProductCode); + MSIREG_DeleteUserProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode); + +done: + msi_free(remove); + msi_free(features); + return ERROR_SUCCESS; +} + static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; + rc = msi_unpublish_product(package); + if (rc != ERROR_SUCCESS) + return rc; + /* turn off scheduling */ package->script->CurrentlyScripting= FALSE; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e5b5ea3..14a365e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -713,6 +713,9 @@ extern UINT MSIREG_OpenUserFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct); +extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct); +extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct); extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index c557264..238cdd1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -437,6 +437,20 @@ UINT MSIREG_OpenUserProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) return rc; } +UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n",debugstr_w(szProduct)); + squash_guid(szProduct,squished_pc); + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath,szUserProduct_fmt,squished_pc); + + return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); +} + UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) { UINT rc; @@ -593,9 +607,34 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + msi_free(usersid); return rc; } +UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) +{ + UINT rc; + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + LPWSTR usersid; + + TRACE("%s\n", debugstr_w(szProduct)); + squash_guid(szProduct, squished_pc); + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } + + sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); + + msi_free(usersid); + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); +} + UINT MSIREG_OpenProducts(HKEY* key) { return RegCreateKeyW(HKEY_LOCAL_MACHINE,szInstaller_Products,key); @@ -621,6 +660,20 @@ UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create) return rc; } +UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n", debugstr_w(szProduct)); + squash_guid(szProduct, squished_pc); + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath, szInstaller_Products_fmt, squished_pc); + + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); +} + UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create) { UINT rc; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f7df7eb..42d41a2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1706,10 +1706,7 @@ static void test_publish(void) ok(pf_exists("msitest"), "File deleted\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + 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); @@ -1952,10 +1949,7 @@ static void test_publish(void) } state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); todo_wine @@ -1984,10 +1978,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine @@ -2013,16 +2004,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); @@ -2071,10 +2056,7 @@ static void test_publish(void) } state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); todo_wine @@ -2103,16 +2085,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);

1 0

James Hawkins : msi: Delay publishing of the SourceList until the PublishProduct action.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 5e46fc9019dce5befe72b50695b8d309aba4f65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e46fc9019dce5befe72b5069… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:20:20 2007 -0700 msi: Delay publishing of the SourceList until the PublishProduct action. --- dlls/msi/action.c | 17 +++++++++++++++++ dlls/msi/files.c | 18 +++++++----------- dlls/msi/helpers.c | 21 ++++++++++++++++++++- dlls/msi/msipriv.h | 24 ++++++++++++++++++++++++ dlls/msi/package.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 5 ++++- 6 files changed, 111 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f09a1b9..c9d4fa8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3251,6 +3251,8 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) { UINT rc; MSIQUERY * view; + MSISOURCELISTINFO *info; + MSIMEDIADISK *disk; static const WCHAR Query[]= {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','I','c','o','n','`',0}; @@ -3363,6 +3365,21 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = ERROR_SUCCESS; } + /* publish the SourceList info */ + LIST_FOR_EACH_ENTRY(info, &package->sourcelist_info, MSISOURCELISTINFO, entry) + { + MsiSourceListSetInfoW(package->ProductCode, NULL, + info->context, info->options, + info->property, info->value); + } + + LIST_FOR_EACH_ENTRY(disk, &package->sourcelist_media, MSIMEDIADISK, entry) + { + MsiSourceListAddMediaDiskW(package->ProductCode, NULL, + disk->context, disk->options, + disk->disk_id, disk->volume_label, disk->disk_prompt); + } + end: RegCloseKey(hkey); RegCloseKey(hukey); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 14fb83b..f2561d4 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -580,14 +580,12 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf lstrcatW(mi->source, mi->cabinet); } - MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, - mi->disk_id, mi->volume_label, mi->disk_prompt); + msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, + mi->disk_id, mi->volume_label, mi->disk_prompt); - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT | MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); + msi_package_add_info(package, MSIINSTALLCONTEXT_USERMANAGED, + MSICODE_PRODUCT | MSISOURCETYPE_MEDIA, + INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); msi_free(source_dir); return ERROR_SUCCESS; @@ -754,10 +752,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (ptr) { ptr++; - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT, - INSTALLPROPERTY_PACKAGENAMEW, ptr); + msi_package_add_info(package, MSIINSTALLCONTEXT_USERMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, ptr); } schedule_install_files(package); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 36cbda4..d314699 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -489,7 +489,7 @@ void ACTION_free_package_structures( MSIPACKAGE* package) { INT i; struct list *item, *cursor; - + TRACE("Freeing package action data\n"); remove_tracked_tempfiles(package); @@ -607,6 +607,25 @@ void ACTION_free_package_structures( MSIPACKAGE* package) msi_free( appid ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->sourcelist_info ) + { + MSISOURCELISTINFO *info = LIST_ENTRY( item, MSISOURCELISTINFO, entry ); + + list_remove( &info->entry ); + msi_free( info->value ); + msi_free( info ); + } + + LIST_FOR_EACH_SAFE( item, cursor, &package->sourcelist_media ) + { + MSIMEDIADISK *info = LIST_ENTRY( item, MSIMEDIADISK, entry ); + + list_remove( &info->entry ); + msi_free( info->volume_label ); + msi_free( info->disk_prompt ); + msi_free( info ); + } + if (package->script) { for (i = 0; i < TOTAL_SCRIPTS; i++) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7e563a4..e5b5ea3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -113,6 +113,25 @@ typedef struct tagMSIRECORD MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; +typedef struct tagMSISOURCELISTINFO +{ + struct list entry; + DWORD context; + DWORD options; + LPCWSTR property; + LPWSTR value; +} MSISOURCELISTINFO; + +typedef struct tagMSIMEDIADISK +{ + struct list entry; + DWORD context; + DWORD options; + DWORD disk_id; + LPWSTR volume_label; + LPWSTR disk_prompt; +} MSIMEDIADISK; + typedef const struct tagMSICOLUMNHASHENTRY *MSIITERHANDLE; typedef struct tagMSIVIEWOPS @@ -249,6 +268,9 @@ typedef struct tagMSIPACKAGE struct list subscriptions; + struct list sourcelist_info; + struct list sourcelist_media; + unsigned char scheduled_action_running : 1; unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; @@ -664,6 +686,8 @@ extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTA extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); +extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); +extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); /* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8cb2771..e7482e0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -699,6 +699,8 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->extensions ); list_init( &package->progids ); list_init( &package->RunningActions ); + list_init( &package->sourcelist_info ); + list_init( &package->sourcelist_media ); package->ActionFormat = NULL; package->LastAction = NULL; @@ -1573,3 +1575,40 @@ HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) return S_OK; } + +UINT msi_package_add_info(MSIPACKAGE *package, DWORD context, DWORD options, + LPCWSTR property, LPWSTR value) +{ + MSISOURCELISTINFO *info; + + info = msi_alloc(sizeof(MSISOURCELISTINFO)); + if (!info) + return ERROR_OUTOFMEMORY; + + info->context = context; + info->options = options; + info->property = property; + info->value = strdupW(value); + list_add_head(&package->sourcelist_info, &info->entry); + + return ERROR_SUCCESS; +} + +UINT msi_package_add_media_disk(MSIPACKAGE *package, DWORD context, DWORD options, + DWORD disk_id, LPWSTR volume_label, LPWSTR disk_prompt) +{ + MSIMEDIADISK *disk; + + disk = msi_alloc(sizeof(MSIMEDIADISK)); + if (!disk) + return ERROR_OUTOFMEMORY; + + disk->context = context; + disk->options = options; + disk->disk_id = disk_id; + disk->volume_label = strdupW(volume_label); + disk->disk_prompt = strdupW(disk_prompt); + list_add_head(&package->sourcelist_media, &disk->entry); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 421fd85..f7df7eb 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1706,7 +1706,10 @@ static void test_publish(void) ok(pf_exists("msitest"), "File deleted\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + todo_wine + { + 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);

1 0

James Hawkins : msi: Only publish the product if at least one feature is to be installed.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: a2df31aea1746fcf067c77af56453100077a336f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2df31aea1746fcf067c77af5… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:21:26 2007 -0700 msi: Only publish the product if at least one feature is to be installed. --- dlls/msi/action.c | 17 ++++++++++++ dlls/msi/tests/install.c | 64 ++++++++++++--------------------------------- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0911a29..6c857f0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3241,6 +3241,19 @@ static UINT ITERATE_PublishProduct(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } +static BOOL msi_check_publish(MSIPACKAGE *package) +{ + MSIFEATURE *feature; + + LIST_FOR_EACH_ENTRY(feature, &package->features, MSIFEATURE, entry) + { + if (feature->ActionRequest == INSTALLSTATE_LOCAL) + return TRUE; + } + + return FALSE; +} + /* * 99% of the work done here is only done for * advertised installs. However this is where the @@ -3275,6 +3288,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) DWORD size; MSIHANDLE hDb, hSumInfo; + /* FIXME: also need to publish if the product is in advertise mode */ + if (!msi_check_publish(package)) + return ERROR_SUCCESS; + /* write out icon files */ rc = MSI_DatabaseOpenViewW(package->db, Query, &view); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 42d41a2..f6d59c8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1594,6 +1594,9 @@ static void test_publish(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + + state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); if (state != INSTALLSTATE_UNKNOWN) { skip("Install database not in a clean state\n"); @@ -1602,9 +1605,6 @@ static void test_publish(void) 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); @@ -1775,10 +1775,7 @@ static void test_publish(void) ok(pf_exists("msitest"), "File deleted\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); todo_wine @@ -1827,10 +1824,7 @@ static void test_publish(void) ok(pf_exists("msitest"), "File deleted\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); todo_wine @@ -1859,10 +1853,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine @@ -1888,10 +1879,7 @@ static void test_publish(void) } state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature");\ todo_wine @@ -1920,10 +1908,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine @@ -2108,10 +2093,7 @@ static void test_publish(void) } state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - } + ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); todo_wine @@ -2161,11 +2143,8 @@ static void test_publishsourcelist(void) size = 0xdeadbeef; r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); - todo_wine - { - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); - } + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -2176,11 +2155,8 @@ static void test_publishsourcelist(void) size = 0xdeadbeef; r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); - todo_wine - { - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); - } + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -2191,11 +2167,8 @@ static void test_publishsourcelist(void) size = 0xdeadbeef; r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); - todo_wine - { - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); - } + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -2206,11 +2179,8 @@ static void test_publishsourcelist(void) size = 0xdeadbeef; r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); - todo_wine - { - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); - } + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

James Hawkins : msi: PackagePath must also include the package name.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 08443b3bf7f5535dc438b64e9f8aeb9976b64424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08443b3bf7f5535dc438b64e9… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:19:46 2007 -0700 msi: PackagePath must also include the package name. --- dlls/msi/action.c | 40 ++++++++++++++++++++++++---------------- dlls/msi/tests/install.c | 7 ++----- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cc2583d..f09a1b9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -629,35 +629,43 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, if (szPackagePath) { - LPWSTR p, check, path; - - path = strdupW(szPackagePath); - p = strrchrW(path,'\\'); + LPWSTR p, check, dir; + + dir = strdupW(szPackagePath); + p = strrchrW(dir, '\\'); if (p) + *(++p) = 0; + else { - p++; - *p=0; + msi_free(dir); + dir = msi_alloc(MAX_PATH*sizeof(WCHAR)); + GetCurrentDirectoryW(MAX_PATH, dir); + lstrcatW(dir, cszbs); + p = (LPWSTR)szPackagePath; } - else + + msi_free( package->PackagePath ); + package->PackagePath = msi_alloc((lstrlenW(dir) + lstrlenW(p) + 2) * sizeof(WCHAR)); + if (!package->PackagePath) { - msi_free(path); - path = msi_alloc(MAX_PATH*sizeof(WCHAR)); - GetCurrentDirectoryW(MAX_PATH,path); - strcatW(path,cszbs); + msi_free(dir); + return ERROR_OUTOFMEMORY; } + lstrcpyW(package->PackagePath, dir); + lstrcatW(package->PackagePath, cszbs); + lstrcatW(package->PackagePath, p); + check = msi_dup_property( package, cszSourceDir ); if (!check) - MSI_SetPropertyW(package, cszSourceDir, path); + MSI_SetPropertyW(package, cszSourceDir, dir); msi_free(check); check = msi_dup_property( package, cszSOURCEDIR ); if (!check) - MSI_SetPropertyW(package, cszSOURCEDIR, path); - - msi_free( package->PackagePath ); - package->PackagePath = path; + MSI_SetPropertyW(package, cszSOURCEDIR, dir); + msi_free(dir); msi_free(check); } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7af097e..421fd85 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2244,11 +2244,8 @@ static void test_publishsourcelist(void) r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(value, "msitest.msi"), "Expected 'msitest.msi', got %s\n", value); - ok(size == 11, "Expected 11, got %d\n", size); - } + ok(!lstrcmpA(value, "msitest.msi"), "Expected 'msitest.msi', got %s\n", value); + ok(size == 11, "Expected 11, got %d\n", size); /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL");

1 0

James Hawkins : msi: Add tests to show when the SourceList is published to the registry.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 56129f252c6180be1f75c4698b6bb759344d4490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56129f252c6180be1f75c4698… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:19:10 2007 -0700 msi: Add tests to show when the SourceList is published to the registry. --- dlls/msi/tests/install.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e92abbf..7af097e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2159,6 +2159,114 @@ static void test_publish(void) RemoveDirectory("msitest"); } +static void test_publishsourcelist(void) +{ + UINT r; + DWORD size; + CHAR value[MAX_PATH]; + CHAR prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + + create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\maximus"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + /* nothing published */ + size = 0xdeadbeef; + r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); + todo_wine + { + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); + } + + r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\maximus"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + /* after RegisterProduct */ + size = 0xdeadbeef; + r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); + todo_wine + { + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); + } + + r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\maximus"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + /* after ProcessComponents */ + size = 0xdeadbeef; + r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); + todo_wine + { + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); + } + + r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\maximus"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + /* after PublishFeatures */ + size = 0xdeadbeef; + r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); + todo_wine + { + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); + ok(size == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", size); + } + + r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\maximus"), "File not installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + /* after PublishProduct */ + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = MsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(value, "msitest.msi"), "Expected 'msitest.msi', got %s\n", value); + ok(size == 11, "Expected 11, got %d\n", size); + } + + /* complete uninstall */ + r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); + ok(!pf_exists("msitest"), "File not deleted\n"); + } + + /* make sure 'Program Files\msitest' is removed */ + delete_pfmsitest_files(); + + DeleteFile(msifile); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); +} + START_TEST(install) { DWORD len; @@ -2190,6 +2298,7 @@ START_TEST(install) test_concurrentinstall(); test_setpropertyfolder(); test_publish(); + test_publishsourcelist(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Add support for the MSICODE_PATCH option.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 04c67c2a1cce0986a2587b9605092b9eef317a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c67c2a1cce0986a2587b960… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:18:34 2007 -0700 msi: Add support for the MSICODE_PATCH option. --- dlls/msi/msipriv.h | 2 + dlls/msi/registry.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/source.c | 45 ++++++++++++++++++++++--------------- dlls/msi/tests/source.c | 22 +++++++----------- 4 files changed, 94 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04c67c2a1cce0986a2587…

1 0

James Hawkins : msi: pcchValue represents the length of szValue in TCHARS, not bytes.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 0cd708e7f5eb91d6ec8c7448180451cf400f062e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd708e7f5eb91d6ec8c74481… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:17:59 2007 -0700 msi: pcchValue represents the length of szValue in TCHARS, not bytes. --- dlls/msi/source.c | 16 ++++++++++++++-- dlls/msi/tests/source.c | 5 +---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 74e2881..6223400 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -184,6 +184,7 @@ UINT WINAPI MsiSourceListGetInfoA( LPCSTR szProduct, LPCSTR szUserSid, if (!value) return ERROR_OUTOFMEMORY; + *value = '\0'; ret = MsiSourceListGetInfoW(product, usersid, dwContext, dwOptions, property, value, &len); if (ret != ERROR_SUCCESS) @@ -341,10 +342,21 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, } else if (strcmpW(INSTALLPROPERTY_PACKAGENAMEW, szProperty)==0) { - rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_PACKAGENAMEW, 0, 0, - (LPBYTE)szValue, pcchValue); + *pcchValue = *pcchValue * sizeof(WCHAR); + rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_PACKAGENAMEW, 0, 0, + (LPBYTE)szValue, pcchValue); if (rc != ERROR_SUCCESS && rc != ERROR_MORE_DATA) + { + *pcchValue = 0; rc = ERROR_SUCCESS; + } + else + { + if (*pcchValue) + *pcchValue = (*pcchValue - 1) / sizeof(WCHAR); + if (szValue) + szValue[*pcchValue] = '\0'; + } } else { diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 2c2fe05..58c2e86 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -209,10 +209,7 @@ static void test_MsiSourceListGetInfo(void) r = MsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(size == 0, "Expected 0, got %d\n", size); - } + ok(size == 0, "Expected 0, got %d\n", size); data = "msitest.msi"; res = RegSetValueExA(hkey, "PackageName", 0, REG_SZ, (const BYTE *)data, lstrlenA(data) + 1);

1 0

James Hawkins : msi: Handle remote calls to MsiGetProperty.
by Alexandre Julliard July 3, 2007

July 3, 2007

Module: wine Branch: master Commit: 4de8247c5a8b914483f589455fa89d9c9313eaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de8247c5a8b914483f589455… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:16:33 2007 -0700 msi: Handle remote calls to MsiGetProperty. --- dlls/msi/package.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index cafa656..d096466 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1343,7 +1343,7 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, static const WCHAR empty[] = {0}; MSIPACKAGE *package; MSIRECORD *row = NULL; - UINT r; + UINT r = ERROR_FUNCTION_FAILED; LPCWSTR val = NULL; TRACE("%lu %s %p %p\n", handle, debugstr_w(name), @@ -1354,7 +1354,50 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ); if (!package) - return ERROR_INVALID_HANDLE; + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + LPWSTR value = NULL; + DWORD len; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( handle ); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + len = 0; + hr = IWineMsiRemotePackage_GetProperty( remote_package, (BSTR *)name, NULL, &len ); + if (FAILED(hr)) + goto done; + + len++; + value = msi_alloc(len * sizeof(WCHAR)); + if (!value) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + hr = IWineMsiRemotePackage_GetProperty( remote_package, (BSTR *)name, (BSTR *)value, &len ); + if (FAILED(hr)) + goto done; + + r = msi_strcpy_to_awstring( value, szValueBuf, pchValueBuf ); + *pchValueBuf *= sizeof(WCHAR); /* Bug required by Adobe installers */ + +done: + IWineMsiRemotePackage_Release(remote_package); + msi_free(value); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return r; + } row = MSI_GetPropertyRow( package, name ); if (row)

1 0