Changeset 5810 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

Replaced TabbedTextOutA/W & GetTabbedTextExtentA/W with Wine version

Location:

trunk/src

Files:

• gdi32/gdi32.DEF (modified) (2 diffs)
• gdi32/text.cpp (modified) (4 diffs)
• user32/text.cpp (modified) (4 diffs)
• user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/gdi32/gdi32.DEF

@@ -1 @@
-; $Id: gdi32.DEF,v 1.16 2001-03-27 20:47:52 sandervl Exp $
+; $Id: gdi32.DEF,v 1.17 2001-05-27 19:01:14 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -367 +367 @@
     InternalDrawTextExA                                         @1205 NONAME
     InternalDrawTextExW                                         @1206 NONAME
-    InternalTabbedTextOutA                                      @1207 NONAME
-    InternalTabbedTextOutW                                      @1208 NONAME
-    InternalGetTabbedTextExtentA                                @1209 NONAME
-    InternalGetTabbedTextExtentW                                @1210 NONAME
+;;    InternalTabbedTextOutA                                      @1207 NONAME
+;;    InternalTabbedTextOutW                                      @1208 NONAME
+;;    InternalGetTabbedTextExtentA                                @1209 NONAME
+;;    InternalGetTabbedTextExtentW                                @1210 NONAME
     _setWinDeviceRegionFromPMDeviceRegion@16                    @1211 NONAME
 

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.22 2001-05-25 10:05:29 sandervl Exp $ */
+/* $Id: text.cpp,v 1.23 2001-05-27 19:01:14 sandervl Exp $ */
 
 /*
@@ -470 +470 @@
   return(rc);
 }
+#if 0
+//Replaced with Wine functions in user32\text.cpp)
 //******************************************************************************
 // CB: USER32 function, but here is the better place
@@ -488 +490 @@
     return 0;
   }
-  if ((lpString == NULL) || (nCount >  512) || ((nTabPositions > 0) && (lpnTabStopPositions == NULL)))
+  if ((lpString == NULL) || ((nTabPositions > 0) && (lpnTabStopPositions == NULL)))
   {
     SetLastError(ERROR_INVALID_PARAMETER);
     return 0;
   }
+  if(nCount > 512) {
+      DWORD cbStringNew;
+      DWORD ret1;
+      DWORD ret = 0;
+
+      dprintf(("WARNING: InternalGetTabbedTextExtentA string longer than 512 chars; splitting up"));
+      while(nCount) {
+         cbStringNew = min(500, nCount);
+
+         ret = InternalGetTabbedTextExtentA(hDC, lpString, cbStringNew, nTabPositions, lpnTabStopPositions);
+         lpString += cbStringNew;
+         nCount   -= cbStringNew;
+      }
+      return ret;
+  }
+
   //CB: Win95 supports negative values for right aligned text
   for (INT i = 0;i < nTabPositions;i++)
@@ -623 +641 @@
   return(rc);
 }
+#endif
 //******************************************************************************
 // todo: metafile support

trunk/src/user32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.11 2001-05-24 19:26:59 sandervl Exp $ */
+/* $Id: text.cpp,v 1.12 2001-05-27 19:01:35 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include "user32.h"
 #include "syscolor.h"
+#include <winnls.h>
 
 #define DBG_LOCALLOG    DBG_text
@@ -50 +51 @@
   return InternalDrawTextExW(hdc,lpchText,cchText,lprc,dwDTFormat,lpDTParams,TRUE);
 }
+#if 1
+//Based on Wine version 20010510
+/***********************************************************************
+ *           TEXT_TabbedTextOut
+ *
+ * Helper function for TabbedTextOut() and GetTabbedTextExtent().
+ * Note: this doesn't work too well for text-alignment modes other
+ *       than TA_LEFT|TA_TOP. But we want bug-for-bug compatibility :-)
+ */
+static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCSTR lpstr,
+                                INT count, INT cTabStops, const INT16 *lpTabPos16,
+                                const INT *lpTabPos32, INT nTabOrg,
+                                BOOL fDisplayText )
+{
+    INT defWidth;
+    SIZE extent;
+    int i, tabPos = x;
+    int start = x;
+
+    extent.cx = 0;
+    extent.cy = 0;
+
+    if (cTabStops == 1)
+    {
+        defWidth = lpTabPos32 ? *lpTabPos32 : *lpTabPos16;
+        cTabStops = 0;
+    }
+    else
+    {
+        TEXTMETRICA tm;
+        GetTextMetricsA( hdc, &tm );
+        defWidth = 8 * tm.tmAveCharWidth;
+    }
+
+    while (count > 0)
+    {
+        for (i = 0; i < count; i++)
+            if (lpstr[i] == '\t') break;
+        GetTextExtentPointA( hdc, lpstr, i, &extent );
+        if (lpTabPos32)
+        {
+            while ((cTabStops > 0) &&
+                   (nTabOrg + *lpTabPos32 <= x + extent.cx))
+            {
+                lpTabPos32++;
+                cTabStops--;
+            }
+        }
+        else
+        {
+            while ((cTabStops > 0) &&
+                   (nTabOrg + *lpTabPos16 <= x + extent.cx))
+            {
+                lpTabPos16++;
+                cTabStops--;
+            }
+        }
+        if (i == count)
+            tabPos = x + extent.cx;
+        else if (cTabStops > 0)
+            tabPos = nTabOrg + (lpTabPos32 ? *lpTabPos32 : *lpTabPos16);
+        else
+            tabPos = nTabOrg + ((x + extent.cx - nTabOrg) / defWidth + 1) * defWidth;
+        if (fDisplayText)
+        {
+            RECT r;
+            r.left   = x;
+            r.top    = y;
+            r.right  = tabPos;
+            r.bottom = y + extent.cy;
+            ExtTextOutA( hdc, x, y,
+                           GetBkMode(hdc) == OPAQUE ? ETO_OPAQUE : 0,
+                           &r, lpstr, i, NULL );
+        }
+        x = tabPos;
+        count -= i+1;
+        lpstr += i+1;
+    }
+    return MAKELONG(tabPos - start, extent.cy);
+}
+
+
+
+/***********************************************************************
+ *           TabbedTextOutA    (USER32.@)
+ */
+LONG WINAPI TabbedTextOutA( HDC hdc, INT x, INT y, LPCSTR lpstr, INT count,
+                            INT cTabStops, INT *lpTabPos, INT nTabOrg )
+{
+    dprintf(("USER32: TabbedTextOutA %x (%d,%d) %s %d %d %x %d", hdc, x, y, lpstr, count, cTabStops, lpTabPos, nTabOrg));
+    return TEXT_TabbedTextOut( hdc, x, y, lpstr, count, cTabStops,
+                               NULL, lpTabPos, nTabOrg, TRUE );
+}
+
+
+/***********************************************************************
+ *           TabbedTextOutW    (USER32.@)
+ */
+LONG WINAPI TabbedTextOutW( HDC hdc, INT x, INT y, LPCWSTR str, INT count,
+                            INT cTabStops, INT *lpTabPos, INT nTabOrg )
+{
+    LONG ret;
+    LPSTR p;
+    INT acount;
+    UINT codepage = CP_ACP; /* FIXME: get codepage of font charset */
+
+    acount = WideCharToMultiByte(codepage,0,str,count,NULL,0,NULL,NULL);
+    p = (LPSTR)HeapAlloc( GetProcessHeap(), 0, acount );
+    if(p == NULL) return 0; /* FIXME: is this the correct return on failure */ 
+    acount = WideCharToMultiByte(codepage,0,str,count,p,acount,NULL,NULL);
+    ret = TabbedTextOutA( hdc, x, y, p, acount, cTabStops, lpTabPos, nTabOrg );
+    HeapFree( GetProcessHeap(), 0, p );
+    return ret;
+}
+
+
+
+/***********************************************************************
+ *           GetTabbedTextExtentA    (USER32.@)
+ */
+DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count,
+                                   INT cTabStops, INT *lpTabPos )
+{
+    dprintf(("USER32: GetTabbedTextExtentA %x %s %d %d %x",hdc, lpstr, count, cTabStops, lpTabPos));
+
+    return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops,
+                               NULL, lpTabPos, 0, FALSE );
+}
+
+
+/***********************************************************************
+ *           GetTabbedTextExtentW    (USER32.@)
+ */
+DWORD WINAPI GetTabbedTextExtentW( HDC hdc, LPCWSTR lpstr, INT count,
+                                   INT cTabStops, INT *lpTabPos )
+{
+    LONG ret;
+    LPSTR p;
+    INT acount;
+    UINT codepage = CP_ACP; /* FIXME: get codepage of font charset */
+
+    acount = WideCharToMultiByte(codepage,0,lpstr,count,NULL,0,NULL,NULL);
+    p = (LPSTR)HeapAlloc( GetProcessHeap(), 0, acount );
+    if(p == NULL) return 0; /* FIXME: is this the correct failure value? */
+    acount = WideCharToMultiByte(codepage,0,lpstr,count,p,acount,NULL,NULL);
+    ret = GetTabbedTextExtentA( hdc, p, acount, cTabStops, lpTabPos );
+    HeapFree( GetProcessHeap(), 0, p );
+    return ret;
+}
+#else
 //******************************************************************************
 //******************************************************************************
@@ -82 +233 @@
   return InternalTabbedTextOutW(hdc,x,y,lpString,nCount,nTabPositions,lpnTabStopPositions,nTabOrigin);
 }
+#endif
 //******************************************************************************
 // WINE/objects/text.c

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.258 2001-05-17 09:50:30 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.259 2001-05-27 19:01:35 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1999 +1999 @@
   }
   fInternalMsg = fInternalMsgBackup;
+  dprintf2(("SendMessageA %x %x %x %x returned %d", getWindowHandle(), Msg, wParam, lParam, rc));
   return rc;
 }
@@ -2059 +2060 @@
   }
   fInternalMsg = fInternalMsgBackup;
+  dprintf2(("SendMessageW %x %x %x %x returned %d", getWindowHandle(), Msg, wParam, lParam, rc));
   return rc;
 }