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

trunk/src/ddraw/ddmain.cpp

@@ -22 +22 @@
 #include <memory.h>
 #include <stdio.h>
-#define INITGUID
-#define ICOM_CINTERFACE 1
+
 #define CINTERFACE
-
 #include "ddraw2d.h"
 #include "winerror.h"
@@ -50 +48 @@
   else
   {
-    newdraw->Vtbl.AddRef((IDirectDraw2 *)newdraw);
+    newdraw->Vtbl.fnAddRef((IDirectDraw2 *)newdraw);
 
     rc = newdraw->GetLastError();
@@ -217 +215 @@
   dprintf(("DDRAW:DDCF_CreateInstance"));
   if( lpGUID &&
-      ( (*lpGUID == IID_IDirectDraw ) ||
-        (*lpGUID == IID_IDirectDraw2) ||
-        (*lpGUID == IID_IDirectDraw4))
+      ( IsEqualGUID(lpGUID, &IID_IDirectDraw) ||
+        IsEqualGUID(lpGUID, &IID_IDirectDraw2) ||
+        IsEqualGUID(lpGUID, &IID_IDirectDraw4))
     )
   {
@@ -267 +265 @@
   {
     *ppv = (LPVOID)&DDRAW_CF;
-    DDRAW_CF.lpvtbl->AddRef((IClassFactory*)&DDRAW_CF);
+    DDRAW_CF.lpvtbl->fnAddRef((IClassFactory*)&DDRAW_CF);
     return S_OK;
   }