[DMUSIC] Sync with Wine Staging 1.7.47. CORE-9924

svn path=/trunk/; revision=68521

diff --git a/reactos/dll/directx/wine/dmusic/dmobject.c b/reactos/dll/directx/wine/dmusic/dmobject.c
index d0bb7b1..8f0441b 100644 (file)
--- a/reactos/dll/directx/wine/dmusic/dmobject.c
+++ b/reactos/dll/directx/wine/dmusic/dmobject.c
@@ -1,5 +1,6 @@
 /*
  * Base IDirectMusicObject Implementation
+ * Keep in sync with the master in dlls/dmusic/dmobject.c
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
  * Copyright (C) 2014 Michael Stefaniuc
@@ -128,6 +129,20 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface)
     return IUnknown_Release(This->outer_unk);
 }
 
+HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
+{
+    struct dmobject *This = impl_from_IPersistStream(iface);
+
+    TRACE("(%p, %p)\n", This, class);
+
+    if (!class)
+        return E_POINTER;
+
+    *class = This->desc.guidClass;
+
+    return S_OK;
+}
+
 /* IPersistStream methods not implemented in native */
 HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
 {

diff --git a/reactos/dll/directx/wine/dmusic/dmobject.h b/reactos/dll/directx/wine/dmusic/dmobject.h
index 2af6f51..5fc9918 100644 (file)
--- a/reactos/dll/directx/wine/dmusic/dmobject.h
+++ b/reactos/dll/directx/wine/dmusic/dmobject.h
@@ -1,5 +1,6 @@
 /*
  * Base IDirectMusicObject Implementation
+ * Keep in sync with the master in dlls/dmusic/dmobject.h
  *
  * Copyright (C) 2014 Michael Stefaniuc
  *
@@ -44,6 +45,7 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID
         void **ret_iface) DECLSPEC_HIDDEN;
 ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN;
 ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN;
+HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN;
 
 /* IPersistStream methods not implemented in native */
 HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,

diff --git a/reactos/dll/directx/wine/dmusic/dmusic_private.h b/reactos/dll/directx/wine/dmusic/dmusic_private.h
index 233a2d4..b227555 100644 (file)
--- a/reactos/dll/directx/wine/dmusic/dmusic_private.h
+++ b/reactos/dll/directx/wine/dmusic/dmusic_private.h
@@ -252,10 +252,6 @@ static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_ref
 /*****************************************************************************
  * Misc.
  */
-/* my custom ICOM stuff */
-#define ICOM_NAME_MULTI(impl,field,iface,name)  impl* const name=(impl*)((char*)(iface) - offsetof(impl,field))
-#define ICOM_THIS_MULTI(impl,field,iface) ICOM_NAME_MULTI(impl,field,iface,This)
- 
 /* for simpler reading */
 typedef struct _DMUS_PRIVATE_CHUNK {
        FOURCC fccID; /* FOURCC ID of the chunk */

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 99f0610..2caf155 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -32,7 +32,7 @@ reactos/dll/directx/wine/ddraw          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.7.37
-reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.7.37
+reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29