[PATCH] msiexec: Check registry value type again for consistency.
Serge Gautherie
winehq-git_serge_180711 at gautherie.fr
Fri Dec 6 10:57:32 CST 2019
Signed-off-by: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
---
programs/msiexec/msiexec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index 17d4bf8..c586a91 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -573,14 +573,14 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg
{
LONG r;
HKEY hkey;
- DWORD sz = 0, type = 0;
+ DWORD sz, type;
WCHAR *buf;
BOOL ret = FALSE;
r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey);
if(r != ERROR_SUCCESS)
return FALSE;
- r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz);
+ r = RegQueryValueExW(hkey, ident, NULL, &type, NULL, &sz);
if(r == ERROR_SUCCESS && type == REG_SZ)
{
int len = lstrlenW( *pargv[0] );
@@ -591,8 +591,8 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg
}
memcpy( buf, *pargv[0], len * sizeof(WCHAR) );
buf[len++] = ' ';
- r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)(buf + len), &sz);
- if( r == ERROR_SUCCESS )
+ r = RegQueryValueExW(hkey, ident, NULL, &type, (LPBYTE)(buf + len), &sz);
+ if (r == ERROR_SUCCESS && type == REG_SZ)
{
process_args(buf, pargc, pargv);
ret = TRUE;
--
2.10.0.windows.1
More information about the wine-devel
mailing list