Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DMUSIC]

Browse source 
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61328
This commit is contained in:
Amine Khaldi 2013-12-21 18:59:44 +00:00
parent b54cee4f88
commit b453f9616c
10 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,11 +20,8 @@
*/
#include "dmusic_private.h"
//#include "initguid.h"
#include <dmksctrl.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicBufferImpl, IDirectMusicBuffer_iface);

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

@ -20,8 +20,6 @@
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface)
{
return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface);

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

@ -20,7 +20,6 @@
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface)

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

@ -19,12 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#include <stdio.h>
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
{
return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface);

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

@ -17,16 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
//#include "wine/port.h"
#include <stdio.h>
#include "dmusic_private.h"
#include <stdio.h>
#include "rpcproxy.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static HINSTANCE instance;
LONG DMUSIC_refCount = 0;

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

@ -22,20 +22,16 @@
#ifndef __WINE_DMUSIC_PRIVATE_H
#define __WINE_DMUSIC_PRIVATE_H
//#include <stdarg.h>
#include <config.h>
#define COBJMACROS
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
//#include "windef.h"
//#include "winbase.h"
//#include "winnt.h"
//#include "wingdi.h"
//#include "winuser.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
#include <wine/list.h>
#include <wine/unicode.h>
#include <winreg.h>

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

@ -20,8 +20,6 @@
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface);

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

@ -20,8 +20,6 @@
#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: */

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

@ -19,10 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <assert.h>
#include "dmusic_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
#include <assert.h>
static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)
{

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

@ -19,9 +19,6 @@
*/
#include "dmusic_private.h"
//#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
/*
* Near the bottom of this file are the exported DllRegisterServer and