USER32: -Wpointer-sign fixes for gcc 4.0
Mike McCormack
mike at codeweavers.com
Mon Jul 4 09:06:56 CDT 2005
ChangeLog:
* -Wpointer-sign fixes for gcc 4.0
-------------- next part --------------
Index: dlls/user/dde_client.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dde_client.c,v
retrieving revision 1.1
diff -u -p -r1.1 dde_client.c
--- dlls/user/dde_client.c 9 Jun 2005 10:21:31 -0000 1.1
+++ dlls/user/dde_client.c 4 Jul 2005 05:07:25 -0000
@@ -573,7 +573,7 @@ static HGLOBAL WDML_BuildExecuteCommand(
if (hMem)
{
- LPBYTE pDst;
+ LPSTR pDst;
pDst = GlobalLock(hMem);
if (pDst)
Index: dlls/user/dde_misc.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dde_misc.c,v
retrieving revision 1.2
diff -u -p -r1.2 dde_misc.c
--- dlls/user/dde_misc.c 30 Jun 2005 18:11:37 -0000 1.2
+++ dlls/user/dde_misc.c 4 Jul 2005 05:07:26 -0000
@@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
#define HSZ2ATOM(hsz) ((ATOM) (ULONG_PTR)(hsz))
static WDML_INSTANCE* WDML_InstanceList = NULL;
-static DWORD WDML_MaxInstanceID = 0; /* OK for present, have to worry about wrap-around later */
+static LONG WDML_MaxInstanceID = 0; /* OK for present, have to worry about wrap-around later */
const WCHAR WDML_szEventClass[] = {'W','i','n','e','D','d','e','E','v','e','n','t','C','l','a','s','s',0};
static CRITICAL_SECTION_DEBUG critsect_debug =
Index: dlls/user/defwnd.c
===================================================================
RCS file: /home/wine/wine/dlls/user/defwnd.c,v
retrieving revision 1.3
diff -u -p -r1.3 defwnd.c
--- dlls/user/defwnd.c 17 Jun 2005 20:57:26 -0000 1.3
+++ dlls/user/defwnd.c 4 Jul 2005 05:07:26 -0000
@@ -831,7 +831,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd
case WM_SYSCHAR:
{
- BYTE ch = LOWORD(wParam);
+ CHAR ch = LOWORD(wParam);
WCHAR wch;
MultiByteToWideChar(CP_ACP, 0, &ch, 1, &wch, 1);
wParam = MAKEWPARAM( wch, HIWORD(wParam) );
Index: dlls/user/dialog.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dialog.c,v
retrieving revision 1.2
diff -u -p -r1.2 dialog.c
--- dlls/user/dialog.c 1 Jul 2005 15:38:39 -0000 1.2
+++ dlls/user/dialog.c 4 Jul 2005 05:07:27 -0000
@@ -380,6 +380,7 @@ static LPCSTR DIALOG_ParseTemplate32( LP
WORD signature;
WORD dlgver;
+ memset( result, 0, sizeof *result );
signature = GET_WORD(p); p++;
dlgver = GET_WORD(p); p++;
Index: dlls/user/dialog16.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dialog16.c,v
retrieving revision 1.10
diff -u -p -r1.10 dialog16.c
--- dlls/user/dialog16.c 15 Feb 2005 21:51:07 -0000 1.10
+++ dlls/user/dialog16.c 4 Jul 2005 05:07:27 -0000
@@ -212,6 +212,7 @@ static BOOL DIALOG_CreateControls16( HWN
*/
static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result )
{
+ memset( result, 0, sizeof *result );
result->style = GET_DWORD(p); p += sizeof(DWORD);
result->nbItems = (unsigned char) *p++;
result->x = GET_WORD(p); p += sizeof(WORD);
Index: dlls/user/driver16.c
===================================================================
RCS file: /home/wine/wine/dlls/user/driver16.c,v
retrieving revision 1.1
diff -u -p -r1.1 driver16.c
--- dlls/user/driver16.c 9 Jun 2005 09:50:03 -0000 1.1
+++ dlls/user/driver16.c 4 Jul 2005 05:07:27 -0000
@@ -120,7 +120,7 @@ static LRESULT inline DRIVER_SendMessage
LPARAM lParam1, LPARAM lParam2)
{
WORD args[8];
- LRESULT ret;
+ DWORD_PTR ret;
TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n",
lpDrv->lpDrvProc, lpDrv->dwDriverID, msg, lParam1, lParam2);
Index: dlls/user/hook.c
===================================================================
RCS file: /home/wine/wine/dlls/user/hook.c,v
retrieving revision 1.21
diff -u -p -r1.21 hook.c
--- dlls/user/hook.c 11 May 2005 13:03:15 -0000 1.21
+++ dlls/user/hook.c 4 Jul 2005 05:07:27 -0000
@@ -333,7 +333,7 @@ LRESULT HOOK_CallHooks( INT id, INT code
DWORD pid = 0, tid = 0;
WCHAR module[MAX_PATH];
BOOL unicode_hook = FALSE;
- LRESULT ret = 0;
+ DWORD_PTR ret = 0;
USER_CheckNotLock();
@@ -513,7 +513,7 @@ LRESULT WINAPI CallNextHookEx( HHOOK hho
DWORD pid = 0, tid = 0;
INT id = 0;
BOOL prev_unicode = FALSE, next_unicode = FALSE;
- LRESULT ret = 0;
+ DWORD_PTR ret = 0;
SERVER_START_REQ( get_next_hook )
{
Index: dlls/user/hook16.c
===================================================================
RCS file: /home/wine/wine/dlls/user/hook16.c,v
retrieving revision 1.10
diff -u -p -r1.10 hook16.c
--- dlls/user/hook16.c 27 Apr 2005 10:23:24 -0000 1.10
+++ dlls/user/hook16.c 4 Jul 2005 05:07:27 -0000
@@ -111,7 +111,7 @@ static LRESULT call_hook_16( INT id, INT
{
struct hook16_queue_info *info = get_user_thread_info()->hook16_info;
WORD args[4];
- LRESULT ret;
+ DWORD ret;
INT prev_id = info->id;
info->id = id;
Index: dlls/user/message.c
===================================================================
RCS file: /home/wine/wine/dlls/user/message.c,v
retrieving revision 1.83
diff -u -p -r1.83 message.c
--- dlls/user/message.c 2 Jun 2005 10:38:12 -0000 1.83
+++ dlls/user/message.c 4 Jul 2005 05:07:28 -0000
@@ -408,7 +408,7 @@ static WPARAM map_wparam_WtoA( UINT mess
case WM_MENUCHAR:
{
WCHAR wch = LOWORD(wparam);
- BYTE ch;
+ CHAR ch;
WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL );
wparam = MAKEWPARAM( ch, HIWORD(wparam) );
}
@@ -416,7 +416,7 @@ static WPARAM map_wparam_WtoA( UINT mess
case WM_IME_CHAR:
{
WCHAR wch = LOWORD(wparam);
- BYTE ch[2];
+ CHAR ch[2];
if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, ch, 2, NULL, NULL ) == 2)
wparam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wparam) );
@@ -2432,7 +2432,7 @@ LRESULT WINAPI SendMessageTimeoutA( HWND
*/
LRESULT WINAPI SendMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
{
- LRESULT res = 0;
+ DWORD_PTR res = 0;
SendMessageTimeoutW( hwnd, msg, wparam, lparam, SMTO_NORMAL, INFINITE, &res );
return res;
}
@@ -2443,7 +2443,7 @@ LRESULT WINAPI SendMessageW( HWND hwnd,
*/
LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
{
- LRESULT res = 0;
+ DWORD_PTR res = 0;
SendMessageTimeoutA( hwnd, msg, wparam, lparam, SMTO_NORMAL, INFINITE, &res );
return res;
}
Index: dlls/user/spy.c
===================================================================
RCS file: /home/wine/wine/dlls/user/spy.c,v
retrieving revision 1.5
diff -u -p -r1.5 spy.c
--- dlls/user/spy.c 14 Jun 2005 19:23:00 -0000 1.5
+++ dlls/user/spy.c 4 Jul 2005 05:07:28 -0000
@@ -2590,7 +2590,7 @@ int SPY_Init(void)
DWORD type, count = sizeof(buffer);
buffer[0] = 0;
- if (!RegQueryValueExA(hkey, "SpyInclude", 0, &type, buffer, &count) &&
+ if (!RegQueryValueExA(hkey, "SpyInclude", 0, &type, (LPBYTE) buffer, &count) &&
strcmp( buffer, "INCLUDEALL" ))
{
TRACE("Include=%s\n", buffer );
@@ -2600,7 +2600,7 @@ int SPY_Init(void)
count = sizeof(buffer);
buffer[0] = 0;
- if (!RegQueryValueExA(hkey, "SpyExclude", 0, &type, buffer, &count))
+ if (!RegQueryValueExA(hkey, "SpyExclude", 0, &type, (LPBYTE) buffer, &count))
{
TRACE("Exclude=%s\n", buffer );
if (!strcmp( buffer, "EXCLUDEALL" ))
@@ -2612,7 +2612,7 @@ int SPY_Init(void)
SPY_ExcludeDWP = 0;
count = sizeof(buffer);
- if(!RegQueryValueExA(hkey, "SpyExcludeDWP", 0, &type, buffer, &count))
+ if(!RegQueryValueExA(hkey, "SpyExcludeDWP", 0, &type, (LPBYTE) buffer, &count))
SPY_ExcludeDWP = atoi(buffer);
RegCloseKey(hkey);
Index: dlls/user/sysparams.c
===================================================================
RCS file: /home/wine/wine/dlls/user/sysparams.c,v
retrieving revision 1.25
diff -u -p -r1.25 sysparams.c
--- dlls/user/sysparams.c 30 Jun 2005 18:14:14 -0000 1.25
+++ dlls/user/sysparams.c 4 Jul 2005 05:07:29 -0000
@@ -755,7 +755,7 @@ void SYSPARAMS_Init(void)
if (hkey)
{
DWORD dwDataSize = sizeof(buffer);
- if (!(RegQueryValueExA(hkey,DefSysColors[i*2], 0, 0, buffer, &dwDataSize)))
+ if (!(RegQueryValueExA(hkey,DefSysColors[i*2], 0, 0, (LPBYTE) buffer, &dwDataSize)))
if (sscanf( buffer, "%d %d %d", &r, &g, &b ) == 3) bOk = TRUE;
}
Index: dlls/user/text.c
===================================================================
RCS file: /home/wine/wine/dlls/user/text.c,v
retrieving revision 1.57
diff -u -p -r1.57 text.c
--- dlls/user/text.c 27 May 2005 19:26:34 -0000 1.57
+++ dlls/user/text.c 4 Jul 2005 05:07:29 -0000
@@ -598,7 +598,7 @@ static const WCHAR *TEXT_NextLineW( HDC
int num_fit;
int word_broken;
int line_fits;
- int j_in_seg;
+ unsigned int j_in_seg;
int ellipsified;
*pprefix_offset = -1;
@@ -674,7 +674,7 @@ static const WCHAR *TEXT_NextLineW( HDC
if (!line_fits && (format & DT_WORDBREAK))
{
const WCHAR *s;
- int chars_used;
+ unsigned int chars_used;
TEXT_WordBreak (hdc, dest+seg_j, maxl-seg_j, &j_in_seg,
max_seg_width, format, num_fit, &chars_used, &size);
line_fits = (size.cx <= max_seg_width);
Index: dlls/user/user_main.c
===================================================================
RCS file: /home/wine/wine/dlls/user/user_main.c,v
retrieving revision 1.86
diff -u -p -r1.86 user_main.c
--- dlls/user/user_main.c 20 Jun 2005 16:04:32 -0000 1.86
+++ dlls/user/user_main.c 4 Jul 2005 05:07:29 -0000
@@ -71,7 +71,7 @@ static BOOL load_driver(void)
if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey ))
{
DWORD type, count = sizeof(buffer);
- RegQueryValueExA( hkey, "Graphics", 0, &type, buffer, &count );
+ RegQueryValueExA( hkey, "Graphics", 0, &type, (LPBYTE) buffer, &count );
RegCloseKey( hkey );
}
Index: dlls/user/winproc.c
===================================================================
RCS file: /home/wine/wine/dlls/user/winproc.c,v
retrieving revision 1.6
diff -u -p -r1.6 winproc.c
--- dlls/user/winproc.c 16 May 2005 17:52:10 -0000 1.6
+++ dlls/user/winproc.c 4 Jul 2005 05:07:30 -0000
@@ -809,7 +809,7 @@ INT WINPROC_MapMsg32ATo32W( HWND hwnd, U
case WM_SYSDEADCHAR:
case EM_SETPASSWORDCHAR:
{
- BYTE ch = LOWORD(*pwparam);
+ CHAR ch = LOWORD(*pwparam);
WCHAR wch;
MultiByteToWideChar(CP_ACP, 0, &ch, 1, &wch, 1);
*pwparam = MAKEWPARAM( wch, HIWORD(*pwparam) );
@@ -818,7 +818,7 @@ INT WINPROC_MapMsg32ATo32W( HWND hwnd, U
case WM_IME_CHAR:
{
- BYTE ch[2];
+ CHAR ch[2];
WCHAR wch;
ch[0] = (*pwparam >> 8);
ch[1] = *pwparam & 0xff;
@@ -1105,7 +1105,7 @@ static INT WINPROC_MapMsg32WTo32A( HWND
case EM_SETPASSWORDCHAR:
{
WCHAR wch = LOWORD(*pwparam);
- BYTE ch;
+ CHAR ch;
WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL );
*pwparam = MAKEWPARAM( ch, HIWORD(*pwparam) );
}
@@ -1114,7 +1114,7 @@ static INT WINPROC_MapMsg32WTo32A( HWND
case WM_IME_CHAR:
{
WCHAR wch = LOWORD(*pwparam);
- BYTE ch[2];
+ CHAR ch[2];
if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, ch, 2, NULL, NULL ) == 2)
*pwparam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(*pwparam) );
@@ -1734,7 +1734,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND hw
INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32,
WPARAM *pwparam32, LPARAM *plparam )
{
- BYTE ch;
+ CHAR ch;
WCHAR wch;
*pmsg32=(UINT)msg16;
@@ -2710,7 +2710,7 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UI
UINT16 *pmsg16, WPARAM16 *pwparam16,
LPARAM *plparam )
{
- BYTE ch;
+ CHAR ch;
WCHAR wch;
*pmsg16 = LOWORD(msg32);
@@ -2825,7 +2825,7 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UI
return 0;
case WM_IME_CHAR:
{
- BYTE ch[2];
+ CHAR ch[2];
wch = wParam32;
if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, ch, 2, NULL, NULL ) == 2)
More information about the wine-patches
mailing list