dmime: Remove patterntrack.c and tool.c as they are unused and don't correspond to objects.

Francois Gouget fgouget at free.fr
Thu Jun 18 04:11:37 CDT 2009


---

As suggested by Rok Mandeljc (hopefully).

 dlls/dmime/Makefile.in     |    2 -
 dlls/dmime/dmime_private.h |   26 ---------
 dlls/dmime/patterntrack.c  |  106 ----------------------------------
 dlls/dmime/tool.c          |  134 --------------------------------------------
 4 files changed, 0 insertions(+), 268 deletions(-)
 delete mode 100644 dlls/dmime/patterntrack.c
 delete mode 100644 dlls/dmime/tool.c

diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in
index 9efdd08..1248e02 100644
--- a/dlls/dmime/Makefile.in
+++ b/dlls/dmime/Makefile.in
@@ -13,7 +13,6 @@ C_SRCS = \
 	lyricstrack.c \
 	markertrack.c \
 	paramcontroltrack.c \
-	patterntrack.c \
 	performance.c \
 	regsvr.c \
 	segment.c \
@@ -23,7 +22,6 @@ C_SRCS = \
 	sysextrack.c \
 	tempotrack.c \
 	timesigtrack.c \
-	tool.c \
 	wavetrack.c
 
 RC_SRCS = version.rc
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index 308c2c8..d3ad0e5 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -51,8 +51,6 @@ typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl;
 typedef struct IDirectMusicSegmentState8Impl IDirectMusicSegmentState8Impl;
 typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl;
 typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl;
-typedef struct IDirectMusicTool8Impl IDirectMusicTool8Impl;
-typedef struct IDirectMusicPatternTrackImpl IDirectMusicPatternTrackImpl;
 
 typedef struct IDirectMusicLyricsTrack IDirectMusicLyricsTrack;
 typedef struct IDirectMusicMarkerTrack IDirectMusicMarkerTrack;
@@ -72,8 +70,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVO
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentStateImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter);
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicGraphImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter);
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicAudioPathImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter);
-extern HRESULT WINAPI DMUSIC_CreateDirectMusicToolImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter);
-extern HRESULT WINAPI DMUSIC_CreateDirectMusicPatternTrackImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter);
 
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicLyricsTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);
 extern HRESULT WINAPI DMUSIC_CreateDirectMusicMarkerTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);
@@ -237,28 +233,6 @@ struct IDirectMusicAudioPathImpl {
 };
 
 /*****************************************************************************
- * IDirectMusicTool8Impl implementation structure
- */
-struct IDirectMusicTool8Impl {
-  /* IUnknown fields */
-  const IDirectMusicTool8Vtbl *lpVtbl;
-  LONG           ref;
-
-  /* IDirectMusicTool8Impl fields */
-};
-
-/*****************************************************************************
- * IDirectMusicPatternTrackImpl implementation structure
- */
-struct IDirectMusicPatternTrackImpl {
-  /* IUnknown fields */
-  const IDirectMusicPatternTrackVtbl *lpVtbl;
-  LONG           ref;
-
-  /* IDirectMusicPatternTrackImpl fields */
-};
-
-/*****************************************************************************
  * IDirectMusicLyricsTrack implementation structure
  */
 struct IDirectMusicLyricsTrack
