Changeset 7808 for trunk/src

Timestamp:

Feb 6, 2002, 5:31:49 PM (24 years ago)

Author:

sandervl

Message:

minor logging updates

Location:

trunk/src/user32

Files:

• message.cpp (modified) (6 diffs)
• window.cpp (modified) (2 diffs)
• wndmsg.cpp (modified) (4 diffs)

trunk/src/user32/message.cpp

@@ -1 @@
-/* $Id: message.cpp,v 1.1 2002-02-05 17:58:59 sandervl Exp $ */
+/* $Id: message.cpp,v 1.2 2002-02-06 16:31:48 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -29 +29 @@
 #include "oslibmsg.h"
 #include "hook.h"
+#include "wndmsg.h"
 
 #define DBG_LOCALLOG    DBG_message
@@ -263 +264 @@
 {
     LRESULT res = 0;
+    DebugPrintMessage(hwnd, msg, wParam, lParam, FALSE, FALSE);
     SendMessageTimeoutA(hwnd, msg, wParam, lParam, SMTO_NORMAL, INFINITE, (LPDWORD)&res);
     return res;
@@ -271 +273 @@
 {
     LRESULT res = 0;
+    DebugPrintMessage(hwnd, msg, wParam, lParam, TRUE, FALSE);
     SendMessageTimeoutW(hwnd, msg, wParam, lParam, SMTO_NORMAL, INFINITE, (LPDWORD)&res);
     return res;
@@ -314 +317 @@
     hwndOS2 = window->getOS2WindowHandle();
     RELEASE_WNDOBJ(window);
-    dprintf(("PostMessageA, %x %x %x %x", hwnd, msg, wParam, lParam));
+    DebugPrintMessage(hwnd, msg, wParam, lParam, FALSE, TRUE);
     return OSLibPostMessage(hwndOS2, msg, wParam, lParam, FALSE);
 }
@@ -349 +352 @@
     hwndOS2 = window->getOS2WindowHandle();
     RELEASE_WNDOBJ(window);
-    dprintf(("PostMessageW, %x %x %x %x", hwnd, msg, wParam, lParam));
+    DebugPrintMessage(hwnd, msg, wParam, lParam, TRUE, TRUE);
     return OSLibPostMessage(hwndOS2, msg, wParam, lParam, TRUE);
 }

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.115 2002-01-12 14:09:32 sandervl Exp $ */
+/* $Id: window.cpp,v 1.116 2002-02-06 16:31:48 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1917 +1917 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(DWORD,   GetWindowThreadProcessId,
-              HWND,    hWnd,
-              PDWORD,  lpdwProcessId)
-{
-  hWnd = Win32ToOS2Handle(hWnd);
-  return O32_GetWindowThreadProcessId(hWnd,lpdwProcessId);
+DWORD WIN32API GetWindowThreadProcessId(HWND hwnd, PDWORD lpdwProcessId)
+{
+    DWORD dwThreadId;
+
+    dwThreadId = O32_GetWindowThreadProcessId(Win32ToOS2Handle(hwnd), lpdwProcessId);
+    if(dwThreadId == 0) {
+        dprintf(("!WARNING! GetWindowThreadProcessId %x failed!!", hwnd));
+    }
+    return dwThreadId;
 }
 //******************************************************************************

trunk/src/user32/wndmsg.cpp

@@ -1 @@
-/* $Id: wndmsg.cpp,v 1.16 2001-10-08 23:24:43 phaller Exp $ */
+/* $Id: wndmsg.cpp,v 1.17 2002-02-06 16:31:49 sandervl Exp $ */
 /*
  * Win32 window message text function for OS/2
@@ -765 +765 @@
 }
 
-
-void DebugPrintMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode, BOOL fInternalMsg)
+#include <commctrl.h>
+
+void DebugPrintMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode, BOOL fPostMessage)
 {
  char unicode;
@@ -778 +779 @@
         if(PostSpyMessage(hwnd, Msg, wParam, lParam) == FALSE)
         {
-            if(fInternalMsg) {
-                    dprintf(("SendInternalMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));
+            if(fPostMessage) {
+                    dprintf(("PostMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));
             }
             else    dprintf(("SendMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));
@@ -785 +786 @@
   }
   else {
-        if(fInternalMsg) {
-                dprintf2(("SendInternalMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));
+        if(fPostMessage) {
+                dprintf2(("PostMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));
         }
         else    dprintf2(("SendMessage%c %s for %x %x %x", unicode, GetMsgText(Msg), hwnd, wParam, lParam));
   }
+//testestest
+  if(Msg == WM_NOTIFY && (hwnd == 0x6800000a || hwnd == 0x6800000c)) {
+      LPNMLISTVIEW pHdr = (LPNMLISTVIEW)lParam;
+      dprintf(("WM_NOTIFY %x %x %x", pHdr->hdr.hwndFrom, pHdr->hdr.idFrom, pHdr->hdr.code));
+  }
+//testestest
 }