[ros-diffs] [tfaber] 74928: [NTDLL_VISTA] - Avoid importing from kernel32. We're supposed to be... ntdll CORE-13361

[tfaber]

Author: tfaber
Date: Mon Jun  5 21:37:13 2017
New Revision: 74928

URL: http://svn.reactos.org/svn/reactos?rev=74928&view=rev
Log:
[NTDLL_VISTA]
- Avoid importing from kernel32. We're supposed to be... ntdll
CORE-13361

Modified:
    trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt
    trunk/reactos/dll/win32/ntdll_vista/DllMain.c

Modified: trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt?rev=74928&r1=74927&r2=74928&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt  [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt  [iso-8859-1] Mon Jun  5 
21:37:13 2017
@@ -15,6 +15,6 @@
 
 add_library(ntdll_vista SHARED ${SOURCE})
 set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12)
-add_importlibs(ntdll_vista ntdll kernel32)
+add_importlibs(ntdll_vista ntdll)
 add_dependencies(ntdll_vista psdk)
 add_cd_file(TARGET ntdll_vista DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/ntdll_vista/DllMain.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdll_vista/DllMain.c?rev=74928&r1=74927&r2=74928&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ntdll_vista/DllMain.c       [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ntdll_vista/DllMain.c       [iso-8859-1] Mon Jun  5 
21:37:13 2017
@@ -7,6 +7,8 @@
 #include <winreg.h>
 #include <winuser.h>
 #include <winwlx.h>
+#include <ndk/rtltypes.h>
+#include <ndk/umfuncs.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -25,7 +27,7 @@
 {
     if (dwReason == DLL_PROCESS_ATTACH)
     {
-        DisableThreadLibraryCalls(hDll);
+        LdrDisableThreadCalloutsForDll(hDll);
         RtlpInitializeKeyedEvent();
     }
     else if (dwReason == DLL_PROCESS_DETACH)