- Completely removed previously commented code: there's no need to keep it, that...

- Added a diff with that change

svn path=/trunk/; revision=36033

diff --git a/reactos/dll/win32/mscoree/mscoree_main.c b/reactos/dll/win32/mscoree/mscoree_main.c
index c08118a..4a4769a 100644 (file)
--- 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 (file)
index 0000000..4f8aee6
--- /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;