diff --git a/dlls/dmime/patterntrack.c b/dlls/dmime/patterntrack.c
deleted file mode 100644
index c8ed574..0000000
--- a/dlls/dmime/patterntrack.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* IDirectMusicPatternTrack Implementation
- *
- * Copyright (C) 2003-2004 Rok Mandeljc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "dmime_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmime);
-
-/* IDirectMusicPatternTrack IUnknown parts follow: */
-static HRESULT WINAPI IDirectMusicPatternTrackImpl_QueryInterface (LPDIRECTMUSICPATTERNTRACK iface, REFIID riid, LPVOID *ppobj) {
-	IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
-	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
-
-	if (IsEqualIID (riid, &IID_IUnknown) || 
-	    IsEqualIID (riid, &IID_IDirectMusicPatternTrack)) {
-		IUnknown_AddRef(iface);
-		*ppobj = This;
-		return S_OK;
-	}
-	
-	WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
-	return E_NOINTERFACE;
-}
-
-static ULONG WINAPI IDirectMusicPatternTrackImpl_AddRef (LPDIRECTMUSICPATTERNTRACK iface) {
-	IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
-        ULONG ref = InterlockedIncrement(&This->ref);
-
-	TRACE("(%p): AddRef from %d\n", This, ref - 1);
-
-	DMIME_LockModule();
-
-	return ref;
-}
-
-static ULONG WINAPI IDirectMusicPatternTrackImpl_Release (LPDIRECTMUSICPATTERNTRACK iface) {
-	IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)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;
-}
-
-/* IDirectMusicPatternTrack Interface follow: */
-static HRESULT WINAPI IDirectMusicPatternTrackImpl_CreateSegment (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicStyle* pStyle, IDirectMusicSegment** ppSegment) {
-	IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
-	FIXME("(%p, %p, %p): stub\n", This, pStyle, ppSegment);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicPatternTrackImpl_SetVariation (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicSegmentState* pSegState, DWORD dwVariationFlags, DWORD dwPart) {
-	IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
-	FIXME("(%p, %p, %d, %d): stub\n", This, pSegState, dwVariationFlags, dwPart);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUSICPATTERNTRACK iface, IDirectMusicSegmentState* pSegState, WCHAR* wszName, IDirectMusicStyle* pStyle, DWORD dwPatternType, DWORD* pdwLength) {
-	IDirectMusicPatternTrackImpl *This = (IDirectMusicPatternTrackImpl *)iface;
-	FIXME("(%p, %p, %p, %p, %d, %p): stub\n", This, pSegState, wszName, pStyle, dwPatternType, pdwLength);
-	return S_OK;
-}
-
-static const IDirectMusicPatternTrackVtbl DirectMusicPatternTrack_Vtbl = {
-	IDirectMusicPatternTrackImpl_QueryInterface,
-	IDirectMusicPatternTrackImpl_AddRef,
-	IDirectMusicPatternTrackImpl_Release,
-	IDirectMusicPatternTrackImpl_CreateSegment,
-	IDirectMusicPatternTrackImpl_SetVariation,
-	IDirectMusicPatternTrackImpl_SetPatternByName
-};
-
-/* for ClassFactory */
-HRESULT WINAPI DMUSIC_CreateDirectMusicPatternTrackImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) {
-	IDirectMusicPatternTrackImpl* track;
-	
-	track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPatternTrackImpl));
-	if (NULL == track) {
-		*ppobj = NULL;
-		return E_OUTOFMEMORY;
-	}
-	track->lpVtbl = &DirectMusicPatternTrack_Vtbl;
-	track->ref = 0; /* will be inited by QueryInterface */
-	
-	return IDirectMusicPatternTrackImpl_QueryInterface ((LPDIRECTMUSICPATTERNTRACK)track, lpcGUID, ppobj);
-}
diff --git a/dlls/dmime/tool.c b/dlls/dmime/tool.c
deleted file mode 100644
index 1654bb8..0000000
--- a/dlls/dmime/tool.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* IDirectMusicTool8 Implementation
- *
- * Copyright (C) 2003-2004 Rok Mandeljc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "dmime_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmime);
-
-/* IDirectMusicTool8Impl IUnknown part: */
-static HRESULT WINAPI IDirectMusicTool8Impl_QueryInterface (LPDIRECTMUSICTOOL8 iface, REFIID riid, LPVOID *ppobj) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
-	if (IsEqualIID (riid, &IID_IUnknown) || 
-	    IsEqualIID (riid, &IID_IDirectMusicTool) ||
-	    IsEqualIID (riid, &IID_IDirectMusicTool8)) {
-		IUnknown_AddRef(iface);
-		*ppobj = This;
-		return S_OK;
-	}
-	WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
-	return E_NOINTERFACE;
-}
-
-static ULONG WINAPI IDirectMusicTool8Impl_AddRef (LPDIRECTMUSICTOOL8 iface) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-        ULONG ref = InterlockedIncrement(&This->ref);
-
-	TRACE("(%p) : AddRef from %d\n", This, ref - 1);
-
-	DMIME_LockModule();
-
-	return ref;
-}
-
-static ULONG WINAPI IDirectMusicTool8Impl_Release (LPDIRECTMUSICTOOL8 iface) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)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;
-}
-
-/* IDirectMusicTool8Impl IDirectMusicTool part: */
-static HRESULT WINAPI IDirectMusicTool8Impl_Init (LPDIRECTMUSICTOOL8 iface, IDirectMusicGraph* pGraph) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p): stub\n", This, pGraph);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicTool8Impl_GetMsgDeliveryType (LPDIRECTMUSICTOOL8 iface, DWORD* pdwDeliveryType) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p): stub\n", This, pdwDeliveryType);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicTool8Impl_GetMediaTypeArraySize (LPDIRECTMUSICTOOL8 iface, DWORD* pdwNumElements) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p): stub\n", This, pdwNumElements);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicTool8Impl_GetMediaTypes (LPDIRECTMUSICTOOL8 iface, DWORD** padwMediaTypes, DWORD dwNumElements) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p, %d): stub\n", This, padwMediaTypes, dwNumElements);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicTool8Impl_ProcessPMsg (LPDIRECTMUSICTOOL8 iface, IDirectMusicPerformance* pPerf, DMUS_PMSG* pPMSG) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p, %p): stub\n", This, pPerf, pPMSG);
-	return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicTool8Impl_Flush (LPDIRECTMUSICTOOL8 iface, IDirectMusicPerformance* pPerf, DMUS_PMSG* pPMSG, REFERENCE_TIME rtTime) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p, %p, 0x%s): stub\n", This, pPerf, pPMSG, wine_dbgstr_longlong(rtTime));
-	return S_OK;
-}
-
-/* IDirectMusicTool8Impl IDirectMusicTool8 part: */
-static HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDirectMusicTool** ppTool) {
-	IDirectMusicTool8Impl *This = (IDirectMusicTool8Impl *)iface;
-	FIXME("(%p, %p): stub\n", This, ppTool);
-	return S_OK;
-}
-
-static const IDirectMusicTool8Vtbl DirectMusicTool8_Vtbl = {
-	IDirectMusicTool8Impl_QueryInterface,
-	IDirectMusicTool8Impl_AddRef,
-	IDirectMusicTool8Impl_Release,
-	IDirectMusicTool8Impl_Init,
-	IDirectMusicTool8Impl_GetMsgDeliveryType,
-	IDirectMusicTool8Impl_GetMediaTypeArraySize,
-	IDirectMusicTool8Impl_GetMediaTypes,
-	IDirectMusicTool8Impl_ProcessPMsg,
-	IDirectMusicTool8Impl_Flush,
-	IDirectMusicTool8Impl_Clone
-};
-
-/* for ClassFactory */
-HRESULT WINAPI DMUSIC_CreateDirectMusicobjImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) {
-	IDirectMusicTool8Impl* obj;
-	
-	obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTool8Impl));
-	if (NULL == obj) {
-		*ppobj = NULL;
-		return E_OUTOFMEMORY;
-	}
-	obj->lpVtbl = &DirectMusicTool8_Vtbl;
-	obj->ref = 0; /* will be inited by QueryInterface */
-	
-	return IDirectMusicTool8Impl_QueryInterface ((LPDIRECTMUSICTOOL8)obj, lpcGUID, ppobj);	
-}
-- 
1.6.3.1



More information about the wine-patches mailing list