dmloader: complete rewrite and full implementation.

dlls/dmloader/Makefile.in

@@ -7,7 +7,9 @@ IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
+	classfactory.c \
 	container.c \
+	debug.c \
 	dmloader_main.c \
 	loader.c \
 	loaderstream.c \

dlls/dmloader/classfactory.c

+ /* IDirectMusicLoaderCF
+ *  IDirectMusicContainerCF
+ *
+ * Copyright (C) 2004 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 "dmloader_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmloader);
+
+/*****************************************************************************
+ * IDirectMusicLoaderCF implementation
+ */
+HRESULT WINAPI IDirectMusicLoaderCF_QueryInterface (LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) {
+	ICOM_THIS(IDirectMusicLoaderCF, iface);
+	
+	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
+	if (IsEqualIID (riid, &IID_IUnknown) || 
+	    IsEqualIID (riid, &IID_IClassFactory)) {
+		IDirectMusicLoaderCF_AddRef (iface);
+		*ppobj = This;
+		return S_OK;
+	}
+	
+	WARN(": not found\n");
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicLoaderCF_AddRef (LPCLASSFACTORY iface) {
+	ICOM_THIS(IDirectMusicLoaderCF, iface);
+	TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+	return InterlockedIncrement (&This->dwRef);
+}
+
+ULONG WINAPI IDirectMusicLoaderCF_Release (LPCLASSFACTORY iface) {
+	ICOM_THIS(IDirectMusicLoaderCF, iface);
+	
+	DWORD dwRef = InterlockedDecrement (&This->dwRef);
+	TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+	if (dwRef == 0) {
+		HeapFree(GetProcessHeap (), 0, This);
+		/* decrease number of instances */
+		InterlockedDecrement(&dwDirectMusicLoader);
+	}
+	
+	return dwRef;	
+}
+
+HRESULT WINAPI IDirectMusicLoaderCF_CreateInstance (LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
+	ICOM_THIS(IDirectMusicLoaderCF, iface);
+	
+	TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
+	if (pOuter) {
+		ERR(": pOuter should be NULL\n");
+		return CLASS_E_NOAGGREGATION;
+	}
+	
+	return DMUSIC_CreateDirectMusicLoaderImpl (riid, ppobj, pOuter);
+}
+
+HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) {
+	ICOM_THIS(IDirectMusicLoaderCF, iface);
+	TRACE("(%p, %d)\n", This, dolock);
+	if (dolock == TRUE)
+		InterlockedIncrement (&dwDirectMusicLoader);
+	else
+		InterlockedDecrement (&dwDirectMusicLoader);
+	return S_OK;
+}
+
+ICOM_VTABLE(IClassFactory) DirectMusicLoaderCF_Vtbl = {
+	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicLoaderCF_QueryInterface,
+	IDirectMusicLoaderCF_AddRef,
+	IDirectMusicLoaderCF_Release,
+	IDirectMusicLoaderCF_CreateInstance,
+	IDirectMusicLoaderCF_LockServer
+};
+
+HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) {
+	IDirectMusicLoaderCF *obj;
+
+	TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter);
+	obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderCF));
+	if (NULL == obj) {
+		*ppobj = (LPCLASSFACTORY)NULL;
+		return E_OUTOFMEMORY;
+	}
+	obj->lpVtbl = &DirectMusicLoaderCF_Vtbl;
+	obj->dwRef = 0; /* will be inited with QueryInterface */
+
+	/* increase number of instances */
+	InterlockedIncrement (&dwDirectMusicLoader);	
+	
+	return IDirectMusicLoaderCF_QueryInterface ((LPCLASSFACTORY)obj, lpcGUID, ppobj);
+}
+
+
+/*****************************************************************************
+ * IDirectMusicContainerCF implementation
+ */
+HRESULT WINAPI IDirectMusicContainerCF_QueryInterface (LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) {
+	ICOM_THIS(IDirectMusicContainerCF, iface);
+	
+	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
+	if (IsEqualIID (riid, &IID_IUnknown) || 
+	    IsEqualIID (riid, &IID_IClassFactory)) {
+		IDirectMusicContainerCF_AddRef (iface);
+		*ppobj = This;
+		return S_OK;
+	}
+	
+	WARN(": not found\n");
+	return E_NOINTERFACE;
+}
+
+ULONG WINAPI IDirectMusicContainerCF_AddRef (LPCLASSFACTORY iface) {
+	ICOM_THIS(IDirectMusicContainerCF, iface);
+	TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+	return InterlockedIncrement (&This->dwRef);
+}
+
+ULONG WINAPI IDirectMusicContainerCF_Release (LPCLASSFACTORY iface) {
+	ICOM_THIS(IDirectMusicContainerCF, iface);
+	
+	DWORD dwRef = InterlockedDecrement (&This->dwRef);
+	TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+	if (dwRef == 0) {
+		HeapFree(GetProcessHeap (), 0, This);
+		/* decrease number of instances */
+		InterlockedDecrement(&dwDirectMusicContainer);
+	}
+	
+	return dwRef;
+}
+
+HRESULT WINAPI IDirectMusicContainerCF_CreateInstance (LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) {
+	ICOM_THIS(IDirectMusicContainerCF, iface);
+
+	TRACE ("(%p, %p, %s, %p)\n", This, pOuter, debugstr_dmguid(riid), ppobj);
+	if (pOuter) {
+		ERR(": pOuter should be NULL\n");
+		return CLASS_E_NOAGGREGATION;
+	}
+
+	return DMUSIC_CreateDirectMusicContainerImpl (riid, ppobj, pOuter);
+}
+
+HRESULT WINAPI IDirectMusicContainerCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) {
+	ICOM_THIS(IDirectMusicContainerCF, iface);
+	TRACE("(%p, %d)\n", This, dolock);
+	if (dolock == TRUE)
+		InterlockedIncrement (&dwDirectMusicContainer);
+	else
+		InterlockedDecrement (&dwDirectMusicContainer);
+	return S_OK;
+}
+
+ICOM_VTABLE(IClassFactory) DirectMusicContainerCF_Vtbl = {
+	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IDirectMusicContainerCF_QueryInterface,
+	IDirectMusicContainerCF_AddRef,
+	IDirectMusicContainerCF_Release,
+	IDirectMusicContainerCF_CreateInstance,
+	IDirectMusicContainerCF_LockServer
+};
+
+HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) {
+	IDirectMusicContainerCF *obj;
+
+	TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter);
+	obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerCF));
+	if (NULL == obj) {
+		*ppobj = (LPCLASSFACTORY)NULL;
+		return E_OUTOFMEMORY;
+	}
+	obj->lpVtbl = &DirectMusicContainerCF_Vtbl;
+	obj->dwRef = 0; /* will be inited with QueryInterface */
+
+	/* increase number of instances */
+	InterlockedIncrement (&dwDirectMusicContainer);
+	
+	return IDirectMusicContainerCF_QueryInterface ((LPCLASSFACTORY)obj, lpcGUID, ppobj);
+}

