download.c
instrument.c
port.c
- dmusic_private.h)
+ precomp.h)
add_library(dmusic SHARED
${SOURCE}
set_module_type(dmusic win32dll)
target_link_libraries(dmusic dxguid uuid wine)
add_importlibs(dmusic ole32 advapi32 winmm dsound user32 msvcrt kernel32 ntdll)
-add_pch(dmusic dmusic_private.h SOURCE)
+add_pch(dmusic precomp.h SOURCE)
add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all)
*/
#include "dmusic_private.h"
+#include "initguid.h"
+#include "dmksctrl.h"
-#include <dmksctrl.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)
{
#include "dmusic_private.h"
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface)
{
return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface);
*/
#include "dmusic_private.h"
+#include "dmobject.h"
-#include <dmusicf.h>
-
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
/*****************************************************************************
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "dmusic_private.h"
+#define COBJMACROS
+#include "objbase.h"
+#include "dmusici.h"
+#include "dmobject.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
/* Generic IDirectMusicObject methods */
static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <stdio.h>
+
#include "dmusic_private.h"
-#include <winuser.h>
-#include <winreg.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
{
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "dmusic_private.h"
+#include "config.h"
+#include "wine/port.h"
#include <stdio.h>
-#include <rpcproxy.h>
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
+
+#include "dmusic_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static HINSTANCE instance;
LONG DMUSIC_refCount = 0;
#ifndef __WINE_DMUSIC_PRIVATE_H
#define __WINE_DMUSIC_PRIVATE_H
-#include <wine/config.h>
-
#include <stdarg.h>
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <dmusici.h>
-#include <dmusics.h>
-#include <dmksctrl.h>
-
-#include <wine/debug.h>
-#include <wine/list.h>
-#include <wine/unicode.h>
-
-#include "dmobject.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "wine/debug.h"
+#include "wine/list.h"
+#include "wine/unicode.h"
+#include "winreg.h"
+#include "objbase.h"
+
+#include "dmusici.h"
+#include "dmusicf.h"
+#include "dmusics.h"
+#include "dmksctrl.h"
/*****************************************************************************
* Interfaces
#include "dmusic_private.h"
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface);
#include "dmusic_private.h"
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, { 0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } };
/* IDirectMusicInstrument IUnknown part: */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include <assert.h>
#include "dmusic_private.h"
-#include <assert.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
typedef struct SynthPortImpl {
IDirectMusicPort IDirectMusicPort_iface;
--- /dev/null
+
+#ifndef __WINE_DMUSIC_PRECOMP_H
+#define __WINE_DMUSIC_PRECOMP_H
+
+#include <wine/config.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include "dmusic_private.h"
+#include "dmobject.h"
+
+#endif /* !__WINE_DMUSIC_PRECOMP_H */
#define WINE_PRODUCTVERSION_STR "5.3.1.904"
#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
reactos/dll/directx/wine/devenum # Synced to WineStaging-3.3
reactos/dll/directx/wine/dinput # Synced to WineStaging-3.3
reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3
-reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9
+reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.3
reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9
reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.16
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29