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

winex11.drv: Fix compiler warnings with flag -Wcast-qual.

This commit is contained in:
Mikhail Maroukhine 2010-03-28 19:52:16 +07:00 committed by Alexandre Julliard
parent 2a8972378f
commit 3069ad44cb
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/winex11.drv/dib.c
View File

@ -4049,7 +4049,8 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start
{ {
unsigned int srcwidthb = ds.dsBm.bmWidthBytes; unsigned int srcwidthb = ds.dsBm.bmWidthBytes;
int dstwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); int dstwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp );
LPBYTE dbits = physBitmap->base, sbits = (LPBYTE)bits + (startscan * srcwidthb); LPBYTE dbits = physBitmap->base;
const BYTE *sbits = (const BYTE*)bits + (startscan * srcwidthb);
int widthb; int widthb;
UINT y; UINT y;

4
dlls/winex11.drv/ime.c
View File

@ -189,7 +189,7 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset,
return currentOffset; return currentOffset;
} }
static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len)
{ {
/* we need to make sure the CompStr, CompClaus and CompAttr fields are all /* we need to make sure the CompStr, CompClaus and CompAttr fields are all
* set and correct */ * set and correct */
@ -923,7 +923,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp,
if (dwCompLen && lpComp) if (dwCompLen && lpComp)
{ {
newCompStr = updateCompStr(lpIMC->hCompStr, (LPWSTR)lpComp, dwCompLen / sizeof(WCHAR)); newCompStr = updateCompStr(lpIMC->hCompStr, (LPCWSTR)lpComp, dwCompLen / sizeof(WCHAR));
ImmDestroyIMCC(lpIMC->hCompStr); ImmDestroyIMCC(lpIMC->hCompStr);
lpIMC->hCompStr = newCompStr; lpIMC->hCompStr = newCompStr;

2
dlls/winex11.drv/settings.c
View File

@ -243,7 +243,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm)
return FALSE; return FALSE;
#define set_value(name, data) \ #define set_value(name, data) \
if (RegSetValueExA(hkey, name, 0, REG_DWORD, (LPBYTE)(data), sizeof(DWORD))) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \
ret = FALSE ret = FALSE
set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel);