Changeset 342 for trunk/src/user32/new/oslibmsg.cpp

Timestamp:

Jul 20, 1999, 9:42:36 AM (26 years ago)

Author:

sandervl

Message:

Accelerator support (not working) + bugfixes

File:

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

trunk/src/user32/new/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.1 1999-07-17 11:52:22 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.2 1999-07-20 07:42:35 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -9 +9 @@
  * Project Odin Software License can be found in LICENSE.TXT
  *
- * TODO: Simply copy for now. Probably need to make a real translation
+ * TODO: Simply copy for now. Need to make a real translation
  *
  */
 #define  INCL_WIN
 #define  INCL_PM
+#define  INCL_DOSPROCESS
 #include <os2.h>
 #include <os2wrap.h>
@@ -19 +20 @@
 #include <misc.h>
 #include "oslibmsg.h"
+#include <win32wnd.h>
+#include "oslibutil.h"
 
+QMSG *MsgThreadPtr = 0;
+
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibInitMsgQueue()
+{
+   if(DosAllocThreadLocalMemory(sizeof(QMSG)/sizeof(ULONG), (PULONG *)&MsgThreadPtr) != 0) 
+   {
+        dprintf(("OSLibInitMsgQueue: local thread memory alloc failed!!"));
+        DebugInt3();
+        return FALSE;
+   }
+   return TRUE;
+}
 //******************************************************************************
 //******************************************************************************
@@ -32 +49 @@
 {
   memcpy(winMsg, os2Msg, sizeof(MSG));
+  winMsg->hwnd = Win32Window::OS2ToWin32Handle(os2Msg->hwnd);
 }
 //******************************************************************************
@@ -42 +60 @@
 //******************************************************************************
 //******************************************************************************
+void OSLibWinPostQuitMessage(ULONG nExitCode)
+{
+  WinPostQueueMsg(GetThreadMessageQueue(), WM_QUIT, (MPARAM)nExitCode, 0);
+}
+//******************************************************************************
+//******************************************************************************
+LONG OSLibWinDispatchMsg(MSG *msg, BOOL isUnicode)
+{
+//TODO: What to do if app changed msg? (translate)
+//  WinToOS2MsgTranslate(msg, &qmsg, isUnicode);
+  
+  return (LONG)WinDispatchMsg(GetThreadHAB(), MsgThreadPtr);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax, BOOL isUnicode)
+{
+ BOOL rc;
+
+  rc = WinGetMsg(GetThreadHAB(), MsgThreadPtr, TranslateWinMsg(uMsgFilterMin), TranslateWinMsg(uMsgFilterMax), 0);
+  OS2ToWinMsgTranslate(MsgThreadPtr, pMsg, isUnicode);
+  return rc;
+}
+//******************************************************************************
+//******************************************************************************