ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some gcc 4.0 warnings.

Browse Source
This commit is contained in:
Mike McCormack 2005-08-22 09:26:53 +00:00 committed by Alexandre Julliard
parent d5b898c14c
commit eafa666bee
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/ole32/stg_prop.c
View File

@ -1022,7 +1022,7 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This,
ptr[cbEntry - 1] = '\0'; ptr[cbEntry - 1] = '\0';
else else
*((LPWSTR)ptr + cbEntry / sizeof(WCHAR)) = '\0'; *((LPWSTR)ptr + cbEntry / sizeof(WCHAR)) = '\0';
hr = PropertyStorage_StoreNameWithId(This, ptr, This->codePage, propid); hr = PropertyStorage_StoreNameWithId(This, (char*)ptr, This->codePage, propid);
if (This->codePage == CP_UNICODE) if (This->codePage == CP_UNICODE)
{ {
/* Unicode entries are padded to DWORD boundaries */ /* Unicode entries are padded to DWORD boundaries */
@ -1060,7 +1060,7 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This,
TRACE("Read byte 0x%x\n", prop->u.bVal); TRACE("Read byte 0x%x\n", prop->u.bVal);
break; break;
case VT_I2: case VT_I2:
StorageUtl_ReadWord(data, 0, &prop->u.iVal); StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal);
TRACE("Read short %d\n", prop->u.iVal); TRACE("Read short %d\n", prop->u.iVal);
break; break;
case VT_UI2: case VT_UI2:
@ -1069,7 +1069,7 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This,
break; break;
case VT_INT: case VT_INT:
case VT_I4: case VT_I4:
StorageUtl_ReadDWord(data, 0, &prop->u.lVal); StorageUtl_ReadDWord(data, 0, (DWORD*)&prop->u.lVal);
TRACE("Read long %ld\n", prop->u.lVal); TRACE("Read long %ld\n", prop->u.lVal);
break; break;
case VT_UINT: case VT_UINT:

2
dlls/shell32/regsvr.c
View File

@ -313,7 +313,7 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list)
&shellfolder_key, NULL); &shellfolder_key, NULL);
if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (res != ERROR_SUCCESS) goto error_close_clsid_key;
if (list->flags & SHELLFOLDER_WANTSFORPARSING) if (list->flags & SHELLFOLDER_WANTSFORPARSING)
res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, "", 1); res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1);
if (list->flags & SHELLFOLDER_ATTRIBUTES) if (list->flags & SHELLFOLDER_ATTRIBUTES)
res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD,
(LPBYTE)&list->dwAttributes, sizeof(DWORD)); (LPBYTE)&list->dwAttributes, sizeof(DWORD));

2
dlls/shell32/shellole.c
View File

@ -642,7 +642,7 @@ HRESULT WINAPI SHCreateDefClassObject(
shdebugstr_guid(riid), ppv, lpfnCI, pcRefDll, shdebugstr_guid(riidInst)); shdebugstr_guid(riid), ppv, lpfnCI, pcRefDll, shdebugstr_guid(riidInst));
if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE; if (! IsEqualCLSID(riid, &IID_IClassFactory) ) return E_NOINTERFACE;
if (! (pcf = IDefClF_fnConstructor(lpfnCI, pcRefDll, riidInst))) return E_OUTOFMEMORY; if (! (pcf = IDefClF_fnConstructor(lpfnCI, (PLONG)pcRefDll, riidInst))) return E_OUTOFMEMORY;
*ppv = pcf; *ppv = pcf;
return NOERROR; return NOERROR;
} }

2
dlls/shell32/shellreg.c
View File

