Changeset 21479 for trunk/src/dsound

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.

Location:

trunk/src/dsound

Files:

• DAudioBuffer.cpp (modified) (5 diffs)
• DAudioNotify.cpp (modified) (5 diffs)
• DSOUND.CPP (modified) (5 diffs)
• OS23DBuffer.cpp (modified) (5 diffs)
• OS23DListener.cpp (modified) (5 diffs)
• OS2DSOUND.CPP (modified) (6 diffs)
• OS2NOTIFY.CPP (modified) (5 diffs)
• OS2PrimBuff.cpp (modified) (5 diffs)
• OS2SNDBUFFER.CPP (modified) (12 diffs)
• dsmixer.cpp (modified) (1 diff)

trunk/src/dsound/DAudioBuffer.cpp

@@ -20 +20 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -186 +186 @@
 {
     lpVtbl = &Vtbl;
-    Vtbl.AddRef               = DAudioBufAddRef;
-    Vtbl.Release              = DAudioBufRelease;
-    Vtbl.QueryInterface       = DAudioBufQueryInterface;
-    Vtbl.GetCaps              = DAudioBufGetCaps;
-    Vtbl.GetFormat            = DAudioBufGetFormat;
-    Vtbl.GetVolume            = DAudioBufGetVolume;
-    Vtbl.GetStatus            = DAudioBufGetStatus;
-    Vtbl.GetCurrentPosition   = DAudioBufGetCurrentPosition;
-    Vtbl.GetPan               = DAudioBufGetPan;
-    Vtbl.GetFrequency         = DAudioBufGetFrequency;
-    Vtbl.Initialize           = DAudioBufInitialize;
-    Vtbl.Restore              = DAudioBufRestore;
-    Vtbl.SetFormat            = DAudioBufSetFormat;
-    Vtbl.SetVolume            = DAudioBufSetVolume;
-    Vtbl.SetCurrentPosition   = DAudioBufSetCurrentPosition;
-    Vtbl.SetPan               = DAudioBufSetPan;
-    Vtbl.SetFrequency         = DAudioBufSetFrequency;
-    Vtbl.Lock                 = DAudioBufLock;
-    Vtbl.Unlock               = DAudioBufUnlock;
-    Vtbl.Stop                 = DAudioBufStop;
-    Vtbl.Play                 = DAudioBufPlay;
+    Vtbl.fnAddRef               = DAudioBufAddRef;
+    Vtbl.fnRelease              = DAudioBufRelease;
+    Vtbl.fnQueryInterface       = DAudioBufQueryInterface;
+    Vtbl.fnGetCaps              = DAudioBufGetCaps;
+    Vtbl.fnGetFormat            = DAudioBufGetFormat;
+    Vtbl.fnGetVolume            = DAudioBufGetVolume;
+    Vtbl.fnGetStatus            = DAudioBufGetStatus;
+    Vtbl.fnGetCurrentPosition   = DAudioBufGetCurrentPosition;
+    Vtbl.fnGetPan               = DAudioBufGetPan;
+    Vtbl.fnGetFrequency         = DAudioBufGetFrequency;
+    Vtbl.fnInitialize           = DAudioBufInitialize;
+    Vtbl.fnRestore              = DAudioBufRestore;
+    Vtbl.fnSetFormat            = DAudioBufSetFormat;
+    Vtbl.fnSetVolume            = DAudioBufSetVolume;
+    Vtbl.fnSetCurrentPosition   = DAudioBufSetCurrentPosition;
+    Vtbl.fnSetPan               = DAudioBufSetPan;
+    Vtbl.fnSetFrequency         = DAudioBufSetFrequency;
+    Vtbl.fnLock                 = DAudioBufLock;
+    Vtbl.fnUnlock               = DAudioBufUnlock;
+    Vtbl.fnStop                 = DAudioBufStop;
+    Vtbl.fnPlay                 = DAudioBufPlay;
 }
 //******************************************************************************
@@ -233 +233 @@
    *ppvObj = NULL;
 
-   if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
       *ppvObj = this;
 
@@ -240 +240 @@
    }
 
-   if (IsEqualGUID(riid, IID_IDirectSoundNotify))
+   if (IsEqualGUID(riid, &IID_IDirectSoundNotify))
    {
       IDirectAudioNotify  *notify;
@@ -246 +246 @@
       notify     = new IDirectAudioNotify(this);
       *ppvObj    = notify;
-      notify->Vtbl.AddRef(notify);
+      notify->Vtbl.fnAddRef(notify);
       return DS_OK;
    }
 #if 0
