Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[ion] 52583: [NTDLL]: LdrFindEntryForAddress should cehck EntryInProgress first. Also add missing dprint. [NTDLL]: LdrVerifyImageMatchesCheckSum does not actually do the check if the FileHandle is ...

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 9 14:52:07 2011 New Revision: 52583 URL: http://svn.reactos.org/svn/reactos?rev=52583&view=rev Log: [NTDLL]: LdrFindEntryForAddress should cehck EntryInProgress first. Also add missing dprint. [NTDLL]: LdrVerifyImageMatchesCheckSum does not actually do the check if the FileHandle is ORed with 1 (this is an optimization for KnownDLLs). Also, use EndOfFile.LowPart for the checksum, not ViewSize. [NTDLL]: LdrpGetProcedureAddress: fix overflows, incorrect constants, incorrect memcopy call, and only run init routines if the thunk was actually snapped. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Jul 9 14:52:07 2011 @@ -374,6 +374,29 @@ /* Nothing to do */ if (!Ldr) return STATUS_NO_MORE_ENTRIES; + + /* Get the current entry */ + LdrEntry = Ldr->EntryInProgress; + if (LdrEntry) + { + /* Get the NT Headers */ + NtHeader = RtlImageNtHeader(LdrEntry->DllBase); + if (NtHeader) + { + /* Get the Image Base */ + DllBase = (ULONG_PTR)LdrEntry->DllBase; + DllEnd = DllBase + NtHeader->OptionalHeader.SizeOfImage; + + /* Check if they match */ + if (((ULONG_PTR)Address >= DllBase) && + ((ULONG_PTR)Address < DllEnd)) + { + /* Return it */ + *Module = LdrEntry; + return STATUS_SUCCESS; + } + } + } /* Loop the module list */ ListHead = &Ldr->InMemoryOrderModuleList; @@ -382,7 +405,8 @@ { /* Get the entry and NT Headers */ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InMemoryOrderModuleList); - if ((NtHeader = RtlImageNtHeader(LdrEntry->DllBase))) + NtHeader = RtlImageNtHeader(LdrEntry->DllBase); + if (NtHeader) { /* Get the Image Base */ DllBase = (ULONG_PTR)LdrEntry->DllBase; @@ -403,6 +427,8 @@ } /* Nothing found */ + // 85 == DPFLTR_LDR_ID; + DbgPrintEx(85, DPFLTR_WARNING_LEVEL, "LDR: %s() exiting 0x%08lx\n", __FUNCTION__, STATUS_NO_MORE_ENTRIES); return STATUS_NO_MORE_ENTRIES; } @@ -753,14 +779,16 @@ IO_STATUS_BLOCK IoStatusBlock; PIMAGE_NT_HEADERS NtHeader; HANDLE SectionHandle; - SIZE_T ViewSize = 0; - PVOID ViewBase = NULL; - BOOLEAN Result; + SIZE_T ViewSize; + PVOID ViewBase; + BOOLEAN Result, NoActualCheck; NTSTATUS Status; PVOID ImportName; ULONG Size; - DPRINT("LdrVerifyImageMatchesChecksum() called\n"); + + /* If the handle has the magic KnownDll flag, skip actual checksums */ + NoActualCheck = ((ULONG_PTR)FileHandle & 1); /* Create the section */ Status = NtCreateSection(&SectionHandle, @@ -777,6 +805,8 @@ } /* Map the section */ + ViewSize = 0; + ViewBase = NULL; Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &ViewBase, @@ -811,13 +841,22 @@ /* Protect with SEH */ _SEH2_TRY { - /* Verify the checksum */ - Result = LdrVerifyMappedImageMatchesChecksum(ViewBase, - ViewSize, - FileStandardInfo.EndOfFile.LowPart); + /* Check if this is the KnownDll hack */ + if (NoActualCheck) + { + /* Don't actually do it */ + Result = TRUE; + } + else + { + /* Verify the checksum */ + Result = LdrVerifyMappedImageMatchesChecksum(ViewBase, + FileStandardInfo.EndOfFile.LowPart, + FileStandardInfo.EndOfFile.LowPart); + } /* Check if a callback was supplied */ - if (Result && Callback) + if ((Result) && (Callback)) { /* Get the NT Header */ NtHeader = RtlImageNtHeader(ViewBase); @@ -866,7 +905,7 @@ NtClose(SectionHandle); /* Return status */ - return !Result ? STATUS_IMAGE_CHECKSUM_MISMATCH : Status; + return Result ? Status : STATUS_IMAGE_CHECKSUM_MISMATCH; } NTSTATUS Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sat Jul 9 14:52:07 2011 @@ -1671,7 +1671,7 @@ PVOID ImageBase; PIMAGE_IMPORT_BY_NAME ImportName = NULL; PIMAGE_EXPORT_DIRECTORY ExportDir; - ULONG ExportDirSize; + ULONG ExportDirSize, Length; PLIST_ENTRY Entry; /* Show debug message */ @@ -1684,20 +1684,22 @@ if (ShowSnaps) DbgPrint("NAME - %s\n", Name->Buffer); /* Make sure it's not too long */ - if ((Name->Length + sizeof(CHAR) + sizeof(USHORT)) > MAXLONG) + Length = Name->Length + + sizeof(CHAR) + + FIELD_OFFSET(IMAGE_IMPORT_BY_NAME, Name); + if (Length > UNICODE_STRING_MAX_BYTES) { /* Won't have enough space to add the hint */ return STATUS_NAME_TOO_LONG; } /* Check if our buffer is large enough */ - if (Name->Length >= (sizeof(ImportBuffer) - sizeof(CHAR))) + if (Name->Length > sizeof(ImportBuffer)) { /* Allocate from heap, plus 2 bytes for the Hint */ ImportName = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - Name->Length + sizeof(CHAR) + - sizeof(USHORT)); + 0, + Length); } else { @@ -1709,8 +1711,8 @@ ImportName->Hint = 0; /* Copy the name and null-terminate it */ - RtlMoveMemory(ImportName->Name, Name->Buffer, Name->Length); - ImportName->Name[Name->Length] = 0; + RtlCopyMemory(ImportName->Name, Name->Buffer, Name->Length); + ImportName->Name[Name->Length] = ANSI_NULL; /* Clear the high bit */ ImageBase = ImportName; @@ -1724,16 +1726,16 @@ /* Show debug message */ if (ShowSnaps) DbgPrint("ORDINAL - %lx\n", Ordinal); - if (Ordinal) - { - Thunk.u1.Ordinal = Ordinal | IMAGE_ORDINAL_FLAG; - } - else + /* Make sure an ordinal was given */ + if (!Ordinal) { /* No ordinal */ DPRINT1("No ordinal and no name\n"); return STATUS_INVALID_PARAMETER; } + + /* Set the orginal flag in the thunk */ + Thunk.u1.Ordinal = Ordinal | IMAGE_ORDINAL_FLAG; } /* Acquire lock unless we are initting */ @@ -1774,7 +1776,7 @@ NULL); /* Finally, see if we're supposed to run the init routines */ - if (ExecuteInit) + if ((NT_SUCCESS(Status)) && (ExecuteInit)) { /* * It's possible a forwarded entry had us load the DLL. In that case,

