diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-25 09:24:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-25 09:24:55 +0200 |
| commit | af62a89a4e677bc0a10094be86816b2e273b2c4a (patch) | |
| tree | 3cceb0e23b7ab79dbcedb27c5546cf2666c1c7a0 /xorg-server/hw/xwin/winwindowswm.c | |
| parent | de54c5b749b3eefb75d420840c889533a58aa342 (diff) | |
| parent | acf3535c75d7c79154b6b89c66567317944d244c (diff) | |
| download | vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.tar.gz vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.tar.bz2 vcxsrv-af62a89a4e677bc0a10094be86816b2e273b2c4a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 25 Jul 2013
Conflicts:
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowclass.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winwindowswm.c')
| -rw-r--r-- | xorg-server/hw/xwin/winwindowswm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c index 70e0419bb..36f4ce0ae 100644 --- a/xorg-server/hw/xwin/winwindowswm.c +++ b/xorg-server/hw/xwin/winwindowswm.c @@ -242,7 +242,7 @@ winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg, return; for (pEvent = *pHead; pEvent; pEvent = pEvent->next) { client = pEvent->client; - winDebug ("winWindowsWMSendEvent - x%08x\n", (int) client); + winDebug ("winWindowsWMSendEvent - %p\n", client); if ((pEvent->mask & mask) == 0) { continue; } @@ -366,8 +366,8 @@ ProcWindowsWMFrameDraw(ClientPtr client) if (pRLWinPriv == 0) return BadWindow; - winDebug ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n", - (int) pRLWinPriv->hWnd, (int) stuff->frame_style, + winDebug ("ProcWindowsWMFrameDraw - HWND %p 0x%08x 0x%08x\n", + pRLWinPriv->hWnd, (int) stuff->frame_style, (int) stuff->frame_style_ex); winDebug ("ProcWindowsWMFrameDraw - %d %d %d %d\n", stuff->ix, stuff->iy, stuff->iw, stuff->ih); |