From be700b4487548b6a42d9e8f56215029c0858f510 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 7 Sep 2008 14:06:11 +0000 Subject: [PATCH] - Completely removed previously commented code: there's no need to keep it, that's wine specific code. - Added a diff with that change svn path=/trunk/; revision=36033 --- reactos/dll/win32/mscoree/mscoree_main.c | 2 -- reactos/dll/win32/mscoree/mscoree_ros.diff | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 reactos/dll/win32/mscoree/mscoree_ros.diff diff --git a/reactos/dll/win32/mscoree/mscoree_main.c b/reactos/dll/win32/mscoree/mscoree_main.c index c08118acc5c..4a4769ac489 100644 --- a/reactos/dll/win32/mscoree/mscoree_main.c +++ b/reactos/dll/win32/mscoree/mscoree_main.c @@ -112,8 +112,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - //case DLL_WINE_PREATTACH: - //return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; diff --git a/reactos/dll/win32/mscoree/mscoree_ros.diff b/reactos/dll/win32/mscoree/mscoree_ros.diff new file mode 100644 index 00000000000..4f8aee63b47 --- /dev/null +++ b/reactos/dll/win32/mscoree/mscoree_ros.diff @@ -0,0 +1,11 @@ +--- mscoree_main.c Tue Jun 10 13:29:52 2008 ++++ mscoree_main.c Sun Sep 07 16:53:09 2008 +@@ -112,8 +112,6 @@ + + switch (fdwReason) + { +- case DLL_WINE_PREATTACH: +- return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break;