Changeset 522 for trunk/src/ddraw/OS2DDRAW.CPP

Timestamp:

Aug 17, 1999, 2:44:46 PM (26 years ago)

Author:

sandervl

Message:

divewrap bugfixes + removal of FS save/restore macro calls

File:

• trunk/src/ddraw/OS2DDRAW.CPP (modified) (26 diffs)

trunk/src/ddraw/OS2DDRAW.CPP

@@ -22 +22 @@
 #include "os2DDWindow.h"
 #include "os2palset.h"
-#include <odincrt.h>
+
 #define KEY_DIRECT2 "\\Software\\Win32OS2\\Direct2"
 #define KEY_DIRECT2DRAW "\\Software\\Win32OS2\\Direct2\\Draw"
@@ -128 +128 @@
   }
 
-  ODIN_FS_BEGIN
-    rc = DiveOpen( &hDive,
-                   FALSE,
-                   &pFrameBuffer);
-  ODIN_FS_END
+  rc = DiveOpen( &hDive,
+                 FALSE,
+                 &pFrameBuffer);
   if(rc)
   {
@@ -242 +240 @@
     if(me->Referenced == 0)
     {
-      ODIN_delete(me);
+      delete(me);
       rc = 0;
     }
@@ -271 +269 @@
  HRESULT                rc;
 
- ODIN_FS_BEGIN
-
   newclip = new OS2IDirectDrawClipper(me);
 
@@ -295 +291 @@
       *lplpDD = (IDirectDrawClipper *)newclip;
   }
-
-  ODIN_FS_END
 
   return(rc);
@@ -311 +305 @@
   HRESULT                rc = DD_OK;
   int                    palsize = 0;
-
-  ODIN_FS_BEGIN
 
   if(dwFlags & DDPCAPS_8BITENTRIES)
@@ -360 +352 @@
   }
 
-  ODIN_FS_END
-
   return(rc);
 }
@@ -373 +363 @@
  OS2IDirectDrawSurface *newsurf;
  HRESULT                rc;
-
-  ODIN_FS_BEGIN
 
   #ifdef DEBUG
@@ -410 +398 @@
   }
 
-  ODIN_FS_END
-
   return(rc);
 }
@@ -423 +409 @@
  OS2IDirectDrawSurface *newsurf;
  HRESULT                rc;
-
-  ODIN_FS_BEGIN
 
   #ifdef DEBUG
@@ -461 +445 @@
   }
 
-  ODIN_FS_END
-
   return(rc);
 }
@@ -508 +490 @@
   }
 
-
-  ODIN_FS_BEGIN
 
   // Setting up the surface
@@ -538 +518 @@
         if(!lpDDEnumModesCallback(&DDSurfAct,lpContext))
         {
-          {ODIN_FS_END
           return (DD_OK);
         }
@@ -610 +589 @@
         if(!lpDDEnumModesCallback(&DDSurfAct,lpContext))
         {
-          {ODIN_FS_END
           return (DD_OK);
         }
@@ -682 +660 @@
       if (lpDDSurfaceDesc->dwFlags & !(DDSD_WIDTH|DDSD_HEIGHT|DDSD_PIXELFORMAT))
       {
-        {ODIN_FS_END
         return(DDERR_INVALIDPARAMS);
       }
@@ -717 +694 @@
   }
 
-  ODIN_FS_END
+  
 
   return(DD_OK);
@@ -786 +763 @@
     // Clear structure so we only have to set the supported flags
 
-    ODIN_FS_BEGIN
+    
     memset(lpDDDriverCaps,0,sizeof(DDCAPS));
-    ODIN_FS_END
+    
 
     // Reset the size
@@ -1160 +1137 @@
     return(DDERR_INVALIDPARAMS);
 
-  ODIN_FS_BEGIN
+  
 
   if(DD_OK==DrawWaitForVerticalBlank(This, dwFlags, 0))
@@ -1183 +1160 @@
   }
 
-  ODIN_FS_END
+  
 
   return(DD_OK);
@@ -1222 +1199 @@
     return(DDERR_INVALIDPARAMS);
 
-  ODIN_FS_BEGIN
+  
     rc = io_init1();
-  ODIN_FS_END
+  
 
   if(0==rc)  // try to get IOPL for the thread
   {
     *lpbIsInVB = (c_inb1(0x3da)&0x08)!=0;
-    ODIN_FS_BEGIN
+    
       io_exit1(); // reset IOPL
-    ODIN_FS_END
+    
     return(DD_OK);
   }
@@ -1340 +1317 @@
     return (DDERR_UNSUPPORTED);
 
-  ODIN_FS_BEGIN
+  
     rci = io_init1();
-  ODIN_FS_END
+  
 
   if(rci)  // try to get IOPL for the thread
@@ -1373 +1350 @@
   }
 
-  ODIN_FS_BEGIN
+  
     io_exit1();
-  ODIN_FS_END
+  
 
   return (rc);
@@ -1472 +1449 @@
     return DDERR_INVALIDPARAMS;
 
-  ODIN_FS_BEGIN
+  
 
   memset( lpdddi,
@@ -1483 +1460 @@
           "ODIN DD Emulation Driver");
 
-  ODIN_FS_END
+  
 
   return(DD_OK);
@@ -1494 +1471 @@
   HKEY hkDirectDraw2;
 
-  ODIN_FS_BEGIN
+  
 
   if (bScale)
@@ -1510 +1487 @@
   }
 
-  ODIN_FS_END
-}
-//******************************************************************************
-//******************************************************************************
-
+  
+}
+//******************************************************************************
+//******************************************************************************
+