-   if (IsEqualGUID(riid, IID_IDirectSound3DBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSound3DBuffer)) {
       OS2IDirectSound3DBuffer *buffer3D;
 
       buffer3D   = new OS2IDirectSound3DBuffer(this);
       *ppvObj    = buffer3D;
-      buffer3D->Vtbl.AddRef((IDirectSound3DBuffer *)buffer3D);
+      buffer3D->Vtbl.fnAddRef((IDirectSound3DBuffer *)buffer3D);
       return DS_OK;
    }

trunk/src/dsound/DAudioNotify.cpp

@@ -19 +19 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -32 +32 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef                   = DAudioNotifyAddRef;
-   Vtbl.Release                  = DAudioNotifyRelease;
-   Vtbl.QueryInterface           = DAudioNotifyQueryInterface;
-   Vtbl.SetNotificationPositions = DAudioNotifySetNotificationPositions;
+   Vtbl.fnAddRef                   = DAudioNotifyAddRef;
+   Vtbl.fnRelease                  = DAudioNotifyRelease;
+   Vtbl.fnQueryInterface           = DAudioNotifyQueryInterface;
+   Vtbl.fnSetNotificationPositions = DAudioNotifySetNotificationPositions;
 
    dprintf(("DSOUND-IDirectAudioNotify::IDirectAudioNotify (this=%X)", this));
@@ -45 +45 @@
 
    // add a reference to the parent SoundBuffer to make sure it won't suddenly disappear
-   lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    // set pointer to ourselves in parent SoundBuffer
    lpSoundBuffer->SetNotify(this);
@@ -56 +56 @@
    dprintf(("DSOUND-IDirectAudioNotify::~IDirectAudioNotify (this=%X)", this));
    lpSoundBuffer->SetNotify(NULL);
-   lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    if (lpPositions != NULL)
       free(lpPositions);
@@ -71 +71 @@
    *ppvObj = NULL;
 
-   if (!IsEqualGUID(riid, IID_IDirectSoundNotify))
+   if (!IsEqualGUID(riid, &IID_IDirectSoundNotify))
       return E_NOINTERFACE;
 

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;
   }

trunk/src/dsound/OS23DBuffer.cpp

@@ -19 +19 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -42 +42 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef                   = Sound3DBufferAddRef;
-   Vtbl.Release                  = Sound3DBufferRelease;
-   Vtbl.QueryInterface           = Sound3DBufferQueryInterface;
-   Vtbl.GetAllParameters         = Sound3DBufferGetAllParameters;
-   Vtbl.SetAllParameters         = Sound3DBufferSetAllParameters;
-   Vtbl.GetMaxDistance           = Sound3DBufferGetMaxDistance;
-   Vtbl.SetMaxDistance           = Sound3DBufferSetMaxDistance;
-   Vtbl.GetMinDistance           = Sound3DBufferGetMinDistance;
-   Vtbl.SetMinDistance           = Sound3DBufferSetMinDistance;
-   Vtbl.GetMode                  = Sound3DBufferGetMode;
-   Vtbl.SetMode                  = Sound3DBufferSetMode;
-   Vtbl.GetPosition              = Sound3DBufferGetPosition;
-   Vtbl.SetPosition              = Sound3DBufferSetPosition;
-   Vtbl.GetConeAngles            = Sound3DBufferGetConeAngles;
-   Vtbl.SetConeAngles            = Sound3DBufferSetConeAngles;
-   Vtbl.GetConeOrientation       = Sound3DBufferGetConeOrientation;
-   Vtbl.SetConeOrientation       = Sound3DBufferSetConeOrientation;
-   Vtbl.GetConeOutsideVolume     = Sound3DBufferGetConeOutsideVolume;
-   Vtbl.SetConeOutsideVolume     = Sound3DBufferSetConeOutsideVolume;
-   Vtbl.GetVelocity              = Sound3DBufferGetVelocity;
-   Vtbl.SetVelocity              = Sound3DBufferSetVelocity;
+   Vtbl.fnAddRef                   = Sound3DBufferAddRef;
+   Vtbl.fnRelease                  = Sound3DBufferRelease;
+   Vtbl.fnQueryInterface           = Sound3DBufferQueryInterface;
+   Vtbl.fnGetAllParameters         = Sound3DBufferGetAllParameters;
+   Vtbl.fnSetAllParameters         = Sound3DBufferSetAllParameters;
+   Vtbl.fnGetMaxDistance           = Sound3DBufferGetMaxDistance;
+   Vtbl.fnSetMaxDistance           = Sound3DBufferSetMaxDistance;
+   Vtbl.fnGetMinDistance           = Sound3DBufferGetMinDistance;
+   Vtbl.fnSetMinDistance           = Sound3DBufferSetMinDistance;
+   Vtbl.fnGetMode                  = Sound3DBufferGetMode;
+   Vtbl.fnSetMode                  = Sound3DBufferSetMode;
+   Vtbl.fnGetPosition              = Sound3DBufferGetPosition;
+   Vtbl.fnSetPosition              = Sound3DBufferSetPosition;
+   Vtbl.fnGetConeAngles            = Sound3DBufferGetConeAngles;
+   Vtbl.fnSetConeAngles            = Sound3DBufferSetConeAngles;
+   Vtbl.fnGetConeOrientation       = Sound3DBufferGetConeOrientation;
+   Vtbl.fnSetConeOrientation       = Sound3DBufferSetConeOrientation;
+   Vtbl.fnGetConeOutsideVolume     = Sound3DBufferGetConeOutsideVolume;
+   Vtbl.fnSetConeOutsideVolume     = Sound3DBufferSetConeOutsideVolume;
+   Vtbl.fnGetVelocity              = Sound3DBufferGetVelocity;
+   Vtbl.fnSetVelocity              = Sound3DBufferSetVelocity;
 
 
@@ -74 +74 @@
 
    // add a reference to the parent primary SoundBuffer to make sure it won't suddenly disappear
