Changeset 3373 for trunk/src

Timestamp:

Apr 13, 2000, 8:51:43 PM (25 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• window.cpp (modified) (3 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.31 2000-03-29 17:16:06 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.32 2000-04-13 18:50:44 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -180 +180 @@
         MsgThreadPtr->time = -1;
         if(msg->hwnd) {
-            thdb->nrOfMsgs = 1;
-            thdb->msgstate++; //odd -> next call to our PM window handler should dispatch the translated msg
-            memcpy(&thdb->msg, msg, sizeof(MSG));
+                thdb->nrOfMsgs = 1;
+                thdb->msgstate++; //odd -> next call to our PM window handler should dispatch the translated msg
+                memcpy(&thdb->msg, msg, sizeof(MSG));
         }
         if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
-            return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
+                memset(MsgThreadPtr, 0, sizeof(*MsgThreadPtr));
+                return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
         }
         //SvL: Don't dispatch messages sent by PostThreadMessage (correct??)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.59 2000-03-14 20:04:09 sandervl Exp $ */
+/* $Id: window.cpp,v 1.60 2000-04-13 18:50:44 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -107 +107 @@
     cs.dwExStyle      = exStyle;
     if(HIWORD(className)) {
-         dprintf(("CreateWindowExA: class %s parent %x (%d,%d) (%d,%d), %x %x", className, parent, x, y, width, height, style, exStyle));
-    }
-    else dprintf(("CreateWindowExA: class %d parent %x (%d,%d) (%d,%d), %x %x", className, parent, x, y, width, height, style, exStyle));
+         dprintf(("CreateWindowExA: class %s parent %x (%d,%d) (%d,%d), %x %x menu=%x", className, parent, x, y, width, height, style, exStyle, menu));
+    }
+    else dprintf(("CreateWindowExA: class %d parent %x (%d,%d) (%d,%d), %x %x menu=%x", className, parent, x, y, width, height, style, exStyle, menu));
 
     if(!strcmpi(className, MDICLIENTCLASSNAMEA)) {
@@ -372 +372 @@
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("IsChild, window %x not found", hwnd));
+        dprintf(("IsChild %x, window %x not found", hwndParent, hwnd));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;