[ros-diffs] [akhaldi] 61397: [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 i...

Author: akhaldi
Date: Wed Dec 25 11:10:09 2013
New Revision: 61397

URL: http://svn.reactos.org/svn/reactos?rev=61397&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/mmdevapi/audiovolume.c
    trunk/reactos/dll/win32/mmdevapi/devenum.c
    trunk/reactos/dll/win32/mmdevapi/main.c
    trunk/reactos/dll/win32/mmdevapi/mmdevapi.h

Modified: trunk/reactos/dll/win32/mmdevapi/audiovolume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/audiovo…
==============================================================================
--- trunk/reactos/dll/win32/mmdevapi/audiovolume.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdevapi/audiovolume.c	[iso-8859-1] Wed Dec 25 11:10:09 2013
@@ -16,31 +16,7 @@
  * 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;
 

Modified: trunk/reactos/dll/win32/mmdevapi/devenum.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/devenum…
==============================================================================
--- trunk/reactos/dll/win32/mmdevapi/devenum.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdevapi/devenum.c	[iso-8859-1] Wed Dec 25 11:10:09 2013
@@ -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','\\',

Modified: trunk/reactos/dll/win32/mmdevapi/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/mmdevapi/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdevapi/main.c	[iso-8859-1] Wed Dec 25 11:10:09 2013
@@ -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;
 

Modified: trunk/reactos/dll/win32/mmdevapi/mmdevapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdevapi/mmdevap…
==============================================================================
--- trunk/reactos/dll/win32/mmdevapi/mmdevapi.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdevapi/mmdevapi.h	[iso-8859-1] Wed Dec 25 11:10:09 2013
@@ -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;