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

trunk/src/ddraw/ddraw3d.cpp

@@ -14 +14 @@
 #include <memory.h>
 
-#define INITGUID
 #define _OS2WIN_H
 #define FAR
@@ -20 +19 @@
 #include <odin.h>
 #include <winbase.h>
+
+#define CINTERFACE
 #include "ddraw2d.h"
 #include "clipper.h"
 #include "palette.h"
 #include "surface.h"
+
 #include <misc.h>
 #include <winerror.h>
@@ -36 +38 @@
   *ppvObj = NULL;
 
-  if (!IsEqualGUID(riid, IID_IDirect3D))
+  if (!IsEqualGUID(riid, &IID_IDirect3D))
     return E_NOINTERFACE;