Skip to content

W
wine-winehq
Commit 7c9d04a4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winex11: Build without -DWINE_NO_LONG_TYPES.

parent 7d614be4
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 80 deletions
dlls/winex11.drv/Makefile.in
View file @ 7c9d04a4
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winex11.drv
UNIXLIB = winex11.so
IMPORTS = uuid user32 gdi32 win32u
......
dlls/winex11.drv/clipboard.c
View file @ 7c9d04a4
......@@ -2240,7 +2240,7 @@ static BOOL clipboard_init( HWND hwnd )
xfixes_init();
request_selection_contents( clipboard_display, TRUE );
TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() );
TRACE( "clipboard thread running\n" );
return TRUE;
}
......
dlls/winex11.drv/desktop.c
View file @ 7c9d04a4
......@@ -217,7 +217,8 @@ static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode )
static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, const DEVMODEW *mode )
{
if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp)
WARN("Cannot change screen color depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel);
WARN("Cannot change screen color depth from %dbits to %dbits!\n",
screen_bpp, (int)mode->dmBitsPerPel);
desktop_width = mode->dmPelsWidth;
desktop_height = mode->dmPelsHeight;
......
dlls/winex11.drv/display.c
View file @ 7c9d04a4
......@@ -180,8 +180,8 @@ void init_registry_display_settings(void)
}
TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n",
wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel,
dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y);
wine_dbgstr_w(dd.DeviceName), (int)dm.dmPelsWidth, (int)dm.dmPelsHeight,
(int)dm.dmBitsPerPel, (int)dm.dmDisplayFrequency, (int)dm.dmPosition.x, (int)dm.dmPosition.y);
ret = NtUserChangeDisplaySettings( &device_name, &dm, NULL,
CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL );
......@@ -348,9 +348,9 @@ static LONG apply_display_settings( DEVMODEW *displays, ULONG_PTR *ids, BOOL do_
TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz "
"depth:%ubits orientation:%#x.\n", settings_handler.name,
wine_dbgstr_w(mode->dmDeviceName),
full_mode->dmPosition.x, full_mode->dmPosition.y, full_mode->dmPelsWidth,
full_mode->dmPelsHeight, full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel,
full_mode->dmDisplayOrientation);
(int)full_mode->dmPosition.x, (int)full_mode->dmPosition.y, (int)full_mode->dmPelsWidth,
(int)full_mode->dmPelsHeight, (int)full_mode->dmDisplayFrequency,
(int)full_mode->dmBitsPerPel, (int)full_mode->dmDisplayOrientation);
ret = settings_handler.set_current_mode(*id, full_mode);
if (attached_mode && ret == DISP_CHANGE_SUCCESSFUL)
......
dlls/winex11.drv/event.c
View file @ 7c9d04a4
......@@ -701,7 +701,8 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
HWND last_focus = x11drv_thread_data()->last_focus;
TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08x), focus=%p, active=%p, fg=%p, last=%p\n",
hwnd, NtUserIsWindowEnabled(hwnd), NtUserIsWindowVisible(hwnd), NtUserGetWindowLongW(hwnd, GWL_STYLE),
hwnd, NtUserIsWindowEnabled(hwnd), NtUserIsWindowVisible(hwnd),
(int)NtUserGetWindowLongW(hwnd, GWL_STYLE),
get_focus(), get_active_window(), NtUserGetForegroundWindow(), last_focus );
if (can_activate_window(hwnd))
......@@ -1137,7 +1138,8 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
if (root_coords) NtUserMapWindowPoints( 0, parent, (POINT *)&rect, 2 );
TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n",
hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
hwnd, data->whole_window, (int)rect.left, (int)rect.top,
(int)(rect.right-rect.left), (int)(rect.bottom-rect.top),
event->x, event->y, event->width, event->height );
/* Compare what has changed */
......@@ -1153,7 +1155,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
if (data->window_rect.left == x && data->window_rect.top == y) flags |= SWP_NOMOVE;
else
TRACE( "%p moving from (%d,%d) to (%d,%d)\n",
hwnd, data->window_rect.left, data->window_rect.top, x, y );
hwnd, (int)data->window_rect.left, (int)data->window_rect.top, x, y );
if ((data->window_rect.right - data->window_rect.left == cx &&
data->window_rect.bottom - data->window_rect.top == cy) ||
......@@ -1161,8 +1163,8 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
flags |= SWP_NOSIZE;
else
TRACE( "%p resizing from (%dx%d) to (%dx%d)\n",
hwnd, data->window_rect.right - data->window_rect.left,
data->window_rect.bottom - data->window_rect.top, cx, cy );
hwnd, (int)(data->window_rect.right - data->window_rect.left),
(int)(data->window_rect.bottom - data->window_rect.top), cx, cy );
style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE );
if ((style & WS_CAPTION) == WS_CAPTION || !NtUserIsWindowRectFullScreen( &data->whole_rect ))
......@@ -1810,7 +1812,7 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event )
effect = x11drv_client_func( client_func_dnd_position_event, &params, sizeof(params) );
TRACE( "actionRequested(%ld) chosen(0x%x) at x(%d),y(%d)\n",
event->data.l[4], effect, params.point.x, params.point.y );
event->data.l[4], effect, (int)params.point.x, (int)params.point.y );
/*
* Let source know if we're accepting the drop by
......
dlls/winex11.drv/ime.c
View file @ 7c9d04a4
......@@ -184,7 +184,7 @@ static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len)
LPCOMPOSITIONSTRING lpcs = NULL;
INT current_offset = 0;
TRACE("%s, %i\n",debugstr_wn(compstr,len),len);
TRACE("%s, %li\n",debugstr_wn(compstr,len),len);
if (old == NULL && compstr == NULL && len == 0)
return NULL;
......@@ -328,7 +328,7 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len)
LPCOMPOSITIONSTRING lpcs = NULL;
INT current_offset = 0;
TRACE("%s, %i\n",debugstr_wn(resultstr,len),len);
TRACE("%s, %li\n",debugstr_wn(resultstr,len),len);
if (old == NULL && resultstr == NULL && len == 0)
return NULL;
......@@ -534,7 +534,7 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass,
BOOL WINAPI ImeConfigure(HKL hKL,HWND hWnd, DWORD dwMode, LPVOID lpData)
{
FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData);
FIXME("(%p, %p, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
......@@ -543,7 +543,7 @@ DWORD WINAPI ImeConversionList(HIMC hIMC, LPCWSTR lpSource,
LPCANDIDATELIST lpCandList, DWORD dwBufLen, UINT uFlag)
{
FIXME("(%p, %s, %p, %d, %d): stub\n", hIMC, debugstr_w(lpSource),
FIXME("(%p, %s, %p, %ld, %d): stub\n", hIMC, debugstr_w(lpSource),
lpCandList, dwBufLen, uFlag);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
......@@ -632,7 +632,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
BOOL bRet = FALSE;
LPINPUTCONTEXT lpIMC;
TRACE("%p %i %i %i\n",hIMC,dwAction,dwIndex,dwValue);
TRACE("%p %li %li %li\n",hIMC,dwAction,dwIndex,dwValue);
lpIMC = LockRealIMC(hIMC);
if (lpIMC == NULL)
......@@ -787,7 +787,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue)
BOOL WINAPI ImeRegisterWord(LPCWSTR lpszReading, DWORD dwStyle,
LPCWSTR lpszRegister)
{
FIXME("(%s, %d, %s): stub\n", debugstr_w(lpszReading), dwStyle,
FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszRegister));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
......@@ -796,7 +796,7 @@ BOOL WINAPI ImeRegisterWord(LPCWSTR lpszReading, DWORD dwStyle,
BOOL WINAPI ImeUnregisterWord(LPCWSTR lpszReading, DWORD dwStyle,
LPCWSTR lpszUnregister)
{
FIXME("(%s, %d, %s): stub\n", debugstr_w(lpszReading), dwStyle,
FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle,
debugstr_w(lpszUnregister));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
......@@ -813,7 +813,7 @@ UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW lpfnEnumProc,
LPCWSTR lpszReading, DWORD dwStyle,
LPCWSTR lpszRegister, LPVOID lpData)
{
FIXME("(%p, %s, %d, %s, %p): stub\n", lpfnEnumProc,
FIXME("(%p, %s, %ld, %s, %p): stub\n", lpfnEnumProc,
debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister),
lpData);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
......@@ -829,7 +829,7 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp,
WCHAR wParam = 0;
LPIMEPRIVATE myPrivate;
TRACE("(%p, %d, %p, %d, %p, %d):\n",
TRACE("(%p, %ld, %p, %ld, %p, %ld):\n",
hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen);
......@@ -899,7 +899,7 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType,
LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu,
DWORD dwSize)
{
FIXME("(%p, %x %x %p %p %x): stub\n", hIMC, dwFlags, dwType,
FIXME("(%p, %lx %lx %p %p %lx): stub\n", hIMC, dwFlags, dwType,
lpImeParentMenu, lpImeMenu, dwSize);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
......@@ -1221,7 +1221,7 @@ static void UpdateDefaultIMEWindow(HIMC hIMC, HWND hwnd)
static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam)
{
TRACE("IME message WM_IME_COMPOSITION 0x%lx\n", lParam);
TRACE("IME message WM_IME_COMPOSITION 0x%Ix\n", lParam);
if (!(lParam & GCS_RESULTSTR))
UpdateDefaultIMEWindow(hIMC, hwnd);
}
......@@ -1277,7 +1277,7 @@ static LRESULT ImeHandleNotify(HIMC hIMC, HWND hwnd, UINT msg, WPARAM wParam,
FIXME("WM_IME_NOTIFY:IMN_SETSTATUSWINDOWPOS\n");
break;
default:
FIXME("WM_IME_NOTIFY:<Unknown 0x%lx>\n",wParam);
FIXME("WM_IME_NOTIFY:<Unknown 0x%Ix>\n",wParam);
break;
}
return 0;
......@@ -1289,7 +1289,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
LRESULT rc = 0;
HIMC hIMC;
TRACE("Incoming Message 0x%x (0x%08lx, 0x%08lx)\n", msg, wParam, lParam);
TRACE("Incoming Message 0x%x (0x%08Ix, 0x%08Ix)\n", msg, wParam, lParam);
/*
* Each UI window contains the current Input Context.
......@@ -1361,15 +1361,15 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
DefaultIMEStartComposition(hIMC, hwnd);
break;
case WM_IME_ENDCOMPOSITION:
TRACE("IME message %s, 0x%lx, 0x%lx\n",
TRACE("IME message %s, 0x%Ix, 0x%Ix\n",
"WM_IME_ENDCOMPOSITION", wParam, lParam);
ShowWindow(hwnd,SW_HIDE);
break;
case WM_IME_SELECT:
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_IME_SELECT", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_IME_SELECT", wParam, lParam);
break;
case WM_IME_CONTROL:
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_IME_CONTROL", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_IME_CONTROL", wParam, lParam);
rc = 1;
break;
case WM_IME_NOTIFY:
......@@ -1381,32 +1381,32 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
/* check the MSIME messages */
if (msg == WM_MSIME_SERVICE)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_SERVICE", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_SERVICE", wParam, lParam);
rc = FALSE;
}
else if (msg == WM_MSIME_RECONVERTOPTIONS)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_RECONVERTOPTIONS", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_RECONVERTOPTIONS", wParam, lParam);
}
else if (msg == WM_MSIME_MOUSE)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_MOUSE", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_MOUSE", wParam, lParam);
}
else if (msg == WM_MSIME_RECONVERTREQUEST)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_RECONVERTREQUEST", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_RECONVERTREQUEST", wParam, lParam);
}
else if (msg == WM_MSIME_RECONVERT)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_RECONVERT", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_RECONVERT", wParam, lParam);
}
else if (msg == WM_MSIME_QUERYPOSITION)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_QUERYPOSITION", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_QUERYPOSITION", wParam, lParam);
}
else if (msg == WM_MSIME_DOCUMENTFEED)
{
TRACE("IME message %s, 0x%lx, 0x%lx\n","WM_MSIME_DOCUMENTFEED", wParam, lParam);
TRACE("IME message %s, 0x%Ix, 0x%Ix\n","WM_MSIME_DOCUMENTFEED", wParam, lParam);
}
/* DefWndProc if not an IME message */
if (!rc && !((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) ||
......
dlls/winex11.drv/keyboard.c
View file @ 7c9d04a4
......@@ -2234,7 +2234,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize )
/* Finally issue WARN for unknown keys */
pthread_mutex_unlock( &kbd_mutex );
WARN("(%08x,%p,%d): unsupported key, vkey=%04X, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi);
WARN("(%08x,%p,%d): unsupported key, vkey=%04X, ansi=%04x\n",(int)lParam,lpBuffer,nSize,vkey,ansi);
*lpBuffer = 0;
return 0;
}
......
dlls/winex11.drv/mouse.c
View file @ 7c9d04a4
......@@ -1518,7 +1518,7 @@ BOOL X11DRV_SetCursorPos( INT x, INT y )
if (keyboard_grabbed)
{
WARN( "refusing to warp to %u, %u\n", pos.x, pos.y );
WARN( "refusing to warp to %u, %u\n", (int)pos.x, (int)pos.y );
return FALSE;
}
......@@ -1527,7 +1527,7 @@ BOOL X11DRV_SetCursorPos( INT x, INT y )
PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, None, CurrentTime ) != GrabSuccess)
{
WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", pos.x, pos.y );
WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", (int)pos.x, (int)pos.y );
return FALSE;
}
......@@ -1792,7 +1792,7 @@ BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *xev )
if (!hwnd && is_old_motion_event( event->serial ))
{
TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial );
TRACE( "pos %d,%d old serial %lu, ignoring\n", event->x, event->y, event->serial );
return FALSE;
}
map_event_coords( hwnd, event->window, event->root, event->x_root, event->y_root, &input );
......@@ -1824,7 +1824,7 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev )
if (is_old_motion_event( event->serial ))
{
TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial );
TRACE( "pos %d,%d old serial %lu, ignoring\n", event->x, event->y, event->serial );
return FALSE;
}
map_event_coords( hwnd, event->window, event->root, event->x_root, event->y_root, &input );
......@@ -1908,7 +1908,8 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
input->u.mi.dx = round( x->value );
input->u.mi.dy = round( y->value );
TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy );
TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value,
(int)input->u.mi.dx, (int)input->u.mi.dy );
x->value -= input->u.mi.dx;
y->value -= input->u.mi.dy;
......
dlls/winex11.drv/opengl.c
View file @ 7c9d04a4
......@@ -294,7 +294,7 @@ static BOOL glxRequireVersion(int requiredVersion);
static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) {
TRACE( "size %u version %u flags %u type %u color %u %u,%u,%u,%u "
"accum %u depth %u stencil %u aux %u ",
ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType,
ppfd->nSize, ppfd->nVersion, (int)ppfd->dwFlags, ppfd->iPixelType,
ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits,
ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers );
#define TEST_AND_DUMP(t,tv) if ((t) & (tv)) TRACE(#tv " ")
......
dlls/winex11.drv/systray.c
View file @ 7c9d04a4
......@@ -766,7 +766,7 @@ int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data )
cleanup_icons( data->hWnd );
break;
default:
FIXME( "unhandled tray message: %u\n", msg );
FIXME( "unhandled tray message: %lu\n", msg );
break;
}
return ret;
......@@ -784,7 +784,7 @@ LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
case WM_PARENTNOTIFY:
if (LOWORD(wparam) == WM_DESTROY)
{
TRACE( "%p: got parent notify destroy for win %lx\n", hwnd, lparam );
TRACE( "%p: got parent notify destroy for win %Ix\n", hwnd, lparam );
PostMessageW( hwnd, WM_CLOSE, 0, 0 ); /* so that we come back here once the child is gone */
}
return 0;
......
dlls/winex11.drv/window.c
View file @ 7c9d04a4
......@@ -1378,9 +1378,9 @@ static void sync_window_position( struct x11drv_win_data *data,
#endif
TRACE( "win %p/%lx pos %d,%d,%dx%d after %lx changes=%x serial=%lu\n",
data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top,
data->whole_rect.right - data->whole_rect.left,
data->whole_rect.bottom - data->whole_rect.top,
data->hwnd, data->whole_window, (int)data->whole_rect.left, (int)data->whole_rect.top,
(int)(data->whole_rect.right - data->whole_rect.left),
(int)(data->whole_rect.bottom - data->whole_rect.top),
changes.sibling, mask, data->configure_serial );
}
......@@ -3094,7 +3094,7 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
taskbar_add_tab( hwnd );
return 0;
default:
FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp );
FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp );
return 0;
}
}
......@@ -3197,7 +3197,7 @@ LRESULT X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam )
if ((WCHAR)lparam) goto failed; /* got an explicit char */
if (NtUserGetWindowLongPtrW( hwnd, GWLP_ID )) goto failed; /* window has a real menu */
if (!(NtUserGetWindowLongW( hwnd, GWL_STYLE ) & WS_SYSMENU)) goto failed; /* no system menu */
TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam );
TRACE( "ignoring SC_KEYMENU wp %lx lp %lx\n", (long)wparam, lparam );
release_win_data( data );
return 0;
......
dlls/winex11.drv/x11drv_main.c
View file @ 7c9d04a4
......@@ -373,12 +373,12 @@ HKEY open_hkcu_key( const char *name )
sid = ((TOKEN_USER *)sid_data)->User.Sid;
len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision,
MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5],
sid->IdentifierAuthority.Value[4] ),
MAKEWORD( sid->IdentifierAuthority.Value[3],
sid->IdentifierAuthority.Value[2] )));
(int)MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5],
sid->IdentifierAuthority.Value[4] ),
MAKEWORD( sid->IdentifierAuthority.Value[3],
sid->IdentifierAuthority.Value[2] )));
for (i = 0; i < sid->SubAuthorityCount; i++)
len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] );
len += sprintf( buffer + len, "-%u", (int)sid->SubAuthority[i] );
ascii_to_unicode( bufferW, buffer, len );
hkcu = reg_open_key( NULL, bufferW, len * sizeof(WCHAR) );
......@@ -1017,7 +1017,7 @@ static HANDLE get_display_device_init_mutex(void)
HANDLE mutex;
snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init",
NtCurrentTeb()->Peb->SessionId );
(int)NtCurrentTeb()->Peb->SessionId );
name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer );
InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL );
......@@ -1159,8 +1159,8 @@ NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *des
if (!get_vulkan_uuid_from_luid(&desc->AdapterLuid, &uuid))
{
WARN("Failed to find Vulkan device with LUID %08x:%08x.\n", desc->AdapterLuid.HighPart,
desc->AdapterLuid.LowPart);
WARN("Failed to find Vulkan device with LUID %08x:%08x.\n",
(int)desc->AdapterLuid.HighPart, (int)desc->AdapterLuid.LowPart);
return STATUS_INVALID_PARAMETER;
}
......
dlls/winex11.drv/xdnd.c
View file @ 7c9d04a4
......@@ -191,7 +191,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size )
{
hr = IDropTarget_DragLeave(dropTarget);
if (FAILED(hr))
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragLeave failed, error 0x%08lx\n", hr);
IDropTarget_Release(dropTarget);
}
}
......@@ -210,12 +210,12 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size )
if (hr == S_OK)
{
XDNDAccepted = TRUE;
TRACE("the application accepted the drop (effect = %d)\n", effect_ignore);
TRACE("the application accepted the drop (effect = %ld)\n", effect_ignore);
}
else
{
XDNDAccepted = FALSE;
WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragEnter failed, error 0x%08lx\n", hr);
}
IDropTarget_Release(dropTarget);
}
......@@ -230,7 +230,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size )
if (hr == S_OK)
XDNDDropEffect = effect;
else
WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragOver failed, error 0x%08lx\n", hr);
IDropTarget_Release(dropTarget);
}
}
......@@ -283,10 +283,10 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg )
TRACE("the application refused the drop\n");
}
else if (FAILED(hr))
WARN("drop failed, error 0x%08X\n", hr);
WARN("drop failed, error 0x%08lx\n", hr);
else
{
WARN("drop returned 0x%08X\n", hr);
WARN("drop returned 0x%08lx\n", hr);
drop_file = FALSE;
}
IDropTarget_Release(dropTarget);
......@@ -295,7 +295,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg )
{
HRESULT hr = IDropTarget_DragLeave(dropTarget);
if (FAILED(hr))
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragLeave failed, error 0x%08lx\n", hr);
IDropTarget_Release(dropTarget);
}
}
......@@ -318,7 +318,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg )
}
}
TRACE("effectRequested(0x%x) accept(%d) performed(0x%x) at x(%d),y(%d)\n",
TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n",
XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y);
return accept ? effect : 0;
......@@ -343,7 +343,7 @@ NTSTATUS x11drv_dnd_leave_event( UINT arg )
{
HRESULT hr = IDropTarget_DragLeave(dropTarget);
if (FAILED(hr))
WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr);
WARN("IDropTarget_DragLeave failed, error 0x%08lx\n", hr);
IDropTarget_Release(dropTarget);
}
}
......@@ -428,7 +428,7 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd)
lpDrop->fNC = !(ScreenToClient(hwnd, &lpDrop->pt) &&
GetClientRect(hwnd, &rect) &&
PtInRect(&rect, lpDrop->pt));
TRACE("Sending WM_DROPFILES: hWnd=0x%p, fNC=%d, x=%d, y=%d, files=%p(%s)\n", hwnd,
TRACE("Sending WM_DROPFILES: hWnd=0x%p, fNC=%d, x=%ld, y=%ld, files=%p(%s)\n", hwnd,
lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles,
debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles)));
GlobalUnlock(dropHandle);
......@@ -593,7 +593,7 @@ static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject,
struct format_entry *iter;
char formatDesc[1024];
TRACE("(%p, %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%d}\n",
TRACE("(%p, %p={.tymed=0x%lx, .dwAspect=%ld, .cfFormat=%d}\n",
dataObject, formatEtc, formatEtc->tymed, formatEtc->dwAspect, formatEtc->cfFormat);
X11DRV_XDND_DescribeClipboardFormat(formatEtc->cfFormat, formatDesc, sizeof(formatDesc));
......@@ -644,7 +644,7 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject,
DWORD count = 0;
FORMATETC *formats;
TRACE("(%p, %u, %p)\n", dataObject, dwDirection, ppEnumFormatEtc);
TRACE("(%p, %lu, %p)\n", dataObject, dwDirection, ppEnumFormatEtc);
if (dwDirection != DATADIR_GET)
{
......@@ -681,7 +681,7 @@ static HRESULT WINAPI XDNDDATAOBJECT_DAdvise(IDataObject *dataObject,
IAdviseSink *adviseSink,
DWORD *pdwConnection)
{
FIXME("(%p, %p, %u, %p, %p): stub\n", dataObject, formatEtc, advf,
FIXME("(%p, %p, %lu, %p, %p): stub\n", dataObject, formatEtc, advf,
adviseSink, pdwConnection);
return OLE_E_ADVISENOTSUPPORTED;
}
......@@ -689,7 +689,7 @@ static HRESULT WINAPI XDNDDATAOBJECT_DAdvise(IDataObject *dataObject,
static HRESULT WINAPI XDNDDATAOBJECT_DUnadvise(IDataObject *dataObject,
DWORD dwConnection)
{
FIXME("(%p, %u): stub\n", dataObject, dwConnection);
FIXME("(%p, %lu): stub\n", dataObject, dwConnection);
return OLE_E_ADVISENOTSUPPORTED;
}
......
dlls/winex11.drv/xrandr.c
View file @ 7c9d04a4
......@@ -298,7 +298,8 @@ static LONG xrandr10_set_current_mode( ULONG_PTR id, const DEVMODEW *mode )
}
if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp)
WARN("Cannot change screen bit depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel);
WARN("Cannot change screen bit depth from %dbits to %dbits!\n",
screen_bpp, (int)mode->dmBitsPerPel);
root = DefaultRootWindow( gdi_display );
screen_config = pXRRGetScreenInfo( gdi_display, root );
......@@ -1556,7 +1557,8 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, const DEVMODEW *mode )
RRMode rrmode;
if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp)
WARN("Cannot change screen color depth from %ubits to %ubits!\n", screen_bpp, mode->dmBitsPerPel);
WARN("Cannot change screen color depth from %ubits to %ubits!\n",
screen_bpp, (int)mode->dmBitsPerPel);
screen_resources = xrandr_get_screen_resources();
if (!screen_resources)
......
dlls/winex11.drv/xrender.c
View file @ 7c9d04a4
......@@ -843,7 +843,7 @@ static HFONT CDECL xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_fla
}
TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n",
lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight,
(int)lfsz.lf.lfHeight, (int)lfsz.lf.lfWidth, (int)lfsz.lf.lfWeight,
lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName));
lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth );
lfsz.devsize.cx = X11DRV_XWStoDS( dev->hdc, lfsz.lf.lfWidth );
......@@ -1112,7 +1112,7 @@ static void UploadGlyph(struct xrender_physdev *physDev, UINT glyph, enum glyph_
TRACE("buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%d,%d\n",
buflen,
gm.gmBlackBoxX, gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY,
gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y);
(int)gm.gmptGlyphOrigin.x, (int)gm.gmptGlyphOrigin.y);
gi.width = gm.gmBlackBoxX;
gi.height = gm.gmBlackBoxY;
......@@ -1351,7 +1351,7 @@ static BOOL CDECL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
}
TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count),
physdev->x11dev->dc_rect.left + x, physdev->x11dev->dc_rect.top + y);
(int)(physdev->x11dev->dc_rect.left + x), (int)(physdev->x11dev->dc_rect.top + y));
elts = malloc( sizeof(XGlyphElt16) * count );
......@@ -2084,7 +2084,7 @@ static BOOL CDECL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, U
rc.bottom = max( pt[0].y, pt[1].y );
TRACE( "%u gradient %s colors %04x,%04x,%04x,%04x -> %04x,%04x,%04x,%04x\n",
mode, wine_dbgstr_rect( &rc ),
(int)mode, wine_dbgstr_rect( &rc ),
colors[0].red, colors[0].green, colors[0].blue, colors[0].alpha,
colors[1].red, colors[1].green, colors[1].blue, colors[1].alpha );
......
dlls/winex11.drv/xvidmode.c
View file @ 7c9d04a4
......@@ -228,7 +228,8 @@ static LONG xf86vm_set_current_mode(ULONG_PTR id, const DEVMODEW *mode)
}
if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp)
WARN("Cannot change screen bit depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel);
WARN("Cannot change screen bit depth from %dbits to %dbits!\n",
screen_bpp, (int)mode->dmBitsPerPel);
assert(mode->dmDriverExtra == sizeof(XF86VidModeModeInfo *));
memcpy(&xf86vm_mode, (BYTE *)mode + sizeof(*mode), sizeof(xf86vm_mode));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment