December 2008 - Wine-Commits

James Hawkins : msi: Remove a duplicated function.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 8438d21127b6d9f52efcda5c1675951e10836b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8438d21127b6d9f52efcda5c1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:09 2008 -0600 msi: Remove a duplicated function. --- dlls/msi/msi.c | 8 ++++---- dlls/msi/msipriv.h | 1 - dlls/msi/registry.c | 30 ------------------------------ 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index dbe2acf..45fc728 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -733,7 +733,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, } if (classes) - MSIREG_OpenLocalSystemProductKey(szProduct, &userdata, FALSE); + MSIREG_OpenInstallProps(szProduct, szLocalSid, &userdata, FALSE); else MSIREG_OpenCurrentUserInstallProps(szProduct, &userdata, FALSE); @@ -1062,7 +1062,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, else if (dwContext == MSIINSTALLCONTEXT_MACHINE) { package = INSTALLPROPERTY_LOCALPACKAGEW; - MSIREG_OpenLocalSystemProductKey(szProductCode, &props, FALSE); + MSIREG_OpenInstallProps(szProductCode, szLocalSid, &props, FALSE); MSIREG_OpenProductKey(szProductCode, dwContext, &classes, FALSE); if (!props && !classes) @@ -1296,7 +1296,7 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context) }; if (context == MSIINSTALLCONTEXT_MACHINE) - r = MSIREG_OpenLocalSystemProductKey(prodcode, &hkey, FALSE); + r = MSIREG_OpenInstallProps(prodcode, szLocalSid, &hkey, FALSE); else r = MSIREG_OpenCurrentUserInstallProps(prodcode, &hkey, FALSE); @@ -1784,7 +1784,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, state = INSTALLSTATE_ABSENT; - if ((MSIREG_OpenLocalSystemProductKey(szProduct, &hkey, FALSE) == ERROR_SUCCESS || + if ((MSIREG_OpenInstallProps(szProduct, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || MSIREG_OpenUserDataProductKey(szProduct, NULL, &hkey, FALSE) == ERROR_SUCCESS) && msi_reg_get_val_dword(hkey, wininstaller, &version) && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4781092..37d1d43 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -786,7 +786,6 @@ extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL cr extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct); -extern UINT MSIREG_OpenLocalSystemProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create); extern UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3f173e0..bd56a72 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -187,16 +187,6 @@ static const WCHAR szInstallProperties_fmt[] = { '%','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}; -static const WCHAR szInstaller_LocalSystemProductCodes_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','-','1','-','5','-','1','8','\\','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}; - static const WCHAR szInstaller_LocalSystemComponent_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -1049,26 +1039,6 @@ UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } -UINT MSIREG_OpenLocalSystemProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create) -{ - WCHAR squished_pc[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n", debugstr_w(szProductCode)); - - if (!squash_guid(szProductCode, squished_pc)) - return ERROR_FUNCTION_FAILED; - - TRACE("squished (%s)\n", debugstr_w(squished_pc)); - - sprintfW(keypath, szInstaller_LocalSystemProductCodes_fmt, squished_pc); - - if (create) - return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); - - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); -} - UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create) { WCHAR squished_pc[GUID_SIZE];

1 0

James Hawkins : msi: Add the ability to open multiple users' install properties key.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 98c703ab8788eb677c4247be61a38e31d980dcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c703ab8788eb677c4247be6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:04 2008 -0600 msi: Add the ability to open multiple users' install properties key. --- dlls/msi/action.c | 5 +++-- dlls/msi/msi.c | 8 ++++---- dlls/msi/msipriv.h | 3 ++- dlls/msi/registry.c | 10 ++-------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8dd2476..fd60505 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4170,7 +4170,8 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (package->Context == MSIINSTALLCONTEXT_MACHINE) { - rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &props, TRUE); + rc = MSIREG_OpenInstallProps(package->ProductCode, szLocalSid, + &props, TRUE); if (rc != ERROR_SUCCESS) goto done; } @@ -4438,7 +4439,7 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) return ERROR_SUCCESS; if (package->Context == MSIINSTALLCONTEXT_MACHINE) - rc = MSIREG_OpenLocalSystemInstallProps(package->ProductCode, &hkey, TRUE); + rc = MSIREG_OpenInstallProps(package->ProductCode, szLocalSid, &hkey, TRUE); else rc = MSIREG_OpenCurrentUserInstallProps(package->ProductCode, &hkey, TRUE); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b2664e6..dbe2acf 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -108,7 +108,7 @@ static UINT MSI_OpenProductW(LPCWSTR szProduct, MSIPACKAGE **package) return r; if (context == MSIINSTALLCONTEXT_MACHINE) - r = MSIREG_OpenLocalSystemInstallProps(szProduct, &props, FALSE); + r = MSIREG_OpenInstallProps(szProduct, szLocalSid, &props, FALSE); else if (context == MSIINSTALLCONTEXT_USERMANAGED || context == MSIINSTALLCONTEXT_USERUNMANAGED) r = MSIREG_OpenCurrentUserInstallProps(szProduct, &props, FALSE); @@ -407,7 +407,7 @@ static UINT msi_open_package(LPCWSTR product, MSIINSTALLCONTEXT context, 'L','o','c','a','l','P','a','c','k','a','g','e',0}; if (context == MSIINSTALLCONTEXT_MACHINE) - r = MSIREG_OpenLocalSystemInstallProps(product, &props, FALSE); + r = MSIREG_OpenInstallProps(product, szLocalSid, &props, FALSE); else r = MSIREG_OpenCurrentUserInstallProps(product, &props, FALSE); @@ -1448,7 +1448,7 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR szProduct) } else { - r = MSIREG_OpenLocalSystemInstallProps(szProduct, &userdata, FALSE); + r = MSIREG_OpenInstallProps(szProduct, szLocalSid, &userdata, FALSE); if (r != ERROR_SUCCESS) goto done; } @@ -2449,7 +2449,7 @@ static USERINFOSTATE MSI_GetUserInfo(LPCWSTR szProduct, } if (MSIREG_OpenCurrentUserInstallProps(szProduct, &props, FALSE) != ERROR_SUCCESS && - MSIREG_OpenLocalSystemInstallProps(szProduct, &props, FALSE) != ERROR_SUCCESS) + MSIREG_OpenInstallProps(szProduct, szLocalSid, &props, FALSE) != ERROR_SUCCESS) { RegCloseKey(hkey); return USERINFOSTATE_ABSENT; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6f5299c..4781092 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -779,7 +779,8 @@ extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, HKEY* key, BOOL create); extern UINT MSIREG_OpenCurrentUserInstallProps(LPCWSTR szProduct, HKEY* key, BOOL create); -extern UINT MSIREG_OpenLocalSystemInstallProps(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, + 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); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index c8ea83f..3f173e0 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -890,8 +890,8 @@ UINT MSIREG_OpenUserDataPatchKey(LPWSTR patch, HKEY *key, BOOL create) return rc; } -static UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, - HKEY *key, BOOL create) +UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, + HKEY *key, BOOL create) { UINT rc; WCHAR squished_pc[GUID_SIZE]; @@ -931,12 +931,6 @@ UINT MSIREG_OpenCurrentUserInstallProps(LPCWSTR szProduct, HKEY *key, return rc; } -UINT MSIREG_OpenLocalSystemInstallProps(LPCWSTR szProduct, HKEY *key, - BOOL create) -{ - return MSIREG_OpenInstallProps(szProduct, szLocalSid, key, create); -} - UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) { UINT rc;

1 0

James Hawkins : msi: Add the ability to open multiple users' component keys .
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: b198f4f23f0d36016076645b1634dafda3757628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b198f4f23f0d36016076645b1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:21:00 2008 -0600 msi: Add the ability to open multiple users' component keys. --- dlls/msi/action.c | 6 ++++-- dlls/msi/msi.c | 12 ++++++------ dlls/msi/msipriv.h | 4 ++-- dlls/msi/registry.c | 42 +++++++++++++++--------------------------- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e11421b..8dd2476 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2859,9 +2859,11 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) continue; if (package->Context == MSIINSTALLCONTEXT_MACHINE) - rc = MSIREG_OpenLocalUserDataComponentKey(comp->ComponentId, &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, + &hkey, TRUE); else - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, + &hkey, TRUE); if (rc != ERROR_SUCCESS) continue; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7de78f9..b2664e6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -618,7 +618,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer) if (!squash_guid(szComponent, squished_comp)) return ERROR_INVALID_PARAMETER; - if (MSIREG_OpenUserDataComponentKey(szComponent, &compkey, FALSE) != ERROR_SUCCESS && + if (MSIREG_OpenUserDataComponentKey(szComponent, NULL, &compkey, FALSE) != ERROR_SUCCESS && MSIREG_OpenLocalSystemComponentKey(szComponent, &compkey, FALSE) != ERROR_SUCCESS) { return ERROR_UNKNOWN_COMPONENT; @@ -1326,7 +1326,7 @@ static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, if (context == MSIINSTALLCONTEXT_MACHINE) r = MSIREG_OpenLocalSystemComponentKey(comp, &hkey, FALSE); else - r = MSIREG_OpenUserDataComponentKey(comp, &hkey, FALSE); + r = MSIREG_OpenUserDataComponentKey(comp, NULL, &hkey, FALSE); if (r != ERROR_SUCCESS) return FALSE; @@ -1777,7 +1777,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, state = INSTALLSTATE_UNKNOWN; if (MSIREG_OpenLocalSystemComponentKey(szComponent, &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataComponentKey(szComponent, &hkey, FALSE) == ERROR_SUCCESS) + MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) { path = msi_reg_get_val_str(hkey, squished_pc); RegCloseKey(hkey); @@ -1803,7 +1803,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, RegCloseKey(hkey); if (MSIREG_OpenLocalSystemComponentKey(szComponent, &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataComponentKey(szComponent, &hkey, FALSE) == ERROR_SUCCESS) + MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) { msi_free(path); path = msi_reg_get_val_str(hkey, squished_pc); @@ -1991,9 +1991,9 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) StringFromGUID2(&guid, comp, GUID_SIZE); if (machine) - rc = MSIREG_OpenLocalUserDataComponentKey(comp, &hkey, FALSE); + rc = MSIREG_OpenUserDataComponentKey(comp, szLocalSid, &hkey, FALSE); else - rc = MSIREG_OpenUserDataComponentKey(comp, &hkey, FALSE); + rc = MSIREG_OpenUserDataComponentKey(comp, NULL, &hkey, FALSE); if (rc != ERROR_SUCCESS) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ed2e349..6f5299c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -773,8 +773,8 @@ extern UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL c UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, HKEY *key, BOOL create); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); -extern UINT MSIREG_OpenLocalUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); -extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); +extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, + HKEY *key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, HKEY* key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index c624ffd..c8ea83f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -753,24 +753,6 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) return rc; } -UINT MSIREG_OpenLocalUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create) -{ - WCHAR comp[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n", debugstr_w(szComponent)); - if (!squash_guid(szComponent, comp)) - return ERROR_FUNCTION_FAILED; - TRACE("squished (%s)\n", debugstr_w(comp)); - - sprintfW(keypath, szUserDataComp_fmt, szLocalSid, comp); - - if (create) - return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); - - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); -} - UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent) { WCHAR comp[GUID_SIZE]; @@ -785,7 +767,8 @@ UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent) return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } -UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create) +UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, + HKEY *key, BOOL create) { UINT rc; WCHAR comp[GUID_SIZE]; @@ -797,21 +780,26 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(comp)); - rc = get_user_sid(&usersid); - if (rc != ERROR_SUCCESS || !usersid) + if (!szUserSid) { - ERR("Failed to retrieve user SID: %d\n", rc); - return rc; - } + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } - sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + LocalFree(usersid); + } + else + sprintfW(keypath, szUserDataComp_fmt, szUserSid, comp); if (create) rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - LocalFree(usersid); return rc; } @@ -1433,7 +1421,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) if (!szComponent || !*szComponent || !szProduct) return ERROR_INVALID_PARAMETER; - if (MSIREG_OpenUserDataComponentKey(szComponent, &hkeyComp, FALSE) != ERROR_SUCCESS && + if (MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkeyComp, FALSE) != ERROR_SUCCESS && MSIREG_OpenLocalSystemComponentKey(szComponent, &hkeyComp, FALSE) != ERROR_SUCCESS) return ERROR_UNKNOWN_COMPONENT;

1 0

James Hawkins : msi: Add the ability to open multiple users product keys.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 930b429d1ee5310690da2f437e52a76bfde1d345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930b429d1ee5310690da2f437… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:20:56 2008 -0600 msi: Add the ability to open multiple users product keys. --- dlls/msi/action.c | 6 +++- dlls/msi/helpers.c | 1 + dlls/msi/msi.c | 2 +- dlls/msi/msipriv.h | 5 ++- dlls/msi/registry.c | 56 +++++++++++++++++++------------------------------- 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5d9ba65..e11421b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3589,13 +3589,15 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (package->Context == MSIINSTALLCONTEXT_MACHINE) { - rc = MSIREG_OpenLocalUserDataProductKey(package->ProductCode, &hudkey, TRUE); + rc = MSIREG_OpenUserDataProductKey(package->ProductCode, szLocalSid, + &hudkey, TRUE); if (rc != ERROR_SUCCESS) goto end; } else { - rc = MSIREG_OpenUserDataProductKey(package->ProductCode, &hudkey, TRUE); + rc = MSIREG_OpenUserDataProductKey(package->ProductCode, NULL, + &hudkey, TRUE); if (rc != ERROR_SUCCESS) goto end; } diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index d15d79a..5c9dfd0 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -41,6 +41,7 @@ const WCHAR cszSourceDir[] = {'S','o','u','r','c','e','D','i','r',0}; const WCHAR cszSOURCEDIR[] = {'S','O','U','R','C','E','D','I','R',0}; const WCHAR cszRootDrive[] = {'R','O','O','T','D','R','I','V','E',0}; const WCHAR cszbs[]={'\\',0}; +const WCHAR szLocalSid[] = {'S','-','1','-','5','-','1','8',0}; LPWSTR build_icon_path(MSIPACKAGE *package, LPCWSTR icon_name ) { diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 68c0706..7de78f9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1785,7 +1785,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, state = INSTALLSTATE_ABSENT; if ((MSIREG_OpenLocalSystemProductKey(szProduct, &hkey, FALSE) == ERROR_SUCCESS || - MSIREG_OpenUserDataProductKey(szProduct, &hkey, FALSE) == ERROR_SUCCESS) && + MSIREG_OpenUserDataProductKey(szProduct, NULL, &hkey, FALSE) == ERROR_SUCCESS) && msi_reg_get_val_dword(hkey, wininstaller, &version) && GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b72e1d7..ed2e349 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -776,8 +776,8 @@ extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL cr extern UINT MSIREG_OpenLocalUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, 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_OpenLocalUserDataProductKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, + HKEY* key, BOOL create); extern UINT MSIREG_OpenCurrentUserInstallProps(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenLocalSystemInstallProps(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); @@ -1042,6 +1042,7 @@ extern const WCHAR cszSourceDir[]; extern const WCHAR cszSOURCEDIR[]; extern const WCHAR cszRootDrive[]; extern const WCHAR cszbs[]; +extern const WCHAR szLocalSid[]; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index b413b6f..c624ffd 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -244,8 +244,6 @@ static const WCHAR szInstaller_ClassesUpgrade_fmt[] = { 'U','p','g','r','a','d','e','C','o','d','e','s','\\', '%','s',0}; -static const WCHAR localsid[] = {'S','-','1','-','5','-','1','8',0}; - BOOL unsquash_guid(LPCWSTR in, LPWSTR out) { DWORD i,n=0; @@ -713,7 +711,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context if (context == MSIINSTALLCONTEXT_MACHINE) { - sprintfW(keypath, szUserDataFeatures_fmt, localsid, squished_pc); + sprintfW(keypath, szUserDataFeatures_fmt, szLocalSid, squished_pc); } else { @@ -765,7 +763,7 @@ UINT MSIREG_OpenLocalUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL c return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(comp)); - sprintfW(keypath, szUserDataComp_fmt, localsid, comp); + sprintfW(keypath, szUserDataComp_fmt, szLocalSid, comp); if (create) return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); @@ -783,7 +781,7 @@ UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent) return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(comp)); - sprintfW(keypath, szUserDataComp_fmt, localsid, comp); + sprintfW(keypath, szUserDataComp_fmt, szLocalSid, comp); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -842,7 +840,8 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } -UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) +UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, + HKEY *key, BOOL create) { UINT rc; WCHAR squished_pc[GUID_SIZE]; @@ -854,21 +853,26 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) return ERROR_FUNCTION_FAILED; TRACE("squished (%s)\n", debugstr_w(squished_pc)); - rc = get_user_sid(&usersid); - if (rc != ERROR_SUCCESS || !usersid) + if (!szUserSid) { - ERR("Failed to retrieve user SID: %d\n", rc); - return rc; - } + 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); + sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); + LocalFree(usersid); + } + else + sprintfW(keypath, szUserDataProd_fmt, szUserSid, squished_pc); if (create) rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - LocalFree(usersid); return rc; } @@ -898,24 +902,6 @@ UINT MSIREG_OpenUserDataPatchKey(LPWSTR patch, HKEY *key, BOOL create) return rc; } -UINT MSIREG_OpenLocalUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) -{ - WCHAR squished_pc[GUID_SIZE]; - WCHAR keypath[0x200]; - - TRACE("%s\n", debugstr_w(szProduct)); - if (!squash_guid(szProduct, squished_pc)) - return ERROR_FUNCTION_FAILED; - TRACE("squished (%s)\n", debugstr_w(squished_pc)); - - sprintfW(keypath, szUserDataProd_fmt, localsid, squished_pc); - - if (create) - return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); - - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); -} - static UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, LPCWSTR szUserSID, HKEY *key, BOOL create) { @@ -960,7 +946,7 @@ UINT MSIREG_OpenCurrentUserInstallProps(LPCWSTR szProduct, HKEY *key, UINT MSIREG_OpenLocalSystemInstallProps(LPCWSTR szProduct, HKEY *key, BOOL create) { - return MSIREG_OpenInstallProps(szProduct, localsid, key, create); + return MSIREG_OpenInstallProps(szProduct, szLocalSid, key, create); } UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) @@ -1780,7 +1766,7 @@ static UINT msi_get_patch_state(LPCWSTR prodcode, LPCWSTR usersid, *state = MSIPATCHSTATE_INVALID; /* FIXME: usersid might not be current user */ - r = MSIREG_OpenUserDataProductKey(prodcode, &prod, FALSE); + r = MSIREG_OpenUserDataProductKey(prodcode, NULL, &prod, FALSE); if (r != ERROR_SUCCESS) return ERROR_NO_MORE_ITEMS; @@ -1912,7 +1898,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, { usersid = szEmpty; - if (MSIREG_OpenLocalUserDataProductKey(prodcode, &localprod, FALSE) == ERROR_SUCCESS && + if (MSIREG_OpenUserDataProductKey(prodcode, szLocalSid, &localprod, FALSE) == ERROR_SUCCESS && RegOpenKeyExW(localprod, szPatches, 0, KEY_READ, &localpatch) == ERROR_SUCCESS && RegOpenKeyExW(localpatch, ptr, 0, KEY_READ, &patchkey) == ERROR_SUCCESS) { @@ -1988,7 +1974,7 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, if (!szProductCode || !squash_guid(szProductCode, squished_pc)) return ERROR_INVALID_PARAMETER; - if (!lstrcmpW(szUserSid, localsid)) + if (!lstrcmpW(szUserSid, szLocalSid)) return ERROR_INVALID_PARAMETER; if (dwContext & MSIINSTALLCONTEXT_MACHINE && szUserSid)

1 0

James Hawkins : msi: Add tests for MsiEnumPatchesEx.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 947c4c312af72857eaa071cd68cc281490a3a1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=947c4c312af72857eaa071cd6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:20:44 2008 -0600 msi: Add tests for MsiEnumPatchesEx. --- dlls/msi/tests/msi.c | 1672 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1672 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=947c4c312af72857eaa07…

1 0

James Hawkins : msi: Fix an uninitialized variable.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: ff87f354c45c6e962098be6a88e5cb01ff821941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff87f354c45c6e962098be6a8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Dec 9 00:20:29 2008 -0600 msi: Fix an uninitialized variable. --- dlls/msi/registry.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 1f717fd..b413b6f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1777,6 +1777,8 @@ static UINT msi_get_patch_state(LPCWSTR prodcode, LPCWSTR usersid, static const WCHAR szPatches[] = {'P','a','t','c','h','e','s',0}; static const WCHAR szState[] = {'S','t','a','t','e',0}; + *state = MSIPATCHSTATE_INVALID; + /* FIXME: usersid might not be current user */ r = MSIREG_OpenUserDataProductKey(prodcode, &prod, FALSE); if (r != ERROR_SUCCESS)

1 0

Paul Chitescu : shell32.dll: Return SE_ERR_FNF if file not found before checking for associations.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: cd616409ba367e601bd61df44f57e436a14d0a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd616409ba367e601bd61df44… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Dec 8 21:06:12 2008 +0200 shell32.dll: Return SE_ERR_FNF if file not found before checking for associations. --- dlls/shell32/shlexec.c | 6 ++++++ dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index e8c6e7b..515bb48 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -588,6 +588,12 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera } else { + /* Did we get something? Anything? */ + if (xlpFile[0]==0) + { + TRACE("Returning SE_ERR_FNF\n"); + return SE_ERR_FNF; + } /* First thing we need is the file's extension */ extension = strrchrW(xlpFile, '.'); /* Assume last "." is the one; */ /* File->Run in progman uses */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 80ccdf7..4ea855a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -627,8 +627,8 @@ typedef struct static filename_tests_t filename_tests[]= { /* Test bad / nonexistent filenames */ - {NULL, "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF}, - {NULL, "%s\\nonexistent.noassoc", 0x11, SE_ERR_FNF}, + {NULL, "%s\\nonexistent.shlexec", 0x0, SE_ERR_FNF}, + {NULL, "%s\\nonexistent.noassoc", 0x0, SE_ERR_FNF}, /* Standard tests */ {NULL, "%s\\test file.shlexec", 0x0, 33}, @@ -644,7 +644,7 @@ static filename_tests_t filename_tests[]= {NULL, "%s\\test file.shlexec.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test alternate verbs */ - {"LowerL", "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF}, + {"LowerL", "%s\\nonexistent.shlexec", 0x0, SE_ERR_FNF}, {"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, {"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33}, @@ -868,7 +868,7 @@ static void test_find_executable(void) ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); rc=(int)FindExecutableA("test file.sfe", NULL, command); - todo_wine ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %d\n", filename, rc); + ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %d\n", filename, rc); delete_test_association(".sfe");

1 0

Vincent Povirk : gdiplus/tests: Fix a double-free in the region test.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 6a19aa6b6630c7bdf44388311cb2c9ef4bc66351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a19aa6b6630c7bdf44388311… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 8 15:38:53 2008 -0600 gdiplus/tests: Fix a double-free in the region test. --- dlls/gdiplus/tests/region.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 1373634..9ac0e9a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -670,7 +670,6 @@ static void test_combinereplace(void) expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); - GdipDeletePath(path); GdipDeleteRegion(region2); /* more complex case : replace with a combined region */

1 0

Vincent Povirk : gdiplus/tests: Fix a double-free in the graphics test.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 23456b690fe16807067eeea3c47db0c92776b1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23456b690fe16807067eeea3c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 8 15:43:30 2008 -0600 gdiplus/tests: Fix a double-free in the graphics test. Spotted by Lionel Debroux. --- dlls/gdiplus/tests/graphics.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5db3ca9..fd28d5e 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -743,7 +743,6 @@ static void test_Get_Release_DC(void) GdipDeleteBrush((GpBrush*)brush); GdipDeleteRegion(region); GdipDeleteMatrix(m); - GdipDeleteRegion(region); ReleaseDC(0, hdc); }

1 0

Vincent Povirk : gdiplus: Fix a memory leak in GdipCombineRegionRegion.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 5304b59184f7526f36279f605d0ff45db533dec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5304b59184f7526f36279f605… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 8 15:16:10 2008 -0600 gdiplus: Fix a memory leak in GdipCombineRegionRegion. --- dlls/gdiplus/region.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d28292c..4d694f4 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -360,6 +360,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, delete_element(&region1->node); memcpy(region1, reg2copy, sizeof(GpRegion)); + GdipFree(reg2copy); return Ok; }

1 0