June 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Squash the package code property.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: db2e8d2fdf2e57c7c3e8eddd4863d702116b36b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2e8d2fdf2e57c7c3e8eddd4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 23 23:00:21 2008 -0500 msi: Squash the package code property. --- dlls/msi/action.c | 4 +++- dlls/msi/tests/install.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b85b6ce..751c8aa 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3392,6 +3392,7 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) { MSIHANDLE hdb, suminfo; WCHAR guids[MAX_PATH]; + WCHAR packcode[SQUISH_GUID_SIZE]; LPWSTR buffer; LPWSTR ptr; DWORD langid; @@ -3452,7 +3453,8 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) ptr = strchrW(guids, ';'); if (ptr) *ptr = 0; - msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, guids); + squash_guid(guids, packcode); + msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, packcode); done: MsiCloseHandle(suminfo); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f1d493b..235a49a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2530,12 +2530,12 @@ static void test_publish_publishproduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); todo_wine { - CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);

1 0

James Hawkins : msi: Factor out publishing the product properties.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: ebeb537939c8c2b854f17f453101035bc576325a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeb537939c8c2b854f17f453… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 23 22:59:41 2008 -0500 msi: Factor out publishing the product properties. --- dlls/msi/action.c | 148 +++++++++++++++++++++++++++-------------------------- 1 files changed, 75 insertions(+), 73 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8f1920d..b85b6ce 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3388,6 +3388,77 @@ static UINT msi_publish_sourcelist(MSIPACKAGE *package) return ERROR_SUCCESS; } +static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) +{ + MSIHANDLE hdb, suminfo; + WCHAR guids[MAX_PATH]; + LPWSTR buffer; + LPWSTR ptr; + DWORD langid; + DWORD size; + UINT r; + + static const WCHAR szProductLanguage[] = + {'P','r','o','d','u','c','t','L','a','n','g','u','a','g','e',0}; + static const WCHAR szARPProductIcon[] = + {'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}; + + buffer = msi_dup_property(package, INSTALLPROPERTY_PRODUCTNAMEW); + msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTNAMEW, buffer); + msi_free(buffer); + + langid = msi_get_property_int(package, szProductLanguage, 0); + msi_reg_set_val_dword(hkey, INSTALLPROPERTY_LANGUAGEW, langid); + + ptr = strrchrW(package->PackagePath, '\\' ) + 1; + msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGENAMEW, ptr); + + /* FIXME */ + msi_reg_set_val_dword(hkey, INSTALLPROPERTY_AUTHORIZED_LUA_APPW, 0); + + buffer = msi_dup_property(package, szARPProductIcon); + if (buffer) + { + LPWSTR path = build_icon_path(package,buffer); + msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTICONW, path); + msi_free(path); + msi_free(buffer); + } + + buffer = msi_dup_property(package, szProductVersion); + if (buffer) + { + DWORD verdword = msi_version_str_to_dword(buffer); + msi_reg_set_val_dword(hkey, INSTALLPROPERTY_VERSIONW, verdword); + msi_free(buffer); + } + + hdb = alloc_msihandle(&package->db->hdr); + if (!hdb) + return ERROR_NOT_ENOUGH_MEMORY; + + r = MsiGetSummaryInformationW(hdb, NULL, 0, &suminfo); + MsiCloseHandle(hdb); + if (r != ERROR_SUCCESS) + goto done; + + size = MAX_PATH; + r = MsiSummaryInfoGetPropertyW(suminfo, PID_REVNUMBER, NULL, NULL, + NULL, guids, &size); + if (r != ERROR_SUCCESS) + goto done; + + ptr = strchrW(guids, ';'); + if (ptr) *ptr = 0; + msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, guids); + +done: + MsiCloseHandle(suminfo); + return ERROR_SUCCESS; +} + static BOOL msi_check_publish(MSIPACKAGE *package) { MSIFEATURE *feature; @@ -3410,22 +3481,12 @@ static BOOL msi_check_publish(MSIPACKAGE *package) static UINT ACTION_PublishProduct(MSIPACKAGE *package) { UINT rc; - LPWSTR packname; HKEY hukey=0; HKEY hudkey=0; HKEY source; - static const WCHAR szProductLanguage[] = - {'P','r','o','d','u','c','t','L','a','n','g','u','a','g','e',0}; - static const WCHAR szARPProductIcon[] = - {'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 szSourceList[] = {'S','o','u','r','c','e','L','i','s','t',0}; - DWORD langid; - LPWSTR buffer; - DWORD size; - MSIHANDLE hDb, hSumInfo; /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_check_publish(package)) @@ -3456,70 +3517,11 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - buffer = msi_dup_property( package, INSTALLPROPERTY_PRODUCTNAMEW ); - msi_reg_set_val_str( hukey, INSTALLPROPERTY_PRODUCTNAMEW, buffer ); - msi_free(buffer); - - langid = msi_get_property_int( package, szProductLanguage, 0 ); - msi_reg_set_val_dword( hukey, INSTALLPROPERTY_LANGUAGEW, langid ); - - packname = strrchrW( package->PackagePath, '\\' ) + 1; - msi_reg_set_val_str( hukey, INSTALLPROPERTY_PACKAGENAMEW, packname ); - - /* FIXME */ - msi_reg_set_val_dword( hukey, INSTALLPROPERTY_AUTHORIZED_LUA_APPW, 0 ); - - buffer = msi_dup_property( package, szARPProductIcon ); - if (buffer) - { - LPWSTR path = build_icon_path(package,buffer); - msi_reg_set_val_str( hukey, INSTALLPROPERTY_PRODUCTICONW, path ); - msi_free( path ); - } - msi_free(buffer); - - buffer = msi_dup_property( package, szProductVersion ); - if (buffer) - { - DWORD verdword = msi_version_str_to_dword(buffer); - msi_reg_set_val_dword( hukey, INSTALLPROPERTY_VERSIONW, verdword ); - } - msi_free(buffer); - /* FIXME: Need to write more keys to the user registry */ - - hDb= alloc_msihandle( &package->db->hdr ); - if (!hDb) { - rc = ERROR_NOT_ENOUGH_MEMORY; + + rc = msi_publish_product_properties(package, hukey); + if (rc != ERROR_SUCCESS) goto end; - } - rc = MsiGetSummaryInformationW(hDb, NULL, 0, &hSumInfo); - MsiCloseHandle(hDb); - if (rc == ERROR_SUCCESS) - { - WCHAR guidbuffer[0x200]; - size = 0x200; - rc = MsiSummaryInfoGetPropertyW(hSumInfo, 9, NULL, NULL, NULL, - guidbuffer, &size); - if (rc == ERROR_SUCCESS) - { - /* for now we only care about the first guid */ - LPWSTR ptr = strchrW(guidbuffer,';'); - if (ptr) *ptr = 0; - msi_reg_set_val_str( hukey, INSTALLPROPERTY_PACKAGECODEW, guidbuffer ); - } - else - { - ERR("Unable to query Revision_Number...\n"); - rc = ERROR_SUCCESS; - } - MsiCloseHandle(hSumInfo); - } - else - { - ERR("Unable to open Summary Information\n"); - rc = ERROR_SUCCESS; - } rc = msi_publish_sourcelist(package); if (rc != ERROR_SUCCESS)

1 0

James Hawkins : msi: Don't publish the product to an invalid location.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: d809b4e2d95b1ebfbf7d673a3c656e6484a96ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d809b4e2d95b1ebfbf7d673a3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 23 22:59:03 2008 -0500 msi: Don't publish the product to an invalid location. --- dlls/msi/action.c | 6 ------ dlls/msi/tests/automation.c | 11 +++++++---- dlls/msi/tests/install.c | 6 ++++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fb8cfed..8f1920d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3411,7 +3411,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) { UINT rc; LPWSTR packname; - HKEY hkey=0; HKEY hukey=0; HKEY hudkey=0; HKEY source; @@ -3442,10 +3441,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) } else { - rc = MSIREG_OpenProductsKey(package->ProductCode,&hkey,TRUE); - if (rc != ERROR_SUCCESS) - goto end; - rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); if (rc != ERROR_SUCCESS) goto end; @@ -3533,7 +3528,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = msi_publish_icons(package); end: - RegCloseKey(hkey); RegCloseKey(hukey); RegCloseKey(hudkey); diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 2b0ada1..ec54065 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2009,9 +2009,12 @@ static void test_Installer_Products(BOOL bProductInstalled) } } - ok(bProductInstalled == bProductFound, "Product expected to %s installed but product code was %s\n", - bProductInstalled ? "be" : "not be", - bProductFound ? "found" : "not found"); + if (bProductInstalled) todo_wine + { + ok(bProductInstalled == bProductFound, "Product expected to %s installed but product code was %s\n", + bProductInstalled ? "be" : "not be", + bProductFound ? "found" : "not found"); + } if (pEnum) { @@ -2306,7 +2309,7 @@ static void test_Installer_InstallProduct(void) RegCloseKey(hkey); res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\05FA3C1F65B896A40AC00077F34EF203"); - todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); /* Delete installation files we installed */ delete_test_files(); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index d5ebda2..f1d493b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2477,6 +2477,9 @@ static void test_publish_publishproduct(void) "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR cuupgrades[] = "Software\\Microsoft\\Installer\\UpgradeCodes" "\\51AAE0C44620A5E4788506E91F249BD2"; + static const CHAR badprod[] = "Software\\Microsoft\\Windows\\CurrentVersion" + "\\Installer\\Products" + "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; get_user_sid(&usersid); if (!usersid) @@ -2500,6 +2503,9 @@ static void test_publish_publishproduct(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, badprod, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + sprintf(keypath, prodpath, usersid); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

James Hawkins : msi: Don' t set an invalid install property in PublishProduct.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: ee8b4a0132329c73b866a88741a7c0572cb48b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8b4a0132329c73b866a8874… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 23 22:58:24 2008 -0500 msi: Don't set an invalid install property in PublishProduct. --- dlls/msi/action.c | 12 +----------- dlls/msi/tests/install.c | 5 ++++- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8e30102..fb8cfed 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3413,7 +3413,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) LPWSTR packname; HKEY hkey=0; HKEY hukey=0; - HKEY hudkey=0, props=0; + HKEY hudkey=0; HKEY source; static const WCHAR szProductLanguage[] = {'P','r','o','d','u','c','t','L','a','n','g','u','a','g','e',0}; @@ -3439,10 +3439,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = MSIREG_OpenLocalClassesProductKey(package->ProductCode, &hukey, TRUE); if (rc != ERROR_SUCCESS) goto end; - - rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &props, TRUE); - if (rc != ERROR_SUCCESS) - goto end; } else { @@ -3453,10 +3449,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = MSIREG_OpenUserProductsKey(package->ProductCode,&hukey,TRUE); if (rc != ERROR_SUCCESS) goto end; - - rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &props, TRUE); - if (rc != ERROR_SUCCESS) - goto end; } rc = RegCreateKeyW(hukey, szSourceList, &source); @@ -3481,7 +3473,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) /* FIXME */ msi_reg_set_val_dword( hukey, INSTALLPROPERTY_AUTHORIZED_LUA_APPW, 0 ); - msi_reg_set_val_dword( props, INSTALLPROPERTY_INSTANCETYPEW, 0 ); buffer = msi_dup_property( package, szARPProductIcon ); if (buffer) @@ -3545,7 +3536,6 @@ end: RegCloseKey(hkey); RegCloseKey(hukey); RegCloseKey(hudkey); - RegCloseKey(props); return rc; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 93445c9..d5ebda2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2464,7 +2464,7 @@ static void test_publish_publishproduct(void) UINT r; LONG res; LPSTR usersid; - HKEY sourcelist, net; + HKEY sourcelist, net, props; HKEY hkey, patches, media; CHAR keypath[MAX_PATH]; CHAR temp[MAX_PATH]; @@ -2504,6 +2504,9 @@ static void test_publish_publishproduct(void) res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegOpenKeyA(hkey, "InstallProperties", &props); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = RegOpenKeyA(hkey, "Patches", &patches); todo_wine {

1 0

James Hawkins : msi: Factor out publishing the product source list.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: 68e6071d3c91f0a5ab2aa0b924e4905c462c98d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e6071d3c91f0a5ab2aa0b92… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 23 22:57:36 2008 -0500 msi: Factor out publishing the product source list. --- dlls/msi/action.c | 94 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 41 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9d6fe7b..8e30102 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3339,6 +3339,55 @@ static UINT msi_publish_icons(MSIPACKAGE *package) return ERROR_SUCCESS; } +static UINT msi_publish_sourcelist(MSIPACKAGE *package) +{ + UINT r; + LPWSTR buffer; + MSIMEDIADISK *disk; + MSISOURCELISTINFO *info; + + static const WCHAR szEmpty[] = {0}; + + buffer = strrchrW(package->PackagePath, '\\') + 1; + r = MsiSourceListSetInfoW(package->ProductCode, NULL, + package->Context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, buffer); + if (r != ERROR_SUCCESS) + return r; + + r = MsiSourceListSetInfoW(package->ProductCode, NULL, + package->Context, MSICODE_PRODUCT, + INSTALLPROPERTY_MEDIAPACKAGEPATHW, szEmpty); + if (r != ERROR_SUCCESS) + return r; + + r = MsiSourceListSetInfoW(package->ProductCode, NULL, + package->Context, MSICODE_PRODUCT, + INSTALLPROPERTY_DISKPROMPTW, szEmpty); + if (r != ERROR_SUCCESS) + return r; + + LIST_FOR_EACH_ENTRY(info, &package->sourcelist_info, MSISOURCELISTINFO, entry) + { + if (!lstrcmpW(info->property, INSTALLPROPERTY_LASTUSEDSOURCEW)) + msi_set_last_used_source(package->ProductCode, NULL, info->context, + info->options, info->value); + else + 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); + } + + return ERROR_SUCCESS; +} + static BOOL msi_check_publish(MSIPACKAGE *package) { MSIFEATURE *feature; @@ -3362,8 +3411,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) { UINT rc; LPWSTR packname; - MSISOURCELISTINFO *info; - MSIMEDIADISK *disk; HKEY hkey=0; HKEY hukey=0; HKEY hudkey=0, props=0; @@ -3376,7 +3423,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; static const WCHAR szSourceList[] = {'S','o','u','r','c','e','L','i','s','t',0}; - static const WCHAR szEmpty[] = {0}; DWORD langid; LPWSTR buffer; DWORD size; @@ -3454,25 +3500,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) } msi_free(buffer); - buffer = strrchrW( package->PackagePath, '\\') + 1; - rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - package->Context, MSICODE_PRODUCT, - INSTALLPROPERTY_PACKAGENAMEW, buffer ); - if (rc != ERROR_SUCCESS) - goto end; - - rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - package->Context, MSICODE_PRODUCT, - INSTALLPROPERTY_MEDIAPACKAGEPATHW, szEmpty ); - if (rc != ERROR_SUCCESS) - goto end; - - rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - package->Context, MSICODE_PRODUCT, - INSTALLPROPERTY_DISKPROMPTW, szEmpty ); - if (rc != ERROR_SUCCESS) - goto end; - /* FIXME: Need to write more keys to the user registry */ hDb= alloc_msihandle( &package->db->hdr ); @@ -3508,26 +3535,11 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) rc = ERROR_SUCCESS; } - /* publish the SourceList info */ - LIST_FOR_EACH_ENTRY(info, &package->sourcelist_info, MSISOURCELISTINFO, entry) - { - if (!lstrcmpW(info->property, INSTALLPROPERTY_LASTUSEDSOURCEW)) - msi_set_last_used_source(package->ProductCode, NULL, info->context, - info->options, info->value); - else - 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); - } + rc = msi_publish_sourcelist(package); + if (rc != ERROR_SUCCESS) + goto end; - msi_publish_icons(package); + rc = msi_publish_icons(package); end: RegCloseKey(hkey);

