From b295839f98aa45da5bc12a217f1c32f9bbffb085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Sat, 13 Dec 2003 23:59:45 +0000
Subject: [PATCH] In RegQueryValueExA, always request the type from
 RegQueryValueExW, we need it, even if our caller doesn't, to determine if
 conversion is required

svn path=/trunk/; revision=7009
---
 reactos/lib/advapi32/reg/reg.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index 098a554d7be..915dd623c62 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.33 2003/11/17 02:12:50 hyperion Exp $
+/* $Id: reg.c,v 1.34 2003/12/13 23:59:45 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -2197,6 +2197,7 @@ RegQueryValueExA(
   UNICODE_STRING ValueData;
   ANSI_STRING AnsiString;
   LONG ErrorCode;
+  DWORD Type;
 
   if ((lpData) && (!lpcbData))
     {
@@ -2228,13 +2229,14 @@ RegQueryValueExA(
     hKey,
     ValueName.Buffer,
     lpReserved,
-    lpType,
+    &Type,
     (LPBYTE)ValueData.Buffer,
     (LPDWORD)&ValueData.Length);
+  if (lpType) *lpType = Type;
 
   if ((ErrorCode == ERROR_SUCCESS) && (ValueData.Buffer != NULL))
     {
-      if (lpType && ((*lpType == REG_SZ) || (*lpType == REG_MULTI_SZ) || (*lpType == REG_EXPAND_SZ)))
+      if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ))
         {
           RtlInitAnsiString(&AnsiString, NULL);
           AnsiString.Buffer = lpData;