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

msi: Deformat the key path before opening the key.

Browse Source
This commit is contained in:
James Hawkins 2007-05-10 00:02:50 -05:00 committed by Alexandre Julliard
parent 234855f059
commit 0de574b258
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msi/appsearch.c
View File

@ -244,6 +244,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT
'w','h','e','r','e',' ', 'w','h','e','r','e',' ',
'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0};
LPWSTR keyPath = NULL, valueName = NULL; LPWSTR keyPath = NULL, valueName = NULL;
LPWSTR deformatted = NULL;
int root, type; int root, type;
HKEY rootKey, key = NULL; HKEY rootKey, key = NULL;
DWORD sz = 0, regType; DWORD sz = 0, regType;
@ -264,11 +265,11 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT
root = MSI_RecordGetInteger(row,2); root = MSI_RecordGetInteger(row,2);
keyPath = msi_dup_record_field(row,3); keyPath = msi_dup_record_field(row,3);
/* FIXME: keyPath needs to be expanded for properties */
valueName = msi_dup_record_field(row,4); valueName = msi_dup_record_field(row,4);
/* FIXME: valueName probably does too */
type = MSI_RecordGetInteger(row,5); type = MSI_RecordGetInteger(row,5);
deformat_string(package, keyPath, &deformatted);
switch (root) switch (root)
{ {
case msidbRegistryRootClassesRoot: case msidbRegistryRootClassesRoot:
@ -288,7 +289,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT
goto end; goto end;
} }
rc = RegOpenKeyW(rootKey, keyPath, &key); rc = RegOpenKeyW(rootKey, deformatted, &key);
if (rc) if (rc)
{ {
TRACE("RegOpenKeyW returned %d\n", rc); TRACE("RegOpenKeyW returned %d\n", rc);
@ -337,6 +338,7 @@ end:
msi_free( keyPath ); msi_free( keyPath );
msi_free( valueName ); msi_free( valueName );
msi_free( deformatted );
msiobj_release(&row->hdr); msiobj_release(&row->hdr);