frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Changes in error logging to make libwinclipboard more useful as a library 

Consistently use ErrorF() rather than winErrorFVerb()

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2013-06-17 20:03:04 +01:00
parent e1cf2b47be
commit 5ae674ae6d
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hw/xwin/winclipboard/wndproc.c
View File

@ -189,8 +189,8 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
s_hwndNextViewer = (HWND) lParam; s_hwndNextViewer = (HWND) lParam;
if (s_hwndNextViewer == hwnd) { if (s_hwndNextViewer == hwnd) {
s_hwndNextViewer = NULL; s_hwndNextViewer = NULL;
winErrorFVerb(1, "winClipboardWindowProc - WM_CHANGECBCHAIN: " ErrorF("winClipboardWindowProc - WM_CHANGECBCHAIN: "
"attempted to set next window to ourselves."); "attempted to set next window to ourselves.");
} }
} }
else if (s_hwndNextViewer) else if (s_hwndNextViewer)
@ -262,8 +262,8 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
s_fCBCInitialized = FALSE; s_fCBCInitialized = FALSE;
ChangeClipboardChain(hwnd, s_hwndNextViewer); ChangeClipboardChain(hwnd, s_hwndNextViewer);
winFixClipboardChain(); winFixClipboardChain();
winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - " ErrorF("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
"Nested calls detected. Re-initing.\n"); "Nested calls detected. Re-initing.\n");
winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n"); winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
s_fProcessingDrawClipboard = FALSE; s_fProcessingDrawClipboard = FALSE;
return 0; return 0;
@ -325,9 +325,9 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
XSetSelectionOwner(pDisplay, XA_PRIMARY, None, CurrentTime); XSetSelectionOwner(pDisplay, XA_PRIMARY, None, CurrentTime);
} }
else if (BadWindow == iReturn || BadAtom == iReturn) else if (BadWindow == iReturn || BadAtom == iReturn)
winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - " ErrorF("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
"XGetSelection failed for PRIMARY: %d\n", "XGetSelectionOwner failed for PRIMARY: %d\n",
iReturn); iReturn);
/* Release CLIPBOARD selection if owned */ /* Release CLIPBOARD selection if owned */
iReturn = XGetSelectionOwner(pDisplay, atoms->atomClipboard); iReturn = XGetSelectionOwner(pDisplay, atoms->atomClipboard);
@ -337,9 +337,9 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
XSetSelectionOwner(pDisplay, atoms->atomClipboard, None, CurrentTime); XSetSelectionOwner(pDisplay, atoms->atomClipboard, None, CurrentTime);
} }
else if (BadWindow == iReturn || BadAtom == iReturn) else if (BadWindow == iReturn || BadAtom == iReturn)
winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - " ErrorF("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
"XGetSelection failed for CLIPBOARD: %d\n", "XGetSelectionOwner failed for CLIPBOARD: %d\n",
iReturn); iReturn);
winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n"); winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
s_fProcessingDrawClipboard = FALSE; s_fProcessingDrawClipboard = FALSE;
@ -353,8 +353,8 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
XA_PRIMARY, iWindow, CurrentTime); XA_PRIMARY, iWindow, CurrentTime);
if (iReturn == BadAtom || iReturn == BadWindow || if (iReturn == BadAtom || iReturn == BadWindow ||
XGetSelectionOwner(pDisplay, XA_PRIMARY) != iWindow) { XGetSelectionOwner(pDisplay, XA_PRIMARY) != iWindow) {
winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - " ErrorF("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
"Could not reassert ownership of PRIMARY\n"); "Could not reassert ownership of PRIMARY\n");
} }
else { else {
winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - " winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
@ -367,8 +367,8 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (iReturn == BadAtom || iReturn == BadWindow || if (iReturn == BadAtom || iReturn == BadWindow ||
XGetSelectionOwner(pDisplay, atoms->atomClipboard) != iWindow) { XGetSelectionOwner(pDisplay, atoms->atomClipboard) != iWindow) {
winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - " ErrorF("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
"Could not reassert ownership of CLIPBOARD\n"); "Could not reassert ownership of CLIPBOARD\n");
} }
else { else {
winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - " winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
@ -421,8 +421,8 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
atoms->atomLocalProperty, atoms->atomLocalProperty,
iWindow, CurrentTime); iWindow, CurrentTime);
if (iReturn == BadAtom || iReturn == BadWindow) { if (iReturn == BadAtom || iReturn == BadWindow) {
winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMAT - " ErrorF("winClipboardWindowProc - WM_RENDER*FORMAT - "
"XConvertSelection () failed\n"); "XConvertSelection () failed\n");
break; break;
} }
@ -436,16 +436,16 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
if (!OpenClipboard(hwnd)) { if (!OpenClipboard(hwnd)) {
winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMATS - " ErrorF("winClipboardWindowProc - WM_RENDER*FORMATS - "
"OpenClipboard () failed: %08x\n", "OpenClipboard () failed: %08x\n",
GetLastError()); GetLastError());
break; break;
} }
if (!EmptyClipboard()) { if (!EmptyClipboard()) {
winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMATS - " ErrorF("winClipboardWindowProc - WM_RENDER*FORMATS - "
"EmptyClipboard () failed: %08x\n", "EmptyClipboard () failed: %08x\n",
GetLastError()); GetLastError());
break; break;
} }
} }
@ -479,10 +479,9 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
/* We must close the clipboard */ /* We must close the clipboard */
if (!CloseClipboard()) { if (!CloseClipboard()) {
winErrorFVerb(1, ErrorF("winClipboardWindowProc - WM_RENDERALLFORMATS - "
"winClipboardWindowProc - WM_RENDERALLFORMATS - " "CloseClipboard () failed: %08x\n",
"CloseClipboard () failed: %08x\n", GetLastError());
GetLastError());
break; break;
} }
} }