Changeset 3525 for trunk/src

Timestamp:

May 12, 2000, 8:09:42 PM (25 years ago)

Author:

sandervl

Message:

hook, syscolor & message bugfixes

Location:

trunk/src/user32

Files:

• HOOK.CPP (modified) (4 diffs)
• dc.cpp (modified) (4 diffs)
• oslibmsg.cpp (modified) (8 diffs)
• oslibmsg.h (modified) (3 diffs)
• oslibmsgtranslate.cpp (modified) (3 diffs)
• pmframe.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (3 diffs)
• syscolor.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.13 2000-03-23 19:24:25 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.14 2000-05-12 18:09:39 sandervl Exp $ */
 
 /*
@@ -333 +333 @@
   HOOKDATA **prevHook;
   THDB     *thdb;
-  VMutex   *hookMutex;
 
     dprintf(("Removing hook %08x\n", data));
@@ -358 +357 @@
                 return FALSE;
         }
-        hookMutex = &threadHookMutex;
-        hookMutex->enter();
+        threadHookMutex.enter();
         prevHook = (HOOKDATA **)&thdb->hooks[data->id - WH_MINHOOK];
     }
     else {
-        hookMutex = &systemHookMutex;
-        hookMutex->enter();
+        systemHookMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalHookMutex);
         prevHook = (HOOKDATA **)&HOOK_systemHooks[data->id - WH_MINHOOK];
     }
@@ -371 +368 @@
 
     if (!prevHook) {
-        hookMutex->leave();
+        if (data->ownerThread) {
+                threadHookMutex.leave();
+        }
+        else    systemHookMutex.leave(&hGlobalHookMutex);
+
         return FALSE;
     }
     *prevHook = (HOOKDATA *)data->next;
-    hookMutex->leave();
+
+    if (data->ownerThread) {
+         threadHookMutex.leave();
+    }
+    else systemHookMutex.leave(&hGlobalHookMutex);
 
     HeapFree(GetProcessHeap(), 0, (LPVOID)data );

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.56 2000-05-03 20:59:41 achimha Exp $ */
+/* $Id: dc.cpp,v 1.57 2000-05-12 18:09:39 sandervl Exp $ */
 
 /*
@@ -1126 +1126 @@
    {
         //TODO: SvL: pingpong.exe doesn't have RDW_NOERASE, but doesn't want WM_ERASEBKGND msgs
-        if (redraw & RDW_ERASE_W)
-            wnd->setEraseBkgnd (TRUE);
+        if (redraw & RDW_ERASE_W) {
+             wnd->setEraseBkgnd(TRUE);
+        }
 
         if (!pRect && !hrgn)
@@ -1212 +1213 @@
    BOOL result;
 
+   if(pRect) {
+        dprintf(("InvalidateRect %x (%d,%d)(%d,%d) erase=%d", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom, erase));
+   }
+   else dprintf(("InvalidateRect %x NULL erase=%d", hwnd, erase));
    result = RedrawWindow (hwnd, pRect, NULLHANDLE,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
@@ -1224 +1229 @@
    BOOL result;
 
+   dprintf(("InvalidateRgn %x %x erase=%d", hwnd, hrgn, erase));
    result = RedrawWindow (hwnd, NULL, hrgn,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.32 2000-04-13 18:50:44 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.33 2000-05-12 18:09:40 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -99 +99 @@
 #define MAX_MSGTRANSTAB (sizeof(MsgTransTab)/sizeof(MsgTransTab[0]))
 
-QMSG *MsgThreadPtr = 0;
-
 LRESULT WIN32API SendMessageA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibInitMsgQueue()
-{
-   if(DosAllocThreadLocalMemory(sizeof(QMSG)/sizeof(ULONG), (PULONG *)&MsgThreadPtr) != 0)
-   {
-        dprintf(("OSLibInitMsgQueue: local thread memory alloc failed!!"));
-        DebugInt3();
-        return FALSE;
-   }
-   return TRUE;
-}
 //******************************************************************************
 //******************************************************************************
@@ -176 +162 @@
   //  WinToOS2MsgTranslate(msg, &qmsg, isUnicode);
 
-  if(msg->time == MsgThreadPtr->time || msg->hwnd == 0) {
-        memcpy(&os2msg, MsgThreadPtr, sizeof(QMSG));
-        MsgThreadPtr->time = -1;
+  if(!memcmp(msg, &thdb->winmsg, sizeof(MSG)) || msg->hwnd == 0) {
+        memcpy(&os2msg, &thdb->os2msg, sizeof(QMSG));
+        thdb->os2msg.time = -1;
+        thdb->winmsg.time = -1;
         if(msg->hwnd) {
                 thdb->nrOfMsgs = 1;
@@ -185 +172 @@
         }
         if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
-                memset(MsgThreadPtr, 0, sizeof(*MsgThreadPtr));
+                memset(&thdb->os2msg, 0, sizeof(thdb->os2msg));
+                memset(&thdb->winmsg, 0, sizeof(thdb->winmsg));
                 return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
         }
@@ -235 +223 @@
         thdb->fTranslated = FALSE;
         memcpy(pMsg, &thdb->msgWCHAR, sizeof(MSG));
-        MsgThreadPtr->msg  = 0;
-        MsgThreadPtr->hwnd = 0;
+        thdb->os2msg.msg  = 0;
+        thdb->os2msg.hwnd = 0;
         return (pMsg->message != WINWM_QUIT);
   }
@@ -261 +249 @@
 
   OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode, MSG_REMOVE);
-  memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
+  memcpy(&thdb->os2msg, &os2msg, sizeof(QMSG));
+  memcpy(&thdb->winmsg, pMsg, sizeof(MSG));
 
   if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
@@ -317 +306 @@
         if(fRemove & PM_REMOVE_W) {
             thdb->fTranslated = FALSE;
-            MsgThreadPtr->msg  = 0;
-            MsgThreadPtr->hwnd = 0;
+            thdb->os2msg.msg  = 0;
+            thdb->os2msg.hwnd = 0;
         }
         memcpy(pMsg, &thdb->msgWCHAR, sizeof(MSG));
@@ -343 +332 @@
   //TODO: This is not safe! There's no guarantee this message will be dispatched and it might overwrite a previous message
   if(fRemove & PM_REMOVE_W) {
-        memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
+        memcpy(&thdb->os2msg, &os2msg, sizeof(QMSG));
+        memcpy(&thdb->winmsg, pMsg, sizeof(MSG));
   }
 

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.12 2000-01-18 20:08:11 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.13 2000-05-12 18:09:40 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -21 +21 @@
 BOOL  OS2ToWinMsgTranslate(void *pThdb, QMSG *os2Msg, MSG *winMsg, BOOL isUnicode, BOOL fMsgRemoved);
 void  WinToOS2MsgTranslate(MSG *winMsg, QMSG *os2Msg, BOOL isUnicode);
-
-extern QMSG *MsgThreadPtr;
 
 #endif
@@ -35 +33 @@
 
 ULONG OSLibWinQueryMsgTime();
-BOOL  OSLibInitMsgQueue();
 BOOL  OSLibWinWaitMessage();
 BOOL  OSLibWinInSendMessage();

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.29 2000-05-02 20:50:49 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.30 2000-05-12 18:09:40 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -865 +865 @@
     //NOTE: These actually need to be posted so that the next message retrieved by GetMessage contains
     //      the newly generated WM_CHAR message.
-    if(!thdb->fTranslated && MsgThreadPtr->msg == WM_CHAR && !((SHORT1FROMMP(MsgThreadPtr->mp1) & KC_KEYUP) == KC_KEYUP))
+    if(!thdb->fTranslated && thdb->os2msg.msg == WM_CHAR && !((SHORT1FROMMP(thdb->os2msg.mp1) & KC_KEYUP) == KC_KEYUP))
     {//TranslatedMessage was called before DispatchMessage, so queue WM_CHAR message
-            ULONG fl = SHORT1FROMMP(MsgThreadPtr->mp1);
+            ULONG fl = SHORT1FROMMP(thdb->os2msg.mp1);
             MSG extramsg;
 
             memcpy(&extramsg, msg, sizeof(MSG));
-            extramsg.wParam = SHORT1FROMMP(MsgThreadPtr->mp2);
+            extramsg.wParam = SHORT1FROMMP(thdb->os2msg.mp2);
             extramsg.lParam = 0;
 
@@ -881 +881 @@
                 if(msg->wParam)
                         extramsg.wParam = msg->wParam;
-                else    extramsg.wParam = SHORT2FROMMP(MsgThreadPtr->mp2);
+                else    extramsg.wParam = SHORT2FROMMP(thdb->os2msg.mp2);
             }
 

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.52 2000-04-29 18:28:38 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.53 2000-05-12 18:09:41 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -229 +229 @@
     {
         dprintf(("PMFRAME: WM_PAINT"));
-        if (win32wnd->getStyle() & WS_MINIMIZE_W)
-         goto RunDefFrameProc;
-        if (win32wnd->IsWindowCreated())
-          win32wnd->MsgNCPaint();
+        if(win32wnd->getStyle() & WS_MINIMIZE_W)
+                goto RunDefFrameProc;
+        if(win32wnd->IsWindowCreated())
+                win32wnd->MsgNCPaint();
+
         goto RunDefWndProc;
     }
@@ -444 +445 @@
 
     case WM_ERASEBACKGROUND:
-        break;
+    {
+        dprintf(("PMFRAME: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
+        RestoreOS2TIB();
+        return (MRESULT)FALSE;
+    }
 
     case WM_CALCVALIDRECTS:

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.89 2000-04-15 15:11:13 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.90 2000-05-12 18:09:41 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -140 +140 @@
 
    dprintf(("InitPM: Desktop (%d,%d)", ScreenWidth, ScreenHeight));
-   return OSLibInitMsgQueue();
+   return TRUE;
 } /* End of main */
 //******************************************************************************
