[NTDLL_VISTA]

- Avoid importing from kernel32. We're supposed to be... ntdll
CORE-13361

svn path=/trunk/; revision=74928

diff --git a/reactos/dll/win32/ntdll_vista/CMakeLists.txt b/reactos/dll/win32/ntdll_vista/CMakeLists.txt
index 7f235ad..3a73db8 100644 (file)
--- a/reactos/dll/win32/ntdll_vista/CMakeLists.txt
+++ b/reactos/dll/win32/ntdll_vista/CMakeLists.txt
@@ -15,6 +15,6 @@ list(APPEND SOURCE
 
 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)

diff --git a/reactos/dll/win32/ntdll_vista/DllMain.c b/reactos/dll/win32/ntdll_vista/DllMain.c
index a7d5a08..9266b52 100644 (file)
--- a/reactos/dll/win32/ntdll_vista/DllMain.c
+++ b/reactos/dll/win32/ntdll_vista/DllMain.c
@@ -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 @@ DllMain(HANDLE hDll,
 {
     if (dwReason == DLL_PROCESS_ATTACH)
     {
-        DisableThreadLibraryCalls(hDll);
+        LdrDisableThreadCalloutsForDll(hDll);
         RtlpInitializeKeyedEvent();
     }
     else if (dwReason == DLL_PROCESS_DETACH)