Stub implementation of the dmusic dll.

configure.ac

@@ -1410,6 +1410,7 @@ dlls/ddraw/Makefile
 dlls/devenum/Makefile
 dlls/dinput/Makefile
 dlls/dinput8/Makefile
+dlls/dmusic/Makefile
 dlls/dplay/Makefile
 dlls/dplayx/Makefile
 dlls/dsound/Makefile

dlls/Makefile.in

@@ -30,6 +30,7 @@ BASEDIRS = \
 	devenum \
 	dinput \
 	dinput8 \
+	dmusic \
 	dplay \
 	dplayx \
 	dsound \
@@ -197,6 +198,7 @@ all: \
 	devenum.dll$(DLLEXT) \
 	dinput.dll$(DLLEXT) \
 	dinput8.dll$(DLLEXT) \
+	dmusic.dll$(DLLEXT) \
 	dplay.dll$(DLLEXT) \
 	dplayx.dll$(DLLEXT) \
 	dsound.dll$(DLLEXT) \
@@ -335,6 +337,9 @@ dinput.dll$(DLLEXT): dinput/dinput.dll$(DLLEXT)
 dinput8.dll$(DLLEXT): dinput8/dinput8.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) dinput8/dinput8.dll$(DLLEXT) $@
 
+dmusic.dll$(DLLEXT): dmusic/dmusic.dll$(DLLEXT)
+	$(RM) $@ && $(LN_S) dmusic/dmusic.dll$(DLLEXT) $@
+
 dplay.dll$(DLLEXT): dplay/dplay.dll$(DLLEXT)
 	$(RM) $@ && $(LN_S) dplay/dplay.dll$(DLLEXT) $@
 
@@ -615,6 +620,7 @@ IMPORT_LIBS = \
 	libdevenum \
 	libdinput \
 	libdinput8 \
+	libdmusic \
 	libdplay \
 	libdplayx \
 	libdsound \
@@ -771,6 +777,11 @@ libdinput8.def: dinput8/dinput8.spec.def
 libdinput8.a: dinput8/dinput8.spec.def
 	$(DLLTOOL) -k -l $@ -d dinput8/dinput8.spec.def
 
+libdmusic.def: dmusic/dmusic.spec.def
+	$(RM) $@ && $(LN_S) dmusic/dmusic.spec.def $@
+libdmusic.a: dmusic/dmusic.spec.def
+	$(DLLTOOL) -k -l $@ -d dmusic/dmusic.spec.def
+
 libdplay.def: dplay/dplay.spec.def
 	$(RM) $@ && $(LN_S) dplay/dplay.spec.def $@
 libdplay.a: dplay/dplay.spec.def
@@ -1114,6 +1125,7 @@ ddraw/ddraw.spec.def: $(WINEBUILD)
 devenum/devenum.spec.def: $(WINEBUILD)
 dinput/dinput.spec.def: $(WINEBUILD)
 dinput8/dinput8.spec.def: $(WINEBUILD)
+dmusic/dmusic.spec.def: $(WINEBUILD)
 dplay/dplay.spec.def: $(WINEBUILD)
 dplayx/dplayx.spec.def: $(WINEBUILD)
 dsound/dsound.spec.def: $(WINEBUILD)
@@ -1203,6 +1215,7 @@ ddraw/ddraw.dll$(DLLEXT): ddraw
 devenum/devenum.dll$(DLLEXT): devenum
 dinput/dinput.dll$(DLLEXT): dinput
 dinput8/dinput8.dll$(DLLEXT): dinput8
+dmusic/dmusic.dll$(DLLEXT): dmusic
 dplay/dplay.dll$(DLLEXT): dplay
 dplayx/dplayx.dll$(DLLEXT): dplayx
 dsound/dsound.dll$(DLLEXT): dsound
@@ -1308,6 +1321,7 @@ ddraw/__install__: ddraw.dll$(DLLEXT)
 devenum/__install__: devenum.dll$(DLLEXT)
 dinput/__install__: dinput.dll$(DLLEXT)
 dinput8/__install__: dinput8.dll$(DLLEXT)
+dmusic/__install__: dmusic.dll$(DLLEXT)
 dplay/__install__: dplay.dll$(DLLEXT)
 dplayx/__install__: dplayx.dll$(DLLEXT)
 dsound/__install__: dsound.dll$(DLLEXT)

dlls/dmusic/.cvsignore

+Makefile
+dmusic.dll.dbg.c
+dmusic.spec.c
+dmusic.spec.def

dlls/dmusic/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = dmusic.dll
+IMPORTS   = user32 kernel32
+EXTRALIBS = $(LIBUUID)
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
+C_SRCS = \
+	dmusic.c \
+	dmusic8.c \
+	dmusic_buffer.c \
+	dmusic_collection.c \
+	dmusic_dlinstrument.c \
+	dmusic_download.c \
+	dmusic_instrument.c \
+	dmusic_main.c \
+	dmusic_port.c \
+	dmusic_portdl.c \
+	dmusic_thru.c \
+	reference_clock.c
+
+@MAKE_DLL_RULES@
+
+### Dependencies:

dlls/dmusic/dmusic.c

