[ros-diffs] [akhaldi] 61411: [MSCOREE] * 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...

Author: akhaldi
Date: Wed Dec 25 15:31:19 2013
New Revision: 61411

URL: http://svn.reactos.org/svn/reactos?rev=61411&view=rev
Log:
[MSCOREE]
* 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.
* Improve the GUIDs situation.
CORE-7716

Added:
    trunk/reactos/dll/win32/mscoree/guid.c   (with props)
Modified:
    trunk/reactos/dll/win32/mscoree/CMakeLists.txt
    trunk/reactos/dll/win32/mscoree/assembly.c
    trunk/reactos/dll/win32/mscoree/config.c
    trunk/reactos/dll/win32/mscoree/cordebug.c
    trunk/reactos/dll/win32/mscoree/corruntimehost.c
    trunk/reactos/dll/win32/mscoree/metadata.c
    trunk/reactos/dll/win32/mscoree/metahost.c
    trunk/reactos/dll/win32/mscoree/mscoree_main.c
    trunk/reactos/dll/win32/mscoree/mscoree_private.h

Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/CMakeLists.txt	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -15,12 +15,13 @@
     metadata.c
     metahost.c
     mscoree_main.c
+    guid.c
     mscoree.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
 
 add_library(mscoree SHARED ${SOURCE})
 set_module_type(mscoree win32dll)
-target_link_libraries(mscoree wine uuid)
+target_link_libraries(mscoree uuid wine)
 add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/mscoree/assembly.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/assembly…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/assembly.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/assembly.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -18,28 +18,10 @@
  * 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>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
+#include "mscoree_private.h"
+
 #include <winver.h>
 #include <dbghelp.h>
-#include <ole2.h>
-//#include "mscoree.h"
-#include <corhdr.h>
-#include <metahost.h>
-#include <cordebug.h>
-#include <wine/list.h>
-#include "mscoree_private.h"
-
-//#include "wine/debug.h"
-//#include "wine/unicode.h"
 
 typedef struct
 {

Modified: trunk/reactos/dll/win32/mscoree/config.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/config.c…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/config.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/config.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -18,30 +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
-
-#define COBJMACROS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
+#include "mscoree_private.h"
+
 #include <ole2.h>
+#include <shlwapi.h>
+#include <initguid.h>
 #include <msxml2.h>
-//#include "mscoree.h"
-#include <corhdr.h>
-#include <metahost.h>
-#include <cordebug.h>
-#include <wine/list.h>
-#include "mscoree_private.h"
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
 enum parse_state
 {

Modified: trunk/reactos/dll/win32/mscoree/cordebug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/cordebug…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/cordebug.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/cordebug.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -17,32 +17,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
-
-#define COBJMACROS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "winreg.h"
-#include <ole2.h>
-//#include "shellapi.h"
-//#include "mscoree.h"
-#include <corhdr.h>
-#include <metahost.h>
-#include <cordebug.h>
-#include <wine/list.h>
 #include "mscoree_private.h"
-#include <wine/debug.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
 typedef struct DebugProcess
 {

Modified: trunk/reactos/dll/win32/mscoree/corruntimehost.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/corrunti…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/corruntimehost.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/corruntimehost.c	[iso-8859-1] Wed Dec 25 15:31:19
2013
@@ -17,37 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
+#include "mscoree_private.h"
 
 #include <assert.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <winreg.h>
-#include <ole2.h>
 #include <shellapi.h>
-
-#include <cor.h>
-//#include "mscoree.h"
-#include <metahost.h>
-//#include "corhdr.h"
-#include <cordebug.h>
-#include <wine/list.h>
-#include "mscoree_private.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "wine/list.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
-
 #include <initguid.h>
 
 DEFINE_GUID(IID__AppDomain,
0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13);

Added: trunk/reactos/dll/win32/mscoree/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/guid.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/guid.c	(added)
+++ trunk/reactos/dll/win32/mscoree/guid.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -0,0 +1,17 @@
+/* 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 <objbase.h>
+#include <initguid.h>
+#include <cor.h>
+#include <cordebug.h>
+#include <metahost.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

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

Modified: trunk/reactos/dll/win32/mscoree/metadata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metadata…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/metadata.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/metadata.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -18,32 +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 <stdio.h>
-#include <stdarg.h>
-//#include <assert.h>
-
-#define COBJMACROS
-
-//#include "wine/library.h"
-#include <windef.h>
-#include <winbase.h>
-//#include "winreg.h"
-#include <ole2.h>
-#include <cor.h>
-//#include "mscoree.h"
-//#include "corhdr.h"
-//#include "cordebug.h"
-//#include "metahost.h"
-//#include "wine/list.h"
-//#include "mscoree_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
+#include "mscoree_private.h"
 
 typedef struct MetaDataDispenser
 {

Modified: trunk/reactos/dll/win32/mscoree/metahost.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/metahost…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/metahost.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/metahost.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -18,36 +18,14 @@
  * 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 "mscoree_private.h"
 
 #include <stdio.h>
-//#include <stdarg.h>
 #include <assert.h>
 
-#define COBJMACROS
-
-#include <wine/unicode.h>
 #include <wine/library.h>
-//#include "windef.h"
-//#include "winbase.h"
-#include <winreg.h>
-#include <ole2.h>
-
-//#include "corerror.h"
-#include <cor.h>
-//#include "mscoree.h"
-//#include "corhdr.h"
-#include <cordebug.h>
-#include <metahost.h>
+
 #include <fusion.h>
-#include <wine/list.h>
-#include "mscoree_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
 static const WCHAR net_11_subdir[] = {'1','.','0',0};
 static const WCHAR net_20_subdir[] = {'2','.','0',0};

Modified: trunk/reactos/dll/win32/mscoree/mscoree_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/mscoree_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/mscoree_main.c	[iso-8859-1] Wed Dec 25 15:31:19 2013
@@ -19,40 +19,9 @@
  * 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 <wine/unicode.h>
-//#include "wine/library.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winnls.h"
-#include <winreg.h>
-#include <ole2.h>
-#include <ocidl.h>
-//#include "shellapi.h"
-
-#include <initguid.h>
-#include <msxml2.h>
-//#include "corerror.h"
-#include <cor.h>
-//#include "mscoree.h"
-//#include "corhdr.h"
-#include <cordebug.h>
-#include <metahost.h>
-//#include "fusion.h"
-#include <wine/list.h>
 #include "mscoree_private.h"
+
 #include <rpcproxy.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
 static HINSTANCE MSCOREE_hInstance;
 

Modified: trunk/reactos/dll/win32/mscoree/mscoree_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/mscoree_…
==============================================================================
--- trunk/reactos/dll/win32/mscoree/mscoree_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mscoree/mscoree_private.h	[iso-8859-1] Wed Dec 25 15:31:19
2013
@@ -19,6 +19,29 @@
 
 #ifndef __MSCOREE_PRIVATE__
 #define __MSCOREE_PRIVATE__
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <objbase.h>
+#include <cor.h>
+#include <corhdr.h>
+#include <cordebug.h>
+#include <metahost.h>
+
+#include <wine/list.h>
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
 extern char *WtoA(LPCWSTR wstr) DECLSPEC_HIDDEN;