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

trunk/src/dsound/OS2DSOUND.CPP

@@ -21 +21 @@
 #include <stdio.h> /****** DEBUGGING ********/
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -42 +42 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef               = SoundAddRef;
-   Vtbl.Release              = SoundRelease;
-   Vtbl.QueryInterface       = SoundQueryInterface;
-   Vtbl.Compact              = SoundCompact;
-   Vtbl.CreateSoundBuffer    = SoundCreateSoundBuffer;
-   Vtbl.GetCaps              = SoundGetCaps;
-   Vtbl.DuplicateSoundBuffer = SoundDuplicateSoundBuffer;
-   Vtbl.SetCooperativeLevel  = SoundSetCooperativeLevel;
-   Vtbl.Compact              = SoundCompact;
-   Vtbl.GetSpeakerConfig     = SoundGetSpeakerConfig;
-   Vtbl.SetSpeakerConfig     = SoundSetSpeakerConfig;
-   Vtbl.Initialize           = SoundInitialize;
+   Vtbl.fnAddRef               = SoundAddRef;
+   Vtbl.fnRelease              = SoundRelease;
+   Vtbl.fnQueryInterface       = SoundQueryInterface;
+   Vtbl.fnCompact              = SoundCompact;
+   Vtbl.fnCreateSoundBuffer    = SoundCreateSoundBuffer;
+   Vtbl.fnGetCaps              = SoundGetCaps;
+   Vtbl.fnDuplicateSoundBuffer = SoundDuplicateSoundBuffer;
+   Vtbl.fnSetCooperativeLevel  = SoundSetCooperativeLevel;
+   Vtbl.fnCompact              = SoundCompact;
+   Vtbl.fnGetSpeakerConfig     = SoundGetSpeakerConfig;
+   Vtbl.fnSetSpeakerConfig     = SoundSetSpeakerConfig;
+   Vtbl.fnInitialize           = SoundInitialize;
 
    dprintf(("DSOUND-OS2IDirectSound::OS2IDirectSound"));
@@ -75 +75 @@
       return;
    }
-   primary->Vtbl.AddRef(primary);
+   primary->Vtbl.fnAddRef(primary);
 
    dprintf(("Sound init OK"));
@@ -99 +99 @@
    *ppvObj = NULL;
 
-   if (!IsEqualGUID(riid, CLSID_DirectSound) &&
-       !IsEqualGUID(riid, IID_IDirectSound))
+   if (!IsEqualGUID(riid, &CLSID_DirectSound) &&
+       !IsEqualGUID(riid, &IID_IDirectSound))
       return E_NOINTERFACE;
 
@@ -181 +181 @@
       return lastErr;
    }
-   sndbuf->Vtbl.AddRef(sndbuf);
+   sndbuf->Vtbl.fnAddRef(sndbuf);
 
    *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)sndbuf;
@@ -251 +251 @@
       return lastErr;
    }
-   tgtBuf->Vtbl.AddRef(tgtBuf);
+   tgtBuf->Vtbl.fnAddRef(tgtBuf);
 
    *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)tgtBuf;