msi: Use msi_reg_get_val_str() to read a registry value.
This commit is contained in:
parent
db1baf7367
commit
869495efd3
|
@ -1572,22 +1572,11 @@ UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent,
|
||||||
if (rc != ERROR_SUCCESS)
|
if (rc != ERROR_SUCCESS)
|
||||||
return ERROR_INDEX_ABSENT;
|
return ERROR_INDEX_ABSENT;
|
||||||
|
|
||||||
sz = 0;
|
info = msi_reg_get_val_str( hkey, szQualifier );
|
||||||
rc = RegQueryValueExW( hkey, szQualifier, NULL, NULL, NULL, &sz);
|
RegCloseKey(hkey);
|
||||||
if (sz <= 0)
|
|
||||||
{
|
|
||||||
RegCloseKey(hkey);
|
|
||||||
return ERROR_INDEX_ABSENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
info = msi_alloc(sz);
|
if (!info)
|
||||||
rc = RegQueryValueExW( hkey, szQualifier, NULL, NULL, (LPBYTE)info, &sz);
|
|
||||||
if (rc != ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
RegCloseKey(hkey);
|
|
||||||
msi_free(info);
|
|
||||||
return ERROR_INDEX_ABSENT;
|
return ERROR_INDEX_ABSENT;
|
||||||
}
|
|
||||||
|
|
||||||
MsiDecomposeDescriptorW(info, product, feature, component, &sz);
|
MsiDecomposeDescriptorW(info, product, feature, component, &sz);
|
||||||
|
|
||||||
|
@ -1596,7 +1585,6 @@ UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent,
|
||||||
else
|
else
|
||||||
rc = MsiGetComponentPathW(szProduct, component, lpPathBuf, pcchPathBuf);
|
rc = MsiGetComponentPathW(szProduct, component, lpPathBuf, pcchPathBuf);
|
||||||
|
|
||||||
RegCloseKey(hkey);
|
|
||||||
msi_free(info);
|
msi_free(info);
|
||||||
|
|
||||||
if (rc == INSTALLSTATE_LOCAL)
|
if (rc == INSTALLSTATE_LOCAL)
|
||||||
|
|
Loading…
Reference in New Issue