Changeset 21479 for trunk/src/ddraw/palette.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/palette.cpp (modified) (6 diffs)

trunk/src/ddraw/palette.cpp

@@ -20 +20 @@
 #include <string.h>
 #include <memory.h>
-#define INITGUID
+
+#define CINTERFACE
 #include "ddraw2d.h"
 #include "clipper.h"
 #include "palette.h"
 #include "surface.h"
+
 #include <misc.h>
 #include "os2palset.h"
@@ -49 +51 @@
 
   lpDraw  = lpDirectDraw;
-  ((OS2IDirectDraw*)lpDraw)->Vtbl.AddRef(lpDraw);
+  ((OS2IDirectDraw*)lpDraw)->Vtbl.fnAddRef(lpDraw);
   hDive   = ((OS2IDirectDraw*)lpDirectDraw)->GetDiveInstance();
   dwCaps  = dwPalFlags;
@@ -85 +87 @@
   if(os2pal)
     free(os2pal);
-  ((OS2IDirectDraw*)lpDraw)->Vtbl.Release((OS2IDirectDraw*)lpDraw);
+  ((OS2IDirectDraw*)lpDraw)->Vtbl.fnRelease((OS2IDirectDraw*)lpDraw);
 }
 //******************************************************************************
@@ -95 +97 @@
   *ppvObj = NULL;
 
-  if(!IsEqualGUID(riid, IID_IDirectDrawPalette))
-//&& !IsEqualGUID(riid, IID_IUnknown))
+  if(!IsEqualGUID(riid, &IID_IDirectDrawPalette))
+//&& !IsEqualGUID(riid, &IID_IUnknown))
   return E_NOINTERFACE;
 
@@ -237 +239 @@
         // Run appropriate code depening on whether FS DDraw is enabled
         if (bUseFSDD)
-                SetSVGAPalette(os2pal); 
-        else    
+                SetSVGAPalette(os2pal);
+        else
                 OS2SetPhysPalette(os2pal);
 }
@@ -270 +272 @@
 //******************************************************************************
 //******************************************************************************
-IDirectDrawPaletteVtbl DDrawPaletteTable = 
+IDirectDrawPaletteVtbl DDrawPaletteTable =
 {
   PalQueryInterface,