Changeset 14988

Timestamp:

Oct 4, 2000, 9:35:31 PM (25 years ago)

Author:

sandervl

Message:

more logging

Location:

tags/trunk/src/user32

Files:

• loadres.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbasepos.cpp (modified) (2 diffs)
• windlg.cpp (modified) (7 diffs)

tags/trunk/src/user32/loadres.cpp ¶

@@ -1 @@
-/* $Id: loadres.cpp,v 1.29 2000-05-28 16:43:45 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.30 2000-10-04 19:35:30 sandervl Exp $ */
 
 /*
@@ -410 +410 @@
     {
         hMapping = VIRTUAL_MapFileA( lpszName, (LPVOID *)&ptr, TRUE);
-        if (hMapping == INVALID_HANDLE_VALUE) return 0;
+        if (hMapping == INVALID_HANDLE_VALUE) {
+                //TODO: last err set to ERROR_OPEN_FAILED if file not found; correct??
+                dprintf(("LoadBitmapA: failed to load file %s (lasterr=%x)", lpszName, GetLastError()));
+                return 0;
+        }
         info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER));
     }

tags/trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.103 2000-09-05 19:20:34 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.104 2000-10-04 19:35:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1062 +1062 @@
         /* if successful copy final position back */
         if(!WinEqualRect(0, &rcl, &track.rclTrack)) {
+                dprintf(("FrameTrackFrame: new (os/2) window rect: (%d,%d)(%d,%d)", track.rclTrack.xLeft, track.rclTrack.yBottom, track.rclTrack.xRight - track.rclTrack.xLeft, track.rclTrack.yTop - track.rclTrack.yBottom));
                 if(flags == TF_MOVE) {
                         WinSetWindowPos(win32wnd->getOS2WindowHandle(), 

tags/trunk/src/user32/win32wbasepos.cpp ¶

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.15 2000-06-07 14:51:32 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.16 2000-10-04 19:35:31 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -139 +139 @@
                 winposCopy = *winpos;
                 params.rgrc[1] = *oldWindowRect;
+                params.rgrc[2] = *oldClientRect;
                 //client rectangel must be in parent coordinates
-                OffsetRect(oldClientRect, rectWindow.left, rectWindow.top);
-
-                params.rgrc[2] = *oldClientRect;
+                OffsetRect(&params.rgrc[2], rectWindow.left, rectWindow.top);
+
                 params.lppos = &winposCopy;
         }

tags/trunk/src/user32/windlg.cpp ¶

@@ -1 @@
-/* $Id: windlg.cpp,v 1.17 2000-07-18 18:35:40 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.18 2000-10-04 19:35:31 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -210 +210 @@
 {
   Win32Dialog *dialog;
+#ifdef DEBUG
+  BOOL rc;
+  RECT dlgRect = *rect;
+#endif
 
     dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwndDlg);
@@ -217 +221 @@
         return 0;
     }
-    dprintf(("USER32: MapDialogRect\n"));
+#ifdef DEBUG
+    rc = dialog->MapDialogRect(rect);
+    dprintf(("USER32: MapDialogRect %x (%d,%d)(%d,%d) -> (%d,%d)(%d,%d)", hwndDlg, dlgRect.left, dlgRect.top, dlgRect.right, dlgRect.bottom, rect->left, rect->top, rect->right, rect->bottom));
+    return rc;
+#else
+    dprintf(("USER32: MapDialogRect %x (%d,%d)(%d,%d)", hwndDlg, rect->left, rect->top, rect->right, rect->bottom));
     return dialog->MapDialogRect(rect);
+#endif
 }
 //******************************************************************************
@@ -277 +287 @@
         return 0;
     }
-    dprintf(("USER32:  GetDlgCtrlID\n"));
+    dprintf(("USER32: GetDlgCtrlID %x", hwnd));
     return dlgcontrol->getWindowId();
 }
@@ -292 +302 @@
         return 0;
     }
-    dprintf(("USER32: EndDialog\n"));
+    dprintf(("USER32: EndDialog %x %d", hwnd, retval));
     return dialog->endDialog(retval);
 }
@@ -299 +309 @@
 BOOL WIN32API CheckDlgButton( HWND hwnd, int id, UINT check)
 {
-    dprintf(("USER32:  CheckDlgButton\n"));
+    dprintf(("USER32: CheckDlgButton %x %d %d", hwnd, id, check));
 
     return (BOOL)SendDlgItemMessageA(hwnd, id, BM_SETCHECK, check,0);
@@ -307 +317 @@
 BOOL WIN32API CheckRadioButton( HWND hDlg, UINT nIDFirstButton, UINT nIDLastButton, UINT  nIDCheckButton)
 {
-    dprintf(("USER32:  CheckRadioButton\n"));
+    dprintf(("USER32: CheckRadioButton %x %d %d %d", hDlg, nIDFirstButton, nIDLastButton, nIDCheckButton));
 
     //CB: check radio buttons in interval