Changeset 5796 for trunk/src

Timestamp:

May 24, 2001, 9:27:00 PM (24 years ago)

Author:

sandervl

Message:

minor logging updates

Location:

trunk/src/user32

Files:

• text.cpp (modified) (3 diffs)
• win32dlg.cpp (modified) (3 diffs)

trunk/src/user32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.10 2000-12-17 15:04:11 sandervl Exp $ */
+/* $Id: text.cpp,v 1.11 2001-05-24 19:26:59 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 INT WIN32API DrawTextW(HDC hDC,LPCWSTR lpString,INT nCount,PRECT lpRect,UINT nFormat)
 {
-  dprintf(("USER32: DrawTextW %x",hDC));
+  dprintf(("USER32: DrawTextA %x %ls %d (%d,%d)(%d,%d) %x",hDC, lpString, nCount, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, nFormat));
 
   return InternalDrawTextExW(hDC,lpString,nCount,lpRect,nFormat,NULL,FALSE);
@@ -46 +46 @@
 int WIN32API DrawTextExW(HDC hdc,LPWSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams)
 {
-  dprintf(("USER32: DrawTextExW %x",hdc));
+  dprintf(("USER32: DrawTextExA %x %ls %d (%d,%d)(%d,%d) %x",hdc, lpchText, cchText, lprc->left, lprc->top, lprc->right, lprc->bottom, dwDTFormat));
 
   return InternalDrawTextExW(hdc,lpchText,cchText,lprc,dwDTFormat,lpDTParams,TRUE);

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.63 2001-05-17 09:50:30 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.64 2001-05-24 19:27:00 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -83 +83 @@
         /* and must be converted to pixels first */
         /* (see CreateFont() documentation in the Windows SDK).   */
-        HDC dc = GetDC(0);
-        int pixels = dlgInfo.pointSize * GetDeviceCaps(dc , LOGPIXELSY)/72;
-        ReleaseDC(0, dc);
+        int pixels;
+        if (((short)dlgInfo.pointSize) < 0)
+            pixels = -((short)dlgInfo.pointSize);
+        else
+        {
+            HDC hdc = GetDC(0);
+            pixels = dlgInfo.pointSize * GetDeviceCaps(hdc, LOGPIXELSY)/72;
+            ReleaseDC(0, hdc);
+        }
 
         hUserFont = CreateFontW(-pixels, 0, 0, 0,
@@ -496 +502 @@
 BOOL Win32Dialog::getCharSize( HFONT hUserFont, SIZE * pSize )
 {
-    HDC  hDC = GetDC(0);
+    HDC  hDC = CreateCompatibleDC(0);
     BOOL Success = getCharSizeFromDC( hDC, hUserFont, pSize );
-    ReleaseDC(0, hDC);
+    DeleteDC(hDC);
     return Success;
 }