+/* IDirectMusic Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* for ClassFactory */
+HRESULT WINAPI DMUSIC_CreateDirectMusic (LPCGUID lpcGUID, LPDIRECTMUSIC *ppDM, LPUNKNOWN pUnkOuter)
+{
+	IDirectMusicImpl *dmusic;
+
+	TRACE("(%p,%p,%p)\n",lpcGUID, ppDM, pUnkOuter);
+
+
+	dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicImpl));
+	if (NULL == dmusic)
+	{
+		*ppDM = (LPDIRECTMUSIC)NULL;
+		return E_OUTOFMEMORY;
+	}
+	
+	dmusic->lpVtbl = &DirectMusic_Vtbl;
+	dmusic->ref = 1;
+	
+	*ppDM = (LPDIRECTMUSIC)dmusic;
+	return S_OK;
+	
+	WARN("No interface found\n");
+	return E_NOINTERFACE;
+}
+
+/* IDirectMusic IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicImpl_QueryInterface (LPDIRECTMUSIC iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusic))
+	{
+		IDirectMusicImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicImpl_AddRef (LPDIRECTMUSIC iface)
+{
+	ICOM_THIS(IDirectMusicImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI   IDirectMusicImpl_Release (LPDIRECTMUSIC iface)
+{
+	ICOM_THIS(IDirectMusicImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusic Interface follow: */
+HRESULT WINAPI IDirectMusicImpl_EnumPort (LPDIRECTMUSIC iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_CreateMusicBuffer (LPDIRECTMUSIC iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_CreatePort (LPDIRECTMUSIC iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_EnumMasterClock (LPDIRECTMUSIC iface, DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_GetMasterClock (LPDIRECTMUSIC iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_SetMasterClock (LPDIRECTMUSIC iface, REFGUID rguidClock)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_Activate (LPDIRECTMUSIC iface, BOOL fEnable)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_GetDefaultPort (LPDIRECTMUSIC iface, LPGUID pguidPort)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicImpl_SetDirectSound (LPDIRECTMUSIC iface, LPDIRECTSOUND pDirectSound, HWND hWnd)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusic) DirectMusic_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicImpl_QueryInterface,
+	IDirectMusicImpl_AddRef,
+	IDirectMusicImpl_Release,
+	IDirectMusicImpl_EnumPort,
+	IDirectMusicImpl_CreateMusicBuffer,
+	IDirectMusicImpl_CreatePort,
+	IDirectMusicImpl_EnumMasterClock,
+	IDirectMusicImpl_GetMasterClock,
+	IDirectMusicImpl_SetMasterClock,
+	IDirectMusicImpl_Activate,
+	IDirectMusicImpl_GetDefaultPort,
+	IDirectMusicImpl_SetDirectSound
+};

dlls/dmusic/dmusic.spec

+@ stdcall DllCanUnloadNow() DMUSIC_DllCanUnloadNow
+@ stdcall DllGetClassObject(ptr ptr ptr) DMUSIC_DllGetClassObject
+@ stdcall DllRegisterServer() DMUSIC_DllRegisterServer
+@ stdcall DllUnregisterServer() DMUSIC_DllUnregisterServer

dlls/dmusic/dmusic8.c

+/* IDirectMusic8 Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusic8 IUnknown parts follow: */
+HRESULT WINAPI IDirectMusic8Impl_QueryInterface (LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusic8Impl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusic8))
+	{
+		IDirectMusic8Impl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusic8Impl_AddRef (LPDIRECTMUSIC8 iface)
+{
+	ICOM_THIS(IDirectMusic8Impl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface)
+{
+	ICOM_THIS(IDirectMusic8Impl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusic8 Interface follow: */
+HRESULT WINAPI IDirectMusic8Impl_EnumPort (LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_PORTCAPS pPortCaps)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer (LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER** ppBuffer, LPUNKNOWN pUnkOuter)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock (LPDIRECTMUSIC8 iface, DWORD dwIndex, LPDMUS_CLOCKINFO lpClockInfo)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_GetMasterClock (LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_SetMasterClock (LPDIRECTMUSIC8 iface, REFGUID rguidClock)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEnable)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort (LPDIRECTMUSIC8 iface, LPGUID pguidPort)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_SetDirectSound (LPDIRECTMUSIC8 iface, LPDIRECTSOUND pDirectSound, HWND hWnd)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, IReferenceClock* pClock)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusic8) DirectMusic8_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusic8Impl_QueryInterface,
+	IDirectMusic8Impl_AddRef,
+	IDirectMusic8Impl_Release,
+	IDirectMusic8Impl_EnumPort,
+	IDirectMusic8Impl_CreateMusicBuffer,
+	IDirectMusic8Impl_CreatePort,
+	IDirectMusic8Impl_EnumMasterClock,
+	IDirectMusic8Impl_GetMasterClock,
+	IDirectMusic8Impl_SetMasterClock,
+	IDirectMusic8Impl_Activate,
+	IDirectMusic8Impl_GetDefaultPort,
+	IDirectMusic8Impl_SetDirectSound,
+	IDirectMusic8Impl_SetExternalMasterClock
+};

dlls/dmusic/dmusic_buffer.c

+/* IDirectMusicBuffer Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicBuffer IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicBufferImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicBuffer))
+	{
+		IDirectMusicBufferImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface)
+{
+	ICOM_THIS(IDirectMusicBufferImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface)
+{
+	ICOM_THIS(IDirectMusicBufferImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicBuffer Interface follow: */
+HRESULT WINAPI IDirectMusicBufferImpl_Flush (LPDIRECTMUSICBUFFER iface)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_TotalTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_PackStructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr (LPDIRECTMUSICBUFFER iface)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr (LPDIRECTMUSICBUFFER iface, LPBYTE* ppData)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat (LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicBuffer) DirectMusicBuffer_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicBufferImpl_QueryInterface,
+	IDirectMusicBufferImpl_AddRef,
+	IDirectMusicBufferImpl_Release,
+	IDirectMusicBufferImpl_Flush,
+	IDirectMusicBufferImpl_TotalTime,
+	IDirectMusicBufferImpl_PackStructured,
+	IDirectMusicBufferImpl_PackUnstructured,
+	IDirectMusicBufferImpl_ResetReadPtr,
+	IDirectMusicBufferImpl_GetNextEvent,
+	IDirectMusicBufferImpl_GetRawBufferPtr,
+	IDirectMusicBufferImpl_GetStartTime,
+	IDirectMusicBufferImpl_GetUsedBytes,
+	IDirectMusicBufferImpl_GetMaxBytes,
+	IDirectMusicBufferImpl_GetBufferFormat,
+	IDirectMusicBufferImpl_SetStartTime,
+	IDirectMusicBufferImpl_SetUsedBytes	
+};

dlls/dmusic/dmusic_collection.c

+/* IDirectMusicCollection Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicCollection IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface (LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicCollectionImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicCollection))
+	{
+		IDirectMusicCollectionImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicCollectionImpl_AddRef (LPDIRECTMUSICCOLLECTION iface)
+{
+	ICOM_THIS(IDirectMusicCollectionImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicCollectionImpl_Release (LPDIRECTMUSICCOLLECTION iface)
+{
+	ICOM_THIS(IDirectMusicCollectionImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicCollection Interface follow: */
+HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument (LPDIRECTMUSICCOLLECTION iface, DWORD dwPatch, IDirectMusicInstrument** ppInstrument)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument (LPDIRECTMUSICCOLLECTION iface, DWORD dwIndex, DWORD* pdwPatch, LPWSTR pwszName, DWORD dwNameLen)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicCollection) DirectMusicCollection_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicCollectionImpl_QueryInterface,
+	IDirectMusicCollectionImpl_AddRef,
+	IDirectMusicCollectionImpl_Release,
+	IDirectMusicCollectionImpl_GetInstrument,
+	IDirectMusicCollectionImpl_EnumInstrument
+};

