ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Dynamically allocate the path buffer in MsiQueryComponentStateW.

This commit is contained in:
Hans Leidekker 2012-04-23 15:46:41 +02:00 committed by Alexandre Julliard
parent cf1cb30dfa
commit 2e5bf9ca06
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/msi/msi.c
View File

@ -2148,7 +2148,7 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context)
return (res == ERROR_SUCCESS); return (res == ERROR_SUCCESS);
} }
static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, static UINT msi_comp_find_prodcode(LPWSTR squished_pc,
MSIINSTALLCONTEXT context, MSIINSTALLCONTEXT context,
LPCWSTR comp, LPWSTR val, DWORD *sz) LPCWSTR comp, LPWSTR val, DWORD *sz)
{ {
@ -2162,14 +2162,14 @@ static BOOL msi_comp_find_prodcode(LPWSTR squished_pc,
r = MSIREG_OpenUserDataComponentKey(comp, NULL, &hkey, FALSE); r = MSIREG_OpenUserDataComponentKey(comp, NULL, &hkey, FALSE);
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
return FALSE; return r;
res = RegQueryValueExW(hkey, squished_pc, NULL, NULL, (BYTE *)val, sz); res = RegQueryValueExW(hkey, squished_pc, NULL, NULL, (BYTE *)val, sz);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
return FALSE; return res;
RegCloseKey(hkey); RegCloseKey(hkey);
return TRUE; return res;
} }
UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
@ -2177,7 +2177,6 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
LPCWSTR szComponent, INSTALLSTATE *pdwState) LPCWSTR szComponent, INSTALLSTATE *pdwState)
{ {
WCHAR squished_pc[GUID_SIZE]; WCHAR squished_pc[GUID_SIZE];
WCHAR val[MAX_PATH];
BOOL found; BOOL found;
DWORD sz; DWORD sz;
@ -2208,14 +2207,21 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
*pdwState = INSTALLSTATE_UNKNOWN; *pdwState = INSTALLSTATE_UNKNOWN;
sz = MAX_PATH; sz = 0;
if (!msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz)) if (msi_comp_find_prodcode(squished_pc, dwContext, szComponent, NULL, &sz))
return ERROR_UNKNOWN_COMPONENT; return ERROR_UNKNOWN_COMPONENT;
if (sz == 0) if (sz == 0)
*pdwState = INSTALLSTATE_NOTUSED; *pdwState = INSTALLSTATE_NOTUSED;
else else
{ {
WCHAR *val;
UINT r;
if (!(val = msi_alloc( sz ))) return ERROR_OUTOFMEMORY;
if ((r = msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz)))
return r;
if (lstrlenW(val) > 2 && if (lstrlenW(val) > 2 &&
val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9' && val[2] != ':') val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9' && val[2] != ':')
{ {
@ -2223,6 +2229,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
} }
else else
*pdwState = INSTALLSTATE_LOCAL; *pdwState = INSTALLSTATE_LOCAL;
msi_free( val );
} }
TRACE("-> %d\n", *pdwState); TRACE("-> %d\n", *pdwState);