[SXS]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Improve the GUIDs situation.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61817

reactos/dll/win32/sxs/CMakeLists.txt

@@ -7,6 +7,7 @@ list(APPEND SOURCE
     cache.c
     name.c
     sxs.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 

reactos/dll/win32/sxs/cache.c

@@ -18,27 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define INITGUID
-
-#include <windef.h>
-#include <winbase.h>
-#include <ole2.h>
-#include <winsxs.h>
-#include <msxml2.h>
-
-#include <wine/debug.h>
-#include <wine/list.h>
-#include <wine/unicode.h>
 #include "sxs_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(sxs);
+#include <oleauto.h>
+#include <msxml2.h>
+
+#include <wine/list.h>
 
 static const WCHAR cache_mutex_nameW[] =
     {'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0};

reactos/dll/win32/sxs/guid.c

@@ -0,0 +1,16 @@
+/* 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 <initguid.h>
+#include <objbase.h>
+#include <winsxs.h>
+#include <msxml2.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/dll/win32/sxs/name.c

@@ -18,25 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <ole2.h>
-#include <winsxs.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "sxs_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(sxs);
-
 struct name
 {
     IAssemblyName IAssemblyName_iface;

reactos/dll/win32/sxs/sxs.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-
+#include "sxs_private.h"
 
 /***********************************************************************
  *             DllMain   (SXS.@)

reactos/dll/win32/sxs/sxs_private.h

@@ -16,6 +16,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <winsxs.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(sxs);
+
 enum name_attr_id
 {
     NAME_ATTR_ID_NAME,