Changeset 21479 for trunk/src/ddraw/ddraw2d.cpp

Timestamp:

Nov 27, 2010, 11:27:43 AM (15 years ago)

Author:

dmik

Message:

Get rid of dd_obj_base.h which duplicates obj_base.h creating unnecessary mess (symbol/define duplication) and conflicts when both the DDarw and other COM-related headers are included.

File:

• trunk/src/ddraw/ddraw2d.cpp (modified) (16 diffs)

trunk/src/ddraw/ddraw2d.cpp

@@ -23 +23 @@
 
 #define INITGUID
+#define CINTERFACE
 #include "ddraw2d.h"
 #include "clipper.h"
 #include "palette.h"
 #include "surface.h"
+
 #include <misc.h>
 #include <string.h>
@@ -105 +107 @@
 
 
-  if(lpGUID && *lpGUID == IID_IDirect3D)
+  if(lpGUID && IsEqualGUID(lpGUID, &IID_IDirect3D))
   {
     dprintf(("DDRAW: D3D Interface -> using V4 Interface"));
@@ -113 +115 @@
   else
   {
-    if(lpGUID && *lpGUID == IID_IDirectDraw4)
+    if(lpGUID && IsEqualGUID(lpGUID, &IID_IDirectDraw4))
     {
       dprintf(("DDRAW: V4 Interface\n"));
@@ -184 +186 @@
 
   // Check to see if FS DDraw is enabled in ODIN.INI
-  if (!fNoFSDD && PROFILE_GetOdinIniBool(ODINDDRAW_SECTION, "Fullscreen", FALSE)) 
+  if (!fNoFSDD && PROFILE_GetOdinIniBool(ODINDDRAW_SECTION, "Fullscreen", FALSE))
   {
 #if 0
@@ -201 +203 @@
       rc = LoadPMIService();
       dprintf(("DDRAW: LoadPMIService() rc=0x%08X",rc));
-                
+
       if (!rc) {
           SetUpModeTable();
-                        
+
           bUseFSDD = TRUE;
           dprintf(("DDRAW: Fullscreen enabled",rc));
-      } 
-  }     
+      }
+  }
 }
 //******************************************************************************
@@ -258 +260 @@
   *ppvObj = NULL;
 
-  if(!IsEqualGUID(riid, CLSID_DirectDraw) &&
-     !IsEqualGUID(riid, IID_IDirectDraw) &&
-     !IsEqualGUID(riid, IID_IDirectDraw2) &&
-     !IsEqualGUID(riid, IID_IDirectDraw4) &&
-     !IsEqualGUID(riid, IID_IDirect3D))
+  if(!IsEqualGUID(riid, &CLSID_DirectDraw) &&
+     !IsEqualGUID(riid, &IID_IDirectDraw) &&
+     !IsEqualGUID(riid, &IID_IDirectDraw2) &&
+     !IsEqualGUID(riid, &IID_IDirectDraw4) &&
+     !IsEqualGUID(riid, &IID_IDirect3D))
 //     !IsEqualGUID(riid, IID_IUnknown))
   return E_NOINTERFACE;
 
   // ToDo Better way of returning differnent interfaces for same class