dlls/dmloader/debug.h

+/* Debug and Helper Functions
+ *
+ * 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 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_DMLOADER_DEBUG_H
+#define __WINE_DMLOADER_DEBUG_H
+ 
+/* used for generic dumping (copied from ddraw) */
+typedef struct {
+    DWORD val;
+    const char* name;
+} flag_info;
+
+typedef struct {
+    const GUID *guid;
+    const char* name;
+} guid_info;
+
+/* used for initialising structs */
+#define DM_STRUCT_INIT(x) 				\
+	do {								\
+		memset((x), 0, sizeof(*(x)));	\
+		(x)->dwSize = sizeof(*x);		\
+	} while (0)
+
+#define FE(x) { x, #x }	
+#define GE(x) { &x, #x }
+
+/* check whether the given DWORD is even (return 0) or odd (return 1) */
+extern int even_or_odd (DWORD number);
+/* check whether chunkID is valid dmobject form chunk */
+extern BOOL IS_VALID_DMFORM (FOURCC chunkID);
+/* translate STREAM_SEEK flag to string */
+extern const char *resolve_STREAM_SEEK (DWORD flag);
+/* FOURCC to string conversion for debug messages */
+extern const char *debugstr_fourcc (DWORD fourcc);
+/* DMUS_VERSION struct to string conversion for debug messages */
+extern const char *debugstr_dmversion (LPDMUS_VERSION version);
+/* FILETIME struct to string conversion for debug messages */
+extern const char *debugstr_filetime (LPFILETIME time);
+/* returns name of given GUID */
+extern const char *debugstr_dmguid (const GUID *id);
+/* returns name of given error code */
+extern const char *debugstr_dmreturn (DWORD code);
+/* generic flags-dumping function */
+extern const char *debugstr_flags (DWORD flags, const flag_info* names, size_t num_names);
+
+extern const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask);
+extern const char *debugstr_DMUS_CONTAINER_FLAGS (DWORD flagmask);
+extern const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask);
+/* dump whole DMUS_OBJECTDESC struct */
+extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc);
+extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader);
+extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader);
+
+#endif /* __WINE_DMLOADER_DEBUG_H */