-   lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    // set pointer to ourselves in parent SoundBuffer
    lpSoundBuffer->Set3DBuffer(this);
@@ -85 +85 @@
    dprintf(("DSOUND-OS2IDirectSound3DBuffer::~OS2IDirectSound3DBuffer (this=%X)", this));
    lpSoundBuffer->Set3DBuffer(NULL);
-   lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
 }
 
@@ -98 +98 @@
    *ppvObj = NULL;
 
-   if (!IsEqualGUID(riid, IID_IDirectSound3DBuffer))
+   if (!IsEqualGUID(riid, &IID_IDirectSound3DBuffer))
       return E_NOINTERFACE;
 

trunk/src/dsound/OS23DListener.cpp

@@ -19 +19 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -42 +42 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef                   = Sound3DListenerAddRef;
-   Vtbl.Release                  = Sound3DListenerRelease;
-   Vtbl.QueryInterface           = Sound3DListenerQueryInterface;
-   Vtbl.GetAllParameters         = Sound3DListenerGetAllParameters;
-   Vtbl.SetAllParameters         = Sound3DListenerSetAllParameters;
-   Vtbl.CommitDeferredSettings   = Sound3DListenerCommitDeferredSettings;
-   Vtbl.GetDistanceFactor        = Sound3DListenerGetDistanceFactor;
-   Vtbl.SetDistanceFactor        = Sound3DListenerSetDistanceFactor;
-   Vtbl.GetDopplerFactor         = Sound3DListenerGetDopplerFactor;
-   Vtbl.SetDopplerFactor         = Sound3DListenerSetDopplerFactor;
-   Vtbl.GetOrientation           = Sound3DListenerGetOrientation;
-   Vtbl.SetOrientation           = Sound3DListenerSetOrientation;
-   Vtbl.GetPosition              = Sound3DListenerGetPosition;
-   Vtbl.SetPosition              = Sound3DListenerSetPosition;
-   Vtbl.GetRolloffFactor         = Sound3DListenerGetRolloffFactor;
-   Vtbl.SetRolloffFactor         = Sound3DListenerSetRolloffFactor;
-   Vtbl.GetVelocity              = Sound3DListenerGetVelocity;
-   Vtbl.SetVelocity              = Sound3DListenerSetVelocity;
+   Vtbl.fnAddRef                   = Sound3DListenerAddRef;
+   Vtbl.fnRelease                  = Sound3DListenerRelease;
+   Vtbl.fnQueryInterface           = Sound3DListenerQueryInterface;
+   Vtbl.fnGetAllParameters         = Sound3DListenerGetAllParameters;
+   Vtbl.fnSetAllParameters         = Sound3DListenerSetAllParameters;
+   Vtbl.fnCommitDeferredSettings   = Sound3DListenerCommitDeferredSettings;
+   Vtbl.fnGetDistanceFactor        = Sound3DListenerGetDistanceFactor;
+   Vtbl.fnSetDistanceFactor        = Sound3DListenerSetDistanceFactor;
+   Vtbl.fnGetDopplerFactor         = Sound3DListenerGetDopplerFactor;
+   Vtbl.fnSetDopplerFactor         = Sound3DListenerSetDopplerFactor;
+   Vtbl.fnGetOrientation           = Sound3DListenerGetOrientation;
+   Vtbl.fnSetOrientation           = Sound3DListenerSetOrientation;
+   Vtbl.fnGetPosition              = Sound3DListenerGetPosition;
+   Vtbl.fnSetPosition              = Sound3DListenerSetPosition;
+   Vtbl.fnGetRolloffFactor         = Sound3DListenerGetRolloffFactor;
+   Vtbl.fnSetRolloffFactor         = Sound3DListenerSetRolloffFactor;
+   Vtbl.fnGetVelocity              = Sound3DListenerGetVelocity;
+   Vtbl.fnSetVelocity              = Sound3DListenerSetVelocity;
 
 
@@ -71 +71 @@
 
    // add a reference to the parent primary SoundBuffer to make sure it won't suddenly disappear
