Changeset 2774 for trunk/synergy/lib/platform/CPMClipboard.cpp

Timestamp:

Aug 20, 2006, 9:50:11 AM (19 years ago)

Author:

bird

Message:

fixed a couple of clipboard issues. seems to work now.

File:

• trunk/synergy/lib/platform/CPMClipboard.cpp (modified) (10 diffs)

trunk/synergy/lib/platform/CPMClipboard.cpp

@@ -43 +43 @@
 
 bool
-CPMClipboard::emptyUnowned()
+CPMClipboard::empty()
 {
     LOG((CLOG_DEBUG "empty clipboard"));
-
-    // empty the clipboard (and take ownership)
     if (!WinEmptyClipbrd(CPMUtil::getHAB())) {
-        LOG((CLOG_DEBUG "failed to grab clipboard"));
-        return false;
-    }
-
-    return true;
-}
-
-bool
-CPMClipboard::empty()
-{
-    if (!emptyUnowned()) {
+        LOG((CLOG_ERR "failed to empty the clipboard"));
         return false;
     }
@@ -70 +58 @@
         return false;
     }
-    return !!WinSetClipbrdData(CPMUtil::getHAB(), (ULONG)pv, getOwnershipFormat(), CFI_POINTER);
+    if (!WinSetClipbrdData(CPMUtil::getHAB(), (ULONG)pv, getOwnershipFormat(), CFI_POINTER)) {
+        LOG((CLOG_ERR "failed to set dummy clipboard data. %#x", WinGetLastError(CPMUtil::getHAB())));
+        DosFreeMem(pv);
+        return false;
+    }
+    return true;
 }
 
@@ -92 +85 @@
                 if (!WinSetClipbrdData(CPMUtil::getHAB(), ulPMData, ulPMFormat, ulPMFormatInfo)) {
                     // free converted data if we couldn't put it on the clipboard
+                    LOG((CLOG_ERR "failed to set clipboard data ulPMData=%#lx ulPMFormat=%#lx ulPMFormatInfo=%#lx. %#x",
+                         ulPMData, ulPMFormat, ulPMFormatInfo, WinGetLastError(CPMUtil::getHAB())));
                     converter->freePMData(ulPMData);
                 }
@@ -108 +103 @@
         return false;
     }
-
     m_time = time;
-
     return true;
 }
@@ -118 +111 @@
 {
     LOG((CLOG_DEBUG "close clipboard"));
-    WinCloseClipbrd(CPMUtil::getHAB());
+    if (!WinCloseClipbrd(CPMUtil::getHAB())) {
+        LOG((CLOG_WARN "failed to close the clipboard. %#x", WinGetLastError(CPMUtil::getHAB())));
+    }
 }
 
@@ -130 +125 @@
 CPMClipboard::has(EFormat format) const
 {
+    LOG((CLOG_DEBUG "has clipboard format=%d?", format));
     for (ConverterList::const_iterator index = m_converters.begin();
          index != m_converters.end();
          ++index) {
         IPMClipboardConverter* converter = *index;
+        LOG((CLOG_DEBUG2 "CPMClipboard::has: format=%d convert->getFormat()->%d (pmformat=%d)", format, converter->getFormat(), converter->getPMFormat()));
         if (converter->getFormat() == format) {
             ULONG fFmtInfo;
-            if (WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo)) {
+            if (WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), converter->getPMFormat(), &fFmtInfo)) {
+                LOG((CLOG_DEBUG "yes, we have format %d!", format));
                 return true;
             }
         }
     }
+    LOG((CLOG_DEBUG "sorry, no we haven't."));
     return false;
 }
@@ -147 +146 @@
 CPMClipboard::get(EFormat format) const
 {
+    LOG((CLOG_DEBUG "get clipboard format=%d?", format));
+
     // find the converter for the first clipboard format we can handle
     IPMClipboardConverter* converter = NULL;
@@ -155 +156 @@
              ++index) {
             converter = *index;
+            LOG((CLOG_DEBUG2 "CPMClipboard::get: pmFormat=%d format=%d ?=? %d:%d", pmFormat, format, converter->getPMFormat(), converter->getFormat()));
             if (converter->getPMFormat() == pmFormat &&
                 converter->getFormat()   == format) {
@@ -172 +174 @@
     ULONG ulData = WinQueryClipbrdData(CPMUtil::getHAB(), converter->getPMFormat());
     if (ulData == 0) {
+        LOG((CLOG_DEBUG "CPMClipboard::get: ulData=%#x\n", ulData));
         return CString();
     }
 
     // convert
-    return converter->toIClipboard(ulData);
+    CString str = converter->toIClipboard(ulData);
+    LOG((CLOG_DEBUG2 "CPMClipboard::get: converted ulData=%lx to '%s'\n", ulData, str.c_str()));
+    return str;
 }
 
@@ -194 +199 @@
 {
     ULONG fFmtInfo;
-    return (!!WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo));
+    if (WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo)) {
+        LOG((CLOG_DEBUG "isOwnedBySynergy: yes"));
+        return true;
+    }
+    LOG((CLOG_DEBUG "isOwnedBySynergy: no"));
+    return false;
 }