dlls/dmusic/dmusic_dlinstrument.c

+/* IDirectMusicDownloadedInstrument Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicDownloadedInstrument IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicDownloadedInstrument))
+	{
+		IDirectMusicDownloadedInstrumentImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface)
+{
+	ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOADEDINSTRUMENT iface)
+{
+	ICOM_THIS(IDirectMusicDownloadedInstrumentImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicDownloadedInstrument Interface follow: */
+/* none at this time */
+
+ICOM_VTABLE(IDirectMusicDownloadedInstrument) DirectMusicDownloadedInstrument_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicDownloadedInstrumentImpl_QueryInterface,
+	IDirectMusicDownloadedInstrumentImpl_AddRef,
+	IDirectMusicDownloadedInstrumentImpl_Release
+};

dlls/dmusic/dmusic_download.c

+/* IDirectMusicDownload Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicDownload IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicDownloadImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicDownload))
+	{
+		IDirectMusicDownloadImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicDownloadImpl_AddRef (LPDIRECTMUSICDOWNLOAD iface)
+{
+	ICOM_THIS(IDirectMusicDownloadImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface)
+{
+	ICOM_THIS(IDirectMusicDownloadImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicDownload Interface follow: */
+HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD iface, void** ppvBuffer, DWORD* pdwSize)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicDownload) DirectMusicDownload_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicDownloadImpl_QueryInterface,
+	IDirectMusicDownloadImpl_AddRef,
+	IDirectMusicDownloadImpl_Release,
+	IDirectMusicDownloadImpl_GetBuffer
+};

dlls/dmusic/dmusic_instrument.c

+/* IDirectMusicInstrument Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicInstrument IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicInstrumentImpl_QueryInterface (LPDIRECTMUSICINSTRUMENT iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicInstrumentImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicInstrument))
+	{
+		IDirectMusicInstrumentImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicInstrumentImpl_AddRef (LPDIRECTMUSICINSTRUMENT iface)
+{
+	ICOM_THIS(IDirectMusicInstrumentImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicInstrumentImpl_Release (LPDIRECTMUSICINSTRUMENT iface)
+{
+	ICOM_THIS(IDirectMusicInstrumentImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicInstrument Interface follow: */
+HRESULT WINAPI IDirectMusicInstrumentImpl_GetPatch (LPDIRECTMUSICINSTRUMENT iface, DWORD* pdwPatch)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch (LPDIRECTMUSICINSTRUMENT iface, DWORD dwPatch)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicInstrument) DirectMusicInstrument_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicInstrumentImpl_QueryInterface,
+	IDirectMusicInstrumentImpl_AddRef,
+	IDirectMusicInstrumentImpl_Release,
+	IDirectMusicInstrumentImpl_GetPatch,
+	IDirectMusicInstrumentImpl_SetPatch
+};

dlls/dmusic/dmusic_main.c

