Changeset 2560 for trunk/src

Timestamp:

Jan 29, 2000, 3:23:33 PM (26 years ago)

Author:

sandervl

Message:

Call DrawTextA in uitools.cpp, not Open32's DrawText.

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• text.cpp (modified) (3 diffs)
• uitools.cpp (modified) (3 diffs)
• window.cpp (modified) (6 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.38 2000-01-28 22:25:59 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.39 2000-01-29 14:23:32 sandervl Exp $ */
 
 /*
@@ -445 +445 @@
    }
 
-   if(hWnd == 0x6800003a) {
-        hwnd = 0x6800003a;
-   }
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 

trunk/src/user32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.5 2000-01-18 20:10:46 sandervl Exp $ */
+/* $Id: text.cpp,v 1.6 2000-01-29 14:23:33 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
 INT WIN32API DrawTextA(HDC hDC,LPCSTR lpString,INT nCount,PRECT lpRect,UINT nFormat)
 {
-  dprintf(("USER32: DrawTextA %x",hDC));
-
+ int bla;
+
+  dprintf(("USER32: DrawTextA %x %s %d (%d,%d)(%d,%d) %x",hDC, lpString, nCount, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, nFormat));
+
+  if(nFormat == 0x828) {
+        bla = 1;
+  }
   return InternalDrawTextExA(hDC,lpString,nCount,lpRect,nFormat,NULL,FALSE);
 }
@@ -64 +69 @@
 INT WIN32API DrawTextExA(HDC hdc,LPCSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams)
 {
-  dprintf(("USER32:DrawTextExA %x\n",hdc));
+  dprintf(("USER32: DrawTextExA %x %s %d (%d,%d)(%d,%d) %x",hdc, lpchText, cchText, lprc->left, lprc->top, lprc->right, lprc->bottom, dwDTFormat));
 
   return InternalDrawTextExA(hdc,lpchText,cchText,lprc,dwDTFormat,lpDTParams,TRUE);

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.21 2000-01-18 20:10:47 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.22 2000-01-29 14:23:33 sandervl Exp $ */
 /*
  * User Interface Functions
@@ -2003 +2003 @@
 
     if (str)
-      O32_DrawText (hdc,
+      DrawTextA (hdc,
                     str,
                     -1,
@@ -2017 +2017 @@
                                 128);
 
-      O32_DrawText (hdc,
+      DrawTextA (hdc,
                     szText,
                     nLen,

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.53 2000-01-28 22:26:01 sandervl Exp $ */
+/* $Id: window.cpp,v 1.54 2000-01-29 14:23:33 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -654 +654 @@
       window = windowDesktop;
 
+
     if(!window) {
         dprintf(("GetWindowRect, window %x not found", hwnd));
@@ -665 +666 @@
     *pRect = *window->getWindowRect(); //always in screen coordinates
 
+    if(hwnd == 0x68000034) {
+        window = 0;
+    }
     dprintf(("GetWindowRect %x (%d,%d) (%d,%d)", hwnd, pRect->left, pRect->top, pRect->right, pRect->bottom));
     return TRUE;
@@ -917 +921 @@
     Win32BaseWindow *wnd;
     PRECT rcl;
-
-    dprintf(("ScreenToClient %x (%d,%d)\n", hwnd, pt->x, pt->y));
+    BOOL rc;
 
     if (!hwnd) return (TRUE);
     wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
-    if (!wnd) return (TRUE);
-    return mapWin32Point(OSLIB_HWND_DESKTOP,wnd->getOS2WindowHandle(),(OSLIBPOINT*)pt);
+    if (!wnd) {
+        dprintf(("warning: ScreenToClient: window %x not found!", hwnd));
+        return (TRUE);
+    }
+#ifdef DEBUG
+    POINT tmp = *pt;
+#endif
+    rc = mapWin32Point(OSLIB_HWND_DESKTOP, wnd->getOS2WindowHandle(), (OSLIBPOINT*)pt);
+    dprintf(("ScreenToClient %x (%d,%d) -> (%d,%d)", hwnd, tmp.x, tmp.y, pt->x, pt->y));
+    return rc;
 }
 //******************************************************************************
@@ -1035 +1046 @@
     Win32BaseWindow *wnd;
     PRECT rcl;
-
-    dprintf(("ClientToScreen (%d,%d)\n", pt->x, pt->y));
+    BOOL rc;
+
     if (!hwnd) {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -1043 +1054 @@
     wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
     if (!wnd) {
+        dprintf(("warning: ClientToScreen window %x not found!", hwnd));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return (FALSE);
     }
-    return mapWin32Point(wnd->getOS2WindowHandle(),OSLIB_HWND_DESKTOP,(OSLIBPOINT*)pt);
+#ifdef DEBUG
+    POINT tmp = *pt;
+#endif
+    rc = mapWin32Point(wnd->getOS2WindowHandle(),OSLIB_HWND_DESKTOP,(OSLIBPOINT*)pt);
+    dprintf(("ClientToScreen %x (%d,%d) -> (%d,%d)", hwnd, tmp.x, tmp.y, pt->x, pt->y));
+    
+    return rc;
 }
 //******************************************************************************