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

Timestamp:

Jul 8, 2001, 5:51:43 PM (24 years ago)

Author:

sandervl

Message:

edit control bugfix (selected text); key translation additions; clipboard memory handle translation added

File:

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

trunk/src/user32/clipboard.cpp

@@ -1 @@
-/* $Id: clipboard.cpp,v 1.12 2001-06-09 14:50:16 sandervl Exp $ */
+/* $Id: clipboard.cpp,v 1.13 2001-07-08 15:51:41 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 
 #include <os2win.h>
+#include <string.h>
 #include "win32wbase.h"
 #include <unicode.h>
@@ -21 +22 @@
 #define DBG_LOCALLOG    DBG_clipboard
 #include "dbglocal.h"
+
+#ifdef USING_OPEN32CLIPBOARD
+
+#define FLAG_TO_OPEN32       0
+#define FLAG_FROM_OPEN32     1
+
+//******************************************************************************
+//******************************************************************************
+HGLOBAL GlobalCopy(HGLOBAL hDest, HGLOBAL hSource, BOOL fToOpen32)
+{
+ LPVOID src;
+ LPVOID dest;
+ ULONG  size;
+
+      if(fToOpen32 == FLAG_TO_OPEN32) {
+          src = GlobalLock(hSource);
+          if(src) {
+              size = GlobalSize(hSource);
+              if(hDest == NULL) {
+                  hDest = O32_GlobalAlloc(GHND, size);
+              }
+              dest  = O32_GlobalLock(hDest);
+              memcpy(dest, src, size);
+              O32_GlobalUnlock(hDest);
+          }
+          GlobalUnlock(hSource);
+      }
+      else {
+          src = O32_GlobalLock(hSource);
+          if(src) {
+              size = O32_GlobalSize(hSource);
+              if(hDest == NULL) {
+                  hDest = GlobalAlloc(GHND, size);
+              }
+              dest  = GlobalLock(hDest);
+              memcpy(dest, src, size);
+              GlobalUnlock(hDest);
+          }
+          O32_GlobalUnlock(hSource);
+      }
+      return hDest;
+}
+#endif
 
 //******************************************************************************
@@ -80 +124 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API GetClipboardData( UINT arg1)
-{
-    dprintf(("USER32:  GetClipboardData\n"));
-    return O32_GetClipboardData(arg1);
+HANDLE WIN32API GetClipboardData( UINT uFormat)
+{
+#ifdef USING_OPEN32CLIPBOARD
+    HANDLE hClipObj = 0, hClipObjOpen32 = 0;
+
+    dprintf(("USER32: GetClipboardData %x", uFormat));
+    hClipObjOpen32 = O32_GetClipboardData(uFormat);
+    //memory leak
+    if(hClipObjOpen32) {
+        hClipObj = GlobalCopy(NULL, hClipObjOpen32, FLAG_FROM_OPEN32);
+    }
+    return hClipObj;
+#else
+    dprintf(("USER32: GetClipboardData %x", uFormat));
+    return O32_GetClipboardData(uFormat);
+#endif
 }
 //******************************************************************************
@@ -217 +273 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API SetClipboardData( UINT arg1, HANDLE  arg2)
-{
-    dprintf(("USER32:  SetClipboardData\n"));
-    return O32_SetClipboardData(arg1, arg2);
+HANDLE WIN32API SetClipboardData( UINT uFormat, HANDLE hClipObj)
+{
+#ifdef USING_OPEN32CLIPBOARD
+    HANDLE hClipObjOpen32 = 0;
+
+    dprintf(("USER32: SetClipboardData %x %x", uFormat, hClipObj));
+    //memory leak
+    if(hClipObj) {
+        hClipObjOpen32 = GlobalCopy(NULL, hClipObj, FLAG_TO_OPEN32);
+    }
+    O32_SetClipboardData(uFormat, hClipObjOpen32);
+
+    return hClipObj;
+#else
+    dprintf(("USER32: SetClipboardData %x %x", uFormat, hClipObj));
+    return O32_SetClipboardData(uFormat, hClipObj);
+#endif
 }
 //******************************************************************************