marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up registry functions.

oldstable
Mike McCormack 2005-03-24 15:09:18 +00:00 committed by Alexandre Julliard
parent 6b379fb29f
commit c3ab871ff9
1 changed files with 59 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
dlls/msi/registry.c
View File

@ -134,6 +134,8 @@ static const WCHAR szInstaller_UpgradeCodes_fmt[] = {
'U','p','g','r','a','d','e','C','o','d','e','s','\\', 'U','p','g','r','a','d','e','C','o','d','e','s','\\',
'%','s',0}; '%','s',0};
#define SQUISH_GUID_SIZE 33
BOOL unsquash_guid(LPCWSTR in, LPWSTR out) BOOL unsquash_guid(LPCWSTR in, LPWSTR out)
{ {
DWORD i,n=0; DWORD i,n=0;
@ -496,16 +498,16 @@ UINT WINAPI MsiDecomposeDescriptorA( LPCSTR szDescriptor, LPSTR szProduct,
WCHAR feature[MAX_FEATURE_CHARS+1]; WCHAR feature[MAX_FEATURE_CHARS+1];
WCHAR component[MAX_FEATURE_CHARS+1]; WCHAR component[MAX_FEATURE_CHARS+1];
LPWSTR str = NULL; LPWSTR str = NULL;
UINT r, len; UINT r;
TRACE("%s %p %p %p %p\n", debugstr_a(szDescriptor), szProduct, TRACE("%s %p %p %p %p\n", debugstr_a(szDescriptor), szProduct,
szFeature, szComponent, pUsed); szFeature, szComponent, pUsed);
if( szDescriptor ) if( szDescriptor )
{ {
len = MultiByteToWideChar( CP_ACP, 0, szDescriptor, -1, NULL, 0 ); str = strdupAtoW( szDescriptor );
str = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); if( !str )
MultiByteToWideChar( CP_ACP, 0, szDescriptor, -1, str, len ); return ERROR_OUTOFMEMORY;
} }
r = MsiDecomposeDescriptorW( str, product, feature, component, pUsed ); r = MsiDecomposeDescriptorW( str, product, feature, component, pUsed );
@ -542,7 +544,7 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid)
{ {
HKEY hkeyFeatures = 0; HKEY hkeyFeatures = 0;
DWORD r; DWORD r;
WCHAR szKeyName[33]; WCHAR szKeyName[SQUISH_GUID_SIZE];
TRACE("%ld %p\n",index,lpguid); TRACE("%ld %p\n",index,lpguid);
@ -551,16 +553,12 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid)
r = MSIREG_OpenFeatures(&hkeyFeatures); r = MSIREG_OpenFeatures(&hkeyFeatures);
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
goto end; return ERROR_NO_MORE_ITEMS;
r = RegEnumKeyW(hkeyFeatures, index, szKeyName, GUID_SIZE); r = RegEnumKeyW(hkeyFeatures, index, szKeyName, SQUISH_GUID_SIZE);
if( r == ERROR_SUCCESS )
unsquash_guid(szKeyName, lpguid); unsquash_guid(szKeyName, lpguid);
RegCloseKey(hkeyFeatures);
end:
if( hkeyFeatures )
RegCloseKey(hkeyFeatures);
return r; return r;
} }
@ -576,12 +574,9 @@ UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index,
if( szProduct ) if( szProduct )
{ {
UINT len = MultiByteToWideChar( CP_ACP, 0, szProduct, -1, NULL, 0 ); szwProduct = strdupAtoW( szProduct );
szwProduct = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); if( !szwProduct )
if( szwProduct ) return ERROR_OUTOFMEMORY;
MultiByteToWideChar( CP_ACP, 0, szProduct, -1, szwProduct, len );
else
return ERROR_FUNCTION_FAILED;
} }
r = MsiEnumFeaturesW(szwProduct, index, szwFeature, szwParent); r = MsiEnumFeaturesW(szwProduct, index, szwFeature, szwParent);
@ -608,14 +603,11 @@ UINT WINAPI MsiEnumFeaturesW(LPCWSTR szProduct, DWORD index,
r = MSIREG_OpenFeaturesKey(szProduct,&hkeyProduct,FALSE); r = MSIREG_OpenFeaturesKey(szProduct,&hkeyProduct,FALSE);
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
goto end; return ERROR_NO_MORE_ITEMS;
sz = GUID_SIZE; sz = GUID_SIZE;
r = RegEnumValueW(hkeyProduct, index, szFeature, &sz, NULL, NULL, NULL, NULL); r = RegEnumValueW(hkeyProduct, index, szFeature, &sz, NULL, NULL, NULL, NULL);
RegCloseKey(hkeyProduct);
end:
if( hkeyProduct )
RegCloseKey(hkeyProduct);
return r; return r;
} }
@ -638,22 +630,18 @@ UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid)
{ {
HKEY hkeyComponents = 0; HKEY hkeyComponents = 0;
DWORD r; DWORD r;
WCHAR szKeyName[33]; WCHAR szKeyName[SQUISH_GUID_SIZE];
TRACE("%ld %p\n",index,lpguid); TRACE("%ld %p\n",index,lpguid);
r = MSIREG_OpenComponents(&hkeyComponents); r = MSIREG_OpenComponents(&hkeyComponents);
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
goto end; return ERROR_NO_MORE_ITEMS;
r = RegEnumKeyW(hkeyComponents, index, szKeyName, GUID_SIZE); r = RegEnumKeyW(hkeyComponents, index, szKeyName, SQUISH_GUID_SIZE);
if( r == ERROR_SUCCESS )
unsquash_guid(szKeyName, lpguid); unsquash_guid(szKeyName, lpguid);
RegCloseKey(hkeyComponents);
end:
if( hkeyComponents )
RegCloseKey(hkeyComponents);
return r; return r;
} }
@ -668,12 +656,9 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct)
if( szComponent ) if( szComponent )
{ {
UINT len = MultiByteToWideChar( CP_ACP, 0, szComponent, -1, NULL, 0 ); szwComponent = strdupAtoW( szComponent );
szwComponent = HeapAlloc( GetProcessHeap(), 0, len * sizeof (WCHAR) ); if( !szwComponent )
if( szwComponent ) return ERROR_OUTOFMEMORY;
MultiByteToWideChar( CP_ACP, 0, szComponent, -1, szwComponent, len );
else
return ERROR_FUNCTION_FAILED;
} }
r = MsiEnumClientsW(szComponent?szwComponent:NULL, index, szwProduct); r = MsiEnumClientsW(szComponent?szwComponent:NULL, index, szwProduct);
@ -692,24 +677,20 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
{ {
HKEY hkeyComp = 0; HKEY hkeyComp = 0;
DWORD r, sz; DWORD r, sz;
WCHAR szValName[GUID_SIZE]; WCHAR szValName[SQUISH_GUID_SIZE];
TRACE("%s %ld %p\n",debugstr_w(szComponent),index,szProduct); TRACE("%s %ld %p\n",debugstr_w(szComponent),index,szProduct);
r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE); r = MSIREG_OpenComponentsKey(szComponent,&hkeyComp,FALSE);
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
goto end; return ERROR_NO_MORE_ITEMS;
sz = GUID_SIZE; sz = SQUISH_GUID_SIZE;
r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL); r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL);
if( r != ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
goto end; unsquash_guid(szValName, szProduct);
unsquash_guid(szValName, szProduct); RegCloseKey(hkeyComp);
end:
if( hkeyComp )
RegCloseKey(hkeyComp);
return r; return r;
} }
@ -737,9 +718,9 @@ UINT WINAPI MsiEnumComponentQualifiersW( LPWSTR szComponent, DWORD iIndex,
UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved,
DWORD iProductIndex, LPWSTR lpProductBuf) DWORD iProductIndex, LPWSTR lpProductBuf)
{ {
UINT rc; UINT r;
HKEY hkey; HKEY hkey;
WCHAR szKeyName[33]; WCHAR szKeyName[SQUISH_GUID_SIZE];
TRACE("%s %lu %lu %p\n", debugstr_w(szUpgradeCode), dwReserved, TRACE("%s %lu %lu %p\n", debugstr_w(szUpgradeCode), dwReserved,
iProductIndex, lpProductBuf); iProductIndex, lpProductBuf);
@ -748,54 +729,43 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved,
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
if (NULL == lpProductBuf) if (NULL == lpProductBuf)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
rc = MSIREG_OpenUpgradeCodesKey(szUpgradeCode, &hkey, FALSE);
if (rc != ERROR_SUCCESS)
{
rc = ERROR_NO_MORE_ITEMS;
goto end;
}
rc = RegEnumKeyW(hkey, iProductIndex, szKeyName, r = MSIREG_OpenUpgradeCodesKey(szUpgradeCode, &hkey, FALSE);
sizeof(szKeyName) / sizeof(szKeyName[0])); if (r != ERROR_SUCCESS)
return ERROR_NO_MORE_ITEMS;
unsquash_guid(szKeyName, lpProductBuf); r = RegEnumKeyW(hkey, iProductIndex, szKeyName, SQUISH_GUID_SIZE);
if( r == ERROR_SUCCESS )
unsquash_guid(szKeyName, lpProductBuf);
RegCloseKey(hkey); RegCloseKey(hkey);
end: return r;
return rc;
} }
UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved, UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
DWORD iProductIndex, LPSTR lpProductBuf) DWORD iProductIndex, LPSTR lpProductBuf)
{ {
UINT rc; LPWSTR szwUpgradeCode = NULL;
int len; WCHAR productW[GUID_SIZE];
LPWSTR szUpgradeCodeW = NULL; UINT r;
TRACE("%s %lu %lu %p\n", debugstr_a(szUpgradeCode), dwReserved, TRACE("%s %lu %lu %p\n", debugstr_a(szUpgradeCode), dwReserved,
iProductIndex, lpProductBuf); iProductIndex, lpProductBuf);
if (!szUpgradeCode)
return ERROR_INVALID_PARAMETER; if (szUpgradeCode)
len = MultiByteToWideChar(CP_ACP, 0, szUpgradeCode, -1, NULL, 0);
szUpgradeCodeW = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
len * sizeof(WCHAR));
if (szUpgradeCodeW)
{ {
WCHAR productW[39]; szwUpgradeCode = strdupAtoW( szUpgradeCode );
if( !szwUpgradeCode )
MultiByteToWideChar(CP_ACP, 0, szUpgradeCode, -1, szUpgradeCodeW, len); return ERROR_OUTOFMEMORY;
rc = MsiEnumRelatedProductsW(szUpgradeCodeW, dwReserved,
iProductIndex, productW);
if (rc == ERROR_SUCCESS)
{
LPWSTR ptr;
for (ptr = productW; *ptr; )
*lpProductBuf++ = *ptr++;
}
HeapFree(GetProcessHeap(), 0, szUpgradeCodeW);
} }
else
rc = ERROR_OUTOFMEMORY; r = MsiEnumRelatedProductsW( szwUpgradeCode, dwReserved,
return rc; iProductIndex, productW );
if (r == ERROR_SUCCESS)
{
WideCharToMultiByte( CP_ACP, 0, productW, GUID_SIZE,
lpProductBuf, GUID_SIZE, NULL, NULL );
}
HeapFree(GetProcessHeap(), 0, szwUpgradeCode);
return r;
} }