+/* DirectMusic Main
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+
+/******************************************************************
+ *		DirectMusic ClassFactory
+ *
+ *
+ */
+ 
+extern HRESULT WINAPI DMUSIC_CreateDirectMusic (LPCGUID lpcGUID, LPDIRECTMUSIC *ppDM, LPUNKNOWN pUnkOuter);
+
+typedef struct
+{
+    /* IUnknown fields */
+    ICOM_VFIELD(IClassFactory);
+    DWORD                       ref;
+} IClassFactoryImpl;
+
+static HRESULT WINAPI DMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+
+	FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+static ULONG WINAPI DMCF_AddRef(LPCLASSFACTORY iface)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+	return ++(This->ref);
+}
+
+static ULONG WINAPI DMCF_Release(LPCLASSFACTORY iface)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+	/* static class, won't be  freed */
+	return --(This->ref);
+}
+
+static HRESULT WINAPI DMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+
+	TRACE ("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
+	if (IsEqualGUID (&IID_IDirectMusic, riid))
+	{
+		return DMUSIC_CreateDirectMusic (riid, (LPDIRECTMUSIC*)ppobj, pOuter);
+	}
+	
+    WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI DMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+	FIXME("(%p)->(%d),stub!\n",This,dolock);
+	return S_OK;
+}
+
+static ICOM_VTABLE(IClassFactory) DMCF_Vtbl = {
+	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	DMCF_QueryInterface,
+	DMCF_AddRef,
+	DMCF_Release,
+	DMCF_CreateInstance,
+	DMCF_LockServer
+};
+
+static IClassFactoryImpl DMUSIC_CF = {&DMCF_Vtbl, 1 };
+
+/******************************************************************
+ *		DllMain
+ *
+ *
+ */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+	if (fdwReason == DLL_PROCESS_ATTACH)
+	{
+		/* FIXME: Initialisation */
+		FIXME("stub\n");
+	}
+	else if (fdwReason == DLL_PROCESS_DETACH)
+	{
+		/* FIXME: Cleanup */
+		FIXME("stub\n");
+	}
+
+	return TRUE;
+}
+
+
+/******************************************************************
+ *		DllCanUnloadNow (DMUSIC.1)
+ *
+ *
+ */
+HRESULT WINAPI DMUSIC_DllCanUnloadNow(void)
+{
+    FIXME("(void): stub\n");
+
+    return S_FALSE;
+}
+
+
+/******************************************************************
+ *		DllGetClassObject (DMUSIC.2)
+ *
+ *
+ */
+HRESULT WINAPI DMUSIC_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
+{
+    TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
+    if (IsEqualCLSID (&IID_IClassFactory, riid))
+	{
+    	*ppv = (LPVOID)&DMUSIC_CF;
+		IClassFactory_AddRef((IClassFactory*)*ppv);
+		return S_OK;
+    }
+
+    WARN("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+
+/******************************************************************
+ *		DllRegisterServer (DMUSIC.3)
+ *
+ *
+ */
+HRESULT WINAPI DMUSIC_DllRegisterServer(void)
+{
+    FIXME("(void): stub\n");
+
+    return S_OK;
+}
+
+
+/******************************************************************
+ *		DllUnregisterServer (DMUSIC.4)
+ *
+ *
+ */
+HRESULT WINAPI DMUSIC_DllUnregisterServer(void)
+{
+    FIXME("(void): stub\n");
+
+    return S_OK;
+}

dlls/dmusic/dmusic_port.c

+/* IDirectMusicPort Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicPort IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicPortImpl_QueryInterface (LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicPortImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort))
+	{
+		IDirectMusicPortImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicPortImpl_AddRef (LPDIRECTMUSICPORT iface)
+{
+	ICOM_THIS(IDirectMusicPortImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicPortImpl_Release (LPDIRECTMUSICPORT iface)
+{
+	ICOM_THIS(IDirectMusicPortImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicPort Interface follow: */
+HRESULT WINAPI IDirectMusicPortImpl_PlayBuffer (LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER pBuffer)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_SetReadNotificationHandle (LPDIRECTMUSICPORT iface, HANDLE hEvent)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_Read (LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER pBuffer)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_DownloadInstrument (LPDIRECTMUSICPORT iface, IDirectMusicInstrument* pInstrument, IDirectMusicDownloadedInstrument** ppDownloadedInstrument, DMUS_NOTERANGE* pNoteRanges, DWORD dwNumNoteRanges)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_UnloadInstrument (LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *pDownloadedInstrument)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_GetLatencyClock (LPDIRECTMUSICPORT iface, IReferenceClock** ppClock)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_GetRunningStats (LPDIRECTMUSICPORT iface, LPDMUS_SYNTHSTATS pStats)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_DeviceIoControl (LPDIRECTMUSICPORT iface, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_SetNumChannelGroups (LPDIRECTMUSICPORT iface, DWORD dwChannelGroups)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_GetNumChannelGroups (LPDIRECTMUSICPORT iface, LPDWORD pdwChannelGroups)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_SetChannelPriority (LPDIRECTMUSICPORT iface, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwPriority)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_GetChannelPriority (LPDIRECTMUSICPORT iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_SetDirectSound (LPDIRECTMUSICPORT iface, LPDIRECTSOUND pDirectSound, LPDIRECTSOUNDBUFFER pDirectSoundBuffer)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicPort) DirectMusicPort_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicPortImpl_QueryInterface,
+	IDirectMusicPortImpl_AddRef,
+	IDirectMusicPortImpl_Release,
+	IDirectMusicPortImpl_PlayBuffer,
+	IDirectMusicPortImpl_SetReadNotificationHandle,
+	IDirectMusicPortImpl_Read,
+	IDirectMusicPortImpl_DownloadInstrument,
+	IDirectMusicPortImpl_UnloadInstrument,
+	IDirectMusicPortImpl_GetLatencyClock,
+	IDirectMusicPortImpl_GetRunningStats,
+	IDirectMusicPortImpl_GetCaps,
+	IDirectMusicPortImpl_DeviceIoControl,
+	IDirectMusicPortImpl_SetNumChannelGroups,
+	IDirectMusicPortImpl_GetNumChannelGroups,
+	IDirectMusicPortImpl_Activate,
+	IDirectMusicPortImpl_SetChannelPriority,
+	IDirectMusicPortImpl_GetChannelPriority,
+	IDirectMusicPortImpl_SetDirectSound,
+	IDirectMusicPortImpl_GetFormat
+};

dlls/dmusic/dmusic_portdl.c

+/* IDirectMusicPortDownload Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicPortDownload IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicPortDownloadImpl_QueryInterface (LPDIRECTMUSICPORTDOWNLOAD iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicPortDownloadImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPortDownload))
+	{
+		IDirectMusicPortDownloadImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicPortDownloadImpl_AddRef (LPDIRECTMUSICPORTDOWNLOAD iface)
+{
+	ICOM_THIS(IDirectMusicPortDownloadImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicPortDownloadImpl_Release (LPDIRECTMUSICPORTDOWNLOAD iface)
+{
+	ICOM_THIS(IDirectMusicPortDownloadImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicPortDownload Interface follow: */
+HRESULT WINAPI IDirectMusicPortDownloadImpl_GetBuffer (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD dwDLId, IDirectMusicDownload** ppIDMDownload)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortDownloadImpl_AllocateBuffer (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD dwSize, IDirectMusicDownload** ppIDMDownload)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortDownloadImpl_GetDLId (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* pdwStartDLId, DWORD dwCount)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortDownloadImpl_GetAppend (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* pdwAppend)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortDownloadImpl_Download (LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* pIDMDownload)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IDirectMusicPortDownloadImpl_Unload (LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* pIDMDownload)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicPortDownload) DirectMusicPortDownload_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicPortDownloadImpl_QueryInterface,
+	IDirectMusicPortDownloadImpl_AddRef,
+	IDirectMusicPortDownloadImpl_Release,
+	IDirectMusicPortDownloadImpl_GetBuffer,
+	IDirectMusicPortDownloadImpl_AllocateBuffer,
+	IDirectMusicPortDownloadImpl_GetDLId,
+	IDirectMusicPortDownloadImpl_GetAppend,
+	IDirectMusicPortDownloadImpl_Download,
+	IDirectMusicPortDownloadImpl_Unload
+};

