From 9d02c5e329d1b32ea4ef01d3a99fd273f3ed6d38 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 25 Dec 2013 15:19:53 +0000
Subject: [PATCH] [MMDEVAPI] * Improve the GUIDs situation. CORE-7716

svn path=/trunk/; revision=61410
---
 reactos/dll/win32/mmdevapi/CMakeLists.txt |  1 +
 reactos/dll/win32/mmdevapi/devenum.c      |  7 ++++---
 reactos/dll/win32/mmdevapi/guid.c         | 18 ++++++++++++++++++
 reactos/dll/win32/mmdevapi/mmdevapi.h     |  1 -
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 reactos/dll/win32/mmdevapi/guid.c

diff --git a/reactos/dll/win32/mmdevapi/CMakeLists.txt b/reactos/dll/win32/mmdevapi/CMakeLists.txt
index 70a28de6845..ebb3ef3400f 100644
--- a/reactos/dll/win32/mmdevapi/CMakeLists.txt
+++ b/reactos/dll/win32/mmdevapi/CMakeLists.txt
@@ -10,6 +10,7 @@ list(APPEND SOURCE
     audiovolume.c
     devenum.c
     main.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi.def)
 
diff --git a/reactos/dll/win32/mmdevapi/devenum.c b/reactos/dll/win32/mmdevapi/devenum.c
index 3436ff4affe..29e8392de7c 100644
--- a/reactos/dll/win32/mmdevapi/devenum.c
+++ b/reactos/dll/win32/mmdevapi/devenum.c
@@ -18,13 +18,14 @@
 
 #include "mmdevapi.h"
 
-#define _WINDOWS_H
+#include <wine/list.h>
+
 #include <ole2.h>
+#include <initguid.h>
+#define _WINDOWS_H
 #include <dshow.h>
 #include <devpkey.h>
 
-#include <wine/list.h>
-
 static const WCHAR software_mmdevapi[] =
     { 'S','o','f','t','w','a','r','e','\\',
       'M','i','c','r','o','s','o','f','t','\\',
diff --git a/reactos/dll/win32/mmdevapi/guid.c b/reactos/dll/win32/mmdevapi/guid.c
new file mode 100644
index 00000000000..fb6a9f99b3a
--- /dev/null
+++ b/reactos/dll/win32/mmdevapi/guid.c
@@ -0,0 +1,18 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <audiopolicy.h>
+#include <endpointvolume.h>
+#include <mmdeviceapi.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/dll/win32/mmdevapi/mmdevapi.h b/reactos/dll/win32/mmdevapi/mmdevapi.h
index 9fcb4cc449f..04355226d18 100644
--- a/reactos/dll/win32/mmdevapi/mmdevapi.h
+++ b/reactos/dll/win32/mmdevapi/mmdevapi.h
@@ -32,7 +32,6 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winreg.h>
-#include <initguid.h>
 #include <objbase.h>
 #include <audiopolicy.h>
 #include <endpointvolume.h>