Changeset 21479 for trunk/src/dsound/DSOUND.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/dsound/DSOUND.CPP (modified) (5 diffs)

trunk/src/dsound/DSOUND.CPP

@@ -20 +20 @@
 
 #define INITGUID
-#define ICOM_CINTERFACE 1
 #define CINTERFACE
 #include <dsound.h>
@@ -45 +44 @@
    if (OS2IDirectSound::fDSExists) {
       *ppDS = (LPDIRECTSOUND)DS;
-      DS->Vtbl.AddRef(DS);
+      DS->Vtbl.fnAddRef(DS);
       return DS_OK;
    }
@@ -61 +60 @@
    else {
      *ppDS = (LPDIRECTSOUND)newsound;
-     newsound->Vtbl.AddRef(newsound);
+     newsound->Vtbl.fnAddRef(newsound);
      DS = newsound;
    }
@@ -178 +177 @@
 
   dprintf(("DSOUND:DSCF_CreateInstance\n"));
-  if( lpGUID && (*lpGUID == IID_IDirectSound )) {
+  if(lpGUID && IsEqualGUID(lpGUID, &IID_IDirectSound)) {
     return OS2DirectSoundCreate(lpGUID,(LPDIRECTSOUND*)ppobj,pOuter);
   }
@@ -223 +222 @@
   {
     *ppv = (LPVOID)&DSOUND_CF;
-    DSOUND_CF.lpvtbl->AddRef((IClassFactory*)&DSOUND_CF);
+    DSOUND_CF.lpvtbl->fnAddRef((IClassFactory*)&DSOUND_CF);
     return S_OK;
   }