Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMTempoTrack.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jul 6 06:37:36 CDT 2015


Module: wine
Branch: master
Commit: ee09310345f321a936f2d83c85f9eee06588ffa4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ee09310345f321a936f2d83c85f9eee06588ffa4

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Mon Jul  6 00:11:42 2015 +0200

dmime: Remove the extraneous IUnknown from DMTempoTrack.

---

 dlls/dmime/tempotrack.c | 127 ++++++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 75 deletions(-)

diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index cff875e..4270b84 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -27,7 +27,6 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
  * IDirectMusicTempoTrack implementation
  */
 typedef struct IDirectMusicTempoTrack {
-    const IUnknownVtbl *UnknownVtbl;
     IDirectMusicTrack8 IDirectMusicTrack8_iface;
     const IPersistStreamVtbl *PersistStreamVtbl;
     LONG ref;
@@ -36,61 +35,6 @@ typedef struct IDirectMusicTempoTrack {
     struct list Items;
 } IDirectMusicTempoTrack;
 
-/* IDirectMusicTempoTrack IUnknown part: */
-static HRESULT WINAPI IDirectMusicTempoTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
-  ICOM_THIS_MULTI(IDirectMusicTempoTrack, UnknownVtbl, iface);
-  TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
-  
-  if (IsEqualIID (riid, &IID_IUnknown)) {
-    *ppobj = &This->UnknownVtbl;
-    IUnknown_AddRef (iface);
-    return S_OK;
-  } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)
-	     || IsEqualIID (riid, &IID_IDirectMusicTrack8)) {
-    *ppobj = &This->IDirectMusicTrack8_iface;
-    IUnknown_AddRef (iface);
-    return S_OK;
-  } else if (IsEqualIID (riid, &IID_IPersistStream)) {
-    *ppobj = &This->PersistStreamVtbl;
-    IUnknown_AddRef (iface);
-    return S_OK;
-  }
-  
-  WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
-  return E_NOINTERFACE;
-}
-
-static ULONG WINAPI IDirectMusicTempoTrack_IUnknown_AddRef (LPUNKNOWN iface) {
-  ICOM_THIS_MULTI(IDirectMusicTempoTrack, UnknownVtbl, iface);
-  ULONG ref = InterlockedIncrement(&This->ref);
-
-  TRACE("(%p): AddRef from %d\n", This, ref - 1);
-
-  DMIME_LockModule();
-
-  return ref;
-}
-
-static ULONG WINAPI IDirectMusicTempoTrack_IUnknown_Release (LPUNKNOWN iface) {
-  ICOM_THIS_MULTI(IDirectMusicTempoTrack, UnknownVtbl, iface);
-  ULONG ref = InterlockedDecrement(&This->ref);
-  TRACE("(%p): ReleaseRef to %d\n", This, ref);
-  
-  if (ref == 0) {
-    HeapFree(GetProcessHeap(), 0, This);
-  }
-
-  DMIME_UnlockModule();
-  
-  return ref;
-}
-
-static const IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl = {
-  IDirectMusicTempoTrack_IUnknown_QueryInterface,
-  IDirectMusicTempoTrack_IUnknown_AddRef,
-  IDirectMusicTempoTrack_IUnknown_Release
-};
-
 /* IDirectMusicTempoTrack IDirectMusicTrack8 part: */
 static inline IDirectMusicTempoTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface)
 {
@@ -98,22 +42,51 @@ static inline IDirectMusicTempoTrack *impl_from_IDirectMusicTrack8(IDirectMusicT
 }
 
 static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
-        void **ppobj)
+        void **ret_iface)
 {
     IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
-  return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
+
+    TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface);
+
+    *ret_iface = NULL;
+
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) ||
+            IsEqualIID(riid, &IID_IDirectMusicTrack8))
+        *ret_iface = iface;
+    else if (IsEqualIID(riid, &IID_IPersistStream))
+        *ret_iface = &This->PersistStreamVtbl;
+    else {
+        WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown*)*ret_iface);
+    return S_OK;
 }
 
 static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
 {
     IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
-  return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
+    LONG ref = InterlockedIncrement(&This->ref);
+
+    TRACE("(%p) ref=%d\n", This, ref);
+
+    return ref;
 }
 
 static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
 {
     IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
-  return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
+    LONG ref = InterlockedDecrement(&This->ref);
+
+    TRACE("(%p) ref=%d\n", This, ref);
+
+    if (!ref) {
+        HeapFree(GetProcessHeap(), 0, This);
+        DMIME_UnlockModule();
+    }
+
+    return ref;
 }
 
 static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface,
@@ -345,17 +318,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
 /* IDirectMusicTempoTrack IPersistStream part: */
 static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
   ICOM_THIS_MULTI(IDirectMusicTempoTrack, PersistStreamVtbl, iface);
-  return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
+  return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
 }
 
 static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
   ICOM_THIS_MULTI(IDirectMusicTempoTrack, PersistStreamVtbl, iface);
-  return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
+  return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
 }
 
 static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
   ICOM_THIS_MULTI(IDirectMusicTempoTrack, PersistStreamVtbl, iface);
-  return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
+  return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
 }
 
 static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
@@ -445,23 +418,27 @@ static const IPersistStreamVtbl DirectMusicTempoTrack_PersistStream_Vtbl = {
 /* for ClassFactory */
 HRESULT WINAPI create_dmtempotrack(REFIID lpcGUID, void **ppobj)
 {
-  IDirectMusicTempoTrack* track;
-	
-  track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTempoTrack));
-  if (NULL == track) {
-    *ppobj = NULL;
-    return E_OUTOFMEMORY;
-  }
-  track->UnknownVtbl = &DirectMusicTempoTrack_Unknown_Vtbl;
+    IDirectMusicTempoTrack *track;
+    HRESULT hr;
+
+    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
+    if (!track) {
+        *ppobj = NULL;
+        return E_OUTOFMEMORY;
+    }
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
   track->PersistStreamVtbl = &DirectMusicTempoTrack_PersistStream_Vtbl;
   track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
   DM_STRUCT_INIT(track->pDesc);
   track->pDesc->dwValidData |= DMUS_OBJ_CLASS;
   track->pDesc->guidClass = CLSID_DirectMusicTempoTrack;
-  track->ref = 0; /* will be inited by QueryInterface */
-  track->enabled = TRUE;
-  list_init (&track->Items);
+    track->ref = 1;
+    track->enabled = TRUE;
+    list_init(&track->Items);
 
-  return IDirectMusicTempoTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj);
+    DMIME_LockModule();
+    hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
+    IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);
+
+    return hr;
 }




More information about the wine-cvs mailing list