-  if(IsEqualGUID(riid, IID_IDirect3D))
+  if(IsEqualGUID(riid, &IID_IDirect3D))
   {
     me->lpVtbl3D         = &me->Vtbl3D;
@@ -278 +280 @@
   else
   {
-    if(IsEqualGUID(riid, IID_IDirectDraw4))
+    if(IsEqualGUID(riid, &IID_IDirectDraw4))
     {
       dprintf(("DDRAW: IID_IDirectDraw4 Interface"));
@@ -285 +287 @@
     else
     {
-      if(IsEqualGUID(riid, IID_IDirectDraw2))
+      if(IsEqualGUID(riid, &IID_IDirectDraw2))
       {
         dprintf(("DDRAW: IID_IDirectDraw2 Interface"));
@@ -366 +368 @@
   else
   {
-    newclip->Vtbl.AddRef((IDirectDrawClipper *)newclip);
+    newclip->Vtbl.fnAddRef((IDirectDrawClipper *)newclip);
     rc = newclip->GetLastError();
     if(rc != DD_OK)
@@ -422 +424 @@
     else
     {
-      newpal->Vtbl.AddRef((IDirectDrawPalette *)newpal);
+      newpal->Vtbl.fnAddRef((IDirectDrawPalette *)newpal);
       rc = newpal->GetLastError();
 
@@ -465 +467 @@
   else
   {
-    newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
+    newsurf->Vtbl.fnAddRef((IDirectDrawSurface *)newsurf);
     rc = newsurf->GetLastError();
     if(rc != DD_OK)
@@ -509 +511 @@
   else
   {
-    newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
+    newsurf->Vtbl.fnAddRef((IDirectDrawSurface *)newsurf);
     rc = newsurf->GetLastError();
     if(rc != DD_OK)
@@ -2089 +2091 @@
 // Setup table for 3d devices
 //******************************************************************************
-IDirect3DVtbl DDraw3DTable = 
-{
- D3DQueryInterface, 
- D3DAddRef, 
- D3DRelease, 
- D3DInitialize, 
- D3DEnumDevices, 
- D3DCreateLight, 
- D3DCreateMaterial, 
- D3DCreateViewport, 
+IDirect3DVtbl DDraw3DTable =
+{
+ D3DQueryInterface,
+ D3DAddRef,
+ D3DRelease,
+ D3DInitialize,
+ D3DEnumDevices,
+ D3DCreateLight,
+ D3DCreateMaterial,
+ D3DCreateViewport,
  D3DFindDevice
 };
@@ -2104 +2106 @@
 // Org Interface
 //******************************************************************************
-IDirectDrawVtbl DDrawV1Table = 
-{
- DrawQueryInterface, 
- DrawAddRef, 
- DrawRelease, 
- DrawCompact, 
- DrawCreateClipper, 
- DrawCreatePalette, 
- DrawCreateSurface, 
- DrawDuplicateSurface, 
- DrawEnumDisplayModes, 
- DrawEnumSurfaces, 
- DrawFlipToGDISurface, 
- DrawGetCaps, 
- DrawGetDisplayMode, 
- DrawGetFourCCCodes, 
- DrawGetGDISurface, 
- DrawGetMonitorFrequency, 
- DrawGetScanLine, 
- DrawGetVerticalBlankStatus, 
- DrawInitialize, 
- DrawRestoreDisplayMode, 
- DrawSetCooperativeLevel, 
- DrawSetDisplayMode, 
+IDirectDrawVtbl DDrawV1Table =
+{
+ DrawQueryInterface,
+ DrawAddRef,
+ DrawRelease,
+ DrawCompact,
+ DrawCreateClipper,
+ DrawCreatePalette,
+ DrawCreateSurface,
+ DrawDuplicateSurface,
+ DrawEnumDisplayModes,
+ DrawEnumSurfaces,
+ DrawFlipToGDISurface,
+ DrawGetCaps,
+ DrawGetDisplayMode,
+ DrawGetFourCCCodes,
+ DrawGetGDISurface,
+ DrawGetMonitorFrequency,
+ DrawGetScanLine,
+ DrawGetVerticalBlankStatus,
+ DrawInitialize,
+ DrawRestoreDisplayMode,
+ DrawSetCooperativeLevel,
+ DrawSetDisplayMode,
  DrawWaitForVerticalBlank
 };
@@ -2133 +2135 @@
 // V2 Interface
 //******************************************************************************
-IDirectDraw2Vtbl DDrawV2Table = 
-{
- DrawQueryInterface, 
- DrawAddRef, 
- DrawRelease, 
- DrawCompact, 
- DrawCreateClipper, 
- DrawCreatePalette, 
- DrawCreateSurface, 
- DrawDuplicateSurface, 
- DrawEnumDisplayModes, 
- DrawEnumSurfaces, 
- DrawFlipToGDISurface, 
- DrawGetCaps, 
- DrawGetDisplayMode, 
- DrawGetFourCCCodes, 
- DrawGetGDISurface, 
- DrawGetMonitorFrequency, 
- DrawGetScanLine, 
- DrawGetVerticalBlankStatus, 
- DrawInitialize, 
- DrawRestoreDisplayMode, 
- DrawSetCooperativeLevel, 
- DrawSetDisplayMode2, 
- DrawWaitForVerticalBlank, 
+IDirectDraw2Vtbl DDrawV2Table =
+{
+ DrawQueryInterface,
+ DrawAddRef,
+ DrawRelease,
+ DrawCompact,
+ DrawCreateClipper,
+ DrawCreatePalette,
+ DrawCreateSurface,
+ DrawDuplicateSurface,
+ DrawEnumDisplayModes,
+ DrawEnumSurfaces,
+ DrawFlipToGDISurface,
+ DrawGetCaps,
+ DrawGetDisplayMode,
+ DrawGetFourCCCodes,
+ DrawGetGDISurface,
+ DrawGetMonitorFrequency,
+ DrawGetScanLine,
+ DrawGetVerticalBlankStatus,
+ DrawInitialize,
+ DrawRestoreDisplayMode,
+ DrawSetCooperativeLevel,
+ DrawSetDisplayMode2,
+ DrawWaitForVerticalBlank,
  DrawGetAvailableVidMem
 };
@@ -2163 +2165 @@
 // New V4 interface
 //******************************************************************************
-IDirectDraw4Vtbl DDrawV4Table = 
-{
- DrawQueryInterface, 
- DrawAddRef,   // todo change to a DrawAddRef4 as handling this has change, 
- DrawRelease,  // see abov, 
- DrawCompact, 
- DrawCreateClipper, 
- DrawCreatePalette, 
- DrawCreateSurface4, 
- DrawDuplicateSurface4, 
- DrawEnumDisplayModes4, 
- DrawEnumSurfaces4, 
- DrawFlipToGDISurface, 
- DrawGetCaps, 
- DrawGetDisplayMode4, 
- DrawGetFourCCCodes, 
- DrawGetGDISurface4, 
- DrawGetMonitorFrequency, 
- DrawGetScanLine, 
- DrawGetVerticalBlankStatus, 
- DrawInitialize, 
- DrawRestoreDisplayMode, 
- DrawSetCooperativeLevel, 
- DrawSetDisplayMode2, 
- DrawWaitForVerticalBlank, 
- DrawGetAvailableVidMem4, 
- DrawGetSurfaceFromDC, 
- DrawRestoreAllSurfaces, 
- DrawTestCooperativeLevel, 
- DrawGetDeviceIdentifier, 
+IDirectDraw4Vtbl DDrawV4Table =
+{
+ DrawQueryInterface,
+ DrawAddRef,   // todo change to a DrawAddRef4 as handling this has change,
+ DrawRelease,  // see abov,
+ DrawCompact,
+ DrawCreateClipper,
+ DrawCreatePalette,
+ DrawCreateSurface4,
+ DrawDuplicateSurface4,
+ DrawEnumDisplayModes4,
+ DrawEnumSurfaces4,
+ DrawFlipToGDISurface,
+ DrawGetCaps,
+ DrawGetDisplayMode4,
+ DrawGetFourCCCodes,
+ DrawGetGDISurface4,
+ DrawGetMonitorFrequency,
+ DrawGetScanLine,
+ DrawGetVerticalBlankStatus,
+ DrawInitialize,
+ DrawRestoreDisplayMode,
+ DrawSetCooperativeLevel,
+ DrawSetDisplayMode2,
+ DrawWaitForVerticalBlank,
+ DrawGetAvailableVidMem4,
+ DrawGetSurfaceFromDC,
+ DrawRestoreAllSurfaces,
+ DrawTestCooperativeLevel,
+ DrawGetDeviceIdentifier,
 };
 //******************************************************************************