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

Timestamp:

Aug 16, 1999, 2:40:48 AM (26 years ago)

Author:

hugh

Message:

Changed to use ODINCRT macros to preserve FS, but still does crash

File:

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

trunk/src/ddraw/OS2DDRAW.CPP

@@ -21 +21 @@
 #include "os2ddrawmodes.h"
 #include "os2DDWindow.h"
-
+#include "os2palset.h"
+#include <odincrt.h>
 #define KEY_DIRECT2 "\\Software\\Win32OS2\\Direct2"
 #define KEY_DIRECT2DRAW "\\Software\\Win32OS2\\Direct2\\Draw"
@@ -36 +37 @@
   HKEY  hkDirectDraw2;
   DWORD dwVSize, dwVType;
+  ULONG rc;
 
   // Setup table for 3d devices
@@ -126 +128 @@
   }
 
-  ULONG rc = DiveOpen( &hDive,
-                       FALSE,
-                       &pFrameBuffer);
+  ODIN_FS_BEGIN
+    rc = DiveOpen( &hDive,
+                   FALSE,
+                   &pFrameBuffer);
+  ODIN_FS_END
   if(rc)
   {
@@ -160 +164 @@
   if(hDive)
     DiveClose(hDive);
+  if(hDiveColorConv)
+    DiveClose(hDiveColorConv);
+
+  // Safty call in case the program did set the pal to all black
+  // so if the destructor gets called we might be able change this back
+  OS2ResetPhysPalette();
 }
 //******************************************************************************
@@ -199 +209 @@
   *ppvObj = This;
   DrawAddRef(This);
+
   return(DD_OK);
 }
@@ -218 +229 @@
 {
  OS2IDirectDraw *me = (OS2IDirectDraw *)This;
+ ULONG rc;
 
   #ifdef DEBUG
@@ -230 +242 @@
     if(me->Referenced == 0)
     {
-      delete me;
-      return(0);
+      ODIN_delete(me);
+      rc = 0;
     }
     else
-      return me->Referenced;
+      rc = me->Referenced;
   }
   else
-    return(0);
+    rc = 0;
+
+  return rc;
 }
 //******************************************************************************
