msi: Remove a duplicated function.
This commit is contained in:
parent
98c703ab87
commit
8438d21127
dlls/msi
|
@ -733,7 +733,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (classes)
|
if (classes)
|
||||||
MSIREG_OpenLocalSystemProductKey(szProduct, &userdata, FALSE);
|
MSIREG_OpenInstallProps(szProduct, szLocalSid, &userdata, FALSE);
|
||||||
else
|
else
|
||||||
MSIREG_OpenCurrentUserInstallProps(szProduct, &userdata, FALSE);
|
MSIREG_OpenCurrentUserInstallProps(szProduct, &userdata, FALSE);
|
||||||
|
|
||||||
|
@ -1062,7 +1062,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
|
||||||
else if (dwContext == MSIINSTALLCONTEXT_MACHINE)
|
else if (dwContext == MSIINSTALLCONTEXT_MACHINE)
|
||||||
{
|
{
|
||||||
package = INSTALLPROPERTY_LOCALPACKAGEW;
|
package = INSTALLPROPERTY_LOCALPACKAGEW;
|
||||||
MSIREG_OpenLocalSystemProductKey(szProductCode, &props, FALSE);
|
MSIREG_OpenInstallProps(szProductCode, szLocalSid, &props, FALSE);
|
||||||
MSIREG_OpenProductKey(szProductCode, dwContext, &classes, FALSE);
|
MSIREG_OpenProductKey(szProductCode, dwContext, &classes, FALSE);
|
||||||
|
|
||||||
if (!props && !classes)
|
if (!props && !classes)
|
||||||
|
@ -1296,7 +1296,7 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context)
|
||||||
};
|
};
|
||||||
|
|
||||||
if (context == MSIINSTALLCONTEXT_MACHINE)
|
if (context == MSIINSTALLCONTEXT_MACHINE)
|
||||||
r = MSIREG_OpenLocalSystemProductKey(prodcode, &hkey, FALSE);
|
r = MSIREG_OpenInstallProps(prodcode, szLocalSid, &hkey, FALSE);
|
||||||
else
|
else
|
||||||
r = MSIREG_OpenCurrentUserInstallProps(prodcode, &hkey, FALSE);
|
r = MSIREG_OpenCurrentUserInstallProps(prodcode, &hkey, FALSE);
|
||||||
|
|
||||||
|
@ -1784,7 +1784,7 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
|
||||||
|
|
||||||
state = INSTALLSTATE_ABSENT;
|
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) &&
|
MSIREG_OpenUserDataProductKey(szProduct, NULL, &hkey, FALSE) == ERROR_SUCCESS) &&
|
||||||
msi_reg_get_val_dword(hkey, wininstaller, &version) &&
|
msi_reg_get_val_dword(hkey, wininstaller, &version) &&
|
||||||
GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES)
|
GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES)
|
||||||
|
|
|
@ -786,7 +786,6 @@ extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL cr
|
||||||
extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct);
|
extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct);
|
||||||
extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct);
|
extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct);
|
||||||
extern UINT MSIREG_DeleteUserDataProductKey(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_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create);
|
||||||
extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct);
|
extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct);
|
||||||
extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent);
|
extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent);
|
||||||
|
|
|
@ -187,16 +187,6 @@ static const WCHAR szInstallProperties_fmt[] = {
|
||||||
'%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\',
|
'%','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};
|
'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[] = {
|
static const WCHAR szInstaller_LocalSystemComponent_fmt[] = {
|
||||||
'S','o','f','t','w','a','r','e','\\',
|
'S','o','f','t','w','a','r','e','\\',
|
||||||
'M','i','c','r','o','s','o','f','t','\\',
|
'M','i','c','r','o','s','o','f','t','\\',
|
||||||
|
@ -1049,26 +1039,6 @@ UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode)
|
||||||
return RegDeleteTreeW(HKEY_CURRENT_USER, keypath);
|
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)
|
UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create)
|
||||||
{
|
{
|
||||||
WCHAR squished_pc[GUID_SIZE];
|
WCHAR squished_pc[GUID_SIZE];
|
||||||
|
|
Loading…
Reference in New Issue