From 673d558994471c02841fae537c3ba3a747bb79d4 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 25 Dec 2013 11:10:09 +0000
Subject: [PATCH] [MMDEVAPI] * Move some inclusions to the main header. * Set
 the default debugging channel globally through the main header. * Remove
 inclusions and definitions that already exist in the main header. CORE-7716

svn path=/trunk/; revision=61397
---
 reactos/dll/win32/mmdevapi/audiovolume.c | 24 ------------------
 reactos/dll/win32/mmdevapi/devenum.c     | 31 +++++-------------------
 reactos/dll/win32/mmdevapi/main.c        | 29 +---------------------
 reactos/dll/win32/mmdevapi/mmdevapi.h    | 29 +++++++++++++++++++---
 4 files changed, 33 insertions(+), 80 deletions(-)

diff --git a/reactos/dll/win32/mmdevapi/audiovolume.c b/reactos/dll/win32/mmdevapi/audiovolume.c
index 4cc3226be78..845241a3284 100644
--- a/reactos/dll/win32/mmdevapi/audiovolume.c
+++ b/reactos/dll/win32/mmdevapi/audiovolume.c
@@ -16,32 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-#define NONAMELESSUNION
-#define COBJMACROS
-#include "config.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-#include "ole2.h"
-#include "mmdeviceapi.h"
-#include "mmsystem.h"
-#include "dsound.h"
-#include "audioclient.h"
-#include "endpointvolume.h"
-#include "audiopolicy.h"
-
 #include "mmdevapi.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
-
 static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl;
 
 typedef struct AEVImpl {
diff --git a/reactos/dll/win32/mmdevapi/devenum.c b/reactos/dll/win32/mmdevapi/devenum.c
index eebf4ed839c..3436ff4affe 100644
--- a/reactos/dll/win32/mmdevapi/devenum.c
+++ b/reactos/dll/win32/mmdevapi/devenum.c
@@ -16,33 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
-#include <stdarg.h>
-
-#define NONAMELESSUNION
-#define COBJMACROS
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "wine/debug.h"
-#include "wine/list.h"
-#include "wine/unicode.h"
-
-#include "initguid.h"
-#include "ole2.h"
-#include "mmdeviceapi.h"
-#include "dshow.h"
-#include "dsound.h"
-#include "audioclient.h"
-#include "endpointvolume.h"
-#include "audiopolicy.h"
-
 #include "mmdevapi.h"
-#include "devpkey.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
+#define _WINDOWS_H
+#include <ole2.h>
+#include <dshow.h>
+#include <devpkey.h>
+
+#include <wine/list.h>
 
 static const WCHAR software_mmdevapi[] =
     { 'S','o','f','t','w','a','r','e','\\',
diff --git a/reactos/dll/win32/mmdevapi/main.c b/reactos/dll/win32/mmdevapi/main.c
index 447813f12fe..63432de0cb9 100644
--- a/reactos/dll/win32/mmdevapi/main.c
+++ b/reactos/dll/win32/mmdevapi/main.c
@@ -17,36 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "wine/library.h"
-
-#include "ole2.h"
-#include "olectl.h"
-#include "rpcproxy.h"
-#include "propsys.h"
-#include "propkeydef.h"
-#include "mmdeviceapi.h"
-#include "mmsystem.h"
-#include "dsound.h"
-#include "audioclient.h"
-#include "endpointvolume.h"
-#include "audiopolicy.h"
-#include "devpkey.h"
-#include "winreg.h"
-
 #include "mmdevapi.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 
diff --git a/reactos/dll/win32/mmdevapi/mmdevapi.h b/reactos/dll/win32/mmdevapi/mmdevapi.h
index 2a04780a162..9fcb4cc449f 100644
--- a/reactos/dll/win32/mmdevapi/mmdevapi.h
+++ b/reactos/dll/win32/mmdevapi/mmdevapi.h
@@ -16,9 +16,32 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
+#include <wine/config.h>
+#include <wine/port.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winreg.h>
+#include <initguid.h>
+#include <objbase.h>
+#include <audiopolicy.h>
+#include <endpointvolume.h>
+#include <mmdeviceapi.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);
 
 extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
 extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;