From 61aabd66f5e1bf832e5cf1997709365859207931 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Mon, 15 Aug 2005 10:49:39 +0000
Subject: [PATCH] Warning fixes for gcc 4.0.

---
 dlls/kernel/registry16.c |  4 ++--
 dlls/ole32/compobj.c     | 10 +++++-----
 dlls/ole32/storage32.c   |  2 +-
 dlls/shell32/shell.c     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel/registry16.c b/dlls/kernel/registry16.c
index 3262c5ad1f7..ab7e479827e 100644
--- a/dlls/kernel/registry16.c
+++ b/dlls/kernel/registry16.c
@@ -176,7 +176,7 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count
     if (!advapi32) init_func_ptrs();
     fix_win16_hkey( &hkey );
     if (count) *count &= 0xffff;
-    return pRegQueryValueA( hkey, name, data, count );
+    return pRegQueryValueA( hkey, name, data, (LONG*) count );
 }
 
 /******************************************************************************
@@ -198,7 +198,7 @@ DWORD WINAPI RegSetValueEx16( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type
 {
     if (!advapi32) init_func_ptrs();
     fix_win16_hkey( &hkey );
-    if (!count && (type==REG_SZ)) count = strlen(data);
+    if (!count && (type==REG_SZ)) count = strlen( (char*) data);
     return pRegSetValueExA( hkey, name, reserved, type, data, count );
 }
 
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 7addb41020b..ea2a17ca99c 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -1026,7 +1026,7 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID)
 
   if (ret == S_OK)
   {
-    DWORD progidlen = 0;
+    LONG progidlen = 0;
 
     if (RegQueryValueW(hkey, NULL, NULL, &progidlen))
       ret = REGDB_E_CLASSNOTREG;
@@ -1064,7 +1064,7 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID)
 HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid)
 {
 	char	*buf,buf2[80];
-	DWORD	buf2len;
+	LONG	buf2len;
 	HRESULT	err;
 	HKEY	xhkey;
 
@@ -1101,7 +1101,7 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid)
 {
     static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 };
     WCHAR buf2[CHARS_IN_GUID];
-    DWORD buf2len = sizeof(buf2);
+    LONG buf2len = sizeof(buf2);
     HKEY xhkey;
 
     WCHAR *buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) );
@@ -1166,7 +1166,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid)
     static const WCHAR wszPSC[] = {'\\','P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0};
     WCHAR path[ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1 + ARRAYSIZE(wszPSC)];
     WCHAR value[CHARS_IN_GUID];
-    DWORD len;
+    LONG len;
     HKEY hkey;
 
     TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid);
@@ -2206,7 +2206,7 @@ HRESULT WINAPI OleGetAutoConvert(REFCLSID clsidOld, LPCLSID pClsidNew)
     static const WCHAR wszAutoConvertTo[] = {'A','u','t','o','C','o','n','v','e','r','t','T','o',0};
     HKEY hkey = NULL;
     WCHAR buf[CHARS_IN_GUID];
-    DWORD len;
+    LONG len;
     HRESULT res = S_OK;
 
     if (ERROR_SUCCESS != COM_OpenKeyForCLSID(clsidOld, KEY_READ, &hkey))
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index a4e7a93ff24..6f7f22dbfb5 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -7091,7 +7091,7 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName
             {
                 char strTemp[OLESTREAM_MAX_STR_LEN];
                 IStorageCompObj.dwCLSIDNameLength = OLESTREAM_MAX_STR_LEN;
-                hErr = RegQueryValueA(hKey, NULL, strTemp, &(IStorageCompObj.dwCLSIDNameLength));
+                hErr = RegQueryValueA(hKey, NULL, strTemp, (LONG*) &(IStorageCompObj.dwCLSIDNameLength));
                 if(hErr == ERROR_SUCCESS)
                 {
                     strcpy(IStorageCompObj.strCLSIDName, strTemp);
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 16f12e0633b..262ac49bb7d 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -574,7 +574,7 @@ DWORD WINAPI RegQueryValue16( HKEY hkey, LPCSTR name, LPSTR data, LPDWORD count
 {
     fix_win16_hkey( &hkey );
     if (count) *count &= 0xffff;
-    return RegQueryValueA( hkey, name, data, count );
+    return RegQueryValueA( hkey, name, data, (LONG*) count );
 }
 
 /******************************************************************************