Authors: Paul Quinn <paulq@corel.ca>, Zygo Blaxell <zygob@corel.ca>

include/winreg.h

@@ -202,8 +202,8 @@ DWORD       WINAPI RegEnumValue32W(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPB
 DWORD       WINAPI RegOpenKey32A(HKEY,LPCSTR,LPHKEY);
 DWORD       WINAPI RegOpenKey32W(HKEY,LPCWSTR,LPHKEY);
 #define     RegOpenKey WINELIB_NAME_AW(RegOpenKey)
-DWORD       WINAPI RegQueryValue32A(HKEY,LPSTR,LPSTR,LPDWORD);
-DWORD       WINAPI RegQueryValue32W(HKEY,LPWSTR,LPWSTR,LPDWORD);
+DWORD       WINAPI RegQueryValue32A(HKEY,LPCSTR,LPSTR,LPLONG);
+DWORD       WINAPI RegQueryValue32W(HKEY,LPCWSTR,LPWSTR,LPLONG);
 #define     RegQueryValue WINELIB_NAME_AW(RegQueryValue)
 DWORD       WINAPI RegQueryValueEx32A(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 DWORD       WINAPI RegQueryValueEx32W(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);

misc/registry.c

@@ -2272,8 +2272,8 @@ DWORD WINAPI RegQueryValueEx32W( HKEY hkey, LPWSTR lpValueName,
 /******************************************************************************
  * RegQueryValue32W [ADVAPI32.159]
  */
-DWORD WINAPI RegQueryValue32W( HKEY hkey, LPWSTR lpszSubKey, LPWSTR lpszData,
-                               LPDWORD lpcbData )
+DWORD WINAPI RegQueryValue32W( HKEY hkey, LPCWSTR lpszSubKey, LPWSTR lpszData,
+                               LPLONG lpcbData )
 {
 	HKEY	xhkey;
 	DWORD	ret,lpdwType;
@@ -2384,8 +2384,8 @@ DWORD WINAPI RegQueryValueEx16( HKEY hkey, LPSTR lpszValueName,
 /******************************************************************************
  * RegQueryValue32A [ADVAPI32.156]
  */
-DWORD WINAPI RegQueryValue32A( HKEY hkey, LPSTR lpszSubKey, LPSTR lpszData,
-                               LPDWORD lpcbData )
+DWORD WINAPI RegQueryValue32A( HKEY hkey, LPCSTR lpszSubKey, LPSTR lpszData,
+                               LPLONG lpcbData )
 {
     HKEY xhkey;
     DWORD ret, dwType;
@@ -3434,7 +3434,7 @@ LONG WINAPI RegGetKeySecurity( HKEY hkey,
 
     /* FIXME: Check for valid SecurityInformation values */
 
-    if (*lpcbSecurityDescriptor < sizeof(*pSecurityDescriptor))
+    if (*lpcbSecurityDescriptor < sizeof(SECURITY_DESCRIPTOR))
         return ERROR_INSUFFICIENT_BUFFER;
 
     FIXME(reg, "(%x,%ld,%p,%ld): stub\n",hkey,SecurityInformation,