Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-28 06:59:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DMUSIC]

Browse source 
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61719
This commit is contained in:
Amine Khaldi 2014-01-20 11:27:12 +00:00
parent 200251f360
commit b27cb871ec
6 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/directx/wine/dmusic/buffer.c
View file

@ -20,6 +20,7 @@
*/ */
#include "dmusic_private.h" #include "dmusic_private.h"
#include <dmksctrl.h> #include <dmksctrl.h>
static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface) static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)

2
reactos/dll/directx/wine/dmusic/collection.c
View file

@ -20,6 +20,8 @@
#include "dmusic_private.h" #include "dmusic_private.h"
#include <dmusicf.h>
WINE_DECLARE_DEBUG_CHANNEL(dmfile); WINE_DECLARE_DEBUG_CHANNEL(dmfile);
static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface)

2
reactos/dll/directx/wine/dmusic/dmusic.c
View file

@ -21,6 +21,8 @@
#include "dmusic_private.h" #include "dmusic_private.h"
#include <winreg.h>
static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
{ {
return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface); return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface);

3
reactos/dll/directx/wine/dmusic/dmusic_main.c
View file

@ -18,8 +18,9 @@
*/ */
#include "dmusic_private.h" #include "dmusic_private.h"
#include <stdio.h> #include <stdio.h>
#include "rpcproxy.h" #include <rpcproxy.h>
static HINSTANCE instance; static HINSTANCE instance;
LONG DMUSIC_refCount = 0; LONG DMUSIC_refCount = 0;

19
reactos/dll/directx/wine/dmusic/dmusic_private.h
View file

@ -24,22 +24,25 @@
#include <config.h> #include <config.h>
#define COBJMACROS #include <stdarg.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <wine/debug.h> #define COBJMACROS
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <dmusici.h>
#include <dmusics.h>
#include <wine/debug.h>
#include <wine/list.h> #include <wine/list.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#include <winreg.h>
#include <objbase.h>
#include <dmusici.h> WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
#include <dmusicf.h>
#include <dmusics.h>
/***************************************************************************** /*****************************************************************************
* Interfaces * Interfaces

1
reactos/dll/directx/wine/dmusic/port.c
View file

@ -20,6 +20,7 @@
*/ */
#include "dmusic_private.h" #include "dmusic_private.h"
#include <assert.h> #include <assert.h>
static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)