Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

04/06: [LDR] Guard some sections where we grab a lock. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad08c6631b4707c48b212… commit ad08c6631b4707c48b2124821b5a80b8372e2468 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 29 17:40:42 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [LDR] Guard some sections where we grab a lock. CORE-14532 --- dll/ntdll/ldr/ldrapi.c | 117 ++++++++++++------------ dll/ntdll/ldr/ldrutils.c | 229 ++++++++++++++++++++++++----------------------- 2 files changed, 180 insertions(+), 166 deletions(-) diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index 15f36bb2be..b151163dd4 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -353,73 +353,80 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL, /* Check if there's a TLD DLL being loaded */ OldTldDll = LdrpTopLevelDllBeingLoaded; - if (OldTldDll) + _SEH2_TRY { - /* This is a recursive load, do something about it? */ - if ((ShowSnaps) || (LdrpShowRecursiveLoads) || (LdrpBreakOnRecursiveDllLoads)) + + if (OldTldDll) { - /* Print out debug messages */ - DPRINT1("[%p, %p] LDR: Recursive DLL Load\n", - Teb->RealClientId.UniqueProcess, - Teb->RealClientId.UniqueThread); - DPRINT1("[%p, %p] Previous DLL being loaded \"%wZ\"\n", - Teb->RealClientId.UniqueProcess, - Teb->RealClientId.UniqueThread, - OldTldDll); - DPRINT1("[%p, %p] DLL being requested \"%wZ\"\n", - Teb->RealClientId.UniqueProcess, - Teb->RealClientId.UniqueThread, - DllName); - - /* Was it initializing too? */ - if (!LdrpCurrentDllInitializer) + /* This is a recursive load, do something about it? */ + if ((ShowSnaps) || (LdrpShowRecursiveLoads) || (LdrpBreakOnRecursiveDllLoads)) { - DPRINT1("[%p, %p] LDR: No DLL Initializer was running\n", + /* Print out debug messages */ + DPRINT1("[%p, %p] LDR: Recursive DLL Load\n", Teb->RealClientId.UniqueProcess, Teb->RealClientId.UniqueThread); - } - else - { - DPRINT1("[%p, %p] DLL whose initializer was currently running \"%wZ\"\n", - Teb->ClientId.UniqueProcess, - Teb->ClientId.UniqueThread, - &LdrpCurrentDllInitializer->BaseDllName); + DPRINT1("[%p, %p] Previous DLL being loaded \"%wZ\"\n", + Teb->RealClientId.UniqueProcess, + Teb->RealClientId.UniqueThread, + OldTldDll); + DPRINT1("[%p, %p] DLL being requested \"%wZ\"\n", + Teb->RealClientId.UniqueProcess, + Teb->RealClientId.UniqueThread, + DllName); + + /* Was it initializing too? */ + if (!LdrpCurrentDllInitializer) + { + DPRINT1("[%p, %p] LDR: No DLL Initializer was running\n", + Teb->RealClientId.UniqueProcess, + Teb->RealClientId.UniqueThread); + } + else + { + DPRINT1("[%p, %p] DLL whose initializer was currently running \"%wZ\"\n", + Teb->ClientId.UniqueProcess, + Teb->ClientId.UniqueThread, + &LdrpCurrentDllInitializer->BaseDllName); + } } } - } - /* Set this one as the TLD DLL being loaded*/ - LdrpTopLevelDllBeingLoaded = DllName; + /* Set this one as the TLD DLL being loaded*/ + LdrpTopLevelDllBeingLoaded = DllName; - /* Load the DLL */ - Status = LdrpLoadDll(RedirectedDll, - SearchPath, - DllCharacteristics, - DllName, - BaseAddress, - TRUE); - if (NT_SUCCESS(Status)) - { - Status = STATUS_SUCCESS; + /* Load the DLL */ + Status = LdrpLoadDll(RedirectedDll, + SearchPath, + DllCharacteristics, + DllName, + BaseAddress, + TRUE); + if (NT_SUCCESS(Status)) + { + Status = STATUS_SUCCESS; + } + else if ((Status != STATUS_NO_SUCH_FILE) && + (Status != STATUS_DLL_NOT_FOUND) && + (Status != STATUS_OBJECT_NAME_NOT_FOUND) && + (Status != STATUS_DLL_INIT_FAILED)) + { + DbgPrintEx(DPFLTR_LDR_ID, + DPFLTR_WARNING_LEVEL, + "LDR: %s - failing because LdrpLoadDll(%wZ) returned status %x\n", + __FUNCTION__, + DllName, + Status); + } } - else if ((Status != STATUS_NO_SUCH_FILE) && - (Status != STATUS_DLL_NOT_FOUND) && - (Status != STATUS_OBJECT_NAME_NOT_FOUND) && - (Status != STATUS_DLL_INIT_FAILED)) + _SEH2_FINALLY { - DbgPrintEx(DPFLTR_LDR_ID, - DPFLTR_WARNING_LEVEL, - "LDR: %s - failing because LdrpLoadDll(%wZ) returned status %x\n", - __FUNCTION__, - DllName, - Status); - } - - /* Restore the old TLD DLL */ - LdrpTopLevelDllBeingLoaded = OldTldDll; + /* Restore the old TLD DLL */ + LdrpTopLevelDllBeingLoaded = OldTldDll; - /* Release the lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + /* Release the lock */ + LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + } + _SEH2_END; /* Do we have a redirect string? */ if (DllString2.Buffer) RtlFreeUnicodeString(&DllString2); diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 5f55938d13..aa18d0384f 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2488,146 +2488,153 @@ LdrpLoadDll(IN BOOLEAN Redirected, /* Check for init flag and acquire lock */ if (!InInit) RtlEnterCriticalSection(&LdrpLoaderLock); - /* Show debug message */ - if (ShowSnaps) + _SEH2_TRY { - DPRINT1("LDR: LdrLoadDll, loading %wZ from %ws\n", - &RawDllName, - DllPath ? DllPath : L""); - } - - /* Check if the DLL is already loaded */ - if (!LdrpCheckForLoadedDll(DllPath, - &RawDllName, - FALSE, - Redirected, - &LdrEntry)) - { - /* Map it */ - Status = LdrpMapDll(DllPath, - DllPath, - NameBuffer, - DllCharacteristics, - FALSE, - Redirected, - &LdrEntry); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* FIXME: Need to mark the DLL range for the stack DB */ - //RtlpStkMarkDllRange(LdrEntry); - - /* Check if IMAGE_FILE_EXECUTABLE_IMAGE was provided */ - if ((DllCharacteristics) && - (*DllCharacteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) + /* Show debug message */ + if (ShowSnaps) { - /* This is not a DLL, so remove such data */ - LdrEntry->EntryPoint = NULL; - LdrEntry->Flags &= ~LDRP_IMAGE_DLL; + DPRINT1("LDR: LdrLoadDll, loading %wZ from %ws\n", + &RawDllName, + DllPath ? DllPath : L""); } - /* Make sure it's a DLL */ - if (LdrEntry->Flags & LDRP_IMAGE_DLL) + /* Check if the DLL is already loaded */ + if (!LdrpCheckForLoadedDll(DllPath, + &RawDllName, + FALSE, + Redirected, + &LdrEntry)) { - /* Check if this is a .NET Image */ - if (!(LdrEntry->Flags & LDRP_COR_IMAGE)) - { - /* Walk the Import Descriptor */ - Status = LdrpWalkImportDescriptor(DllPath, LdrEntry); - } + /* Map it */ + Status = LdrpMapDll(DllPath, + DllPath, + NameBuffer, + DllCharacteristics, + FALSE, + Redirected, + &LdrEntry); + if (!NT_SUCCESS(Status)) + _SEH2_LEAVE; - /* Update load count, unless it's locked */ - if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); + /* FIXME: Need to mark the DLL range for the stack DB */ + //RtlpStkMarkDllRange(LdrEntry); - /* Check if we failed */ - if (!NT_SUCCESS(Status)) + /* Check if IMAGE_FILE_EXECUTABLE_IMAGE was provided */ + if ((DllCharacteristics) && + (*DllCharacteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) { - /* Clear entrypoint, and insert into list */ + /* This is not a DLL, so remove such data */ LdrEntry->EntryPoint = NULL; - InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderLinks); - - /* Cancel the load */ - LdrpClearLoadInProgress(); + LdrEntry->Flags &= ~LDRP_IMAGE_DLL; + } - /* Unload the DLL */ - if (ShowSnaps) + /* Make sure it's a DLL */ + if (LdrEntry->Flags & LDRP_IMAGE_DLL) + { + /* Check if this is a .NET Image */ + if (!(LdrEntry->Flags & LDRP_COR_IMAGE)) { - DbgPrint("LDR: Unloading %wZ due to error %x walking " - "import descriptors\n", - DllName, - Status); + /* Walk the Import Descriptor */ + Status = LdrpWalkImportDescriptor(DllPath, LdrEntry); } - LdrUnloadDll(LdrEntry->DllBase); - /* Return the error */ - goto Quickie; - } - } - else if (LdrEntry->LoadCount != 0xFFFF) - { - /* Increase load count */ - LdrEntry->LoadCount++; - } + /* Update load count, unless it's locked */ + if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); - /* Insert it into the list */ - InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderLinks); + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Clear entrypoint, and insert into list */ + LdrEntry->EntryPoint = NULL; + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &LdrEntry->InInitializationOrderLinks); - /* If we have to run the entrypoint, make sure the DB is ready */ - if (CallInit && LdrpLdrDatabaseIsSetup) - { - /* Notify Shim Engine */ - if (g_ShimsEnabled) + /* Cancel the load */ + LdrpClearLoadInProgress(); + + /* Unload the DLL */ + if (ShowSnaps) + { + DbgPrint("LDR: Unloading %wZ due to error %x walking " + "import descriptors\n", + DllName, + Status); + } + LdrUnloadDll(LdrEntry->DllBase); + + /* Return the error */ + _SEH2_LEAVE; + } + } + else if (LdrEntry->LoadCount != 0xFFFF) { - VOID (NTAPI* SE_DllLoaded)(PLDR_DATA_TABLE_ENTRY) = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); - SE_DllLoaded(LdrEntry); + /* Increase load count */ + LdrEntry->LoadCount++; } - /* Run the init routine */ - Status = LdrpRunInitializeRoutines(NULL); - if (!NT_SUCCESS(Status)) + /* Insert it into the list */ + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &LdrEntry->InInitializationOrderLinks); + + /* If we have to run the entrypoint, make sure the DB is ready */ + if (CallInit && LdrpLdrDatabaseIsSetup) { - /* Failed, unload the DLL */ - if (ShowSnaps) + /* Notify Shim Engine */ + if (g_ShimsEnabled) { - DbgPrint("LDR: Unloading %wZ because either its init " - "routine or one of its static imports failed; " - "status = 0x%08lx\n", - DllName, - Status); + VOID (NTAPI* SE_DllLoaded)(PLDR_DATA_TABLE_ENTRY) = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); + SE_DllLoaded(LdrEntry); + } + + /* Run the init routine */ + Status = LdrpRunInitializeRoutines(NULL); + if (!NT_SUCCESS(Status)) + { + /* Failed, unload the DLL */ + if (ShowSnaps) + { + DbgPrint("LDR: Unloading %wZ because either its init " + "routine or one of its static imports failed; " + "status = 0x%08lx\n", + DllName, + Status); + } + LdrUnloadDll(LdrEntry->DllBase); } - LdrUnloadDll(LdrEntry->DllBase); + } + else + { + /* The DB isn't ready, which means we were loaded because of a forwarder */ + Status = STATUS_SUCCESS; } } else { - /* The DB isn't ready, which means we were loaded because of a forwarder */ - Status = STATUS_SUCCESS; + /* We were already loaded. Are we a DLL? */ + if ((LdrEntry->Flags & LDRP_IMAGE_DLL) && (LdrEntry->LoadCount != 0xFFFF)) + { + /* Increase load count */ + LdrEntry->LoadCount++; + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); + + /* Clear the load in progress */ + LdrpClearLoadInProgress(); + } + else + { + /* Not a DLL, just increase the load count */ + if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; + } } + } - else + _SEH2_FINALLY { - /* We were already loaded. Are we a DLL? */ - if ((LdrEntry->Flags & LDRP_IMAGE_DLL) && (LdrEntry->LoadCount != 0xFFFF)) - { - /* Increase load count */ - LdrEntry->LoadCount++; - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); - - /* Clear the load in progress */ - LdrpClearLoadInProgress(); - } - else - { - /* Not a DLL, just increase the load count */ - if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; - } + /* Release the lock */ + if (!InInit) RtlLeaveCriticalSection(&LdrpLoaderLock); } - -Quickie: - /* Release the lock */ - if (!InInit) RtlLeaveCriticalSection(&LdrpLoaderLock); + _SEH2_END; /* Check for success */ if (NT_SUCCESS(Status))

1 0

03/06: [NTDLL_APITEST] Show behavior with exceptions in DllMain. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86fe412d5c9aa2bee0032… commit 86fe412d5c9aa2bee0032381401a892319040df1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 14 21:00:18 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [NTDLL_APITEST] Show behavior with exceptions in DllMain. CORE-14532 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 14 +- .../rostests/apitests/ntdll/load_notifications.c | 330 +++++++++++++++++++++ .../ntdll/load_notifications/CMakeLists.txt | 6 + .../ntdll/load_notifications/load_notifications.c | 72 +++++ modules/rostests/apitests/ntdll/ntdll_apitest.spec | 2 + modules/rostests/apitests/ntdll/testdata.rc | 2 + modules/rostests/apitests/ntdll/testlist.c | 2 + 7 files changed, 427 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index a7fdc5a2cd..2bb13f2d3e 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -1,6 +1,12 @@ +add_subdirectory(load_notifications) + +include_directories($<TARGET_FILE_DIR:load_notifications>) +spec2def(ntdll_apitest.exe ntdll_apitest.spec) + list(APPEND SOURCE LdrEnumResources.c + load_notifications.c NtAcceptConnectPort.c NtAllocateVirtualMemory.c NtApphelpCacheControl.c @@ -62,7 +68,13 @@ if(ARCH STREQUAL "i386") add_asm_files(ntdll_apitest_asm i386/NtContinue.S) endif() -add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm} testlist.c) +add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/load_notifications/load_notifications.dll) +add_executable(ntdll_apitest + ${SOURCE} + ${ntdll_apitest_asm} + testdata.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def + testlist.c) target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) diff --git a/modules/rostests/apitests/ntdll/load_notifications.c b/modules/rostests/apitests/ntdll/load_notifications.c new file mode 100644 index 0000000000..430e2fc5cb --- /dev/null +++ b/modules/rostests/apitests/ntdll/load_notifications.c @@ -0,0 +1,330 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for exception behavior in dll notifications + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +WCHAR dllpath[MAX_PATH]; + +LONG g_TlsCalled = 0; +LONG g_DllMainCalled = 0; + +LONG g_TlsExcept = 0xffffff; +LONG g_DllMainExcept = 0xffffff; + +ULONG g_BaseHandlers = 0; + +DWORD g_dwWinVer = 0; + +ULONG CountHandlers(VOID) +{ + EXCEPTION_REGISTRATION_RECORD* exc; + ULONG Count = 0; + + exc = NtCurrentTeb()->NtTib.ExceptionList; + + while (exc && exc != (EXCEPTION_REGISTRATION_RECORD*)~0) + { + Count++; + exc = exc->Next; + } + + return Count; +} + +int g_TLS_ATTACH = 4; +int g_TLS_DETACH = 3; + +VOID WINAPI notify_TlsCallback(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved) +{ + ULONG handlers = CountHandlers() - g_BaseHandlers; + + InterlockedIncrement(&g_TlsCalled); + if (dwReason == DLL_PROCESS_ATTACH) + { + ok_int(handlers, g_TLS_ATTACH); + } + else + { + ok_int(handlers, g_TLS_DETACH); + } + + if (InterlockedCompareExchange(&g_TlsExcept, 0xffffff, dwReason) == dwReason) + { + RaiseException(EXCEPTION_DATATYPE_MISALIGNMENT, EXCEPTION_NONCONTINUABLE, 0, NULL); + } +} + +int g_DLL_ATTACH = 3; +int g_DLL_DETACH = 2; + +BOOL WINAPI notify_DllMain(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved) +{ + ULONG handlers = CountHandlers() - g_BaseHandlers; + + InterlockedIncrement(&g_DllMainCalled); + if (dwReason == DLL_PROCESS_ATTACH) + { + ok_int(handlers, g_DLL_ATTACH); + } + else + { + ok_int(handlers, g_DLL_DETACH); + } + + if (InterlockedCompareExchange(&g_DllMainExcept, 0xffffff, dwReason) == dwReason) + { + RaiseException(EXCEPTION_DATATYPE_MISALIGNMENT, EXCEPTION_NONCONTINUABLE, 0, NULL); + } + return TRUE; +} + + +static void execute_test(void) +{ + HMODULE mod; + DWORD dwErr; + _SEH2_TRY + { + g_TlsExcept = 0xffffff; + g_DllMainExcept = 0xffffff; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + if (g_TlsCalled == 0) + trace("Tls not active\n"); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to load it normally\n"); + } + _SEH2_END; + + + _SEH2_TRY + { + g_TlsExcept = 0xffffff; + g_DllMainExcept = DLL_PROCESS_ATTACH; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Module loaded (0x%lx)\n", dwErr); + if (g_dwWinVer <= _WIN32_WINNT_WIN7) + ok_hex(dwErr, ERROR_NOACCESS); + else + ok_hex(dwErr, ERROR_DLL_INIT_FAILED); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + if (mod) + { + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + + _SEH2_TRY + { + g_TlsExcept = 0xffffff; + g_DllMainExcept = DLL_PROCESS_DETACH; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + + _SEH2_TRY + { + g_TlsExcept = DLL_PROCESS_ATTACH; + g_DllMainExcept = 0xffffff; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + + _SEH2_TRY + { + g_TlsExcept = DLL_PROCESS_DETACH; + g_DllMainExcept = 0xffffff; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + +} + + +BOOL extract_resource(const WCHAR* Filename, LPCWSTR ResourceName) +{ + BOOL Success; + DWORD dwWritten, Size; + HGLOBAL hGlobal; + LPVOID pData; + HANDLE Handle; + HRSRC hRsrc = FindResourceW(GetModuleHandleW(NULL), ResourceName, (LPCWSTR)10); + ok(!!hRsrc, "Unable to find %s\n", wine_dbgstr_w(ResourceName)); + if (!hRsrc) + return FALSE; + + hGlobal = LoadResource(GetModuleHandleW(NULL), hRsrc); + Size = SizeofResource(GetModuleHandleW(NULL), hRsrc); + pData = LockResource(hGlobal); + + ok(Size && !!pData, "Unable to load %s\n", wine_dbgstr_w(ResourceName)); + if (!Size || !pData) + return FALSE; + + Handle = CreateFileW(Filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (Handle == INVALID_HANDLE_VALUE) + { + skip("Failed to create temp file %ls, error %lu\n", Filename, GetLastError()); + return FALSE; + } + Success = WriteFile(Handle, pData, Size, &dwWritten, NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(dwWritten == Size, "WriteFile wrote %lu bytes instead of %lu\n", dwWritten, Size); + CloseHandle(Handle); + Success = Success && (dwWritten == Size); + + UnlockResource(pData); + return Success; +} + + +START_TEST(load_notifications) +{ + WCHAR workdir[MAX_PATH]; + BOOL ret; + UINT Length; + PPEB Peb = NtCurrentPeb(); + + g_dwWinVer = (DWORD)(Peb->OSMajorVersion << 8) | Peb->OSMinorVersion; + trace("Winver: 0x%lx\n", g_dwWinVer); + + if (g_dwWinVer <= _WIN32_WINNT_WS03) + { + g_DLL_ATTACH = 4; + g_DLL_DETACH = 1; + } + else if (g_dwWinVer <= _WIN32_WINNT_WS08) + { + g_TLS_ATTACH = 5; + g_DLL_ATTACH = 4; + } + else if (g_dwWinVer <= _WIN32_WINNT_WIN7) + { + g_TLS_ATTACH = 3; + g_DLL_ATTACH = 2; + } + else if (g_dwWinVer <= _WIN32_WINNT_WINBLUE) + { + g_TLS_DETACH = 5; + g_DLL_DETACH = 4; + } + + ret = GetTempPathW(_countof(workdir), workdir); + ok(ret, "GetTempPathW error: %lu\n", GetLastError()); + + Length = GetTempFileNameW(workdir, L"ntdll", 0, dllpath); + ok(Length != 0, "GetTempFileNameW failed with %lu\n", GetLastError()); + + if (extract_resource(dllpath, (LPCWSTR)101)) + { + _SEH2_TRY + { + execute_test(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Ldr didnt handle exception\n"); + } + _SEH2_END; + } + else + { + ok(0, "Failed to extract resource\n"); + } + + DeleteFileW(dllpath); +} diff --git a/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt b/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt new file mode 100644 index 0000000000..75436635e8 --- /dev/null +++ b/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(load_notifications SHARED load_notifications.c) +set_module_type(load_notifications win32dll ENTRYPOINT DllMain 12) +add_importlibs(load_notifications kernel32 ntdll) +add_dependencies(load_notifications psdk) +add_rostests_file(TARGET load_notifications) diff --git a/modules/rostests/apitests/ntdll/load_notifications/load_notifications.c b/modules/rostests/apitests/ntdll/load_notifications/load_notifications.c new file mode 100644 index 0000000000..04578fbc43 --- /dev/null +++ b/modules/rostests/apitests/ntdll/load_notifications/load_notifications.c @@ -0,0 +1,72 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windows.h> + + +#if defined(_MSC_VER) +#define _CRTALLOC(x) __declspec(allocate(x)) +#elif defined(__GNUC__) +#define _CRTALLOC(x) __attribute__ ((section (x) )) +#else +#error Your compiler is not supported. +#endif + + +static VOID (WINAPI* pTlsCallback)(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved); + +VOID WINAPI +TlsCallback(IN HANDLE hDllHandle, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + if (!pTlsCallback) + pTlsCallback = (VOID*)GetProcAddress(NULL, "notify_TlsCallback"); + if (pTlsCallback) + { + pTlsCallback(hDllHandle, dwReason, lpvReserved); + return; + } + OutputDebugStringA("WARNING: load_notifications.dll loaded from a process without notify_TlsCallback\n"); +} + +/* Tls magic stolen from sdk/lib/crt/startup/tlssup.c */ + +#if defined(_MSC_VER) +#pragma section(".rdata$T",long,read) +#pragma section(".tls",long,read,write) +#pragma section(".tls$ZZZ",long,read,write) +#endif + +_CRTALLOC(".tls") char _tls_start = 0; +_CRTALLOC(".tls$ZZZ") char _tls_end = 0; + +PIMAGE_TLS_CALLBACK __xl_a[2] = { &TlsCallback, NULL }; + +ULONG _tls_index = 0; + +_CRTALLOC(".rdata$T") const IMAGE_TLS_DIRECTORY _tls_used = { + (ULONG_PTR) &_tls_start+1, (ULONG_PTR) &_tls_end, + (ULONG_PTR) &_tls_index, (ULONG_PTR) (__xl_a), + (ULONG) 0, (ULONG) 0 +}; + + +static BOOL (WINAPI* pDllMain)(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved); + + +BOOL WINAPI +DllMain(IN HINSTANCE hDllHandle, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + if (!pDllMain) + pDllMain = (VOID*)GetProcAddress(NULL, "notify_DllMain"); + if (pDllMain) + { + return pDllMain(hDllHandle, dwReason, lpvReserved); + } + OutputDebugStringA("WARNING: load_notifications.dll loaded from a process without notify_DllMain\n"); + return TRUE; +} diff --git a/modules/rostests/apitests/ntdll/ntdll_apitest.spec b/modules/rostests/apitests/ntdll/ntdll_apitest.spec new file mode 100644 index 0000000000..7100a7c7ef --- /dev/null +++ b/modules/rostests/apitests/ntdll/ntdll_apitest.spec @@ -0,0 +1,2 @@ +@ stdcall notify_TlsCallback(ptr long ptr) +@ stdcall notify_DllMain(ptr long ptr) diff --git a/modules/rostests/apitests/ntdll/testdata.rc b/modules/rostests/apitests/ntdll/testdata.rc new file mode 100644 index 0000000000..3c16769902 --- /dev/null +++ b/modules/rostests/apitests/ntdll/testdata.rc @@ -0,0 +1,2 @@ + +101 10 "load_notifications.dll" diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index c6afd1d342..cd96ef8142 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_LdrEnumResources(void); +extern void func_load_notifications(void); extern void func_NtAcceptConnectPort(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtApphelpCacheControl(void); @@ -63,6 +64,7 @@ extern void func_TimerResolution(void); const struct test winetest_testlist[] = { { "LdrEnumResources", func_LdrEnumResources }, + { "load_notifications", func_load_notifications }, { "NtAcceptConnectPort", func_NtAcceptConnectPort }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtApphelpCacheControl", func_NtApphelpCacheControl },

1 0

02/06: [LDR] Add debug logging when we encountered an exception in dll/tls callbacks. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55053f0099c0f29f5e7d7… commit 55053f0099c0f29f5e7d7fba5c87b46599f0b3b7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 29 17:13:42 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [LDR] Add debug logging when we encountered an exception in dll/tls callbacks. CORE-14532 --- dll/ntdll/include/ntdllp.h | 6 +++--- dll/ntdll/ldr/ldrapi.c | 3 ++- dll/ntdll/ldr/ldrinit.c | 27 ++++++++++++++++----------- dll/ntdll/ldr/ldrutils.c | 13 +++++++------ 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dll/ntdll/include/ntdllp.h b/dll/ntdll/include/ntdllp.h index 29ade67b45..934a4b2205 100644 --- a/dll/ntdll/include/ntdllp.h +++ b/dll/ntdll/include/ntdllp.h @@ -62,9 +62,9 @@ VOID NTAPI LdrpInitializeThread(IN PCONTEXT Context); NTSTATUS NTAPI LdrpInitializeTls(VOID); NTSTATUS NTAPI LdrpAllocateTls(VOID); VOID NTAPI LdrpFreeTls(VOID); -VOID NTAPI LdrpCallTlsInitializers(PVOID BaseAddress, ULONG Reason); -BOOLEAN NTAPI LdrpCallInitRoutine(PDLL_INIT_ROUTINE EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); -NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1); +VOID NTAPI LdrpCallTlsInitializers(IN PLDR_DATA_TABLE_ENTRY LdrEntry, IN ULONG Reason); +BOOLEAN NTAPI LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint, IN PVOID BaseAddress, IN ULONG Reason, IN PVOID Context); +NTSTATUS NTAPI LdrpInitializeProcess(IN PCONTEXT Context, IN PVOID SystemArgument1); VOID NTAPI LdrpInitFailure(NTSTATUS Status); VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry); VOID NTAPI LdrpEnsureLoaderLockIsHeld(VOID); diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index d9da842374..15f36bb2be 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1485,7 +1485,8 @@ LdrUnloadDll(IN PVOID BaseAddress) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_DETACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 96af326062..058a128bdf 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -561,7 +561,7 @@ LdrpInitializeThread(IN PCONTEXT Context) if (!LdrpShutdownInProgress) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); + LdrpCallTlsInitializers(LdrEntry, DLL_THREAD_ATTACH); } } @@ -581,7 +581,8 @@ LdrpInitializeThread(IN PCONTEXT Context) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_THREAD_ATTACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -610,7 +611,7 @@ LdrpInitializeThread(IN PCONTEXT Context) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_THREAD_ATTACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -818,7 +819,7 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) if (LdrEntry->TlsIndex && Context) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); + LdrpCallTlsInitializers(LdrEntry, DLL_PROCESS_ATTACH); } /* Call the Entrypoint */ @@ -835,6 +836,8 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DllStatus = FALSE; + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_ATTACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -889,7 +892,7 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_PROCESS_ATTACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -996,7 +999,7 @@ LdrShutdownProcess(VOID) if (LdrEntry->TlsIndex) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); + LdrpCallTlsInitializers(LdrEntry, DLL_PROCESS_DETACH); } /* Call the Entrypoint */ @@ -1009,7 +1012,8 @@ LdrShutdownProcess(VOID) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_PROCESS_DETACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -1034,7 +1038,7 @@ LdrShutdownProcess(VOID) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_PROCESS_DETACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1123,7 +1127,7 @@ LdrShutdownThread(VOID) if (!LdrpShutdownInProgress) { /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); + LdrpCallTlsInitializers(LdrEntry, DLL_THREAD_DETACH); } } @@ -1141,7 +1145,8 @@ LdrShutdownThread(VOID) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("WARNING: Exception 0x%x during LdrpCallInitRoutine(DLL_THREAD_DETACH) for %wZ\n", + _SEH2_GetExceptionCode(), &LdrEntry->BaseDllName); } _SEH2_END; @@ -1167,7 +1172,7 @@ LdrShutdownThread(VOID) _SEH2_TRY { /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + LdrpCallTlsInitializers(LdrpImageEntry, DLL_THREAD_DETACH); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 5459d4a5d2..5f55938d13 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -470,7 +470,7 @@ LdrpUpdateLoadCount2(IN PLDR_DATA_TABLE_ENTRY LdrEntry, VOID NTAPI -LdrpCallTlsInitializers(IN PVOID BaseAddress, +LdrpCallTlsInitializers(IN PLDR_DATA_TABLE_ENTRY LdrEntry, IN ULONG Reason) { PIMAGE_TLS_DIRECTORY TlsDirectory; @@ -478,7 +478,7 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, ULONG Size; /* Get the TLS Directory */ - TlsDirectory = RtlImageDirectoryEntryToData(BaseAddress, + TlsDirectory = RtlImageDirectoryEntryToData(LdrEntry->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &Size); @@ -497,7 +497,7 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, if (ShowSnaps) { DPRINT1("LDR: Tls Callbacks Found. Imagebase %p Tls %p CallBacks %p\n", - BaseAddress, TlsDirectory, Array); + LdrEntry->DllBase, TlsDirectory, Array); } /* Loop the array */ @@ -510,12 +510,12 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, if (ShowSnaps) { DPRINT1("LDR: Calling Tls Callback Imagebase %p Function %p\n", - BaseAddress, Callback); + LdrEntry->DllBase, Callback); } /* Call it */ LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback, - BaseAddress, + LdrEntry->DllBase, Reason, NULL); } @@ -524,7 +524,8 @@ LdrpCallTlsInitializers(IN PVOID BaseAddress, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Do nothing */ + DPRINT1("LDR: Exception 0x%x during Tls Callback(%u) for %wZ\n", + _SEH2_GetExceptionCode(), Reason, &LdrEntry->BaseDllName); } _SEH2_END; }

