Changeset 4170 for trunk/src

Timestamp:

Sep 3, 2000, 11:30:35 AM (25 years ago)

Author:

sandervl

Message:

WinDrawTabbedText fs corruption fixed

File:

• trunk/src/gdi32/oslibgpi.cpp (modified) (4 diffs)

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.6 2000-08-14 15:51:20 cbratschi Exp $ */
+/* $Id: oslibgpi.cpp,v 1.7 2000-09-03 09:30:35 sandervl Exp $ */
 
 /*
@@ -52 +52 @@
 }
 
+LONG APIENTRY WinDrawTabbedText(HPS hps,LONG cchText,LONG lTabWidth,PCH lpchText,PRECTL prcl,LONG clrFore,LONG clrBack,ULONG flCmd);
+
+inline LONG _WinDrawTabbedText(HPS hps,LONG cchText,LONG lTabWidth,PCH lpchText,PRECTL prcl,LONG clrFore,LONG clrBack,ULONG flCmd)
+{
+ LONG yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = WinDrawTabbedText(hps,cchText,lTabWidth,lpchText,prcl,clrFore,clrBack,flCmd);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+#undef  WinDrawTabbedText
+#define WinDrawTabbedText _WinDrawTabbedText
+
 void inline swap(LONG &a,LONG &b)
 {
@@ -292 +308 @@
 }
 
-LONG APIENTRY WinDrawTabbedText(HPS hps,LONG cchText,LONG lTabWidth,PCH lpchText,PRECTL prcl,LONG clrFore,LONG clrBack,ULONG flCmd);
-
 LONG OSLibWinDrawTabbedText(PVOID pHps,LONG cchText,LONG lTabs,LPCSTR lpchText,PVOID prcl,LONG clrFore,LONG clrBack,ULONG flCmd)
 {
@@ -325 +339 @@
   return yyrc;
 }
+
 
 BOOL OSLibGpiEndPath(PVOID pHps)