@@ -254 +268 @@
 {
  OS2IDirectDraw        *me = (OS2IDirectDraw *)This;
- OS2IDirectDrawClipper *newclip = new OS2IDirectDrawClipper(me);
+ OS2IDirectDrawClipper *newclip;
  HRESULT                rc;
 
+ ODIN_FS_BEGIN
+
+  newclip = new OS2IDirectDrawClipper(me);
+
   #ifdef DEBUG
     WriteLog("CreateClipper\n");
@@ -262 +280 @@
 
   if(newclip == NULL)
-    return(DDERR_OUTOFMEMORY);
-
-  newclip->Vtbl.AddRef((IDirectDrawClipper *)newclip);
-  rc = newclip->GetLastError();
-  if(rc != DD_OK)
-  {
-    *lplpDD = NULL;
-    delete newclip;
+  {
+    rc = DDERR_OUTOFMEMORY;
   }
   else
-    *lplpDD = (IDirectDrawClipper *)newclip;
+  {
+    newclip->Vtbl.AddRef((IDirectDrawClipper *)newclip);
+    rc = newclip->GetLastError();
+    if(rc != DD_OK)
+    {
+      *lplpDD = NULL;
+      delete newclip;
+    }
+    else
+      *lplpDD = (IDirectDrawClipper *)newclip;
+  }
+
+  ODIN_FS_END
 
   return(rc);
@@ -285 +309 @@
   OS2IDirectDraw        *me = (OS2IDirectDraw *)This;
   OS2IDirectDrawPalette *newpal;
-  HRESULT                rc;
+  HRESULT                rc = DD_OK;
   int                    palsize = 0;
 
+  ODIN_FS_BEGIN
+
   if(dwFlags & DDPCAPS_8BITENTRIES)
   {
     // We Don't support Indexed palettes...
 
-    return DDERR_INVALIDPARAMS;
+    rc = DDERR_INVALIDPARAMS;
   }
 
@@ -305 +331 @@
 
   if(palsize == 0)
-    return DDERR_INVALIDPARAMS;
-
-  #ifdef DEBUG
-    WriteLog("CreatePalette with %d colors\n", palsize);
-  #endif
-
-  newpal = new OS2IDirectDrawPalette(me, palsize, lpColorTable, dwFlags);
-  if(newpal == NULL)
-    return(DDERR_OUTOFMEMORY);
-
-  newpal->Vtbl.AddRef((IDirectDrawPalette *)newpal);
-  rc = newpal->GetLastError();
-  if(rc != DD_OK)
-  {
-    *lplpDD = NULL;
-    delete newpal;
-  }
-  else
-    *lplpDD = (IDirectDrawPalette *)newpal;
+    rc = DDERR_INVALIDPARAMS;
+
+  if(DD_OK == rc)
+  {
+    #ifdef DEBUG
+      WriteLog("CreatePalette with %d colors\n", palsize);
+    #endif
+
+    newpal = new OS2IDirectDrawPalette(me, palsize, lpColorTable, dwFlags);
+
+    if(newpal == NULL)
+    {
+      rc = DDERR_OUTOFMEMORY;
+    }
+    else
+    {
+      newpal->Vtbl.AddRef((IDirectDrawPalette *)newpal);
+      rc = newpal->GetLastError();
+
+      if(DD_OK != rc)
+      {
+        *lplpDD = NULL;
+        delete newpal;
+      }
+      else
+        *lplpDD = (IDirectDrawPalette *)newpal;
+    }
+  }
+
+  ODIN_FS_END
 
   return(rc);
@@ -336 +373 @@
  OS2IDirectDrawSurface *newsurf;
  HRESULT                rc;
+
+  ODIN_FS_BEGIN
 
   #ifdef DEBUG
@@ -351 +390 @@
 
   newsurf = new OS2IDirectDrawSurface(me, (LPDDSURFACEDESC2)lpDDSurfaceDesc);
-
   if(newsurf == NULL)
-    return(DDERR_OUTOFMEMORY);
-
-  newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
-  rc = newsurf->GetLastError();
-  if(rc != DD_OK)
-  {
-    WriteLog("Error createing Surface\n\n");
-    *lplpDD = NULL;
-    delete newsurf;
+  {
+    rc = DDERR_OUTOFMEMORY;
   }
   else
-    *lplpDD = (IDirectDrawSurface *)newsurf;
-
-  WriteLog("New Surface created at %08X\n\n", newsurf);
+  {
+    newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
+    rc = newsurf->GetLastError();
+    if(rc != DD_OK)
+    {
+      WriteLog("Error createing Surface\n\n");
+      *lplpDD = NULL;
+      delete newsurf;
+    }
+    else
+      *lplpDD = (IDirectDrawSurface *)newsurf;
+
+    WriteLog("New Surface created at %08X\n\n", newsurf);
+  }
+
+  ODIN_FS_END
+
   return(rc);
 }
@@ -379 +424 @@
  HRESULT                rc;
 
-#ifdef DEBUG
-  WriteLog("CreateSurface4\n");
-  WriteLog("dwSize %d\n", lpDDSurfaceDesc2->dwSize);
-  WriteLog("dwHeight %d\n", lpDDSurfaceDesc2->dwHeight);
-  WriteLog("dwWidth %d\n", lpDDSurfaceDesc2->dwWidth);
-  WriteLog("lPitch %d\n", lpDDSurfaceDesc2->lPitch);
-  WriteLog("dwBackBufferCount %d\n", lpDDSurfaceDesc2->dwBackBufferCount);
-  WriteLog("dwMipMapCount %d\n", lpDDSurfaceDesc2->dwMipMapCount);
-  WriteLog("dwAlphaBitDepth %d\n", lpDDSurfaceDesc2->dwAlphaBitDepth);
-  WriteLog("ddsCaps.dwCaps %X\n", lpDDSurfaceDesc2->ddsCaps.dwCaps);
-#endif
+  ODIN_FS_BEGIN
+
+  #ifdef DEBUG
+    WriteLog("CreateSurface4\n");
+    WriteLog("dwSize %d\n", lpDDSurfaceDesc2->dwSize);
+    WriteLog("dwHeight %d\n", lpDDSurfaceDesc2->dwHeight);
+    WriteLog("dwWidth %d\n", lpDDSurfaceDesc2->dwWidth);
+    WriteLog("lPitch %d\n", lpDDSurfaceDesc2->lPitch);
+    WriteLog("dwBackBufferCount %d\n", lpDDSurfaceDesc2->dwBackBufferCount);
+    WriteLog("dwMipMapCount %d\n", lpDDSurfaceDesc2->dwMipMapCount);
+    WriteLog("dwAlphaBitDepth %d\n", lpDDSurfaceDesc2->dwAlphaBitDepth);
+    WriteLog("ddsCaps.dwCaps %X\n", lpDDSurfaceDesc2->ddsCaps.dwCaps);
+  #endif
 
   newsurf = new OS2IDirectDrawSurface(me, lpDDSurfaceDesc2);
 
   if(newsurf == NULL)
-    return(DDERR_OUTOFMEMORY);
-
-  newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
-  rc = newsurf->GetLastError();
-  if(rc != DD_OK)
-  {
-    WriteLog("Error createing Surface\n\n");
-    *lplpDD = NULL;
-    delete newsurf;
+  {
+    rc =DDERR_OUTOFMEMORY;
   }
   else
-    *lplpDD = (IDirectDrawSurface4 *)newsurf;
-
-  WriteLog("New Surface created at %08X\n\n", newsurf);
+  {
+    newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
+    rc = newsurf->GetLastError();
+    if(rc != DD_OK)
+    {
+      WriteLog("Error createing Surface\n\n");
+      *lplpDD = NULL;
+
+      delete newsurf;
+    }
+    else
+      *lplpDD = (IDirectDrawSurface4 *)newsurf;
+
+    WriteLog("New Surface created at %08X\n\n", newsurf);
+  }
+
+  ODIN_FS_END
 
   return(rc);
@@ -416 +470 @@
 {
   #ifdef DEBUG
-    WriteLog("DuplicateSurface\n");
+    WriteLog("DuplicateSurface NIY\n");
   #endif
   return(DD_OK);
@@ -425 +479 @@
 {
   #ifdef DEBUG
-    WriteLog("DuplicateSurface\n");
+    WriteLog("DuplicateSurface4 NIY\n");
   #endif
 
@@ -454 +508 @@
   }
 
+
+  ODIN_FS_BEGIN
 
   // Setting up the surface
@@ -481 +537 @@
         DDSurfAct.ddpfPixelFormat.dwRGBBitCount = ModesDive[0].iBits;
         if(!lpDDEnumModesCallback(&DDSurfAct,lpContext))
+        {
+          {ODIN_FS_END
           return (DD_OK);
+        }
       }
       // Don't know the flag for Mode X so we skip reporting it
@@ -550 +609 @@
         DDSurfAct.ddpfPixelFormat.dwRGBBitCount = ModesDive[0].iBits;
         if(!lpDDEnumModesCallback(&DDSurfAct,lpContext))
+        {
+          {ODIN_FS_END
           return (DD_OK);
+        }
       }
       // Don't know the flag for Mode X so we skip reporting it
@@ -619 +681 @@
 
       if (lpDDSurfaceDesc->dwFlags & !(DDSD_WIDTH|DDSD_HEIGHT|DDSD_PIXELFORMAT))
+      {
+        {ODIN_FS_END
         return(DDERR_INVALIDPARAMS);
+      }
 
       iMode = 2;
@@ -652 +717 @@
   }
 
+  ODIN_FS_END
+
   return(DD_OK);
 }
@@ -665 +732 @@
 
   #ifdef DEBUG
-    WriteLog("EnumDisplayModes4\n");
+    WriteLog("EnumDisplayModes4 NIY\n");
   #endif
   return(DD_OK);
@@ -674 +741 @@
 {
   #ifdef DEBUG
-    WriteLog("EnumSurfaces\n");
+    WriteLog("EnumSurfaces NIY\n");
   #endif
 
@@ -684 +751 @@
 {
   #ifdef DEBUG
-    WriteLog("EnumSurfaces4\n");
+    WriteLog("EnumSurfaces4 NIY\n");
   #endif
 
@@ -694 +761 @@
 {
   #ifdef DEBUG
-    WriteLog("FlipToGDISurface\n");
+    WriteLog("FlipToGDISurface NIY\n");
   #endif
 
@@ -718 +785 @@
 
     // 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
@@ -1063 +1133 @@
 {
   #ifdef DEBUG
-    WriteLog("GetGDISurface\n");
+    WriteLog("GetGDISurface NYI\n");
   #endif
 
@@ -1073 +1143 @@
 {
   #ifdef DEBUG
-    WriteLog("GetGDISurface\n");
+    WriteLog("GetGDISurface NYI\n");
   #endif
 
@@ -1089 +1159 @@
   if(NULL==lpdwFreq)
     return(DDERR_INVALIDPARAMS);
+
+  ODIN_FS_BEGIN
 
   if(DD_OK==DrawWaitForVerticalBlank(This, dwFlags, 0))
@@ -1110 +1182 @@
     *lpdwFreq = 70;
   }
+
+  ODIN_FS_END
+
   return(DD_OK);
 }
@@ -1140 +1215 @@
 HRESULT __stdcall DrawGetVerticalBlankStatus(THIS , LPBOOL lpbIsInVB)
 {
+  int rc;
   #ifdef DEBUG
     WriteLog("GetVerticalBlankStatus\n");
@@ -1145 +1221 @@
   if(NULL==lpbIsInVB)
     return(DDERR_INVALIDPARAMS);
-  if(0==io_init1())  // try to get IOPL for the thread
+
+  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;
-    io_exit1(); // reset IOPL
+    ODIN_FS_BEGIN
+      io_exit1(); // reset IOPL
+    ODIN_FS_END
     return(DD_OK);
   }
@@ -1186 +1269 @@
   me->hwndClient = hwndClient;
   #if 0
-  OS2DDSubclassWindow(hwndClient);
+    OS2DDSubclassWindow(hwndClient);
   #endif
   return(DD_OK);
@@ -1200 +1283 @@
  OS2IDirectDraw        *me = (OS2IDirectDraw *)This;
 
-#ifdef DEBUG
-  WriteLog("SetDisplayMode2 to %dx%d with %d bits colors\n", dwWidth, dwHeight, dwBPP);
-#endif
+  #ifdef DEBUG
+    WriteLog("SetDisplayMode2 to %dx%d with %d bits colors\n", dwWidth, dwHeight, dwBPP);
+  #endif
+
   me->screenwidth  = dwWidth;
   me->screenheight = dwHeight;
@@ -1247 +1331 @@
 {
   HRESULT rc;
+  int rci;
+
   #ifdef DEBUG
     WriteLog("WaitForVerticalBlank\n");
@@ -1254 +1340 @@
     return (DDERR_UNSUPPORTED);
 
-  if(io_init1())  // try to get IOPL for the thread
+  ODIN_FS_BEGIN
+    rci = io_init1();
+  ODIN_FS_END
+
+  if(rci)  // try to get IOPL for the thread
     return (DDERR_UNSUPPORTED);  // we failed so return error that we don't support this
 
@@ -1283 +1373 @@
   }
 
-  io_exit1();
+  ODIN_FS_BEGIN
+    io_exit1();
+  ODIN_FS_END
 
   return (rc);
@@ -1344 +1436 @@
 {
   #ifdef DEBUG
-    WriteLog("GetSurfaceFromDC Unimplemented Stub\n");
+    WriteLog("GetSurfaceFromDC NYI\n");
   #endif
 
@@ -1379 +1471 @@
   if(NULL==lpdddi)
     return DDERR_INVALIDPARAMS;
+
+  ODIN_FS_BEGIN
 
   memset( lpdddi,
@@ -1388 +1482 @@
   strcpy( lpdddi->szDescription,
           "ODIN DD Emulation Driver");
+
+  ODIN_FS_END
+
   return(DD_OK);
 }
@@ -1396 +1493 @@
   DWORD dwVType, dwVSize;
   HKEY hkDirectDraw2;
+
+  ODIN_FS_BEGIN
 
   if (bScale)
@@ -1410 +1509 @@
       bScale = FALSE;
   }
-}
-//******************************************************************************
-//******************************************************************************
-
+
+  ODIN_FS_END
+}
+//******************************************************************************
+//******************************************************************************
+