1 0

01/06: [LDR] Protect calls from LdrpCallInitRoutine and LdrpCallTlsInitializers with SEH. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfff8ed0d82e433b9f620… commit dfff8ed0d82e433b9f620b3ac77ce38ecfa42d05 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 21:51:20 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:00 2018 +0200 [LDR] Protect calls from LdrpCallInitRoutine and LdrpCallTlsInitializers with SEH. CORE-14532 --- dll/ntdll/ldr/ldrapi.c | 16 +++- dll/ntdll/ldr/ldrinit.c | 190 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 139 insertions(+), 67 deletions(-) diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index 6e4019c600..d9da842374 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -1476,10 +1476,18 @@ LdrUnloadDll(IN PVOID BaseAddress) LdrEntry->EntryPointActivationContext); /* Call the entrypoint */ - LdrpCallInitRoutine(LdrEntry->EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_DETACH, - NULL); + _SEH2_TRY + { + LdrpCallInitRoutine(LdrEntry->EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_DETACH, + NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Release the context */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index dc0a3701cc..96af326062 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -552,30 +552,38 @@ LdrpInitializeThread(IN PCONTEXT Context) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex) + _SEH2_TRY { + /* Check if it has TLS */ + if (LdrEntry->TlsIndex) + { + /* Make sure we're not shutting down */ + if (!LdrpShutdownInProgress) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); + } + } + /* Make sure we're not shutting down */ if (!LdrpShutdownInProgress) { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); + /* Call the Entrypoint */ + DPRINT("%wZ - Calling entry point at %p for thread attaching, %p/%p\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint, + NtCurrentTeb()->RealClientId.UniqueProcess, + NtCurrentTeb()->RealClientId.UniqueThread); + LdrpCallInitRoutine(LdrEntry->EntryPoint, + LdrEntry->DllBase, + DLL_THREAD_ATTACH, + NULL); } } - - /* Make sure we're not shutting down */ - if (!LdrpShutdownInProgress) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread attaching, %p/%p\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint, - NtCurrentTeb()->RealClientId.UniqueProcess, - NtCurrentTeb()->RealClientId.UniqueThread); - LdrpCallInitRoutine(LdrEntry->EntryPoint, - LdrEntry->DllBase, - DLL_THREAD_ATTACH, - NULL); + /* Do nothing */ } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -599,8 +607,16 @@ LdrpInitializeThread(IN PCONTEXT Context) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -796,23 +812,31 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex && Context) + _SEH2_TRY { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); - } + /* Check if it has TLS */ + if (LdrEntry->TlsIndex && Context) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); + } - /* Call the Entrypoint */ - if (ShowSnaps) + /* Call the Entrypoint */ + if (ShowSnaps) + { + DPRINT1("%wZ - Calling entry point at %p for DLL_PROCESS_ATTACH\n", + &LdrEntry->BaseDllName, EntryPoint); + } + DllStatus = LdrpCallInitRoutine(EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_ATTACH, + Context); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("%wZ - Calling entry point at %p for DLL_PROCESS_ATTACH\n", - &LdrEntry->BaseDllName, EntryPoint); + DllStatus = FALSE; } - DllStatus = LdrpCallInitRoutine(EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_ATTACH, - Context); + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -862,8 +886,16 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -958,20 +990,28 @@ LdrShutdownProcess(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex) + _SEH2_TRY { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); - } + /* Check if it has TLS */ + if (LdrEntry->TlsIndex) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); + } - /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread detaching\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallInitRoutine(EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_DETACH, - (PVOID)1); + /* Call the Entrypoint */ + DPRINT("%wZ - Calling entry point at %p for thread detaching\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint); + LdrpCallInitRoutine(EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_DETACH, + (PVOID)1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -991,8 +1031,16 @@ LdrShutdownProcess(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -1066,28 +1114,36 @@ LdrShutdownThread(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrEntry->EntryPointActivationContext); - /* Check if it has TLS */ - if (LdrEntry->TlsIndex) + _SEH2_TRY { + /* Check if it has TLS */ + if (LdrEntry->TlsIndex) + { + /* Make sure we're not shutting down */ + if (!LdrpShutdownInProgress) + { + /* Call TLS */ + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); + } + } + /* Make sure we're not shutting down */ if (!LdrpShutdownInProgress) { - /* Call TLS */ - LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); + /* Call the Entrypoint */ + DPRINT("%wZ - Calling entry point at %p for thread detaching\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint); + LdrpCallInitRoutine(EntryPoint, + LdrEntry->DllBase, + DLL_THREAD_DETACH, + NULL); } } - - /* Make sure we're not shutting down */ - if (!LdrpShutdownInProgress) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %p for thread detaching\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallInitRoutine(EntryPoint, - LdrEntry->DllBase, - DLL_THREAD_DETACH, - NULL); + /* Do nothing */ } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -1108,8 +1164,16 @@ LdrShutdownThread(VOID) RtlActivateActivationContextUnsafeFast(&ActCtx, LdrpImageEntry->EntryPointActivationContext); - /* Do TLS callbacks */ - LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + _SEH2_TRY + { + /* Do TLS callbacks */ + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx);

1 0

05/05: [NTOSKRNL] Don't use anonymus allocations for MM objects
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ea68d0510aafddec1334… commit 1ea68d0510aafddec1334d3465fa47f03f391ca5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 08:29:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Don't use anonymus allocations for MM objects --- ntoskrnl/mm/pagefile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 29cfdbc820..bbf3d94d3c 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -651,13 +651,13 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return STATUS_FLOPPY_VOLUME; } - PagingFile = ExAllocatePool(NonPagedPool, sizeof(*PagingFile)); + PagingFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*PagingFile), TAG_MM); if (PagingFile == NULL) { ObDereferenceObject(FileObject); ZwClose(FileHandle); ExFreePoolWithTag(Buffer, TAG_MM); - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; } RtlZeroMemory(PagingFile, sizeof(*PagingFile)); @@ -677,11 +677,11 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, TAG_MM); if (PagingFile->AllocMap == NULL) { - ExFreePool(PagingFile); + ExFreePoolWithTag(PagingFile, TAG_MM); ObDereferenceObject(FileObject); ZwClose(FileHandle); ExFreePoolWithTag(Buffer, TAG_MM); - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; } RtlInitializeBitMap(PagingFile->AllocMap, @@ -698,7 +698,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, MmSwapSpaceMessage = FALSE; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* EOF */

1 0

04/05: [NTOSKRNL] Keep page file name along the page file and free it on shutdown
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34e8f45122982e43a7f73… commit 34e8f45122982e43a7f73ebed7d71d43d31020cc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 08:24:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Keep page file name along the page file and free it on shutdown --- ntoskrnl/include/internal/mm.h | 1 + ntoskrnl/mm/pagefile.c | 97 +++++++++++++++++++++++++++++++----------- ntoskrnl/mm/shutdown.c | 5 +++ 3 files changed, 77 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 6f0972da40..38b34cd74f 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -434,6 +434,7 @@ typedef struct _MMPAGING_FILE PFN_NUMBER UsedPages; PRTL_BITMAP AllocMap; KSPIN_LOCK AllocMapLock; + UNICODE_STRING PageFileName; } MMPAGING_FILE, *PMMPAGING_FILE; diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 2859a35fd1..29cfdbc820 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -376,11 +376,12 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, ULONG AllocMapSize; ULONG Count; KPROCESSOR_MODE PreviousMode; - UNICODE_STRING CapturedFileName; + UNICODE_STRING PageFileName; LARGE_INTEGER SafeInitialSize, SafeMaximumSize, AllocationSize; FILE_FS_DEVICE_INFORMATION FsDeviceInfo; SECURITY_DESCRIPTOR SecurityDescriptor; PACL Dacl; + PWSTR Buffer; DPRINT("NtCreatePagingFile(FileName %wZ, InitialSize %I64d)\n", FileName, InitialSize->QuadPart); @@ -403,6 +404,10 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { SafeInitialSize = ProbeForReadLargeInteger(InitialSize); SafeMaximumSize = ProbeForReadLargeInteger(MaximumSize); + + PageFileName.Length = FileName->Length; + PageFileName.MaximumLength = FileName->MaximumLength; + PageFileName.Buffer = FileName->Buffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -415,6 +420,10 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { SafeInitialSize = *InitialSize; SafeMaximumSize = *MaximumSize; + + PageFileName.Length = FileName->Length; + PageFileName.MaximumLength = FileName->MaximumLength; + PageFileName.Buffer = FileName->Buffer; } /* Pagefiles can't be larger than 4GB and ofcourse the minimum should be @@ -432,20 +441,55 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, return STATUS_INVALID_PARAMETER_MIX; } - Status = ProbeAndCaptureUnicodeString(&CapturedFileName, - PreviousMode, - FileName); - if (!NT_SUCCESS(Status)) + /* Validate name length */ + if (PageFileName.Length > 128 * sizeof(WCHAR)) + { + return STATUS_OBJECT_NAME_INVALID; + } + + /* We won't care about any potential UNICODE_NULL */ + PageFileName.MaximumLength = PageFileName.Length; + /* Allocate a buffer to keep name copy */ + Buffer = ExAllocatePoolWithTag(PagedPool, PageFileName.Length, TAG_MM); + if (Buffer == NULL) { - return(Status); + return STATUS_INSUFFICIENT_RESOURCES; } + /* Copy name */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + if (PageFileName.Length != 0) + { + ProbeForRead(PageFileName.Buffer, PageFileName.Length, sizeof(WCHAR)); + } + + RtlCopyMemory(Buffer, PageFileName.Buffer, PageFileName.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(Buffer, TAG_MM); + + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + RtlCopyMemory(Buffer, PageFileName.Buffer, PageFileName.Length); + } + + /* Erase caller's buffer with ours */ + PageFileName.Buffer = Buffer; + /* Create the security descriptor for the page file */ Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); if (!NT_SUCCESS(Status)) { - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -455,8 +499,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, Dacl = ExAllocatePoolWithTag(PagedPool, Count, 'lcaD'); if (Dacl == NULL) { - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_INSUFFICIENT_RESOURCES; } @@ -465,8 +508,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -475,8 +517,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -485,8 +526,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } @@ -495,13 +535,12 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Dacl, 'lcaD'); - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } InitializeObjectAttributes(&ObjectAttributes, - &CapturedFileName, + &PageFileName, OBJ_KERNEL_HANDLE, NULL, &SecurityDescriptor); @@ -551,13 +590,12 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, SL_OPEN_PAGING_FILE | IO_NO_PARAMETER_CHECKING); } - ReleaseCapturedUnicodeString(&CapturedFileName, - PreviousMode); if (!NT_SUCCESS(Status)) { DPRINT1("Failed creating page file: %lx\n", Status); ExFreePoolWithTag(Dacl, 'lcaD'); - return(Status); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; } /* Set the security descriptor */ @@ -568,6 +606,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { ExFreePoolWithTag(Dacl, 'lcaD'); ZwClose(FileHandle); + ExFreePoolWithTag(Buffer, TAG_MM); return Status; } } @@ -584,7 +623,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status) || !NT_SUCCESS(IoStatus.Status)) { ZwClose(FileHandle); - return(Status); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; } Status = ObReferenceObjectByHandle(FileHandle, @@ -596,7 +636,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, if (!NT_SUCCESS(Status)) { ZwClose(FileHandle); - return(Status); + ExFreePoolWithTag(Buffer, TAG_MM); + return Status; } /* Deny page file creation on a floppy disk */ @@ -606,6 +647,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { ObDereferenceObject(FileObject); ZwClose(FileHandle); + ExFreePoolWithTag(Buffer, TAG_MM); return STATUS_FLOPPY_VOLUME; } @@ -614,7 +656,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, { ObDereferenceObject(FileObject); ZwClose(FileHandle); - return(STATUS_NO_MEMORY); + ExFreePoolWithTag(Buffer, TAG_MM); + return STATUS_NO_MEMORY; } RtlZeroMemory(PagingFile, sizeof(*PagingFile)); @@ -626,6 +669,7 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, PagingFile->FreePages = (ULONG)(SafeInitialSize.QuadPart / PAGE_SIZE); PagingFile->UsedPages = 0; KeInitializeSpinLock(&PagingFile->AllocMapLock); + PagingFile->PageFileName = PageFileName; AllocMapSize = sizeof(RTL_BITMAP) + (((PagingFile->FreePages + 31) / 32) * sizeof(ULONG)); PagingFile->AllocMap = ExAllocatePoolWithTag(NonPagedPool, @@ -636,7 +680,8 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, ExFreePool(PagingFile); ObDereferenceObject(FileObject); ZwClose(FileHandle); - return(STATUS_NO_MEMORY); + ExFreePoolWithTag(Buffer, TAG_MM); + return STATUS_NO_MEMORY; } RtlInitializeBitMap(PagingFile->AllocMap, diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index d4093015ff..c80cc527a3 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -25,6 +25,11 @@ MiShutdownSystem(VOID) /* Loop through all the paging files */ for (i = 0; i < MmNumberOfPagingFiles; i++) { + /* Free page file name */ + ASSERT(MmPagingFile[i]->PageFileName.Buffer != NULL); + ExFreePoolWithTag(MmPagingFile[i]->PageFileName.Buffer, TAG_MM); + MmPagingFile[i]->PageFileName.Buffer = NULL; + /* And close them */ ZwClose(MmPagingFile[i]->FileHandle); }

1 0

03/05: [NTOSKRNL] Dereference page file objects in MM shutdown phase 1
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aaadf39db0108057d5c3… commit 5aaadf39db0108057d5c3aaf983233e567715a27 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 08:23:44 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Dereference page file objects in MM shutdown phase 1 Hack the call the MM shutdown phase 1 --- ntoskrnl/mm/shutdown.c | 13 +++++++++++++ ntoskrnl/po/poshtdwn.c | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index 50522dd4e8..d4093015ff 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -39,8 +39,21 @@ MmShutdownSystem(IN ULONG Phase) { MiShutdownSystem(); } + else if (Phase == 1) + { + ULONG i; + + /* Loop through all the paging files */ + for (i = 0; i < MmNumberOfPagingFiles; i++) + { + /* And dereference them */ + ObDereferenceObject(MmPagingFile[i]->FileObject); + } + } else { + ASSERT(Phase == 2); + UNIMPLEMENTED; } } diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 070cf67e54..8a33157fd0 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -294,6 +294,11 @@ PopGracefulShutdown(IN PVOID Context) IoShutdownSystem(1); CcWaitForCurrentLazyWriterActivity(); + /* FIXME: Calling Mm shutdown phase 1 here to get page file dereference + * but it shouldn't be called here. Only phase 2 should be called. + */ + MmShutdownSystem(1); + /* Note that here, we should broadcast the power IRP to devices */ /* In this step, the HAL disables any wake timers */

1 0

02/05: [NTOSKRNL] Close page files (and delete them!) on shutdown
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3814a822f1de78266e1d0… commit 3814a822f1de78266e1d0b82429c146a6a448cc7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 07:52:05 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Close page files (and delete them!) on shutdown --- ntoskrnl/include/internal/mm.h | 18 ++++++++++++++++++ ntoskrnl/mm/pagefile.c | 20 +------------------- ntoskrnl/mm/shutdown.c | 9 +++++++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index f7b08a2d0f..6f0972da40 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -102,6 +102,8 @@ typedef ULONG_PTR SWAPENTRY; #define SESSION_POOL_MASK 32 #define VERIFIER_POOL_MASK 64 +#define MAX_PAGING_FILES (16) + // FIXME: use ALIGN_UP_BY #define MM_ROUND_UP(x,s) \ ((PVOID)(((ULONG_PTR)(x)+(s)-1) & ~((ULONG_PTR)(s)-1))) @@ -421,6 +423,22 @@ typedef struct _MM_PAGED_POOL_INFO extern MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; +/* Page file information */ +typedef struct _MMPAGING_FILE +{ + PFILE_OBJECT FileObject; + HANDLE FileHandle; + LARGE_INTEGER MaximumSize; + LARGE_INTEGER CurrentSize; + PFN_NUMBER FreePages; + PFN_NUMBER UsedPages; + PRTL_BITMAP AllocMap; + KSPIN_LOCK AllocMapLock; +} +MMPAGING_FILE, *PMMPAGING_FILE; + +extern PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; + typedef VOID (*PMM_ALTER_REGION_FUNC)( PMMSUPPORT AddressSpace, diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 347ffec4a5..2859a35fd1 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -36,30 +36,12 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif - -/* TYPES *********************************************************************/ - -typedef struct _MMPAGING_FILE -{ - PFILE_OBJECT FileObject; - HANDLE FileHandle; - LARGE_INTEGER MaximumSize; - LARGE_INTEGER CurrentSize; - PFN_NUMBER FreePages; - PFN_NUMBER UsedPages; - PRTL_BITMAP AllocMap; - KSPIN_LOCK AllocMapLock; -} -MMPAGING_FILE, *PMMPAGING_FILE; - /* GLOBALS *******************************************************************/ #define PAIRS_PER_RUN (1024) -#define MAX_PAGING_FILES (16) - /* List of paging files, both used and free */ -static PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; +PMMPAGING_FILE MmPagingFile[MAX_PAGING_FILES]; /* Lock for examining the list of paging files */ static KSPIN_LOCK PagingFileListLock; diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c index 68549983bf..50522dd4e8 100644 --- a/ntoskrnl/mm/shutdown.c +++ b/ntoskrnl/mm/shutdown.c @@ -20,6 +20,15 @@ VOID MiShutdownSystem(VOID) { + ULONG i; + + /* Loop through all the paging files */ + for (i = 0; i < MmNumberOfPagingFiles; i++) + { + /* And close them */ + ZwClose(MmPagingFile[i]->FileHandle); + } + UNIMPLEMENTED; }

1 0

01/05: [NTOSKRNL] Stub MM shutdown
by Pierre Schweitzer 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d793f196df4eb5ca7dcd4… commit d793f196df4eb5ca7dcd4b4656f34ad5b611aa50 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 13 07:42:57 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 13 08:30:17 2018 +0200 [NTOSKRNL] Stub MM shutdown --- ntoskrnl/include/internal/mm.h | 4 ++++ ntoskrnl/mm/shutdown.c | 37 +++++++++++++++++++++++++++++++++++++ ntoskrnl/ntos.cmake | 1 + ntoskrnl/po/poshtdwn.c | 1 + 4 files changed, 43 insertions(+) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 8d0234b4aa..f7b08a2d0f 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1474,6 +1474,10 @@ NTAPI MmSetSessionLocaleId( _In_ LCID LocaleId); +/* shutdown.c *****************************************************************/ + +VOID +MmShutdownSystem(IN ULONG Phase); /* virtual.c *****************************************************************/ diff --git a/ntoskrnl/mm/shutdown.c b/ntoskrnl/mm/shutdown.c new file mode 100644 index 0000000000..68549983bf --- /dev/null +++ b/ntoskrnl/mm/shutdown.c @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/mm/shutdown.c + * PURPOSE: Memory Manager Shutdown + * PROGRAMMERS: + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +MiShutdownSystem(VOID) +{ + UNIMPLEMENTED; +} + +VOID +MmShutdownSystem(IN ULONG Phase) +{ + if (Phase == 0) + { + MiShutdownSystem(); + } + else + { + UNIMPLEMENTED; + } +} diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 94e0dc8055..147691bd4c 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -226,6 +226,7 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/region.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/rmap.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/section.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/shutdown.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/devicemap.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obdir.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ob/obhandle.c diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 719f8b8b93..070cf67e54 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -283,6 +283,7 @@ PopGracefulShutdown(IN PVOID Context) ExShutdownSystem(); /* Note that modified pages should be written here (MiShutdownSystem) */ + MmShutdownSystem(0); /* Flush all user files before we start shutting down IO */ /* This is where modified pages are written back by the IO manager */

1 0

01/01: [UMPNPMGR] Partially implement ReenumerateDeviceInstance which is needed by the Lenovo T400 network driver installer
by Eric Kohl 12 Aug '18

12 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d26058a8e1b61da85ce8… commit 9d26058a8e1b61da85ce8f2a4f81fc7dcae63112 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 12 22:19:05 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 12 22:26:22 2018 +0200 [UMPNPMGR] Partially implement ReenumerateDeviceInstance which is needed by the Lenovo T400 network driver installer --- base/services/umpnpmgr/umpnpmgr.c | 36 +++++++++++++++++++++++++++++++----- sdk/include/ndk/cmtypes.h | 7 +++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 478bcc7825..02eaf05b3a 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -1959,11 +1959,36 @@ DisableDeviceInstance(LPWSTR pszDeviceInstance) static CONFIGRET -ReenumerateDeviceInstance(LPWSTR pszDeviceInstance) +ReenumerateDeviceInstance( + _In_ LPWSTR pszDeviceInstance, + _In_ ULONG ulFlags) { - DPRINT("ReenumerateDeviceInstance: not implemented\n"); - /* FIXME */ - return CR_CALL_NOT_IMPLEMENTED; + PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA EnumerateDeviceData; + CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; + + DPRINT1("ReenumerateDeviceInstance(%S 0x%08lx)\n", + pszDeviceInstance, ulFlags); + + if (ulFlags & ~CM_REENUMERATE_BITS) + return CR_INVALID_FLAG; + + if (ulFlags & CM_REENUMERATE_RETRY_INSTALLATION) + { + DPRINT1("CM_REENUMERATE_RETRY_INSTALLATION not implemented!\n"); + } + + RtlInitUnicodeString(&EnumerateDeviceData.DeviceInstance, + pszDeviceInstance); + EnumerateDeviceData.Flags = 0; + + Status = NtPlugPlayControl(PlugPlayControlEnumerateDevice, + &EnumerateDeviceData, + sizeof(PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + + return ret; } @@ -2004,7 +2029,8 @@ PNP_DeviceInstanceAction( break; case PNP_DEVINST_REENUMERATE: - ret = ReenumerateDeviceInstance(pszDeviceInstance1); + ret = ReenumerateDeviceInstance(pszDeviceInstance1, + ulFlags); break; default: diff --git a/sdk/include/ndk/cmtypes.h b/sdk/include/ndk/cmtypes.h index 1d58d93b68..2b854923cf 100644 --- a/sdk/include/ndk/cmtypes.h +++ b/sdk/include/ndk/cmtypes.h @@ -445,6 +445,13 @@ typedef struct _PLUGPLAY_EVENT_BLOCK // Plug and Play Control Classes // +// Class 0x00 +typedef struct _PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA +{ + UNICODE_STRING DeviceInstance; + ULONG Flags; +} PLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA, *PPLUGPLAY_CONTROL_ENUMERATE_DEVICE_DATA; + //Class 0x09 typedef struct _PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA {

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018