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

trunk/src/ddraw/clipper.cpp

@@ -20 +20 @@
 #include <memory.h>
 
-#define INITGUID
+#define CINTERFACE
 #include "ddraw2d.h"
 #include "clipper.h"
+
 #include <misc.h>
 #include <winerror.h>
@@ -39 +40 @@
   // no ddraw object is associated
 
-  lpVtbl                  = &Vtbl;
-  Vtbl.AddRef             = ClipAddRef;
-  Vtbl.Release            = ClipRelease;
-  Vtbl.QueryInterface     = ClipQueryInterface;
-  Vtbl.GetClipList        = ClipGetClipList;
-  Vtbl.GetHWnd            = ClipGetHWnd;
-  Vtbl.Initialize         = ClipInitialize;
-  Vtbl.IsClipListChanged  = ClipIsClipListChanged;
-  Vtbl.SetClipList        = ClipSetClipList;
-  Vtbl.SetHWnd            = ClipSetHWnd;
-
-  lpDraw                  = NULL;
+  lpVtbl                    = &Vtbl;
+  Vtbl.fnAddRef             = ClipAddRef;
+  Vtbl.fnRelease            = ClipRelease;
+  Vtbl.fnQueryInterface     = ClipQueryInterface;
+  Vtbl.fnGetClipList        = ClipGetClipList;
+  Vtbl.fnGetHWnd            = ClipGetHWnd;
+  Vtbl.fnInitialize         = ClipInitialize;
+  Vtbl.fnIsClipListChanged  = ClipIsClipListChanged;
+  Vtbl.fnSetClipList        = ClipSetClipList;
+  Vtbl.fnSetHWnd            = ClipSetHWnd;
+
+  lpDraw                    = NULL;
   // lpDraw->Vtbl.AddRef(lpDraw);
   // hDive                   = lpDirectDraw->GetDiveInstance();
@@ -63 +64 @@
                  fClipListChangedInt(FALSE)
 {
-  lpVtbl                  = &Vtbl;
-  Vtbl.AddRef             = ClipAddRef;
-  Vtbl.Release            = ClipRelease;
-  Vtbl.QueryInterface     = ClipQueryInterface;
-  Vtbl.GetClipList        = ClipGetClipList;
-  Vtbl.GetHWnd            = ClipGetHWnd;
-  Vtbl.Initialize         = ClipInitialize;
-  Vtbl.IsClipListChanged  = ClipIsClipListChanged;
-  Vtbl.SetClipList        = ClipSetClipList;
-  Vtbl.SetHWnd            = ClipSetHWnd;
-
-  lpDraw                  = lpDirectDraw;
-  lpDraw->Vtbl.AddRef(lpDraw);
-  hDive                   = lpDirectDraw->GetDiveInstance();
+  lpVtbl                    = &Vtbl;
+  Vtbl.fnAddRef             = ClipAddRef;
+  Vtbl.fnRelease            = ClipRelease;
+  Vtbl.fnQueryInterface     = ClipQueryInterface;
+  Vtbl.fnGetClipList        = ClipGetClipList;
+  Vtbl.fnGetHWnd            = ClipGetHWnd;
+  Vtbl.fnInitialize         = ClipInitialize;
+  Vtbl.fnIsClipListChanged  = ClipIsClipListChanged;
+  Vtbl.fnSetClipList        = ClipSetClipList;
+  Vtbl.fnSetHWnd            = ClipSetHWnd;
+
+  lpDraw                    = lpDirectDraw;
+  lpDraw->Vtbl.fnAddRef(lpDraw);
+  hDive                     = lpDirectDraw->GetDiveInstance();
 }
 //******************************************************************************
 //******************************************************************************
 OS2IDirectDrawClipper::~OS2IDirectDrawClipper()
-{ 
+{
   if(lpRgnData) free(lpRgnData);
   if(clipWindow) {
       WinSetVisibleRgnNotifyProc(clipWindow, NULL, 0);
   }
-  lpDraw->Vtbl.Release(lpDraw);
+  lpDraw->Vtbl.fnRelease(lpDraw);
 }
 //******************************************************************************
@@ -96 +97 @@
   *ppvObj = NULL;
 
-  if(!IsEqualGUID(riid, IID_IDirectDrawClipper) &&
-     !IsEqualGUID(riid, CLSID_DirectDrawClipper))
+  if(!IsEqualGUID(riid, &IID_IDirectDrawClipper) &&
+     !IsEqualGUID(riid, &CLSID_DirectDrawClipper))
 //&& !IsEqualGUID(riid, IID_IUnknown))
   return E_NOINTERFACE;
@@ -140 +141 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT WIN32API ClipGetClipList(THIS This, LPRECT lpRect, LPRGNDATA lpClipList, 
+HRESULT WIN32API ClipGetClipList(THIS This, LPRECT lpRect, LPRGNDATA lpClipList,
                                  LPDWORD lpdwSize)
 {
@@ -154 +155 @@
       dprintf(("WARNING: clipping the cliplist is not yet implemented"));
   }
-  if(me->clipWindow) 
+  if(me->clipWindow)
   {
       RECT *rect = (RECT *)&lpClipList->Buffer;
@@ -216 +217 @@
       OS2IDirectDraw *os2DD = (OS2IDirectDraw *)lpDD;
       me->lpDraw = os2DD;
-      me->lpDraw->Vtbl.AddRef(me->lpDraw);
+      me->lpDraw->Vtbl.fnAddRef(me->lpDraw);
       me->hDive = me->lpDraw->GetDiveInstance();
   }