1 0

James Hawkins : msi: Factor out publishing icon files.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: fac97bb8c5e1f0be701017929afb930f1141fe2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac97bb8c5e1f0be701017929… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jun 23 22:56:56 2008 -0500 msi: Factor out publishing icon files. --- dlls/msi/action.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 67f06df..9d6fe7b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3261,7 +3261,7 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) return rc; } -static UINT ITERATE_PublishProduct(MSIRECORD *row, LPVOID param) +static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = (MSIPACKAGE*)param; HANDLE the_file; @@ -3320,6 +3320,25 @@ static UINT ITERATE_PublishProduct(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } +static UINT msi_publish_icons(MSIPACKAGE *package) +{ + UINT r; + MSIQUERY *view; + + static const WCHAR query[]= { + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','I','c','o','n','`',0}; + + r = MSI_DatabaseOpenViewW(package->db, query, &view); + if (r == ERROR_SUCCESS) + { + MSI_IterateRecords(view, NULL, ITERATE_PublishIcon, package); + msiobj_release(&view->hdr); + } + + return ERROR_SUCCESS; +} + static BOOL msi_check_publish(MSIPACKAGE *package) { MSIFEATURE *feature; @@ -3343,13 +3362,8 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) { UINT rc; LPWSTR packname; - 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}; - /* for registry stuff */ HKEY hkey=0; HKEY hukey=0; HKEY hudkey=0, props=0; @@ -3372,15 +3386,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (!msi_check_publish(package)) return ERROR_SUCCESS; - /* write out icon files */ - - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); - if (rc == ERROR_SUCCESS) - { - MSI_IterateRecords(view, NULL, ITERATE_PublishProduct, package); - msiobj_release(&view->hdr); - } - /* ok there is a lot more done here but i need to figure out what */ if (package->Context == MSIINSTALLCONTEXT_MACHINE) @@ -3522,6 +3527,8 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) disk->disk_id, disk->volume_label, disk->disk_prompt); } + msi_publish_icons(package); + end: RegCloseKey(hkey); RegCloseKey(hukey);

1 0

Owen Rudge : shell32: Populate comment column in Control Panel.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: 4fb049aaf16f6d9f1fe7bc36c42e53fb31d78523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb049aaf16f6d9f1fe7bc36c… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 18:54:20 2008 +0100 shell32: Populate comment column in Control Panel. --- dlls/shell32/cpanelfolder.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 85c8974..e3f9ffb 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -111,7 +111,7 @@ static inline ICPanelImpl *impl_from_IShellExecuteHookA( IShellExecuteHookA *ifa static const shvheader ControlPanelSFHeader[] = { {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},/*FIXME*/ - {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 200},/*FIXME*/ + {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 80},/*FIXME*/ }; #define CONROLPANELSHELLVIEWCOLUMNS 2 @@ -764,6 +764,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsEx(IShellFolder2 * iface, LPC static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) { ICPanelImpl *This = (ICPanelImpl *)iface; + PIDLCPanelStruct* pcpanel; HRESULT hr; TRACE("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); @@ -785,7 +786,13 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDetailsOf(IShellFolder2 * iface, LPC hr = IShellFolder_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; case 1: /* comment */ - _ILGetFileType(pidl, psd->str.u.cStr, MAX_PATH); + pcpanel = _ILGetCPanelPointer(pidl); + + if (pcpanel) + lstrcpyA(psd->str.u.cStr, pcpanel->szName+pcpanel->offsComment); + else + _ILGetFileType(pidl, psd->str.u.cStr, MAX_PATH); + break; } hr = S_OK;

1 0

Owen Rudge : shell32: Ensure the correct applet is loaded in multi-applet control panels.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: b198924c202c172815f125361dc02b6cd1ad85da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b198924c202c172815f125361… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 18:54:11 2008 +0100 shell32: Ensure the correct applet is loaded in multi-applet control panels. --- dlls/shell32/control.c | 105 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 76 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 1f17016..7afe8e9 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -358,7 +358,8 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) LPWSTR end; WCHAR ch; LPWSTR ptr; - unsigned sp = 0; + signed sp = -1; + LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; int quoted = 0; @@ -368,46 +369,92 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) end = lstrcpyW(buffer, wszCmd); for (;;) { - ch = *end; + ch = *end; if (ch == '"') quoted = !quoted; - if (!quoted && (ch == ' ' || ch == ',' || ch == '\0')) { - *end = '\0'; - if (beg) { - if (*beg == '@') { - sp = atoiW(beg + 1); - } else if (*beg == '\0') { - sp = 0; - } else { - extraPmts = beg; - } - } - if (ch == '\0') break; - beg = end + 1; - if (ch == ' ') while (end[1] == ' ') end++; - } - end++; + if (!quoted && (ch == ' ' || ch == ',' || ch == '\0')) { + *end = '\0'; + if (beg) { + if (*beg == '@') { + sp = atoiW(beg + 1); + } else if (*beg == '\0') { + sp = -1; + } else { + extraPmtsBuf = beg; + } + } + if (ch == '\0') break; + beg = end + 1; + if (ch == ' ') while (end[1] == ' ') end++; + } + end++; } while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + /* now check for any quotes in extraPmtsBuf and remove */ + if (extraPmtsBuf != NULL) + { + beg = end = extraPmtsBuf; + quoted = 0; + + for (;;) { + ch = *end; + if (ch == '"') quoted = !quoted; + if (!quoted && (ch == ' ' || ch == ',' || ch == '\0')) { + *end = '\0'; + if (beg) { + if (*beg != '\0') { + extraPmts = beg; + } + } + if (ch == '\0') break; + beg = end + 1; + if (ch == ' ') while (end[1] == ' ') end++; + } + end++; + } + + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + + if (extraPmts == NULL) + extraPmts = extraPmtsBuf; + } + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); if (panel->first) { - CPlApplet* applet = panel->first; + CPlApplet* applet = panel->first; - assert(applet && applet->next == NULL); - if (sp >= applet->count) { - WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); - sp = 0; - } - if (applet->info[sp].dwSize) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) - applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); - } - Control_UnloadApplet(applet); + assert(applet && applet->next == NULL); + + /* we've been given a textual parameter (or none at all) */ + if (sp == -1) { + while ((++sp) != applet->count) { + if (applet->info[sp].dwSize) { + TRACE("sp %d, name %s\n", sp, debugstr_w(applet->info[sp].szName)); + + if (StrCmpIW(extraPmts, applet->info[sp].szName) == 0) + break; + } + } + } + + if (sp >= applet->count) { + WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); + sp = 0; + } + + if (applet->info[sp].dwSize) { + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) + applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); + } + + Control_UnloadApplet(applet); } + HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Owen Rudge : shell32: Register Control Panel namespace folder.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: 3a95e276f225135b82717dcc49b4f2f30de4093c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a95e276f225135b82717dcc4… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 18:54:00 2008 +0100 shell32: Register Control Panel namespace folder. --- dlls/shell32/regsvr.c | 16 ++++++++++++++++ dlls/shell32/shell32_Bg.rc | 1 + dlls/shell32/shell32_Cs.rc | 1 + dlls/shell32/shell32_Da.rc | 1 + dlls/shell32/shell32_De.rc | 1 + dlls/shell32/shell32_En.rc | 1 + dlls/shell32/shell32_Eo.rc | 1 + dlls/shell32/shell32_Es.rc | 1 + dlls/shell32/shell32_Fi.rc | 1 + dlls/shell32/shell32_Fr.rc | 1 + dlls/shell32/shell32_It.rc | 1 + dlls/shell32/shell32_Ja.rc | 1 + dlls/shell32/shell32_Ko.rc | 1 + dlls/shell32/shell32_Nl.rc | 1 + dlls/shell32/shell32_No.rc | 1 + dlls/shell32/shell32_Pl.rc | 1 + dlls/shell32/shell32_Pt.rc | 1 + dlls/shell32/shell32_Ro.rc | 1 + dlls/shell32/shell32_Ru.rc | 1 + dlls/shell32/shell32_Si.rc | 1 + dlls/shell32/shell32_Tr.rc | 1 + dlls/shell32/shell32_Uk.rc | 1 + dlls/shell32/shresdef.h | 13 +++++++------ 23 files changed, 44 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a95e276f225135b82717…

1 0

Owen Rudge : wine.inf: Add cplfile (control panel applet) association.
by Alexandre Julliard June 24, 2008

June 24, 2008

Module: wine Branch: master Commit: 49d5c7fbe461eeb8600f1519bd9496d584102de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d5c7fbe461eeb8600f1519b… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 18:53:48 2008 +0100 wine.inf: Add cplfile (control panel applet) association. --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 38c48d5..8dfc0d5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -96,6 +96,7 @@ Control="System\CurrentControlSet\Control" [Classes] HKCR,.avi,"Content Type",2,"video/avi" HKCR,.chm,,2,"chm.file" +HKCR,.cpl,,2,"cplfile" HKCR,.dll,"Content Type",2,"application/x-msdownload" HKCR,.exe,,2,"exefile" HKCR,.exe,"Content Type",2,"application/x-msdownload" @@ -119,6 +120,8 @@ HKCR,.xml,,2,"xmlfile" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" +HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" +HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]"

1 0