Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 08:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCOREE]

Browse source 
* 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

svn path=/trunk/; revision=61411
This commit is contained in:
Amine Khaldi 2013-12-25 15:31:19 +00:00
parent 9d02c5e329
commit dca5c07bbe
10 changed files with 57 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/mscoree/CMakeLists.txt
View file

@ -15,12 +15,13 @@ list(APPEND SOURCE
metadata.c metadata.c
metahost.c metahost.c
mscoree_main.c mscoree_main.c
guid.c
mscoree.rc mscoree.rc
${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
add_library(mscoree SHARED ${SOURCE}) add_library(mscoree SHARED ${SOURCE})
set_module_type(mscoree win32dll) 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_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll)
add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all) add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all)

22
reactos/dll/win32/mscoree/assembly.c
View file

@ -18,28 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 <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 "mscoree_private.h"
//#include "wine/debug.h" #include <winver.h>
//#include "wine/unicode.h" #include <dbghelp.h>
typedef struct typedef struct
{ {

26
reactos/dll/win32/mscoree/config.c
View file

@ -18,30 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 <ole2.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 "mscoree_private.h"
#include <ole2.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <initguid.h>
#include <wine/debug.h> #include <msxml2.h>
WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
enum parse_state enum parse_state
{ {

25
reactos/dll/win32/mscoree/cordebug.c
View file

@ -17,32 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "mscoree_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
typedef struct DebugProcess typedef struct DebugProcess
{ {

31
reactos/dll/win32/mscoree/corruntimehost.c
View file

@ -17,37 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 <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 "mscoree_private.h"
#include <wine/debug.h> #include <assert.h>
#include <wine/unicode.h> #include <shellapi.h>
//#include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
#include <initguid.h> #include <initguid.h>
DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13); DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13);

17
reactos/dll/win32/mscoree/guid.c Normal file
View file

@ -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 */

27
reactos/dll/win32/mscoree/metadata.c
View file

@ -18,32 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WIN32_NO_STATUS #include "mscoree_private.h"
#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 );
typedef struct MetaDataDispenser typedef struct MetaDataDispenser
{ {

32
reactos/dll/win32/mscoree/metahost.c
View file

@ -18,36 +18,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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/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 "mscoree_private.h"
#include <wine/debug.h> #include <stdio.h>
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); #include <wine/library.h>
#include <fusion.h>
static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_11_subdir[] = {'1','.','0',0};
static const WCHAR net_20_subdir[] = {'2','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0};

33
reactos/dll/win32/mscoree/mscoree_main.c
View file

@ -19,41 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "mscoree_private.h"
#include <rpcproxy.h> #include <rpcproxy.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
static HINSTANCE MSCOREE_hInstance; static HINSTANCE MSCOREE_hInstance;
typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj); typedef HRESULT (*fnCreateInstance)(REFIID riid, LPVOID *ppObj);

23
reactos/dll/win32/mscoree/mscoree_private.h
View file

@ -20,6 +20,29 @@
#ifndef __MSCOREE_PRIVATE__ #ifndef __MSCOREE_PRIVATE__
#define __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; extern char *WtoA(LPCWSTR wstr) DECLSPEC_HIDDEN;
extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) DECLSPEC_HIDDEN;