Changeset 10595 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

May 3, 2004, 2:09:01 PM (21 years ago)

Author:

sandervl

Message:

KSO: Clipboard updates

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (4 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.123 2004-04-13 14:16:43 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.124 2004-05-03 12:09:01 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -621 +621 @@
         mousehk.dwExtraInfo  = 0;
 
-        if(HOOK_CallHooksW( WH_MOUSE_W, (fMsgRemoved == MSG_REMOVE) ? HC_ACTION : HC_NOREMOVE, winMsg->message, (LPARAM)&mousehk)) 
+        if(HOOK_CallHooksW( WH_MOUSE_W, (fMsgRemoved == MSG_REMOVE) ? HC_ACTION : HC_NOREMOVE, winMsg->message, (LPARAM)&mousehk))
         {
             goto dummymessage; //hook swallowed message
@@ -1012 +1012 @@
     case WM_RENDERFMT:
         winMsg->message = WINWM_RENDERFORMAT;
-        winMsg->wParam  = (UINT) os2Msg->mp1;
+        extern UINT WIN32API clipboardPMToOdinFormat(ULONG ulPMFormat);
+        winMsg->wParam  = (UINT)clipboardPMToOdinFormat((ULONG)os2Msg->mp1);
+        if (!winMsg->wParam)
+        {
+            dprintf(("WM_RENDERFMT: failed to convert clipboard format (%d)!!!\n", os2Msg->mp1));
+            DebugInt3();
+        }
         break;
 
@@ -1164 +1170 @@
       {
         if(!msg->wParam)
-        {//TODO: Why is this here???? 
+        {//TODO: Why is this here????
             DebugInt3();
             extramsg.wParam = SHORT2FROMMP(teb->o.odin.os2msg.mp2);