From c787b146e18147f1d9a9d57023ba61388d64dac7 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Wed, 6 Jul 2005 10:36:28 +0000 Subject: [PATCH] -Wpointer-sign fixes for gcc 4.0. --- dlls/user/dde_client.c | 2 +- dlls/user/dde_misc.c | 2 +- dlls/user/defwnd.c | 2 +- dlls/user/driver16.c | 2 +- dlls/user/hook.c | 4 ++-- dlls/user/hook16.c | 2 +- dlls/user/message.c | 8 ++++---- dlls/user/spy.c | 6 +++--- dlls/user/sysparams.c | 2 +- dlls/user/text.c | 4 ++-- dlls/user/user_main.c | 2 +- dlls/user/winproc.c | 18 +++++++++--------- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/user/dde_client.c b/dlls/user/dde_client.c index 7ca953b209b..035ff0e2b7a 100644 --- a/dlls/user/dde_client.c +++ b/dlls/user/dde_client.c @@ -573,7 +573,7 @@ static HGLOBAL WDML_BuildExecuteCommand(WDML_CONV* pConv, LPCVOID pData, DWORD c if (hMem) { - LPBYTE pDst; + LPSTR pDst; pDst = GlobalLock(hMem); if (pDst) diff --git a/dlls/user/dde_misc.c b/dlls/user/dde_misc.c index 9af48e12bed..561903403df 100644 --- a/dlls/user/dde_misc.c +++ b/dlls/user/dde_misc.c @@ -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 = diff --git a/dlls/user/defwnd.c b/dlls/user/defwnd.c index a2f282e8aea..d24d8130601 100644 --- a/dlls/user/defwnd.c +++ b/dlls/user/defwnd.c @@ -831,7 +831,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam 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) ); diff --git a/dlls/user/driver16.c b/dlls/user/driver16.c index 696d83e7ac9..3ccb0287972 100644 --- a/dlls/user/driver16.c +++ b/dlls/user/driver16.c @@ -120,7 +120,7 @@ static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg, LPARAM lParam1, LPARAM lParam2) { WORD args[8]; - LRESULT ret; + DWORD ret; TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, msg, lParam1, lParam2); diff --git a/dlls/user/hook.c b/dlls/user/hook.c index 37e53b3fee1..25333476db2 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c @@ -333,7 +333,7 @@ LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL uni 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 hhook, INT code, WPARAM wparam, LPARAM lpar 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 ) { diff --git a/dlls/user/hook16.c b/dlls/user/hook16.c index d551034c9dd..cbec32cd872 100644 --- a/dlls/user/hook16.c +++ b/dlls/user/hook16.c @@ -111,7 +111,7 @@ static LRESULT call_hook_16( INT id, INT code, WPARAM wp, LPARAM lp ) { 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; diff --git a/dlls/user/message.c b/dlls/user/message.c index 2cf72bfdb37..3abd6748de0 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -409,7 +409,7 @@ static WPARAM map_wparam_WtoA( UINT message, WPARAM wparam ) { WCHAR wch = LOWORD(wparam); BYTE ch; - WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL ); wparam = MAKEWPARAM( ch, HIWORD(wparam) ); } break; @@ -418,7 +418,7 @@ static WPARAM map_wparam_WtoA( UINT message, WPARAM wparam ) WCHAR wch = LOWORD(wparam); BYTE ch[2]; - if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, ch, 2, NULL, NULL ) == 2) + if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)ch, 2, NULL, NULL ) == 2) wparam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wparam) ); else wparam = MAKEWPARAM( ch[0], HIWORD(wparam) ); @@ -2432,7 +2432,7 @@ LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l */ 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, UINT msg, WPARAM wparam, LPARAM lparam ) */ 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; } diff --git a/dlls/user/spy.c b/dlls/user/spy.c index eb7e67df53d..475f8a3eee1 100644 --- a/dlls/user/spy.c +++ b/dlls/user/spy.c @@ -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); diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 0fbd5a386b2..62b66367ce1 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -757,7 +757,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; } diff --git a/dlls/user/text.c b/dlls/user/text.c index a39e47cfb03..31d2b41b48f 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c @@ -598,7 +598,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, 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 hdc, const WCHAR *str, int *count, 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); diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 87646f8d831..c4827778b94 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -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 ); } diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 79a7e6c899f..fbd7150b375 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -809,7 +809,7 @@ INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plpara 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, UINT msg, WPARAM *pwparam, LPARAM *plpara case WM_IME_CHAR: { - BYTE ch[2]; + CHAR ch[2]; WCHAR wch; ch[0] = (*pwparam >> 8); ch[1] = *pwparam & 0xff; @@ -1106,7 +1106,7 @@ static INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM { WCHAR wch = LOWORD(*pwparam); BYTE ch; - WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL ); *pwparam = MAKEWPARAM( ch, HIWORD(*pwparam) ); } return 0; @@ -1116,7 +1116,7 @@ static INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM WCHAR wch = LOWORD(*pwparam); BYTE ch[2]; - if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, ch, 2, NULL, NULL ) == 2) + if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)ch, 2, NULL, NULL ) == 2) *pwparam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(*pwparam) ); else *pwparam = MAKEWPARAM( ch[0], HIWORD(*pwparam) ); @@ -1734,7 +1734,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pmsg32, WPARAM *pwparam32, LPARAM *plparam ) { - BYTE ch; + CHAR ch; WCHAR wch; *pmsg32=(UINT)msg16; @@ -2805,13 +2805,13 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32, case WM_CHARTOITEM: wch = LOWORD(wParam32); - WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL); + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL); *pwparam16 = ch; *plparam = MAKELPARAM( (HWND16)*plparam, HIWORD(wParam32) ); return 0; case WM_MENUCHAR: wch = LOWORD(wParam32); - WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL); + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL); *pwparam16 = ch; *plparam = MAKELPARAM( HIWORD(wParam32), (HMENU16)*plparam ); return 0; @@ -2820,7 +2820,7 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32, case WM_SYSCHAR: case WM_SYSDEADCHAR: wch = wParam32; - WideCharToMultiByte( CP_ACP, 0, &wch, 1, &ch, 1, NULL, NULL); + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL); *pwparam16 = ch; return 0; case WM_IME_CHAR: @@ -2828,7 +2828,7 @@ INT WINPROC_MapMsg32WTo16( HWND hwnd, UINT msg32, WPARAM wParam32, BYTE ch[2]; wch = wParam32; - if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, ch, 2, NULL, NULL ) == 2) + if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)ch, 2, NULL, NULL ) == 2) *pwparam16 = (ch[0] << 8) | ch[1]; else *pwparam16 = ch[0];