dlls/dmusic/dmusic_thru.c

+/* IDirectMusicThru Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IDirectMusicThru IUnknown parts follow: */
+HRESULT WINAPI IDirectMusicThruImpl_QueryInterface (LPDIRECTMUSICTHRU iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IDirectMusicThruImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicThru))
+	{
+		IDirectMusicThruImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicThruImpl_AddRef (LPDIRECTMUSICTHRU iface)
+{
+	ICOM_THIS(IDirectMusicThruImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IDirectMusicThruImpl_Release (LPDIRECTMUSICTHRU iface)
+{
+	ICOM_THIS(IDirectMusicThruImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IDirectMusicThru Interface follow: */
+HRESULT WINAPI IDirectMusicThruImpl_ThruChannel (LPDIRECTMUSICTHRU iface, DWORD dwSourceChannelGroup, DWORD dwSourceChannel, DWORD dwDestinationChannelGroup, DWORD dwDestinationChannel, LPDIRECTMUSICPORT pDestinationPort)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IDirectMusicThru) DirectMusicThru_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicThruImpl_QueryInterface,
+	IDirectMusicThruImpl_AddRef,
+	IDirectMusicThruImpl_Release,
+	IDirectMusicThruImpl_ThruChannel
+};

dlls/dmusic/reference_clock.c

+/*
+ * IReferenceClock Implementation
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
+/* IReferenceClock IUnknown parts follow: */
+HRESULT WINAPI IReferenceClockImpl_QueryInterface (LPREFERENCECLOCK iface, REFIID riid, LPVOID *ppobj)
+{
+	ICOM_THIS(IReferenceClockImpl,iface);
+
+	if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IReferenceClock))
+	{
+		IReferenceClockImpl_AddRef(iface);
+		*ppobj = This;
+		return DS_OK;
+	}
+	WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj);
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IReferenceClockImpl_AddRef (LPREFERENCECLOCK iface)
+{
+	ICOM_THIS(IReferenceClockImpl,iface);
+	TRACE("(%p) : AddRef from %ld\n", This, This->ref);
+	return ++(This->ref);
+}
+
+ULONG WINAPI IReferenceClockImpl_Release (LPREFERENCECLOCK iface)
+{
+	ICOM_THIS(IReferenceClockImpl,iface);
+	ULONG ref = --This->ref;
+	TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref);
+	if (ref == 0)
+	{
+		HeapFree(GetProcessHeap(), 0, This);
+	}
+	return ref;
+}
+
+/* IReferenceClock Interface follow: */
+HRESULT WINAPI IReferenceClockImpl_GetTime (LPREFERENCECLOCK iface, REFERENCE_TIME* pTime)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IReferenceClockImpl_AdviseTime (LPREFERENCECLOCK iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic (LPREFERENCECLOCK iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+HRESULT WINAPI IReferenceClockImpl_Unadvise (LPREFERENCECLOCK iface, DWORD dwAdviseCookie)
+{
+	FIXME("stub\n");
+	return DS_OK;
+}
+
+ICOM_VTABLE(IReferenceClock) ReferenceClock_Vtbl =
+{
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IReferenceClockImpl_QueryInterface,
+	IReferenceClockImpl_AddRef,
+	IReferenceClockImpl_Release,
+	IReferenceClockImpl_GetTime,
+	IReferenceClockImpl_AdviseTime,
+	IReferenceClockImpl_AdvisePeriodic,
+	IReferenceClockImpl_Unadvise
+};

include/Makefile.in

@@ -39,9 +39,14 @@ WINDOWS_INCLUDES = \
 	dinput.h \
 	dispdib.h \
 	dlgs.h \
+	dls1.h \
+	dmdls.h \
+	dmerror.h \
 	dmo.h \
 	dmoreg.h \
 	dmort.h \
+	dmusbuff.h \
+	dmusicc.h \
 	docobj.h \
 	dplay.h \
 	dplobby.h \

include/dls1.h

+/* Defines and Structures for Instrument Collection Form RIFF DLS
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __WINE_INCLUDE_DLS1_H
+#define __WINE_INCLUDE_DLS1_H
+
+/*****************************************************************************
+ * FOURCC's
+ */
+#define FOURCC_DLS   mmioFOURCC('D','L','S',' ')
+#define FOURCC_DLID  mmioFOURCC('d','l','i','d')
+#define FOURCC_COLH  mmioFOURCC('c','o','l','h')
+#define FOURCC_WVPL  mmioFOURCC('w','v','p','l')
+#define FOURCC_PTBL  mmioFOURCC('p','t','b','l')
+#define FOURCC_PATH  mmioFOURCC('p','a','t','h')
+#define FOURCC_wave  mmioFOURCC('w','a','v','e')
+#define FOURCC_LINS  mmioFOURCC('l','i','n','s')
+#define FOURCC_INS   mmioFOURCC('i','n','s',' ')
+#define FOURCC_INSH  mmioFOURCC('i','n','s','h')
+#define FOURCC_LRGN  mmioFOURCC('l','r','g','n')
+#define FOURCC_RGN   mmioFOURCC('r','g','n',' ')
+#define FOURCC_RGNH  mmioFOURCC('r','g','n','h')
+#define FOURCC_LART  mmioFOURCC('l','a','r','t')
+#define FOURCC_ART1  mmioFOURCC('a','r','t','1')
+#define FOURCC_WLNK  mmioFOURCC('w','l','n','k')
+#define FOURCC_WSMP  mmioFOURCC('w','s','m','p')
+#define FOURCC_VERS  mmioFOURCC('v','e','r','s')
+
+/*****************************************************************************
+ * Definitions
+ */
+#define CONN_SRC_NONE              0x0000
+#define CONN_SRC_LFO               0x0001
+#define CONN_SRC_KEYONVELOCITY     0x0002
+#define CONN_SRC_KEYNUMBER         0x0003
+#define CONN_SRC_EG1               0x0004
+#define CONN_SRC_EG2               0x0005
+#define CONN_SRC_PITCHWHEEL        0x0006
+#define CONN_SRC_CC1               0x0081
+#define CONN_SRC_CC7               0x0087
+#define CONN_SRC_CC10              0x008a
+#define CONN_SRC_CC11              0x008b
+
+#define CONN_DST_NONE              0x0000
+#define CONN_DST_ATTENUATION       0x0001
+#define CONN_DST_PITCH             0x0003
+#define CONN_DST_PAN               0x0004
+#define CONN_DST_LFO_FREQUENCY     0x0104
+#define CONN_DST_LFO_STARTDELAY    0x0105
+#define CONN_DST_EG1_ATTACKTIME    0x0206
+#define CONN_DST_EG1_DECAYTIME     0x0207
+#define CONN_DST_EG1_RELEASETIME   0x0209
+#define CONN_DST_EG1_SUSTAINLEVEL  0x020a
+#define CONN_DST_EG2_ATTACKTIME    0x030a
+#define CONN_DST_EG2_DECAYTIME     0x030b
+#define CONN_DST_EG2_RELEASETIME   0x030d
+#define CONN_DST_EG2_SUSTAINLEVEL  0x030e
+
+#define CONN_TRN_NONE              0x0000
+#define CONN_TRN_CONCAVE           0x0001
+
+#define F_INSTRUMENT_DRUMS      0x80000000
+#define F_RGN_OPTION_SELFNONEXCLUSIVE  0x0001
+
+#define WAVELINK_CHANNEL_LEFT    0x0001l
+#define WAVELINK_CHANNEL_RIGHT   0x0002l
+
+#define F_WAVELINK_PHASE_MASTER  0x0001
+#define POOL_CUE_NULL  0xffffffffl
+
+#define F_WSMP_NO_TRUNCATION     0x0001l
+#define F_WSMP_NO_COMPRESSION    0x0002l
+  
+#define WLOOP_TYPE_FORWARD   0
+
+/*****************************************************************************
+ * Structures
+ */
+typedef struct _DLSID 
+{
+  ULONG    ulData1;
+  USHORT   usData2;
+  USHORT   usData3;
+  BYTE     abData4[8];
+} DLSID, *LPDLSID;
+
+typedef struct _DLSVERSION
+{ DWORD    dwVersionMS;
+  DWORD    dwVersionLS;
+} DLSVERSION, *LPDLSVERSION;
+                   
+typedef struct _CONNECTION
+{
+  USHORT   usSource;
+  USHORT   usControl;
+  USHORT   usDestination;
+  USHORT   usTransform;
+  LONG     lScale;
+} CONNECTION, *LPCONNECTION;
+
+typedef struct _CONNECTIONLIST
+{
+  ULONG    cbSize;
+  ULONG    cConnections;
+} CONNECTIONLIST, *LPCONNECTIONLIST;
+
+typedef struct _RGNRANGE
+{
+  USHORT usLow;
+  USHORT usHigh;
+} RGNRANGE, *LPRGNRANGE;
+
+typedef struct _MIDILOCALE
+{
+  ULONG ulBank;
+  ULONG ulInstrument;
+} MIDILOCALE, *LPMIDILOCALE;
+
+typedef struct _RGNHEADER
+{
+  RGNRANGE RangeKey;
+  RGNRANGE RangeVelocity;
+  USHORT   fusOptions;
+  USHORT   usKeyGroup;
+} RGNHEADER, *LPRGNHEADER;
+
+typedef struct _INSTHEADER
+{
+  ULONG      cRegions;
+  MIDILOCALE Locale;
+} INSTHEADER, *LPINSTHEADER;
+
+typedef struct _DLSHEADER
+{
+  ULONG      cInstruments;
+} DLSHEADER, *LPDLSHEADER;
+
+typedef struct _WAVELINK
+{
+  USHORT   fusOptions;
+  USHORT   usPhaseGroup;
+  ULONG    ulChannel;
+  ULONG    ulTableIndex;
+} WAVELINK, *LPWAVELINK;
+
+typedef struct _POOLCUE
+{ 
+  ULONG    ulOffset;
+} POOLCUE, *LPPOOLCUE;
+
+typedef struct _POOLTABLE
+{
+  ULONG    cbSize;
+  ULONG    cCues;
+} POOLTABLE, *LPPOOLTABLE;
+
+typedef struct _rwsmp
+{
+  ULONG   cbSize;
+  USHORT  usUnityNote;
+  SHORT   sFineTune;
+  LONG    lAttenuation;
+  ULONG   fulOptions;
+  ULONG   cSampleLoops;
+} WSMPL, *LPWSMPL;
+
+typedef struct _rloop
+{
+  ULONG cbSize;
+  ULONG ulType;
+  ULONG ulStart;
+  ULONG ulLength;
+} WLOOP, *LPWLOOP;
+
+#endif /* __WINE_INCLUDE_DLS1_H */

include/dmdls.h

+/* DirectMusic DLS Download Definitions
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __WINE_DMUSIC_DLS_H
+#define __WINE_DMUSIC_DLS_H
+
+#include "dls1.h"
+
+typedef long PCENT, GCENT, TCENT, PERCENT;
+typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME;
+/*
+#ifndef MAKE_FOURCC
+#define MAKEFOURCC(ch0, ch1, ch2, ch3)                              \
+                ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) |   \
+                ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
+typedef DWORD FOURCC;
+#endif*/
+
+/*****************************************************************************
+ * Definitions
+ */
+#define DMUS_DOWNLOADINFO_INSTRUMENT        1
+#define DMUS_DOWNLOADINFO_WAVE              2
+#define DMUS_DOWNLOADINFO_INSTRUMENT2       3
+#define DMUS_DOWNLOADINFO_WAVEARTICULATION  4
+#define DMUS_DOWNLOADINFO_STREAMINGWAVE     5
+#define DMUS_DOWNLOADINFO_ONESHOTWAVE       6
+
+#define DMUS_DEFAULT_SIZE_OFFSETTABLE   1
+ 
+#define DMUS_INSTRUMENT_GM_INSTRUMENT   (1 << 0)
+
+#define DMUS_MIN_DATA_SIZE 4
+
+/*****************************************************************************
+ * Structures
+ */
+typedef struct _DMUS_DOWNLOADINFO
+{
+    DWORD dwDLType;
+    DWORD dwDLId;
+    DWORD dwNumOffsetTableEntries;
+    DWORD cbSize;
+} DMUS_DOWNLOADINFO;
+
+typedef struct _DMUS_OFFSETTABLE
+{
+    ULONG ulOffsetTable[DMUS_DEFAULT_SIZE_OFFSETTABLE];
+} DMUS_OFFSETTABLE;
+
+typedef struct _DMUS_INSTRUMENT
+{
+    ULONG           ulPatch;
+    ULONG           ulFirstRegionIdx;
+    ULONG           ulGlobalArtIdx;
+    ULONG           ulFirstExtCkIdx;
+    ULONG           ulCopyrightIdx;
+    ULONG           ulFlags;
+} DMUS_INSTRUMENT;
+
+typedef struct _DMUS_REGION
+{
+    RGNRANGE        RangeKey;
+    RGNRANGE        RangeVelocity;
+    USHORT          fusOptions;
+    USHORT          usKeyGroup;
+    ULONG           ulRegionArtIdx;
+    ULONG           ulNextRegionIdx;
+    ULONG           ulFirstExtCkIdx;
+    WAVELINK        WaveLink;
+    WSMPL           WSMP;
+    WLOOP           WLOOP[1];
+} DMUS_REGION;
+
+typedef struct _DMUS_LFOPARAMS
+{
+    PCENT       pcFrequency;
+    TCENT       tcDelay;
+    GCENT       gcVolumeScale;
+    PCENT       pcPitchScale;
+    GCENT       gcMWToVolume;
+    PCENT       pcMWToPitch;
+} DMUS_LFOPARAMS;
+
+typedef struct _DMUS_VEGPARAMS
+{
+    TCENT       tcAttack;
+    TCENT       tcDecay;
+    PERCENT     ptSustain;
+    TCENT       tcRelease;
+    TCENT       tcVel2Attack;
+    TCENT       tcKey2Decay;
+} DMUS_VEGPARAMS;
+
+typedef struct _DMUS_PEGPARAMS
+{
+    TCENT       tcAttack;
+    TCENT       tcDecay;
+    PERCENT     ptSustain;
+    TCENT       tcRelease;
+    TCENT       tcVel2Attack;
+    TCENT       tcKey2Decay;
+    PCENT       pcRange;
+} DMUS_PEGPARAMS;
+
+typedef struct _DMUS_MSCPARAMS
+{
+    PERCENT     ptDefaultPan;
+} DMUS_MSCPARAMS;
+
+typedef struct _DMUS_ARTICPARAMS
+{
+    DMUS_LFOPARAMS   LFO;
+    DMUS_VEGPARAMS   VolEG;
+    DMUS_PEGPARAMS   PitchEG;
+    DMUS_MSCPARAMS   Misc;
+} DMUS_ARTICPARAMS;
+
+typedef struct _DMUS_ARTICULATION
+{
+    ULONG           ulArt1Idx;
+    ULONG           ulFirstExtCkIdx;
+} DMUS_ARTICULATION;
+
+typedef struct _DMUS_ARTICULATION2
+{
+    ULONG           ulArtIdx;
+    ULONG           ulFirstExtCkIdx;
+    ULONG           ulNextArtIdx;
+} DMUS_ARTICULATION2;
+
+typedef struct _DMUS_EXTENSIONCHUNK
+{
+    ULONG           cbSize;
+    ULONG           ulNextExtCkIdx;
+    FOURCC          ExtCkID;
+    BYTE            byExtCk[DMUS_MIN_DATA_SIZE];
+} DMUS_EXTENSIONCHUNK;
+
+
+typedef struct _DMUS_COPYRIGHT
+{
+    ULONG           cbSize;
+    BYTE            byCopyright[DMUS_MIN_DATA_SIZE];
+} DMUS_COPYRIGHT;
+
+typedef struct _DMUS_WAVEDATA
+{
+    ULONG           cbSize;
+    BYTE            byData[DMUS_MIN_DATA_SIZE];
+} DMUS_WAVEDATA;
+
+typedef struct _DMUS_WAVE
+{
+    ULONG           ulFirstExtCkIdx;
+    ULONG           ulCopyrightIdx;
+    ULONG           ulWaveDataIdx;
+    WAVEFORMATEX    WaveformatEx;
+} DMUS_WAVE;
+
+typedef struct _DMUS_NOTERANGE
+{
+    DWORD           dwLowNote;
+    DWORD           dwHighNote;
+} DMUS_NOTERANGE, *LPDMUS_NOTERANGE;
+
+typedef struct _DMUS_WAVEARTDL
+{
+    ULONG               ulDownloadIdIdx;
+    ULONG               ulBus;
+    ULONG               ulBuffers;
+    ULONG               ulMasterDLId;
+    USHORT              usOptions;
+}   DMUS_WAVEARTDL, *LPDMUS_WAVEARTDL;
+
+typedef struct _DMUS_WAVEDL
+{
+    ULONG               cbWaveData;
+}   DMUS_WAVEDL, *LPDMUS_WAVEDL;
+
+#endif /* __WINE_DMUSIC_DLS_H */

include/dmusbuff.h

+/* DirectMusic Buffer Format
+ *
+ * Copyright (C) 2003 Rok Mandeljc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __WINE_DMUSIC_BUFFER_H
+#define __WINE_DMUSIC_BUFFER_H
+
+#include "pshpack4.h"
+
+/*****************************************************************************
+ * Definitions
+ */
+#define DMUS_EVENT_STRUCTURED   0x00000001
+#define QWORD_ALIGN(x) (((x) + 7) & ~7)
+#define DMUS_EVENT_SIZE(cb) QWORD_ALIGN(sizeof(DMUS_EVENTHEADER) + cb)
+
+/*****************************************************************************
+ * Structures
+ */
+typedef struct _DMUS_EVENTHEADER
+{
+    DWORD           cbEvent;
+    DWORD           dwChannelGroup;
+    REFERENCE_TIME  rtDelta;
+    DWORD           dwFlags;
+} DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER;
+
+#include "poppack.h"
+
+#endif /* __WINE_DMUSIC_BUFFER_H */

libs/uuid/dxguid.c

@@ -33,6 +33,7 @@
 #include "d3d.h"
 #include "ddraw.h"
 #include "dsound.h"
+#include "dmusicc.h"
 #include "dplay.h"
 #include "dplobby.h"
 #include "dinput.h"

winedefault.reg

@@ -923,6 +923,19 @@
 @="ddraw.dll"
 "ThreadingModel"="Both"
 
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{636B9F10-0C7D-11D1-95B2-0020AFDC7421}]
+@="DirectMusic"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{636B9F10-0C7D-11D1-95B2-0020AFDC7421}\InProcServer32]
+@="dmusic.dll"
+"ThreadingModel"="Both"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{636B9F10-0C7D-11D1-95B2-0020AFDC7421}\ProgID]
+@="Microsoft.DirectMusic.1"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{636B9F10-0C7D-11D1-95B2-0020AFDC7421}\VersionIndependentProgID]
+@="Microsoft.DirectMusic"
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{D1EB6D20-8923-11D0-9D97-00A0C90A43CB}]
 @="DirectPlay Object"