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

Author: akhaldi
Date: Tue Jul 21 23:24:15 2015
New Revision: 68521

URL: http://svn.reactos.org/svn/reactos?rev=68521&view=rev
Log:
[DMUSIC] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/directx/wine/dmusic/dmobject.c
    trunk/reactos/dll/directx/wine/dmusic/dmobject.h
    trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dmusic/dmobject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmobject.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmobject.c	[iso-8859-1] Tue Jul 21 23:24:15
2015
@@ -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 @@
     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)
 {

Modified: trunk/reactos/dll/directx/wine/dmusic/dmobject.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmobject.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmobject.h	[iso-8859-1] Tue Jul 21 23:24:15
2015
@@ -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 @@
         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,

Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm…
==============================================================================
--- trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h	[iso-8859-1] Tue Jul 21
23:24:15 2015
@@ -252,10 +252,6 @@
 /*****************************************************************************
  * 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 */

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Jul 21 23:24:15 2015
@@ -32,7 +32,7 @@
 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