[PATCH] msiexec: Improve RegQueryValueExW() calls a bit.

[Serge Gautherie]

Signed-off-by: Serge Gautherie 
---
 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..dd83dac 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;

[Hans Leidekker]

Signed-off-by: Hans Leidekker

[Alexandre Julliard]

Serge Gautherie  writes:
> Signed-off-by: Serge Gautherie
>
> 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..dd83dac 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);

The indentation is messed up.  Also please try to write better commit
messages, "improve a bit" doesn't tell us anything.