Warning fixes for gcc 4.0.
This commit is contained in:
parent
7160af007c
commit
61aabd66f5
|
@ -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 );
|
||||
}
|
||||
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
|
|
Loading…
Reference in New Issue