Changeset 9532 for trunk/src

Timestamp:

Dec 20, 2002, 11:38:25 AM (23 years ago)

Author:

sandervl

Message:

Removed IOPL override code

Location:

trunk/src/ddraw

Files:

• OS2UTIL.CPP (modified) (3 diffs)
• ddraw2d.cpp (modified) (5 diffs)
• makefile (modified) (2 diffs)

trunk/src/ddraw/OS2UTIL.CPP

@@ -1 @@
-/* $Id: OS2UTIL.CPP,v 1.14 2002-12-04 15:21:40 sandervl Exp $ */
+/* $Id: OS2UTIL.CPP,v 1.15 2002-12-20 10:38:25 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
 int InitIO()
 {
+#if 0
   WORD  gdt;
   HRESULT rc;
@@ -101 +102 @@
 
   SetFS(sel);
+#endif
   return 0;
 }

trunk/src/ddraw/ddraw2d.cpp

@@ -1 @@
-/* $Id: ddraw2d.cpp,v 1.3 2002-12-04 16:45:06 sandervl Exp $ */
+/* $Id: ddraw2d.cpp,v 1.4 2002-12-20 10:38:25 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 #include <winerror.h>
 #include <options.h>
-#include "cio2.h"
 #include "os2util.h"
 #include "os2fsdd.h"
@@ -266 +265 @@
   if (!fNoFSDD && PROFILE_GetOdinIniBool(ODINDDRAW_SECTION, "Fullscreen", FALSE)) 
   {
+#if 0
       rc = InitIO();
 
@@ -276 +276 @@
           dprintf(("DDRAW: IOPL 3!"));
       }
+#endif
 
       rc = LoadPMIService();
@@ -1905 +1906 @@
 }
 //******************************************************************************
-//Backwards compatibility, what's that??
 //******************************************************************************
 HRESULT WIN32API DrawSetDisplayMode2(THIS This, DWORD dwWidth, DWORD dwHeight,

trunk/src/ddraw/makefile

@@ -1 @@
-# $Id: makefile,v 1.30 2002-12-04 10:35:01 sandervl Exp $
+# $Id: makefile,v 1.31 2002-12-20 10:38:25 sandervl Exp $
 
 #
@@ -24 +24 @@
 $(OBJDIR)\oslibgpi.obj \
 $(OBJDIR)\ddraw3d.obj \
-$(OBJDIR)\iccio1.obj \
+##$(OBJDIR)\iccio1.obj \
 $(OBJDIR)\asmutil.obj \
 $(OBJDIR)\surface.obj \