Changeset 5810 for trunk/src/gdi32

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/gdi32

Files:

• gdi32.DEF (modified) (2 diffs)
• text.cpp (modified) (4 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