@ -95,7 +95,7 @@ HRESULT WINAPI SHRegQueryValueW(
{ {
WARN("%p %s %p %p semi-stub\n", WARN("%p %s %p %p semi-stub\n",
hkey, debugstr_w(lpszSubKey), lpszData, lpcbData); hkey, debugstr_w(lpszSubKey), lpszData, lpcbData);
return RegQueryValueW( hkey, lpszSubKey, lpszData, lpcbData ); return RegQueryValueW( hkey, lpszSubKey, lpszData, (LONG*)lpcbData );
} }
/************************************************************************* /*************************************************************************

12
dlls/user/sysparams.c
View File

@ -1107,7 +1107,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
ret = get_twips_param( SPI_ICONHORIZONTALSPACING_IDX, ret = get_twips_param( SPI_ICONHORIZONTALSPACING_IDX,
SPI_ICONHORIZONTALSPACING_REGKEY, SPI_ICONHORIZONTALSPACING_REGKEY,
SPI_ICONHORIZONTALSPACING_VALNAME, SPI_ICONHORIZONTALSPACING_VALNAME,
&icon_metrics.iHorzSpacing, pvParam ); (UINT*)&icon_metrics.iHorzSpacing, pvParam );
} }
else else
{ {
@ -1115,7 +1115,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
ret = set_uint_param( SPI_ICONHORIZONTALSPACING_IDX, ret = set_uint_param( SPI_ICONHORIZONTALSPACING_IDX,
SPI_ICONHORIZONTALSPACING_REGKEY, SPI_ICONHORIZONTALSPACING_REGKEY,
SPI_ICONHORIZONTALSPACING_VALNAME, SPI_ICONHORIZONTALSPACING_VALNAME,
&icon_metrics.iHorzSpacing, uiParam, fWinIni ); (UINT*)&icon_metrics.iHorzSpacing, uiParam, fWinIni );
} }
break; break;
@ -1204,7 +1204,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
ret = get_twips_param( SPI_ICONVERTICALSPACING_IDX, ret = get_twips_param( SPI_ICONVERTICALSPACING_IDX,
SPI_ICONVERTICALSPACING_REGKEY, SPI_ICONVERTICALSPACING_REGKEY,
SPI_ICONVERTICALSPACING_VALNAME, SPI_ICONVERTICALSPACING_VALNAME,
&icon_metrics.iVertSpacing, pvParam ); (UINT*)&icon_metrics.iVertSpacing, pvParam );
} }
else else
{ {
@ -1212,7 +1212,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
ret = set_uint_param( SPI_ICONVERTICALSPACING_IDX, ret = set_uint_param( SPI_ICONVERTICALSPACING_IDX,
SPI_ICONVERTICALSPACING_REGKEY, SPI_ICONVERTICALSPACING_REGKEY,
SPI_ICONVERTICALSPACING_VALNAME, SPI_ICONVERTICALSPACING_VALNAME,
&icon_metrics.iVertSpacing, uiParam, fWinIni ); (UINT*)&icon_metrics.iVertSpacing, uiParam, fWinIni );
} }
break; break;
@ -1312,7 +1312,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
break; break;
case SPI_SETMOUSEBUTTONSWAP: case SPI_SETMOUSEBUTTONSWAP:
ret = set_uint_param( SPI_SETMOUSEBUTTONSWAP_IDX, ret = set_bool_param( SPI_SETMOUSEBUTTONSWAP_IDX,
SPI_SETMOUSEBUTTONSWAP_REGKEY, SPI_SETMOUSEBUTTONSWAP_REGKEY,
SPI_SETMOUSEBUTTONSWAP_VALNAME, SPI_SETMOUSEBUTTONSWAP_VALNAME,
&swap_buttons, uiParam, fWinIni ); &swap_buttons, uiParam, fWinIni );
@ -2261,7 +2261,7 @@ INT WINAPI GetSystemMetrics( INT index )
case SM_DEBUG: case SM_DEBUG:
return 0; return 0;
case SM_SWAPBUTTON: case SM_SWAPBUTTON:
get_uint_param( SPI_SETMOUSEBUTTONSWAP_IDX, SPI_SETMOUSEBUTTONSWAP_REGKEY, get_bool_param( SPI_SETMOUSEBUTTONSWAP_IDX, SPI_SETMOUSEBUTTONSWAP_REGKEY,
SPI_SETMOUSEBUTTONSWAP_VALNAME, &swap_buttons, &ret ); SPI_SETMOUSEBUTTONSWAP_VALNAME, &swap_buttons, &ret );
return ret; return ret;
case SM_RESERVED1: case SM_RESERVED1:

4
dlls/winmm/mmsystem.c
View File

@ -2232,7 +2232,7 @@ void WINAPI WMMMidiRunOnce16(void)
* *
* Map a 32 bit driver message to a 16 bit driver message. * Map a 32 bit driver message to a 16 bit driver message.
*/ */
static WINMM_MapType DRIVER_MapMsg32To16(WORD wMsg, DWORD* lParam1, DWORD* lParam2) static WINMM_MapType DRIVER_MapMsg32To16(WORD wMsg, LPARAM *lParam1, LPARAM *lParam2)
{ {
WINMM_MapType ret = WINMM_MAP_MSGERROR; WINMM_MapType ret = WINMM_MAP_MSGERROR;
@ -2743,7 +2743,7 @@ static LRESULT MMIO_UnMap32To16(DWORD wMsg, LPARAM lParam1, LPARAM lParam2,
static LRESULT MMIO_Callback16(SEGPTR cb16, LPMMIOINFO lpmmioinfo, UINT uMessage, static LRESULT MMIO_Callback16(SEGPTR cb16, LPMMIOINFO lpmmioinfo, UINT uMessage,
LPARAM lParam1, LPARAM lParam2) LPARAM lParam1, LPARAM lParam2)
{ {
LRESULT result; DWORD result;
MMIOINFO16 mmioInfo16; MMIOINFO16 mmioInfo16;
SEGPTR segmmioInfo16; SEGPTR segmmioInfo16;
LPARAM lp1 = lParam1, lp2 = lParam2; LPARAM lp1 = lParam1, lp2 = lParam2;