-   lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    // set pointer to ourselves in parent SoundBuffer
    lpSoundBuffer->Set3DListener(this);
@@ -82 +82 @@
    dprintf(("DSOUND-OS2IDirectSound3DListener::~OS2IDirectSound3DListener (this=%X)", this));
    lpSoundBuffer->Set3DListener(NULL);
-   lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
 }
 
@@ -95 +95 @@
    *ppvObj = NULL;
 
-   if (!IsEqualGUID(riid, IID_IDirectSound3DListener))
+   if (!IsEqualGUID(riid, &IID_IDirectSound3DListener))
       return E_NOINTERFACE;
 

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;

trunk/src/dsound/OS2NOTIFY.CPP

@@ -19 +19 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -32 +32 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef                   = SoundNotifyAddRef;
-   Vtbl.Release                  = SoundNotifyRelease;
-   Vtbl.QueryInterface           = SoundNotifyQueryInterface;
-   Vtbl.SetNotificationPositions = SoundNotifySetNotificationPositions;
+   Vtbl.fnAddRef                   = SoundNotifyAddRef;
+   Vtbl.fnRelease                  = SoundNotifyRelease;
+   Vtbl.fnQueryInterface           = SoundNotifyQueryInterface;
+   Vtbl.fnSetNotificationPositions = SoundNotifySetNotificationPositions;
 
    dprintf(("DSOUND-OS2IDirectSoundNotify::OS2IDirectSoundNotify (this=%X)", this));
@@ -45 +45 @@
 
    // add a reference to the parent SoundBuffer to make sure it won't suddenly disappear
-   lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    // set pointer to ourselves in parent SoundBuffer
    lpSoundBuffer->SetNotify(this);
@@ -56 +56 @@
    dprintf(("DSOUND-OS2IDirectSoundNotify::~OS2IDirectSoundNotify (this=%X)", this));
    lpSoundBuffer->SetNotify(NULL);
-   lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
+   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    if (lpPositions != NULL)
       free(lpPositions);
@@ -71 +71 @@
    *ppvObj = NULL;
 
-   if (!IsEqualGUID(riid, IID_IDirectSoundNotify))
+   if (!IsEqualGUID(riid, &IID_IDirectSoundNotify))
       return E_NOINTERFACE;
 

trunk/src/dsound/OS2PrimBuff.cpp

