Changeset 9423 for trunk/src/user32/clipboard.cpp

Timestamp:

Nov 25, 2002, 10:48:13 AM (23 years ago)

Author:

sandervl

Message:

some updates

File:

• trunk/src/user32/clipboard.cpp (modified) (5 diffs)

trunk/src/user32/clipboard.cpp

@@ -1 @@
-/* $Id: clipboard.cpp,v 1.15 2002-09-03 12:34:01 sandervl Exp $ */
+/* $Id: clipboard.cpp,v 1.16 2002-11-25 09:48:13 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 {
     Win32BaseWindow *wndRemove, *wndNext;
-    HWND hwndOS2Remove, hwndOS2Next;
+    HWND hwndOS2Remove, hwndOS2Next = 0;
 
     wndRemove = Win32BaseWindow::GetWindowFromHandle(hwndRemove);
@@ -39 +39 @@
     RELEASE_WNDOBJ(wndRemove);
 
-    wndNext = Win32BaseWindow::GetWindowFromHandle(hwndNext);
-    if(!wndNext) {
-        dprintf(("ChangeClipboardChain, window %x not found", hwndNext));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return 0;
-    }
-    hwndOS2Next = wndNext->getOS2WindowHandle();
-    RELEASE_WNDOBJ(wndNext);
+    if(hwndNext) {
+        wndNext = Win32BaseWindow::GetWindowFromHandle(hwndNext);
+        if(!wndNext) {
+            dprintf(("ChangeClipboardChain, window %x not found", hwndNext));
+            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+            return 0;
+        }
+        hwndOS2Next = wndNext->getOS2WindowHandle();
+        RELEASE_WNDOBJ(wndNext);
+    }
 
     dprintf(("USER32:  ChangeClipboardChain\n"));
@@ -243 +245 @@
     HANDLE hRet = O32_GetClipboardData(uFormat);
     dprintf(("GetClipboardData %x returned %x", uFormat, hRet));
+#ifdef DEBUG
+    if(hRet) {
+        if(uFormat == CF_TEXT || uFormat == CF_DSPTEXT) {
+            char *lpszText = (char *)GlobalLock(hRet);
+            if(lpszText) dprintf(("GetClipboardData %s", lpszText));
+            GlobalUnlock(hRet);
+        }
+        if(uFormat == CF_UNICODETEXT) {
+            LPWSTR lpszText = (LPWSTR)GlobalLock(hRet);
+            if(lpszText) dprintf(("GetClipboardData %ls", lpszText));
+            GlobalUnlock(hRet);
+        }
+    }
+#endif
     return hRet;
 }
@@ -250 +266 @@
 {
     dprintf(("SetClipboardData %x %x", uFormat, hClipObj));
+#ifdef DEBUG
+    if(hClipObj) {
+        if(uFormat == CF_TEXT || uFormat == CF_DSPTEXT) {
+            char *lpszText = (char *)GlobalLock(hClipObj);
+            if(lpszText) dprintf(("SetClipboardData %s", lpszText));
+            GlobalUnlock(hClipObj);
+        }
+        if(uFormat == CF_UNICODETEXT) {
+            LPWSTR lpszText = (LPWSTR)GlobalLock(hClipObj);
+            if(lpszText) dprintf(("SetClipboardData %ls", lpszText));
+            GlobalUnlock(hClipObj);
+        }
+    }
+#endif
     return O32_SetClipboardData(uFormat, hClipObj);
 }