Changeset 4492 for trunk/src

Timestamp:

Oct 17, 2000, 12:26:53 AM (25 years ago)

Author:

sandervl

Message:

fs fixes for font & line callbacks

Location:

trunk/src/gdi32

Files:

• CALLBACK.CPP (modified) (3 diffs)
• font.cpp (modified) (7 diffs)
• gdi32.cpp (modified) (2 diffs)

trunk/src/gdi32/CALLBACK.CPP

@@ -1 @@
-/* $Id: CALLBACK.CPP,v 1.4 2000-02-16 14:18:09 sandervl Exp $ */
+/* $Id: CALLBACK.CPP,v 1.5 2000-10-16 22:26:53 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include "misc.h"
 #include "callback.h"
+#include <wprocess.h>
 
 #define DBG_LOCALLOG    DBG_callback
@@ -43 +44 @@
 {
  LineDDAProcCallback *me = (LineDDAProcCallback *)lpData;
+ USHORT selTIB = SetWin32TIB(); // save current FS selector and set win32 sel
 
   me->pCallback(X, Y, me->lpUserData);
+  SetFS(selTIB);           // switch back to the saved FS selector
   return;
 }

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.13 2000-10-01 12:06:32 sandervl Exp $ */
+/* $Id: font.cpp,v 1.14 2000-10-16 22:26:53 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #include <heapstring.h>
 #include <win\options.h>
+#include <wprocess.h>
 
 #define DBG_LOCALLOG    DBG_font
@@ -271 +272 @@
  ENUMUSERDATA *lpEnumData = (ENUMUSERDATA *)arg4;
  FONTENUMPROCA proc = (FONTENUMPROCA)lpEnumData->userProc;
-
-  return proc(lpLogFont, lpTextM, arg3, lpEnumData->userData);
+ USHORT selTIB = SetWin32TIB(); // save current FS selector and set win32 sel
+
+  int rc = proc(lpLogFont, lpTextM, arg3, lpEnumData->userData);
+  SetFS(selTIB);           // switch back to the saved FS selector
+  return rc;
 }
 //******************************************************************************
@@ -283 +287 @@
  ENUMLOGFONTW LogFont;
  NEWTEXTMETRICW textM;
+ USHORT selTIB = SetWin32TIB(); // save current FS selector and set win32 sel
  int rc;
 
@@ -316 +321 @@
   textM.ntmAvgWidth = 0;
 
-  return proc(&LogFont, &textM, arg3, lpEnumData->userData);
+  rc = proc(&LogFont, &textM, arg3, lpEnumData->userData);
+  SetFS(selTIB);           // switch back to the saved FS selector
+  return rc;
 }
 //******************************************************************************
@@ -328 +335 @@
  ENUMLOGFONTEXA logFont;
  NEWTEXTMETRICEXA textM;
+ USHORT selTIB = SetWin32TIB(); // save current FS selector and set win32 sel
 
   memcpy(&logFont, lpLogFont, sizeof(ENUMLOGFONTA));
@@ -335 +343 @@
 
   dprintf(("EnumFontProcExA %s", logFont.elfLogFont.lfFaceName));
-  return proc(&logFont, &textM, arg3, lpEnumData->userData);
+
+  int rc = proc(&logFont, &textM, arg3, lpEnumData->userData);
+  SetFS(selTIB);           // switch back to the saved FS selector
+  return rc;
 }
 //******************************************************************************

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.55 2000-09-08 04:31:48 phaller Exp $ */
+/* $Id: gdi32.cpp,v 1.56 2000-10-16 22:26:53 sandervl Exp $ */
 
 /*
@@ -1053 +1053 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API Polygon( HDC arg1, const POINT * arg2, int  arg3)
-{
-    dprintf(("GDI32: Polygon"));
-    return O32_Polygon(arg1, arg2, arg3);
+BOOL WIN32API Polygon( HDC hdc, const POINT *lpPoints, int count)
+{
+    dprintf(("GDI32: Polygon %x %x %d", hdc, lpPoints, count));
+    return O32_Polygon(hdc, lpPoints, count);
 }
 //******************************************************************************