@@ -33 +33 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -55 +55 @@
 {
    lpVtbl = &Vtbl;
-   Vtbl.AddRef               = PrimBufAddRef;
-   Vtbl.Release              = PrimBufRelease;
-   Vtbl.QueryInterface       = PrimBufQueryInterface;
-   Vtbl.GetCaps              = PrimBufGetCaps;
-   Vtbl.GetFormat            = PrimBufGetFormat;
-   Vtbl.GetVolume            = PrimBufGetVolume;
-   Vtbl.GetStatus            = PrimBufGetStatus;
-   Vtbl.GetCurrentPosition   = PrimBufGetCurrentPosition;
-   Vtbl.GetPan               = PrimBufGetPan;
-   Vtbl.GetFrequency         = PrimBufGetFrequency;
-   Vtbl.Initialize           = PrimBufInitialize;
-   Vtbl.Restore              = PrimBufRestore;
-   Vtbl.SetFormat            = PrimBufSetFormat;
-   Vtbl.SetVolume            = PrimBufSetVolume;
-   Vtbl.SetCurrentPosition   = PrimBufSetCurrentPosition;
-   Vtbl.SetPan               = PrimBufSetPan;
-   Vtbl.SetFrequency         = PrimBufSetFrequency;
-   Vtbl.Lock                 = PrimBufLock;
-   Vtbl.Unlock               = PrimBufUnlock;
-   Vtbl.Stop                 = PrimBufStop;
-   Vtbl.Play                 = PrimBufPlay;
+   Vtbl.fnAddRef               = PrimBufAddRef;
+   Vtbl.fnRelease              = PrimBufRelease;
+   Vtbl.fnQueryInterface       = PrimBufQueryInterface;
+   Vtbl.fnGetCaps              = PrimBufGetCaps;
+   Vtbl.fnGetFormat            = PrimBufGetFormat;
+   Vtbl.fnGetVolume            = PrimBufGetVolume;
+   Vtbl.fnGetStatus            = PrimBufGetStatus;
+   Vtbl.fnGetCurrentPosition   = PrimBufGetCurrentPosition;
+   Vtbl.fnGetPan               = PrimBufGetPan;
+   Vtbl.fnGetFrequency         = PrimBufGetFrequency;
+   Vtbl.fnInitialize           = PrimBufInitialize;
+   Vtbl.fnRestore              = PrimBufRestore;
+   Vtbl.fnSetFormat            = PrimBufSetFormat;
+   Vtbl.fnSetVolume            = PrimBufSetVolume;
+   Vtbl.fnSetCurrentPosition   = PrimBufSetCurrentPosition;
+   Vtbl.fnSetPan               = PrimBufSetPan;
+   Vtbl.fnSetFrequency         = PrimBufSetFrequency;
+   Vtbl.fnLock                 = PrimBufLock;
+   Vtbl.fnUnlock               = PrimBufUnlock;
+   Vtbl.fnStop                 = PrimBufStop;
+   Vtbl.fnPlay                 = PrimBufPlay;
 
    dprintf(("DSOUND-PrimBuff: Constructor"));
@@ -135 +135 @@
    *ppvObj = NULL;
 
-   if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
       *ppvObj = This;
       PrimBufAddRef(This);
@@ -142 +142 @@
 
 
-   if (IsEqualGUID(riid, IID_IDirectSound3DListener)) {
+   if (IsEqualGUID(riid, &IID_IDirectSound3DListener)) {
       OS2PrimBuff                *me = (OS2PrimBuff *)This;
       OS2IDirectSound3DListener  *listener;
@@ -148 +148 @@
       listener     = new OS2IDirectSound3DListener(me);
       *ppvObj      = listener;
-      listener->Vtbl.AddRef((IDirectSound3DListener *)listener);
+      listener->Vtbl.fnAddRef((IDirectSound3DListener *)listener);
       return DS_OK;
    }

trunk/src/dsound/OS2SNDBUFFER.CPP

@@ -21 +21 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>
 
@@ -52 +52 @@
    //This is the "normal" constructor
    lpVtbl = &Vtbl;
-   Vtbl.AddRef               = SoundBufAddRef;
-   Vtbl.Release              = SoundBufRelease;
-   Vtbl.QueryInterface       = SoundBufQueryInterface;
-   Vtbl.GetCaps              = SoundBufGetCaps;
-   Vtbl.GetFormat            = SoundBufGetFormat;
-   Vtbl.GetVolume            = SoundBufGetVolume;
-   Vtbl.GetStatus            = SoundBufGetStatus;
-   Vtbl.GetCurrentPosition   = SoundBufGetCurrentPosition;
-   Vtbl.GetPan               = SoundBufGetPan;
-   Vtbl.GetFrequency         = SoundBufGetFrequency;
-   Vtbl.Initialize           = SoundBufInitialize;
-   Vtbl.Restore              = SoundBufRestore;
-   Vtbl.SetFormat            = SoundBufSetFormat;
-   Vtbl.SetVolume            = SoundBufSetVolume;
-   Vtbl.SetCurrentPosition   = SoundBufSetCurrentPosition;
-   Vtbl.SetPan               = SoundBufSetPan;
-   Vtbl.SetFrequency         = SoundBufSetFrequency;
-   Vtbl.Lock                 = SoundBufLock;
-   Vtbl.Unlock               = SoundBufUnlock;
-   Vtbl.Stop                 = SoundBufStop;
-   Vtbl.Play                 = SoundBufPlay;
+   Vtbl.fnAddRef               = SoundBufAddRef;
+   Vtbl.fnRelease              = SoundBufRelease;
+   Vtbl.fnQueryInterface       = SoundBufQueryInterface;
+   Vtbl.fnGetCaps              = SoundBufGetCaps;
+   Vtbl.fnGetFormat            = SoundBufGetFormat;
+   Vtbl.fnGetVolume            = SoundBufGetVolume;
+   Vtbl.fnGetStatus            = SoundBufGetStatus;
+   Vtbl.fnGetCurrentPosition   = SoundBufGetCurrentPosition;
+   Vtbl.fnGetPan               = SoundBufGetPan;
+   Vtbl.fnGetFrequency         = SoundBufGetFrequency;
+   Vtbl.fnInitialize           = SoundBufInitialize;
+   Vtbl.fnRestore              = SoundBufRestore;
+   Vtbl.fnSetFormat            = SoundBufSetFormat;
+   Vtbl.fnSetVolume            = SoundBufSetVolume;
+   Vtbl.fnSetCurrentPosition   = SoundBufSetCurrentPosition;
+   Vtbl.fnSetPan               = SoundBufSetPan;
+   Vtbl.fnSetFrequency         = SoundBufSetFrequency;
+   Vtbl.fnLock                 = SoundBufLock;
+   Vtbl.fnUnlock               = SoundBufUnlock;
+   Vtbl.fnStop                 = SoundBufStop;
+   Vtbl.fnPlay                 = SoundBufPlay;
 
    dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer (buf=%X)", this));
@@ -94 +94 @@
    // destroyed; moreover if the user didn't create  a primary buffer himself/herself,
    // it will automatically get created and destroyed with the last secondary buffer
-   primary->Vtbl.AddRef(primary);
+   primary->Vtbl.fnAddRef(primary);
 
    // Start playing the primary buffer
    // TODO: only start playing the primary buffer when necessary!
-   OS2IDirectSoundBuffer::primary->Vtbl.Play(OS2IDirectSoundBuffer::primary, 0, 0, DSBPLAY_LOOPING);
+   OS2IDirectSoundBuffer::primary->Vtbl.fnPlay(OS2IDirectSoundBuffer::primary, 0, 0, DSBPLAY_LOOPING);
 
    parentDS  = DSound;
@@ -156 +156 @@
    //This is the constructor used for duplicating sound buffers
    lpVtbl = &Vtbl;
-   Vtbl.AddRef               = SoundBufAddRef;
-   Vtbl.Release              = SoundBufRelease;
-   Vtbl.QueryInterface       = SoundBufQueryInterface;
-   Vtbl.GetCaps              = SoundBufGetCaps;
-   Vtbl.GetFormat            = SoundBufGetFormat;
-   Vtbl.GetVolume            = SoundBufGetVolume;
-   Vtbl.GetStatus            = SoundBufGetStatus;
-   Vtbl.GetCurrentPosition   = SoundBufGetCurrentPosition;
-   Vtbl.GetPan               = SoundBufGetPan;
-   Vtbl.GetFrequency         = SoundBufGetFrequency;
-   Vtbl.Initialize           = SoundBufInitialize;
-   Vtbl.Restore              = SoundBufRestore;
-   Vtbl.SetFormat            = SoundBufSetFormat;
-   Vtbl.SetVolume            = SoundBufSetVolume;
-   Vtbl.SetCurrentPosition   = SoundBufSetCurrentPosition;
-   Vtbl.SetPan               = SoundBufSetPan;
-   Vtbl.SetFrequency         = SoundBufSetFrequency;
-   Vtbl.Lock                 = SoundBufLock;
-   Vtbl.Unlock               = SoundBufUnlock;
-   Vtbl.Stop                 = SoundBufStop;
-   Vtbl.Play                 = SoundBufPlay;
+   Vtbl.fnAddRef               = SoundBufAddRef;
+   Vtbl.fnRelease              = SoundBufRelease;
+   Vtbl.fnQueryInterface       = SoundBufQueryInterface;
+   Vtbl.fnGetCaps              = SoundBufGetCaps;
+   Vtbl.fnGetFormat            = SoundBufGetFormat;
+   Vtbl.fnGetVolume            = SoundBufGetVolume;
+   Vtbl.fnGetStatus            = SoundBufGetStatus;
+   Vtbl.fnGetCurrentPosition   = SoundBufGetCurrentPosition;
+   Vtbl.fnGetPan               = SoundBufGetPan;
+   Vtbl.fnGetFrequency         = SoundBufGetFrequency;
+   Vtbl.fnInitialize           = SoundBufInitialize;
+   Vtbl.fnRestore              = SoundBufRestore;
+   Vtbl.fnSetFormat            = SoundBufSetFormat;
+   Vtbl.fnSetVolume            = SoundBufSetVolume;
+   Vtbl.fnSetCurrentPosition   = SoundBufSetCurrentPosition;
+   Vtbl.fnSetPan               = SoundBufSetPan;
+   Vtbl.fnSetFrequency         = SoundBufSetFrequency;
+   Vtbl.fnLock                 = SoundBufLock;
+   Vtbl.fnUnlock               = SoundBufUnlock;
+   Vtbl.fnStop                 = SoundBufStop;
+   Vtbl.fnPlay                 = SoundBufPlay;
 
    dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer/Duplicate (buf=%X)", this));
@@ -197 +197 @@
    // destroyed; moreover if the user didn't create  a primary buffer himself/herself,
    // it will automatically get created and destroyed with the last secondary buffer
-   primary->Vtbl.AddRef(primary);
+   primary->Vtbl.fnAddRef(primary);
 
    parentDS  = DSound;
@@ -259 +259 @@
 
    // release the primary buffer too
-   primary->Vtbl.Release(primary);
+   primary->Vtbl.fnRelease(primary);
 
    if (this == dsbroot)  // is this the first SoundBuffer?
@@ -284 +284 @@
 
    if (primary != NULL)
-      primary->Vtbl.Stop(primary);
+      primary->Vtbl.fnStop(primary);
 
    while (cur != NULL) {
@@ -293 +293 @@
    dprintf(("DSOUND-OS2IDirectSoundBuffer::DestroyAllBuffers - %X", primary));
    if (primary != NULL)
-      primary->Vtbl.Release(primary);
+      primary->Vtbl.fnRelease(primary);
 }
 
@@ -306 +306 @@
    *ppvObj = NULL;
 
-   if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
       *ppvObj = This;
 
@@ -313 +313 @@
    }
 
-   if (IsEqualGUID(riid, IID_IDirectSoundNotify)) {
+   if (IsEqualGUID(riid, &IID_IDirectSoundNotify)) {
       OS2IDirectSoundBuffer  *me     = (OS2IDirectSoundBuffer *)This;
       OS2IDirectSoundNotify  *notify;
@@ -319 +319 @@
       notify     = new OS2IDirectSoundNotify(me);
       *ppvObj    = notify;
-      notify->Vtbl.AddRef(notify);
+      notify->Vtbl.fnAddRef(notify);
       return DS_OK;
    }
 
-   if (IsEqualGUID(riid, IID_IDirectSound3DBuffer)) {
+   if (IsEqualGUID(riid, &IID_IDirectSound3DBuffer)) {
       OS2IDirectSoundBuffer   *me     = (OS2IDirectSoundBuffer *)This;
       OS2IDirectSound3DBuffer *buffer3D;
@@ -329 +329 @@
       buffer3D   = new OS2IDirectSound3DBuffer(me);
       *ppvObj    = buffer3D;
-      buffer3D->Vtbl.AddRef((IDirectSound3DBuffer *)buffer3D);
+      buffer3D->Vtbl.fnAddRef((IDirectSound3DBuffer *)buffer3D);
       return DS_OK;
    }

trunk/src/dsound/dsmixer.cpp

@@ -20 +20 @@
 #include <string.h>
 
-#define INITGUID
+#define CINTERFACE
 #include <dsound.h>