Changeset 2774 for trunk/synergy/lib/platform/CPMClipboardAnyTextConverter.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/CPMClipboardAnyTextConverter.cpp (modified) (5 diffs)

trunk/synergy/lib/platform/CPMClipboardAnyTextConverter.cpp

@@ -3 +3 @@
  * Copyright (C) 2002 Chris Schoeneman
  * Copyright (C) 2006 Knut St. Osmundsen
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15 +15 @@
 
 #include "CPMClipboardAnyTextConverter.h"
+#include "CLog.h"
 
 //
@@ -50 +51 @@
         // copy to memory handle
     PVOID pv = NULL;
-    APIRET rc = DosAllocSharedMem(&pv, NULL, cb, PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_GETTABLE | OBJ_GIVEABLE);
+    APIRET rc = DosAllocSharedMem(&pv, NULL, cb + 1, PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_GETTABLE | OBJ_GIVEABLE);
     if (rc == NO_ERROR) {
-        return (ULONG)memcpy(pv, text.data(), cb);
+                const char *psz = text.c_str();
+LOG((CLOG_DEBUG "fromIClipboard: psz='%s' cb=%d strlen=%d\n", psz, cb, strlen(psz)));
+        return (ULONG)memcpy(pv, psz, cb);
     }
     return 0;
 }
 
-void 
+void
 CPMClipboardAnyTextConverter::freePMData(ULONG ulPMData) const
 {
@@ -68 +71 @@
         // convert text
     const char *psz = (const char *)data;
-        CString text = doToIClipboard(CString(psz));
+LOG((CLOG_DEBUG "toIClipboard: psz='%s' strlen=%d\n", psz, strlen(psz)));
+        CString raw = CString(psz);
+LOG((CLOG_DEBUG "toIClipboard: raw='%s'\n", raw.c_str()));
+        CString text = doToIClipboard(raw);
+LOG((CLOG_DEBUG "toIClipboard: text='%s'\n", text.c_str()));
 
         // convert newlines
@@ -77 +84 @@
 CPMClipboardAnyTextConverter::convertLinefeedToPM(const CString& src) const
 {
-        // note -- we assume src is a valid UTF-8 string
+        // note -- we assume src is a valid UTF-8 string    L
 
         // count newlines in string