@@ -439 +439 @@
 
     case WM_PAINT:
+    {
+//     RECTL rectl;
+
         dprintf(("OS2: WM_PAINT"));
         win32wnd->DispatchMsgA(pWinMsg);
-        goto RunDefWndProc;
+        //SvL: Not calling the default window procedure causes all sorts of
+        //     strange problems (redraw & hanging app)
+//      WinQueryUpdateRect(hwnd, &rectl);
+//        if(rectl.xLeft == 0 && rectl.yTop == 0 && rectl.xRight == 0 && rectl.yBottom == 0) {
+//              RestoreOS2TIB();
+//              return (MRESULT)FALSE;
+//      }
+//      dprintf(("Update rectangle (%d,%d)(%d,%d) not empty, msg %x", rectl.xLeft, rectl.yTop, rectl.xRight, rectl.yBottom, pWinMsg->message));
+        goto RunDefWndProc;
+    }
 
     case WM_CONTEXTMENU:

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.20 2000-02-23 17:05:16 cbratschi Exp $ */
+/* $Id: syscolor.cpp,v 1.21 2000-05-12 18:09:41 sandervl Exp $ */
 
 /*
@@ -229 +229 @@
     }
 
-    return SetSysColors(nChanges, lpSysColor, lpColorValues);
+//SvL: ???
+////////    return SetSysColors(nChanges, lpSysColor, lpColorValues);
 
     /* Send WM_SYSCOLORCHANGE message to all windows */

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.186 2000-05-10 13:14:43 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.187 2000-05-12 18:09:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1056 +1056 @@
     RECT client = rectClient;
 
-////    mapWin32Rect(getParent() ? getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,OS2HwndFrame,&client);
         if ((rect.left >= client.left) && (rect.left < client.right) &&
            (rect.right >= client.left) && (rect.right < client.right) &&