[ros-diffs] [akhaldi] 61817: [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. C...

Author: akhaldi
Date: Sat Jan 25 19:01:00 2014
New Revision: 61817

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

Added:
    trunk/reactos/dll/win32/sxs/guid.c   (with props)
Modified:
    trunk/reactos/dll/win32/sxs/CMakeLists.txt
    trunk/reactos/dll/win32/sxs/cache.c
    trunk/reactos/dll/win32/sxs/name.c
    trunk/reactos/dll/win32/sxs/sxs.c
    trunk/reactos/dll/win32/sxs/sxs_private.h

Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.t…
==============================================================================
--- trunk/reactos/dll/win32/sxs/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/CMakeLists.txt	[iso-8859-1] Sat Jan 25 19:01:00 2014
@@ -7,6 +7,7 @@
     cache.c
     name.c
     sxs.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 

Modified: trunk/reactos/dll/win32/sxs/cache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/cache.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/sxs/cache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/cache.c	[iso-8859-1] Sat Jan 25 19:01:00 2014
@@ -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 "sxs_private.h"
+
+#include <oleauto.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);
 
 static const WCHAR cache_mutex_nameW[] =
    
{'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0};

Added: trunk/reactos/dll/win32/sxs/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/guid.c?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/sxs/guid.c	(added)
+++ trunk/reactos/dll/win32/sxs/guid.c	[iso-8859-1] Sat Jan 25 19:01:00 2014
@@ -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 */

Propchange: trunk/reactos/dll/win32/sxs/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/sxs/name.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/name.c?rev=6…
==============================================================================
--- trunk/reactos/dll/win32/sxs/name.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/name.c	[iso-8859-1] Sat Jan 25 19:01:00 2014
@@ -18,24 +18,7 @@
  * 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
 {

Modified: trunk/reactos/dll/win32/sxs/sxs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.c?rev=61…
==============================================================================
--- trunk/reactos/dll/win32/sxs/sxs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/sxs.c	[iso-8859-1] Sat Jan 25 19:01:00 2014
@@ -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.@)

Modified: trunk/reactos/dll/win32/sxs/sxs_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs_private.…
==============================================================================
--- trunk/reactos/dll/win32/sxs/sxs_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sxs/sxs_private.h	[iso-8859-1] Sat Jan 25 19:01:00 2014
@@ -15,6 +15,24 @@
  * License along with this library; if not, write to the Free Software
  * 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
 {