13 years, 5 months

[tkreuzer] 52582: [NTOSKRNL] In MmDbgCopyMemory do physical memory copy, if the virtual target address is valid, but not writable. Fixes Step-Over on user mode addresses with WinDbg (can write brea...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 9 14:15:47 2011 New Revision: 52582 URL: http://svn.reactos.org/svn/reactos?rev=52582&view=rev Log: [NTOSKRNL] In MmDbgCopyMemory do physical memory copy, if the virtual target address is valid, but not writable. Fixes Step-Over on user mode addresses with WinDbg (can write break points now) Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Sat Jul 9 14:15:47 2011 @@ -150,6 +150,8 @@ { NTSTATUS Status; PVOID TargetAddress; + ULONG64 PhysicalAddress; + PMMPTE PointerPte; // // No local kernel debugging support yet, so don't worry about locking @@ -238,34 +240,30 @@ // No session space support yet // ASSERT(MmIsSessionAddress(TargetAddress) == FALSE); - } - - // - // If we are going to write to the address then make sure it is writeable too - // - if ((Flags & MMDBG_COPY_WRITE) && - (!MI_IS_PAGE_WRITEABLE(MiAddressToPte(TargetAddress)))) - { - // - // Check if we mapped anything - // - if (Flags & MMDBG_COPY_PHYSICAL) - { - // - // Get rid of the mapping - // - MiDbgUnTranslatePhysicalAddress(); - } - - // - // Fail - // - // FIXME: We should attempt to override the write protection instead of - // failing here - // - KdpDprintf("MmDbgCopyMemory: Failing Write for Protected Address 0x%p\n", - TargetAddress); - return STATUS_UNSUCCESSFUL; + + /* If we are going to write to the address, then check if its writable */ + PointerPte = MiAddressToPte(TargetAddress); + if ((Flags & MMDBG_COPY_WRITE) && !MI_IS_PAGE_WRITEABLE(PointerPte)) + { + /* Not writable, we need to do a physical copy */ + Flags |= MMDBG_COPY_PHYSICAL; + + /* Calculate the physical address */ + PhysicalAddress = PointerPte->u.Hard.PageFrameNumber << PAGE_SHIFT; + PhysicalAddress += BYTE_OFFSET(Address); + + /* Translate the physical address */ + TargetAddress = MiDbgTranslatePhysicalAddress(PhysicalAddress, Flags); + + /* Check if translation failed */ + if (!TargetAddress) + { + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failed to translate for write " + "%I64x (%I64x)\n", PhysicalAddress, Address); + return STATUS_UNSUCCESSFUL; + } + } } //

13 years, 5 months

[ion] 52581: [NTDLL]: Fix multiple levels of fail in LdrGetDllHandleEx (returning with lock held, leaking memory, using NULL pointers, using magic flags, missing ASSERTs, buffer overflows, usage of...

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 9 13:37:47 2011 New Revision: 52581 URL: http://svn.reactos.org/svn/reactos?rev=52581&view=rev Log: [NTDLL]: Fix multiple levels of fail in LdrGetDllHandleEx (returning with lock held, leaking memory, using NULL pointers, using magic flags, missing ASSERTs, buffer overflows, usage of incorrect constants, ignoring status failures, lack of varaible initialization, incorrect string initialization). Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Jul 9 13:37:47 2011 @@ -417,31 +417,36 @@ IN PUNICODE_STRING DllName, OUT PVOID *DllHandle OPTIONAL) { - NTSTATUS Status = STATUS_DLL_NOT_FOUND; + NTSTATUS Status; PLDR_DATA_TABLE_ENTRY LdrEntry; - UNICODE_STRING RedirectName, DllString1; - UNICODE_STRING RawDllName; - PUNICODE_STRING pRedirectName = &RedirectName; - PUNICODE_STRING CompareName; + UNICODE_STRING RedirectName, DllString1, RawDllName; + PUNICODE_STRING pRedirectName, CompareName; PWCHAR p1, p2, p3; - BOOLEAN Locked = FALSE; - BOOLEAN RedirectedDll = FALSE; - ULONG Cookie; - ULONG LoadFlag; + BOOLEAN Locked, RedirectedDll; + ULONG_PTR Cookie; + ULONG LoadFlag, Length; /* Initialize the strings */ - RtlInitUnicodeString(&DllString1, NULL); - RtlInitUnicodeString(&RawDllName, NULL); + RtlInitEmptyUnicodeString(&DllString1, NULL, 0); + RtlInitEmptyUnicodeString(&RawDllName, NULL, 0); RedirectName = *DllName; + pRedirectName = &RedirectName; + + /* Initialize state */ + RedirectedDll = Locked = FALSE; + LdrEntry = NULL; + Cookie = 0; /* Clear the handle */ if (DllHandle) *DllHandle = NULL; - /* Check for a valid flag */ - if ((Flags & ~3) || (!DllHandle && !(Flags & 2))) + /* Check for a valid flag combination */ + if ((Flags & ~(LDR_GET_DLL_HANDLE_EX_PIN | LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT)) || + (!DllHandle && !(Flags & LDR_GET_DLL_HANDLE_EX_PIN))) { DPRINT1("Flags are invalid or no DllHandle given\n"); - return STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto Quickie; } /* If not initializing */ @@ -449,6 +454,9 @@ { /* Acquire the lock */ Status = LdrLockLoaderLock(0, NULL, &Cookie); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Remember we own it */ Locked = TRUE; } @@ -474,6 +482,9 @@ /* Unrecoverable SxS failure; */ goto Quickie; } + + /* Set default failure code */ + Status = STATUS_DLL_NOT_FOUND; /* Use the cache if we can */ if (LdrpGetModuleHandleCache) @@ -516,17 +527,15 @@ /* Return success */ Status = STATUS_SUCCESS; - - goto FoundEntry; + goto Quickie; } } DontCompare: /* Find the name without the extension */ p1 = pRedirectName->Buffer; + p2 = NULL; p3 = &p1[pRedirectName->Length / sizeof(WCHAR)]; -StartLoop: - p2 = NULL; while (p1 != p3) { if (*p1++ == L'.') @@ -535,26 +544,35 @@ } else if (*p1 == L'\\') { - goto StartLoop; + p2 = NULL; } } /* Check if no extension was found or if we got a slash */ - if (!p2 || *p2 == L'\\' || *p2 == L'/') + if (!(p2) || (*p2 == L'\\') || (*p2 == L'/')) { /* Check that we have space to add one */ - if (pRedirectName->Length + LdrApiDefaultExtension.Length >= MAXLONG) + Length = pRedirectName->Length + + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL); + if (Length >= UNICODE_STRING_MAX_BYTES) { /* No space to add the extension */ - return STATUS_NAME_TOO_LONG; + Status = STATUS_NAME_TOO_LONG; + goto Quickie; } /* Setup the string */ - RawDllName.MaximumLength = pRedirectName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL); + RawDllName.MaximumLength = Length; + ASSERT(Length >= sizeof(UNICODE_NULL)); RawDllName.Length = RawDllName.MaximumLength - sizeof(UNICODE_NULL); RawDllName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, RawDllName.MaximumLength); + if (!RawDllName.Buffer) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } /* Copy the buffer */ RtlMoveMemory(RawDllName.Buffer, @@ -572,11 +590,11 @@ else { /* Check if there's something in the name */ - if (pRedirectName->Length) + Length = pRedirectName->Length; + if (Length) { /* Check and remove trailing period */ - if (pRedirectName->Buffer[(pRedirectName->Length - 2) / - sizeof(WCHAR)] == '.') + if (pRedirectName->Buffer[Length / sizeof(WCHAR) - sizeof(ANSI_NULL)] == '.') { /* Decrease the size */ pRedirectName->Length -= sizeof(WCHAR); @@ -589,6 +607,11 @@ RawDllName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, RawDllName.MaximumLength); + if (!RawDllName.Buffer) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } /* Copy the buffer */ RtlMoveMemory(RawDllName.Buffer, @@ -625,46 +648,41 @@ /* Make sure to NULL this */ LdrEntry = NULL; } -FoundEntry: +Quickie: + /* The success path must have a valid loader entry */ + ASSERT((LdrEntry != NULL) == NT_SUCCESS(Status)); + + /* Check if we got an entry and success */ DPRINT("Got LdrEntry->BaseDllName %wZ\n", LdrEntry ? &LdrEntry->BaseDllName : NULL); - - /* Check if we got an entry */ - if (LdrEntry) - { - /* Check for success */ - if (NT_SUCCESS(Status)) - { - /* Check if the DLL is locked */ - if (LdrEntry->LoadCount != -1) - { - /* Check what flag we got */ - if (!(Flags & 1)) - { - /* Check what to do with the load count */ - if (Flags & 2) - { - /* Pin it */ - LdrEntry->LoadCount = -1; - LoadFlag = LDRP_UPDATE_PIN; - } - else - { - /* Increase the load count */ - LdrEntry->LoadCount++; - LoadFlag = LDRP_UPDATE_REFCOUNT; - } - - /* Update the load count now */ - LdrpUpdateLoadCount2(LdrEntry, LoadFlag); - LdrpClearLoadInProgress(); - } - } - - /* Check if the caller is requesting the handle */ - if (DllHandle) *DllHandle = LdrEntry->DllBase; - } - } -Quickie: + if ((LdrEntry) && (NT_SUCCESS(Status))) + { + /* Check if the DLL is locked */ + if ((LdrEntry->LoadCount != 0xFFFF) && + !(Flags & LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT)) + { + /* Check what to do with the load count */ + if (Flags & LDR_GET_DLL_HANDLE_EX_PIN) + { + /* Pin it */ + LdrEntry->LoadCount = 0xFFFF; + LoadFlag = LDRP_UPDATE_PIN; + } + else + { + /* Increase the load count */ + LdrEntry->LoadCount++; + LoadFlag = LDRP_UPDATE_REFCOUNT; + } + + /* Update the load count now */ + LdrpUpdateLoadCount2(LdrEntry, LoadFlag); + LdrpClearLoadInProgress(); + } + + /* Check if the caller is requesting the handle */ + if (DllHandle) *DllHandle = LdrEntry->DllBase; + } + /* Free string if needed */ if (DllString1.Buffer) RtlFreeUnicodeString(&DllString1); @@ -672,12 +690,16 @@ if (RawDllName.Buffer) { /* Free the heap-allocated buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, RawDllName.Buffer); + Status = RtlFreeHeap(RtlGetProcessHeap(), 0, RawDllName.Buffer); RawDllName.Buffer = NULL; } /* Release lock */ - if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + if (Locked) + { + Status = LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, + Cookie); + } /* Return */ return Status; Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Sat Jul 9 13:37:47 2011 @@ -61,23 +61,29 @@ // // Dll Characteristics for LdrLoadDll // -#define LDR_IGNORE_CODE_AUTHZ_LEVEL 0x00001000 +#define LDR_IGNORE_CODE_AUTHZ_LEVEL 0x00001000 // // LdrAddRef Flags // -#define LDR_PIN_MODULE 0x00000001 +#define LDR_PIN_MODULE 0x00000001 // // LdrLockLoaderLock Flags // -#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 -#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 +#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 +#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 // // LdrUnlockLoaderLock Flags // #define LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 + +// +// LdrGetDllHandleEx Flags +// +#define LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT 0x00000001 +#define LDR_GET_DLL_HANDLE_EX_PIN 0x00000002 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID 0 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED 1 Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Jul 9 13:37:47 2011 @@ -460,6 +460,8 @@ } UNICODE_STRING, *PUNICODE_STRING; typedef const UNICODE_STRING* PCUNICODE_STRING; #define UNICODE_NULL ((WCHAR)0) +#define UNICODE_STRING_MAX_BYTES ((USHORT) 65534) +#define UNICODE_STRING_MAX_CHARS (32767) typedef struct _CSTRING { USHORT Length; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 9 13:37:47 2011 @@ -284,6 +284,8 @@ #endif #define ANSI_NULL ((CHAR)0) #define UNICODE_NULL ((WCHAR)0) +#define UNICODE_STRING_MAX_BYTES ((USHORT) 65534) +#define UNICODE_STRING_MAX_CHARS (32767) typedef BYTE BOOLEAN,*PBOOLEAN; #endif typedef BYTE FCHAR;

13 years, 5 months

[jgardou] 52580: [CMAKE] - fix typo

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Jul 9 11:17:12 2011 New Revision: 52580 URL: http://svn.reactos.org/svn/reactos?rev=52580&view=rev Log: [CMAKE] - fix typo Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sat Jul 9 11:17:12 2011 @@ -96,7 +96,7 @@ list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c/${NAME}_p.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_HEADER_ARG2} ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${DLLDATA_ARG} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endforeach()

13 years, 5 months

[ekohl] 52579: [WLANSVC] Set status SERVICE_STOPPED when the service has been stopped.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 9 10:41:55 2011 New Revision: 52579 URL: http://svn.reactos.org/svn/reactos?rev=52579&view=rev Log: [WLANSVC] Set status SERVICE_STOPPED when the service has been stopped. Modified: trunk/reactos/base/services/wlansvc/wlansvc.c Modified: trunk/reactos/base/services/wlansvc/wlansvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] Sat Jul 9 10:41:55 2011 @@ -75,6 +75,7 @@ case SERVICE_CONTROL_STOP: UpdateServiceStatus(ServiceStatusHandle, SERVICE_STOP_PENDING, 1); RpcMgmtStopServerListening(NULL); + UpdateServiceStatus(ServiceStatusHandle, SERVICE_STOPPED, 0); break; case SERVICE_CONTROL_INTERROGATE: return NO_ERROR;

13 years, 5 months

[arty] 52578: [CMAKE] Sidesetup overloading nonpaged pool with big slabs of dwarf data.

by arty＠svn.reactos.org

Author: arty Date: Sat Jul 9 09:58:02 2011 New Revision: 52578 URL: http://svn.reactos.org/svn/reactos?rev=52578&view=rev Log: [CMAKE] Sidesetup overloading nonpaged pool with big slabs of dwarf data. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] Sat Jul 9 09:58:02 2011 @@ -17,6 +17,8 @@ #include <debug.h> /* GLOBALS ******************************************************************/ + +#define CURRENT_PROCESS ((HANDLE)~0) typedef struct _IMAGE_SYMBOL_INFO_CACHE { @@ -635,14 +637,69 @@ /* Nothing here */ } -static PVOID KdbpSymAllocMem(ULONG_PTR size) -{ - return ExAllocatePoolWithTag(NonPagedPool, size, 'RSYM'); +typedef struct { + PMDL Mdl; + SIZE_T Size; + PVOID OriginalMapping; +} KdbpMallocHeader; + +static PVOID KdbpSymAllocMem(ULONG_PTR Size) +{ + KdbpMallocHeader *Hdr; + if (Size < PAGE_SIZE) + { + PVOID Result = ExAllocatePoolWithTag(NonPagedPool, Size + sizeof(KdbpMallocHeader), 'RSYM'); + if (!Result) return NULL; + Hdr = (KdbpMallocHeader*)Result; + Hdr->Mdl = NULL; + Hdr->Size = Size; + return &Hdr[1]; + } + else + { + PVOID Base = NULL; + SIZE_T RegionSize = Size + sizeof(KdbpMallocHeader); + NTSTATUS Status = NtAllocateVirtualMemory + (CURRENT_PROCESS, &Base, 0, &RegionSize, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) return NULL; + Hdr = (KdbpMallocHeader*)Base; + Hdr->Mdl = IoAllocateMdl(Base, RegionSize, FALSE, FALSE, NULL); + if (!Hdr->Mdl) { + NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); + return NULL; + } + Hdr->Size = RegionSize; + Hdr->OriginalMapping = Base; + MmProbeAndLockPages(Hdr->Mdl, KernelMode, IoModifyAccess); + KdbpMallocHeader *MappedHdr = (KdbpMallocHeader*)MmMapLockedPages(Hdr->Mdl, KernelMode); + if (!MappedHdr) { + MmUnlockPages(Hdr->Mdl); + IoFreeMdl(Hdr->Mdl); + NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); + return NULL; + } + return &Hdr[1]; + } } static VOID KdbpSymFreeMem(PVOID Area) { - return ExFreePool(Area); + PCHAR HdrPtr = ((PCHAR)Area) - sizeof(KdbpMallocHeader); + KdbpMallocHeader *Hdr = (KdbpMallocHeader*)HdrPtr; + if (Hdr->Size < PAGE_SIZE) + { + ExFreePool(Hdr); + } + else + { + PMDL Mdl = Hdr->Mdl; + PVOID BaseAddress = Hdr->OriginalMapping; + SIZE_T RegionSize = Hdr->Size; + MmUnmapLockedPages(Hdr, Mdl); + MmUnlockPages(Mdl); + NtFreeVirtualMemory(CURRENT_PROCESS, &BaseAddress, &RegionSize, MEM_RELEASE); + IoFreeMdl(Mdl); + } } static BOOLEAN KdbpSymReadMem(PVOID FileContext, PVOID TargetDebug, PVOID SourceMem, ULONG Size)

13 years, 5 months

[fireball] 52577: [NTDLL/LDR] - Comment out the actctx redirection check because it's placed wrongly. This should fix cases when a DLL is being loaded twice or more times for the same process. Spot...

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jul 8 22:32:48 2011 New Revision: 52577 URL: http://svn.reactos.org/svn/reactos?rev=52577&view=rev Log: [NTDLL/LDR] - Comment out the actctx redirection check because it's placed wrongly. This should fix cases when a DLL is being loaded twice or more times for the same process. Spotted by Rafal Harabien. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Fri Jul 8 22:32:48 2011 @@ -1519,11 +1519,11 @@ *LdrEntry = CurEntry; /* Find activation context */ - Status = RtlFindActivationContextSectionString(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, DllName, NULL); - if (!NT_SUCCESS(Status)) - return FALSE; - else - return TRUE; + //Status = RtlFindActivationContextSectionString(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, DllName, NULL); + //if (!NT_SUCCESS(Status)) + // return FALSE; + //else + return TRUE; } }

13 years, 5 months

[ion] 52576: [NTDLL]: Simplify LdrLockLoaderLock, fix its prototype, add an ASSERT, move cookie generation into its own inline.

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 8 21:19:38 2011 New Revision: 52576 URL: http://svn.reactos.org/svn/reactos?rev=52576&view=rev Log: [NTDLL]: Simplify LdrLockLoaderLock, fix its prototype, add an ASSERT, move cookie generation into its own inline. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Fri Jul 8 21:19:38 2011 @@ -21,6 +21,15 @@ /* FUNCTIONS *****************************************************************/ +ULONG_PTR +FORCEINLINE +LdrpMakeCookie(VOID) +{ + /* Generate a cookie */ + return (((ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread & 0xFFF) << 16) | + _InterlockedIncrement(&LdrpLoaderLockAcquisitonCount); +} + /* * @implemented */ @@ -99,17 +108,16 @@ NTSTATUS NTAPI LdrLockLoaderLock(IN ULONG Flags, - OUT PULONG Result OPTIONAL, - OUT PULONG Cookie OPTIONAL) -{ - LONG OldCount; + OUT PULONG Disposition OPTIONAL, + OUT PULONG_PTR Cookie OPTIONAL) +{ NTSTATUS Status = STATUS_SUCCESS; BOOLEAN InInit = LdrpInLdrInit; - DPRINT("LdrLockLoaderLock(%x %p %p)\n", Flags, Result, Cookie); + DPRINT("LdrLockLoaderLock(%x %p %p)\n", Flags, Disposition, Cookie); /* Zero out the outputs */ - if (Result) *Result = 0; + if (Disposition) *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID; if (Cookie) *Cookie = 0; /* Validate the flags */ @@ -140,9 +148,12 @@ /* A normal failure */ return STATUS_INVALID_PARAMETER_3; } + + /* Do or Do Not. There is no Try */ + ASSERT((Disposition != NULL) || !(Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)); /* If the flag is set, make sure we have a valid pointer to use */ - if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Result)) + if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Disposition)) { /* No pointer to return the data to */ if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) @@ -168,13 +179,13 @@ if (!RtlTryEnterCriticalSection(&LdrpLoaderLock)) { /* It's locked */ - *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; - goto Quickie; + *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; } else { /* It worked */ - *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; + *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; + *Cookie = LdrpMakeCookie(); } } else @@ -183,14 +194,9 @@ RtlEnterCriticalSection(&LdrpLoaderLock); /* See if result was requested */ - if (Result) *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; - } - - /* Increase the acquisition count */ - OldCount = _InterlockedIncrement(&LdrpLoaderLockAcquisitonCount); - - /* Generate a cookie */ - *Cookie = (((ULONG)NtCurrentTeb()->RealClientId.UniqueThread & 0xFFF) << 16) | OldCount; + if (Disposition) *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; + *Cookie = LdrpMakeCookie(); + } } else { @@ -204,13 +210,13 @@ if (!RtlTryEnterCriticalSection(&LdrpLoaderLock)) { /* It's locked */ - *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; - _SEH2_YIELD(return STATUS_SUCCESS); + *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; } else { /* It worked */ - *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; + *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; + *Cookie = LdrpMakeCookie(); } } else @@ -219,14 +225,9 @@ RtlEnterCriticalSection(&LdrpLoaderLock); /* See if result was requested */ - if (Result) *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; - } - - /* Increase the acquisition count */ - OldCount = _InterlockedIncrement(&LdrpLoaderLockAcquisitonCount); - - /* Generate a cookie */ - *Cookie = (((ULONG)NtCurrentTeb()->RealClientId.UniqueThread & 0xFFF) << 16) | OldCount; + if (Disposition) *Disposition = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; + *Cookie = LdrpMakeCookie(); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -236,7 +237,7 @@ _SEH2_END; } -Quickie: + /* Return status */ return Status; }

13 years, 5 months

[ion] 52575: [NTDLL]: Fix LdrUnlockLoaderLock bugs. 4x10000$.

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 8 21:07:31 2011 New Revision: 52575 URL: http://svn.reactos.org/svn/reactos?rev=52575&view=rev Log: [NTDLL]: Fix LdrUnlockLoaderLock bugs. 4x10000$. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Fri Jul 8 21:07:31 2011 @@ -34,19 +34,17 @@ DPRINT("LdrUnlockLoaderLock(%x %x)\n", Flags, Cookie); /* Check for valid flags */ - if (Flags & ~1) + if (Flags & ~LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* Flags are invalid, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) + if (Flags & LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_1); } - else - { - /* A normal failure */ - return STATUS_INVALID_PARAMETER_1; - } + + /* A normal failure */ + return STATUS_INVALID_PARAMETER_1; } /* If we don't have a cookie, just return */ @@ -59,20 +57,18 @@ DPRINT1("LdrUnlockLoaderLock() called with an invalid cookie!\n"); /* Invalid cookie, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) + if (Flags & LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_2); } - else - { - /* A normal failure */ - return STATUS_INVALID_PARAMETER_2; - } + + /* A normal failure */ + return STATUS_INVALID_PARAMETER_2; } /* Ready to release the lock */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) + if (Flags & LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* Do a direct leave */ RtlLeaveCriticalSection(&LdrpLoaderLock); Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Fri Jul 8 21:07:31 2011 @@ -73,6 +73,11 @@ // #define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 #define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 + +// +// LdrUnlockLoaderLock Flags +// +#define LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID 0 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED 1

13 years, 5 months

[rharabien] 52574: [NTDLL/LDR] - Use \\KnownDlls\\KnownDllPath instead of \\KnownDlls\\KnownDlls to check known dlls patch (spotted by Thomas Faber) - Assume known dlls are in system32 if \\KnownDl...

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Jul 8 19:42:53 2011 New Revision: 52574 URL: http://svn.reactos.org/svn/reactos?rev=52574&view=rev Log: [NTDLL/LDR] - Use \\KnownDlls\\KnownDllPath instead of \\KnownDlls\\KnownDlls to check known dlls patch (spotted by Thomas Faber) - Assume known dlls are in system32 if \\KnownDlls exists but KnownDllPath not Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Fri Jul 8 19:42:53 2011 @@ -1624,16 +1624,10 @@ &ObjectAttributes); /* Check if it exists */ - if (!NT_SUCCESS(Status)) - { - /* It doesn't, so assume System32 */ - LdrpKnownDllObjectDirectory = NULL; - RtlInitUnicodeString(&LdrpKnownDllPath, StringBuffer); - LdrpKnownDllPath.Length -= sizeof(WCHAR); - } - else + if (NT_SUCCESS(Status)) { /* Open the Known DLLs Path */ + RtlInitUnicodeString(&KnownDllString, L"KnownDllPath"); InitializeObjectAttributes(&ObjectAttributes, &KnownDllString, OBJ_CASE_INSENSITIVE, @@ -1658,6 +1652,15 @@ } } + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Aassume System32 */ + LdrpKnownDllObjectDirectory = NULL; + RtlInitUnicodeString(&LdrpKnownDllPath, StringBuffer); + LdrpKnownDllPath.Length -= sizeof(WCHAR); + } + /* If we have process parameters, get the default path and current path */ if (ProcessParameters) {

13 years, 5 months

← Newer
1
...
41
42
43
44
45
46
47
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011