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

msiexec: Preserve the first argument in process_args_from_reg.

This commit is contained in:
Hans Leidekker 2011-11-03 11:39:44 +01:00 committed by Alexandre Julliard
parent 335a6ca78e
commit 494e20541d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/msiexec/msiexec.c
View File

@ -471,12 +471,12 @@ static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
*pargv = argv; *pargv = argv;
} }
static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***pargv )
{ {
LONG r; LONG r;
HKEY hkey = 0, hkeyArgs = 0; HKEY hkey;
DWORD sz = 0, type = 0; DWORD sz = 0, type = 0;
LPWSTR buf = NULL; WCHAR *buf;
BOOL ret = FALSE; BOOL ret = FALSE;
r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey);
@ -485,8 +485,15 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz);
if(r == ERROR_SUCCESS && type == REG_SZ) if(r == ERROR_SUCCESS && type == REG_SZ)
{ {
buf = HeapAlloc(GetProcessHeap(), 0, sz); int len = lstrlenW( *pargv[0] );
r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); if (!(buf = HeapAlloc( GetProcessHeap(), 0, sz + (len + 1) * sizeof(WCHAR) )))
{
RegCloseKey( hkey );
return FALSE;
}
memcpy( buf, *pargv[0], len * sizeof(WCHAR) );
buf[len++] = ' ';
r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)(buf + len), &sz);
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
{ {
process_args(buf, pargc, pargv); process_args(buf, pargc, pargv);
@ -494,7 +501,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
} }
HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, buf);
} }
RegCloseKey(hkeyArgs); RegCloseKey(hkey);
return ret; return ret;
} }