Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[ion] 52623: [RTL]: Clarify what RtlGetLongestNtPathLength returns instead of using "+9" as a magic constant.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 00:38:34 2011 New Revision: 52623 URL: http://svn.reactos.org/svn/reactos?rev=52623&view=rev Log: [RTL]: Clarify what RtlGetLongestNtPathLength returns instead of using "+9" as a magic constant. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=52623&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 00:38:34 2011 @@ -28,6 +28,8 @@ static const UNICODE_STRING _condev = RTL_CONSTANT_STRING(L"\\\\.\\CON"); +static const UNICODE_STRING _unc = RTL_CONSTANT_STRING(L"\\??\\UNC\\"); + static const UNICODE_STRING _lpt = RTL_CONSTANT_STRING(L"LPT"); static const UNICODE_STRING _com = RTL_CONSTANT_STRING(L"COM"); @@ -46,9 +48,17 @@ /* * @implemented */ -ULONG NTAPI RtlGetLongestNtPathLength (VOID) -{ - return (MAX_PATH + 9); +ULONG +NTAPI +RtlGetLongestNtPathLength(VOID) +{ + /* + * The longest NT path is a DOS path that actually sits on a UNC path (ie: + * a mapped network drive), which is accessed through the DOS Global?? path. + * This is, and has always been equal to, 269 characters, except in Wine + * which claims this is 277. Go figure. + */ + return (MAX_PATH + _unc.Length + sizeof(ANSI_NULL)); }

13 years, 5 months

[ion] 52622: [NTDLL] Merge LdrpResolveFullName and LdrpSearchPath and LdrpAllocateUnicodeString from the LDR Rewrite branch. Not actually used yet since they use Rtl APIs that ReactOS does not impl...

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 00:25:26 2011 New Revision: 52622 URL: http://svn.reactos.org/svn/reactos?rev=52622&view=rev Log: [NTDLL] Merge LdrpResolveFullName and LdrpSearchPath and LdrpAllocateUnicodeString from the LDR Rewrite branch. Not actually used yet since they use Rtl APIs that ReactOS does not implement. Guess what the next commits are going to be about. 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] Mon Jul 11 00:25:26 2011 @@ -20,6 +20,72 @@ /* FUNCTIONS *****************************************************************/ +NTSTATUS +NTAPI +LdrpAllocateUnicodeString(IN OUT PUNICODE_STRING StringOut, + IN ULONG Length) +{ + /* Sanity checks */ + ASSERT(StringOut); + ASSERT(Length <= UNICODE_STRING_MAX_BYTES); + + /* Assume failure */ + StringOut->Length = 0; + + /* Make sure it's not mis-aligned */ + if (Length & 1) + { + /* Fail */ + StringOut->Buffer = NULL; + StringOut->MaximumLength = 0; + return STATUS_INVALID_PARAMETER; + } + + /* Allocate the string*/ + StringOut->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + StringOut->Length + sizeof(WCHAR)); + if (!StringOut->Buffer) + { + /* Fail */ + StringOut->MaximumLength = 0; + return STATUS_NO_MEMORY; + } + + /* Null-terminate it */ + StringOut->Buffer[StringOut->Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Check if this is a maximum-sized string */ + if (StringOut->Length != UNICODE_STRING_MAX_BYTES) + { + /* It's not, so set the maximum length to be one char more */ + StringOut->MaximumLength = StringOut->Length + sizeof(UNICODE_NULL); + } + else + { + /* The length is already the maximum possible */ + StringOut->MaximumLength = UNICODE_STRING_MAX_BYTES; + } + + /* Return success */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +LdrpFreeUnicodeString(IN PUNICODE_STRING StringIn) +{ + ASSERT(StringIn != NULL); + + /* If Buffer is not NULL - free it */ + if (StringIn->Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, StringIn->Buffer); + } + + /* Zero it out */ + RtlInitEmptyUnicodeString(StringIn, NULL, 0); +} BOOLEAN NTAPI LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint, @@ -1394,6 +1460,314 @@ return FALSE; } +NTSTATUS +NTAPI +LdrpResolveFullName(IN PUNICODE_STRING OriginalName, + IN PUNICODE_STRING PathName, + IN PUNICODE_STRING FullPathName, + IN PUNICODE_STRING *ExpandedName) +{ + NTSTATUS Status = STATUS_SUCCESS; +// RTL_PATH_TYPE PathType; +// BOOLEAN InvalidName; + ULONG Length; + + /* Display debug output if snaps are on */ + if (ShowSnaps) + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Expanding full name of %wZ\n", + __FUNCTION__, + OriginalName); + } + + /* FIXME: Lock the PEB */ + //RtlEnterCriticalSection(&FastPebLock); +#if 0 + /* Get the path name */ + Length = RtlGetFullPathName_Ustr(OriginalName, + PathName->Length, + PathName->Buffer, + NULL, + &InvalidName, + &PathType); +#else + Length = 0; +#endif + if (!(Length) || (Length > UNICODE_STRING_MAX_BYTES)) + { + /* Fail */ + Status = STATUS_NAME_TOO_LONG; + goto Quickie; + } + + /* Check if the length hasn't changed */ + if (Length <= PathName->Length) + { + /* Return the same thing */ + *ExpandedName = PathName; + PathName->Length = (USHORT)Length; + goto Quickie; + } + + /* Sanity check */ + ASSERT(Length >= sizeof(WCHAR)); + + /* Allocate a string */ + Status = LdrpAllocateUnicodeString(FullPathName, Length - sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Now get the full path again */ +#if 0 + Length = RtlGetFullPathName_Ustr(OriginalName, + FullPathName->Length, + FullPathName->Buffer, + NULL, + &InvalidName, + &PathType); +#else + Length = 0; +#endif + if (!(Length) || (Length > FullPathName->Length)) + { + /* Fail */ + LdrpFreeUnicodeString(FullPathName); + Status = STATUS_NAME_TOO_LONG; + } + else + { + /* Return the expanded name */ + *ExpandedName = FullPathName; + FullPathName->Length = (USHORT)Length; + } + +Quickie: + /* FIXME: Unlock the PEB */ + //RtlLeaveCriticalSection(&FastPebLock); + + /* Display debug output if snaps are on */ + if (ShowSnaps) + { + /* Check which output to use -- failure or success */ + if (NT_SUCCESS(Status)) + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Expanded to %wZ\n", + __FUNCTION__, + *ExpandedName); + } + else + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Failed to expand %wZ; 0x%08x\n", + __FUNCTION__, + OriginalName, + Status); + } + } + + /* If we failed, return NULL */ + if (!NT_SUCCESS(Status)) *ExpandedName = NULL; + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +LdrpSearchPath(IN PWCHAR *SearchPath, + IN PWCHAR DllName, + IN PUNICODE_STRING PathName, + IN PUNICODE_STRING FullPathName, + IN PUNICODE_STRING *ExpandedName) +{ + BOOLEAN TryAgain = FALSE; + PWCHAR ActualSearchPath = *SearchPath; + UNICODE_STRING TestName; + NTSTATUS Status; + PWCHAR Buffer, BufEnd = NULL; + ULONG Length = 0; + WCHAR p; + PWCHAR pp; + + /* Check if we don't have a search path */ + if (!ActualSearchPath) *SearchPath = LdrpDefaultPath.Buffer; + + /* Display debug output if snaps are on */ + if (ShowSnaps) + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Looking for %ws in %ws\n", + __FUNCTION__, + DllName, + *SearchPath); + } + + /* Check if we're dealing with a relative path */ + if (RtlDetermineDosPathNameType_U(DllName) != RtlPathTypeRelative) + { + /* Good, we're not. Create the name string */ + Status = RtlInitUnicodeStringEx(&TestName, DllName); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Make sure it exists */ + #if 0 + if (!RtlDoesFileExists_UstrEx(&TestName, TRUE)) + { + /* It doesn't, fail */ + Status = STATUS_DLL_NOT_FOUND; + goto Quickie; + } + #endif + + /* Resolve the full name */ + Status = LdrpResolveFullName(&TestName, + PathName, + FullPathName, + ExpandedName); + goto Quickie; + } + + /* FIXME: Handle relative case semicolon-lookup here */ + + /* Calculate length */ + Length += (ULONG)wcslen(DllName) + sizeof(UNICODE_NULL); + if (Length > UNICODE_STRING_MAX_CHARS) + { + /* Too long, fail */ + Status = STATUS_NAME_TOO_LONG; + goto Quickie; + } + + /* Allocate buffer */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); + if (!Buffer) + { + /* Fail */ + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* FIXME: Setup TestName here */ + Status = STATUS_NOT_FOUND; + + /* Start loop */ + do + { + /* Get character */ + p = *ActualSearchPath; + if (!(p) && (p == ';')) + { + /* FIXME: We don't have a character, or is a semicolon.*/ + + /* Display debug output if snaps are on */ + if (ShowSnaps) + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Looking for %ws\n", + __FUNCTION__, + Buffer); + } + + /* Sanity check */ + TestName.Length = (USHORT)ALIGN_DOWN((BufEnd - Buffer), WCHAR); + ASSERT(TestName.Length < TestName.MaximumLength); + + /* Check if the file exists */ + #if 0 + if (RtlDoesFileExists_UstrEx(&TestName, FALSE)) + #endif + { + /* It does. Reallocate the buffer */ + TestName.MaximumLength = (USHORT)ALIGN_DOWN((BufEnd - Buffer), WCHAR) + sizeof(WCHAR); + TestName.Buffer = RtlReAllocateHeap(RtlGetProcessHeap(), + 0, + Buffer, + TestName.MaximumLength); + if (!TestName.Buffer) + { + /* Keep the old one */ + TestName.Buffer = Buffer; + } + else + { + /* Update buffer */ + Buffer = TestName.Buffer; + } + + /* Make sure we have a buffer at least */ + ASSERT(TestName.Buffer); + + /* Resolve the name */ + *SearchPath = ActualSearchPath++; + Status = LdrpResolveFullName(&TestName, + PathName, + FullPathName, + ExpandedName); + break; + } + + /* Update buffer end */ + BufEnd = Buffer; + + /* Update string position */ + pp = ActualSearchPath++; + } + else + { + /* Otherwise, write the character */ + *BufEnd = p; + BufEnd++; + } + + /* Check if the string is empty, meaning we're done */ + if (!(*ActualSearchPath)) TryAgain = TRUE; + + /* Advance in the string */ + ActualSearchPath++; + } while (!TryAgain); + + /* Check if we had a buffer and free it */ + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + +Quickie: + /* Check if we got here through failure */ + if (!NT_SUCCESS(Status)) *ExpandedName = NULL; + + /* Display debug output if snaps are on */ + if (ShowSnaps) + { + /* Check which output to use -- failure or success */ + if (NT_SUCCESS(Status)) + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Returning %wZ\n", + __FUNCTION__, + *ExpandedName); + } + else + { + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Unable to locate %ws in %ws: 0x%08x\n", + __FUNCTION__, + DllName, + ActualSearchPath, + Status); + } + } + + /* Return status */ + return Status; +} + + /* NOTE: This function is b0rked and in the process of being slowly unf*cked */ BOOLEAN NTAPI @@ -2122,20 +2496,4 @@ return ModulesCount; } -VOID -NTAPI -LdrpFreeUnicodeString(IN PUNICODE_STRING StringIn) -{ - ASSERT(StringIn != NULL); - - /* If Buffer is not NULL - free it */ - if (StringIn->Buffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, StringIn->Buffer); - } - - /* Zero it out */ - RtlInitEmptyUnicodeString(StringIn, NULL, 0); -} - /* EOF */

13 years, 5 months

[ion] 52621: [NTDLL]: Cleanup and half-fix LdrpCheckForLoadedDll, including adding comments for where it's broken. This uses RtlImageNtHeaderEx with much stringent checks as well.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 00:12:33 2011 New Revision: 52621 URL: http://svn.reactos.org/svn/reactos?rev=52621&view=rev Log: [NTDLL]: Cleanup and half-fix LdrpCheckForLoadedDll, including adding comments for where it's broken. This uses RtlImageNtHeaderEx with much stringent checks as well. 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] Mon Jul 11 00:12:33 2011 @@ -1394,6 +1394,7 @@ return FALSE; } +/* NOTE: This function is b0rked and in the process of being slowly unf*cked */ BOOLEAN NTAPI LdrpCheckForLoadedDll(IN PWSTR DllPath, @@ -1417,12 +1418,14 @@ PVOID ViewBase = NULL; SIZE_T ViewSize = 0; PIMAGE_NT_HEADERS NtHeader, NtHeader2; - DPRINT("LdrpCheckForLoadedDll('%S' '%wZ' %d %d %p)\n", DllPath, DllName, Flag, RedirectedDll, LdrEntry); /* Check if a dll name was provided */ - if (!DllName->Buffer || !DllName->Buffer[0]) return FALSE; - + if (!(DllName->Buffer) || !(DllName->Buffer[0])) return FALSE; + + /* FIXME: Warning, "Flag" is used as magic instead of "Static" */ + /* FIXME: Warning, code does not support redirection at all */ + /* Look in the hash table if flag was set */ lookinhash: if (Flag) @@ -1459,7 +1462,7 @@ while (*wc) { /* Check for a slash in the current position*/ - if (*wc == L'\\' || *wc == L'/') + if ((*wc == L'\\') || (*wc == L'/')) { /* Found the slash, so dll name contains path */ FullPath = TRUE; @@ -1467,6 +1470,7 @@ /* Setup full dll name string */ FullDllName.Buffer = NameBuf; + /* FIXME: This is from the Windows 2000 loader, not XP/2003, we should call LdrpSearchPath */ Length = RtlDosSearchPath_U(DllPath ? DllPath : LdrpDefaultPath.Buffer, DllName->Buffer, NULL, @@ -1475,7 +1479,7 @@ NULL); /* Check if that was successful */ - if (!Length || Length > sizeof(NameBuf) - sizeof(UNICODE_NULL)) + if (!(Length) || (Length > (sizeof(NameBuf) - sizeof(UNICODE_NULL)))) { if (ShowSnaps) { @@ -1502,18 +1506,22 @@ Flag = TRUE; goto lookinhash; } - - /* Now go through the InLoadOrder module list */ + + /* FIXME: Warning, activation context missing */ + /* NOTE: From here on down, everything looks good */ + + /* Loop the module list */ ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; ListEntry = ListHead->Flink; - while (ListEntry != ListHead) { - /* Get the containing record of the current entry and advance to the next one */ - CurEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + /* Get the current entry and advance to the next one */ + CurEntry = CONTAINING_RECORD(ListEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); ListEntry = ListEntry->Flink; - /* Check if it's already being unloaded */ + /* Check if it's being unloaded */ if (!CurEntry->InMemoryOrderModuleList.Flink) continue; /* Check if name matches */ @@ -1523,17 +1531,9 @@ { /* Found it */ *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; } } - - /* The DLL was not found in the load order modules list. Perform a complex check */ /* Convert given path to NT path */ if (!RtlDosPathNameToNtPathName_U(FullDllName.Buffer, @@ -1551,7 +1551,6 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenFile(&FileHandle, SYNCHRONIZE | FILE_EXECUTE, &ObjectAttributes, @@ -1567,7 +1566,9 @@ /* Create a section for this file */ Status = NtCreateSection(&SectionHandle, - SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_WRITE, + SECTION_MAP_READ | + SECTION_MAP_EXECUTE | + SECTION_MAP_WRITE, NULL, NULL, PAGE_EXECUTE, @@ -1591,6 +1592,7 @@ ViewShare, 0, PAGE_EXECUTE); + /* Close section handle */ NtClose(SectionHandle); @@ -1598,52 +1600,51 @@ if (!NT_SUCCESS(Status)) return FALSE; /* Get pointer to the NT header of this section */ - NtHeader = RtlImageNtHeader(ViewBase); - if (!NtHeader) + Status = RtlImageNtHeaderEx(0, ViewBase, ViewSize, &NtHeader); + if (!(NT_SUCCESS(Status)) || !(NtHeader)) { /* Unmap the section and fail */ NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); return FALSE; } - /* Go through the list of modules */ + /* Go through the list of modules again */ ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; ListEntry = ListHead->Flink; - while (ListEntry != ListHead) { - CurEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + /* Get the current entry and advance to the next one */ + CurEntry = CONTAINING_RECORD(ListEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); ListEntry = ListEntry->Flink; - /* Check if it's already being unloaded */ + /* Check if it's in the process of being unloaded */ if (!CurEntry->InMemoryOrderModuleList.Flink) continue; - + + /* The header is untrusted, use SEH */ _SEH2_TRY { /* Check if timedate stamp and sizes match */ - if (CurEntry->TimeDateStamp == NtHeader->FileHeader.TimeDateStamp && - CurEntry->SizeOfImage == NtHeader->OptionalHeader.SizeOfImage) + if ((CurEntry->TimeDateStamp == NtHeader->FileHeader.TimeDateStamp) && + (CurEntry->SizeOfImage == NtHeader->OptionalHeader.SizeOfImage)) { /* Time, date and size match. Let's compare their headers */ NtHeader2 = RtlImageNtHeader(CurEntry->DllBase); - if (RtlCompareMemory(NtHeader2, NtHeader, sizeof(IMAGE_NT_HEADERS))) { /* Headers match too! Finally ask the kernel to compare mapped files */ Status = ZwAreMappedFilesTheSame(CurEntry->DllBase, ViewBase); - if (!NT_SUCCESS(Status)) { + /* Almost identical, but not quite, keep trying */ _SEH2_YIELD(continue;) } else { - /* This is our entry! */ + /* This is our entry!, unmap and return success */ *LdrEntry = CurEntry; - - /* Unmap the section */ NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); - _SEH2_YIELD(return TRUE;) } } @@ -1656,9 +1657,8 @@ _SEH2_END; } - /* Unmap the section */ + /* Unmap the section and fail */ NtUnmapViewOfSection(NtCurrentProcess(), ViewBase); - return FALSE; }

13 years, 5 months

[ion] 52620: [RTL]: One day, Microsoft is going to stop using flags that are negatives. Fix boot/etc.

by ion＠svn.reactos.org

Author: ion Date: Mon Jul 11 00:10:27 2011 New Revision: 52620 URL: http://svn.reactos.org/svn/reactos?rev=52620&view=rev Log: [RTL]: One day, Microsoft is going to stop using flags that are negatives. Fix boot/etc. Modified: trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=52620&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Mon Jul 11 00:10:27 2011 @@ -143,6 +143,7 @@ { PIMAGE_NT_HEADERS NtHeaders; PIMAGE_DOS_HEADER DosHeader; + BOOLEAN WantsRangeCheck; /* You must want NT Headers, no? */ if (!OutHeaders) return STATUS_INVALID_PARAMETER; @@ -161,7 +162,8 @@ if (!(Base) || (Base == (PVOID)-1)) return STATUS_INVALID_PARAMETER; /* Check if the caller wants validation */ - if (Flags & RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) + WantsRangeCheck = !(Flags & RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK); + if (WantsRangeCheck) { /* Make sure the image size is at least big enough for the DOS header */ if (Size < sizeof(IMAGE_DOS_HEADER)) @@ -181,7 +183,7 @@ } /* Check if the caller wants validation */ - if (Flags & RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) + if (WantsRangeCheck) { /* The offset should fit in the passsed-in size */ if (DosHeader->e_lfanew >= Size)

13 years, 5 months

[rharabien] 52619: [WIN32CSR] - Fix CSR hard error messages. Parameters are now converted to ANSI string which are expected by message format string.

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Jul 10 22:40:43 2011 New Revision: 52619 URL: http://svn.reactos.org/svn/reactos?rev=52619&view=rev Log: [WIN32CSR] - Fix CSR hard error messages. Parameters are now converted to ANSI string which are expected by message format string. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Sun Jul 10 22:40:43 2011 @@ -106,6 +106,25 @@ return STATUS_SUCCESS; } +static +VOID +CsrpFreeStringParameters( + IN OUT PULONG_PTR Parameters, + IN PHARDERROR_MSG HardErrorMessage) +{ + ULONG nParam; + + /* Loop all parameters */ + for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) + { + /* Check if the current parameter is a string */ + if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam) && Parameters[nParam]) + { + /* Free the string buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); + } + } +} static NTSTATUS @@ -115,62 +134,82 @@ IN PHARDERROR_MSG HardErrorMessage, HANDLE hProcess) { - ULONG nParam, UnicodeStringParameterMask, Size = 0; - NTSTATUS Status; - UNICODE_STRING TempStringU; - CHAR *ParamString; - - UnicodeStringParameterMask = HardErrorMessage->UnicodeStringParameterMask; + ULONG nParam, Size = 0; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING TempStringU, ParamStringU; + ANSI_STRING TempStringA; /* Read all strings from client space */ - for (nParam = 0; - nParam < HardErrorMessage->NumberOfParameters; - nParam++, UnicodeStringParameterMask >>= 1) + for (nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++) { Parameters[nParam] = 0; /* Check if the current parameter is a unicode string */ - if (UnicodeStringParameterMask & 0x01) + if (HardErrorMessage->UnicodeStringParameterMask & (1 << nParam)) { /* Read the UNICODE_STRING from the process memory */ Status = NtReadVirtualMemory(hProcess, (PVOID)HardErrorMessage->Parameters[nParam], - &TempStringU, - sizeof(TempStringU), + &ParamStringU, + sizeof(ParamStringU), NULL); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + break; /* Allocate a buffer for the string */ - ParamString = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - TempStringU.Length + sizeof(WCHAR)); - - if (!ParamString) + TempStringU.MaximumLength = ParamStringU.Length; + TempStringU.Length = ParamStringU.Length; + TempStringU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TempStringU.MaximumLength); + + if (!TempStringU.Buffer) { - DPRINT1("Cannot allocate memory %d\n", TempStringU.Length); - return STATUS_NO_MEMORY; + DPRINT1("Cannot allocate memory %u\n", TempStringU.MaximumLength); + Status = STATUS_NO_MEMORY; } /* Read the string buffer from the process memory */ Status = NtReadVirtualMemory(hProcess, + ParamStringU.Buffer, TempStringU.Buffer, - ParamString, - TempStringU.Length, + ParamStringU.Length, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("NtReadVirtualMemory failed with code: %lx\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, ParamString); - return Status; + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); + break; } - /* Zero terminate the string */ - ParamString[TempStringU.Length] = 0; - ParamString[TempStringU.Length + 1] = 0; - DPRINT("ParamString=\'%S\'\n", ParamString); - - Parameters[nParam] = (ULONG_PTR)ParamString; + DPRINT("ParamString=\'%wZ\'\n", &TempStringU); + + /* Allocate a buffer for converted to ANSI string */ + TempStringA.MaximumLength = RtlUnicodeStringToAnsiSize(&TempStringU); + TempStringA.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + TempStringA.MaximumLength); + + if (!TempStringA.Buffer) + { + DPRINT1("Cannot allocate memory %u\n", TempStringA.MaximumLength); + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); + Status = STATUS_NO_MEMORY; + break; + } + + /* Convert string to ANSI and free temporary buffer */ + Status = RtlUnicodeStringToAnsiString(&TempStringA, &TempStringU, FALSE); + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringU.Buffer); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, TempStringA.Buffer); + break; + } + + /* Note: RtlUnicodeStringToAnsiString returns NULL terminated string */ + Parameters[nParam] = (ULONG_PTR)TempStringA.Buffer; Size += TempStringU.Length; } else @@ -180,34 +219,15 @@ } } + if (!NT_SUCCESS(Status)) + { + CsrpFreeStringParameters(Parameters, HardErrorMessage); + return Status; + } + *SizeOfAllUnicodeStrings = Size; - return STATUS_SUCCESS; + return Status; } - -static -VOID -CsrpFreeStringParameters( - IN OUT PULONG_PTR Parameters, - IN PHARDERROR_MSG HardErrorMessage) -{ - ULONG nParam, UnicodeStringParameterMask; - - UnicodeStringParameterMask = HardErrorMessage->UnicodeStringParameterMask; - - /* Loop all parameters */ - for (nParam = 0; - nParam < HardErrorMessage->NumberOfParameters; - nParam++, UnicodeStringParameterMask >>= 1) - { - /* Check if the current parameter is a string */ - if (UnicodeStringParameterMask & 0x01) - { - /* Free the string buffer */ - RtlFreeHeap(RtlGetProcessHeap(), 0, (PVOID)Parameters[nParam]); - } - } -} - static NTSTATUS

13 years, 5 months

[ion] 52618: [NDK]: Add missing RtlImageNtHeaderEx flags. [RTL]: Implement RtlImageNtHeaderEx and make RtlImageNtHeader call it. This will result in much stricter (and correct) PE loading by defaul...

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 10 21:55:55 2011 New Revision: 52618 URL: http://svn.reactos.org/svn/reactos?rev=52618&view=rev Log: [NDK]: Add missing RtlImageNtHeaderEx flags. [RTL]: Implement RtlImageNtHeaderEx and make RtlImageNtHeader call it. This will result in much stricter (and correct) PE loading by default, and enable a flag which can do even stricter checks. [NTDLL]: Export RtlImageNtHeaderEx (maybe NTOS should export it too, not sure). Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/image.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Sun Jul 10 21:55:55 2011 @@ -691,7 +691,7 @@ @ stdcall RtlIdentifierAuthoritySid(ptr) @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @ stdcall RtlImageNtHeader(long) -//@ stdcall RtlImageNtHeaderEx +@ stdcall RtlImageNtHeaderEx(long ptr double ptr) @ stdcall RtlImageRvaToSection(ptr long long) @ stdcall RtlImageRvaToVa(ptr long long ptr) @ stdcall RtlImpersonateSelf(long) Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Jul 10 21:55:55 2011 @@ -243,6 +243,11 @@ // RtlFindCharInUnicodeString Flags // #define RTL_FIND_CHAR_IN_UNICODE_STRING_CASE_INSENSITIVE 4 + +// +// RtlImageNtHeaderEx Flags +// +#define RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK 0x00000001 // // Codepages Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=52618&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Sun Jul 10 21:55:55 2011 @@ -120,6 +120,13 @@ return (BOOLEAN)(CalcSum == HeaderSum); #else + /* + * FIXME: Warning, this violates the PE standard and makes ReactOS drivers + * and other system code when normally on Windows they would not, since + * we do not write the checksum in them. + * Our compilers should be made to write out the checksum and this function + * should be enabled as to reject badly checksummed code. + */ return TRUE; #endif } @@ -127,28 +134,122 @@ /* * @implemented */ +NTSTATUS +NTAPI +RtlImageNtHeaderEx(IN ULONG Flags, + IN PVOID Base, + IN ULONG64 Size, + OUT PIMAGE_NT_HEADERS *OutHeaders) +{ + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_DOS_HEADER DosHeader; + + /* You must want NT Headers, no? */ + if (!OutHeaders) return STATUS_INVALID_PARAMETER; + + /* Assume failure */ + *OutHeaders = NULL; + + /* Validate Flags */ + if (Flags &~ RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) + { + DPRINT1("Invalid flag combination... check for new API flags?\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Validate base */ + if (!(Base) || (Base == (PVOID)-1)) return STATUS_INVALID_PARAMETER; + + /* Check if the caller wants validation */ + if (Flags & RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) + { + /* Make sure the image size is at least big enough for the DOS header */ + if (Size < sizeof(IMAGE_DOS_HEADER)) + { + DPRINT1("Size too small\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + } + + /* Check if the DOS Signature matches */ + DosHeader = Base; + if (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) + { + /* Not a valid COFF */ + DPRINT1("Not an MZ file\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Check if the caller wants validation */ + if (Flags & RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) + { + /* The offset should fit in the passsed-in size */ + if (DosHeader->e_lfanew >= Size) + { + /* Fail */ + DPRINT1("e_lfanew is larger than PE file\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* It shouldn't be past 4GB either */ + if (DosHeader->e_lfanew >= + (MAXULONG - sizeof(IMAGE_DOS_SIGNATURE) - sizeof(IMAGE_FILE_HEADER))) + { + /* Fail */ + DPRINT1("e_lfanew is larger than 4GB\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* And the whole file shouldn't overflow past 4GB */ + if ((DosHeader->e_lfanew + + sizeof(IMAGE_DOS_SIGNATURE) - sizeof(IMAGE_FILE_HEADER)) >= Size) + { + /* Fail */ + DPRINT1("PE is larger than 4GB\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + } + + /* The offset also can't be larger than 256MB, as a hard-coded check */ + if (DosHeader->e_lfanew >= (256 * 1024 * 1024)) + { + /* Fail */ + DPRINT1("PE offset is larger than 256MB\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Now it's safe to get the NT Headers */ + NtHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)Base + DosHeader->e_lfanew); + + /* Verify the PE Signature */ + if (NtHeaders->Signature != IMAGE_NT_SIGNATURE) + { + /* Fail */ + DPRINT1("PE signature missing\n"); + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Now return success and the NT header */ + *OutHeaders = NtHeaders; + return STATUS_SUCCESS; +} + +/* + * @implemented + */ PIMAGE_NT_HEADERS NTAPI -RtlImageNtHeader(IN PVOID BaseAddress) +RtlImageNtHeader(IN PVOID Base) { PIMAGE_NT_HEADERS NtHeader; - PIMAGE_DOS_HEADER DosHeader = (PIMAGE_DOS_HEADER)BaseAddress; - - if (DosHeader && SWAPW(DosHeader->e_magic) != IMAGE_DOS_SIGNATURE) - { - DPRINT1("DosHeader->e_magic %x\n", SWAPW(DosHeader->e_magic)); - DPRINT1("NtHeader 0x%lx\n", ((ULONG_PTR)BaseAddress + SWAPD(DosHeader->e_lfanew))); - } - else - { - NtHeader = (PIMAGE_NT_HEADERS)((ULONG_PTR)BaseAddress + SWAPD(DosHeader->e_lfanew)); - if (SWAPD(NtHeader->Signature) == IMAGE_NT_SIGNATURE) - return NtHeader; - } - - return NULL; -} - + + /* Call the new API */ + RtlImageNtHeaderEx(RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK, + Base, + 0, + &NtHeader); + return NtHeader; +} /* * @implemented

13 years, 5 months

[rharabien] 52617: - Add more NT status messages. Few of them are used by new LDR. Contains patch by Thomas Faber.

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Jul 10 19:47:45 2011 New Revision: 52617 URL: http://svn.reactos.org/svn/reactos?rev=52617&view=rev Log: - Add more NT status messages. Few of them are used by new LDR. Contains patch by Thomas Faber. Modified: trunk/reactos/include/reactos/mc/ntstatus.mc Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Sun Jul 10 19:47:45 2011 @@ -412,6 +412,26 @@ The recovery was successful. . +MessageId=0xa +Severity=Informational +Facility=System +SymbolicName=STATUS_FT_READ_RECOVERY_FROM_BACKUP +Language=English +{Redundant Read} +To satisfy a read request, the Windows NT fault-tolerant file system successfully read the requested data from a redundant copy. +This was done because the file system encountered a failure on a member of the fault-tolerant volume but was unable to reassign the failing area of the device. + +. +MessageId=0xb +Severity=Informational +Facility=System +SymbolicName=STATUS_FT_WRITE_RECOVERY +Language=English +{Redundant Write} +To satisfy a write request, the Windows NT fault-tolerant file system successfully wrote a redundant copy of the information. +This was done because the file system encountered a failure on a member of the fault-tolerant volume but was unable to reassign the failing area of the device. + +. MessageId=0xc Severity=Informational Facility=System @@ -420,6 +440,33 @@ {Serial IOCTL Timeout} A serial I/O operation completed because the time-out period expired. (The IOCTL_SERIAL_XOFF_COUNTER had not reached zero.) + +. +MessageId=0xd +Severity=Informational +Facility=System +SymbolicName=STATUS_NULL_LM_PASSWORD +Language=English +{Password Too Complex} +The Windows password is too complex to be converted to a LAN Manager password. The LAN Manager password that returned is a NULL string. + +. +MessageId=0xe +Severity=Informational +Facility=System +SymbolicName=STATUS_IMAGE_MACHINE_TYPE_MISMATCH +Language=English +{Machine Type Mismatch} +The image file %hs is valid, but is for a machine type other than the current machine. + +. +MessageId=0xf +Severity=Informational +Facility=System +SymbolicName=STATUS_RECEIVE_PARTIAL +Language=English +{Partial Data Received} +The network transport returned partial data to its client. The remaining data will be sent later. . MessageId=0x10 @@ -1714,6 +1761,24 @@ SymbolicName=STATUS_INVALID_SECURITY_DESCR Language=English Indicates the SECURITY_DESCRIPTOR structure is not valid. + +. +MessageId=0x7a +Severity=Error +Facility=System +SymbolicName=STATUS_PROCEDURE_NOT_FOUND +Language=English +Indicates the specified procedure address cannot be found in the DLL. + +. +MessageId=0x7b +Severity=Error +Facility=System +SymbolicName=STATUS_INVALID_IMAGE_FORMAT +Language=English +{Bad Image} +%hs is either not designed for ReactOS or it contains an error. +Try reinstalling the application using the original installation media or contact the software vendor for support. . MessageId=0x7c

13 years, 5 months

[jgardou] 52616: [NTOSKRNL/MM] - The initial region does not necessarily begins with the asked address, calculate remaining space acccordingly.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Jul 10 19:24:49 2011 New Revision: 52616 URL: http://svn.reactos.org/svn/reactos?rev=52616&view=rev Log: [NTOSKRNL/MM] - The initial region does not necessarily begins with the asked address, calculate remaining space acccordingly. Modified: trunk/reactos/ntoskrnl/mm/region.c Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Sun Jul 10 19:24:49 2011 @@ -135,16 +135,20 @@ { return(STATUS_NO_MEMORY); } + if(NewRegion->Length < Length) + RemainingLength = Length - NewRegion->Length; + else + RemainingLength = 0; } else { NewRegion = InitialRegion; - } - - if(NewRegion->Length < Length) - RemainingLength = Length - NewRegion->Length; - else - RemainingLength = 0; + if(((ULONG_PTR)InitialBaseAddress + NewRegion->Length) < + ((ULONG_PTR)StartAddress + Length)) + RemainingLength = ((ULONG_PTR)StartAddress + Length) - ((ULONG_PTR)InitialBaseAddress + NewRegion->Length); + else + RemainingLength = 0; + } /* * Free any complete regions that are containing in the range of addresses

13 years, 5 months

[cgutman] 52615: [RTL] - Revert r52612 - It came before its time ; )

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jul 10 17:46:27 2011 New Revision: 52615 URL: http://svn.reactos.org/svn/reactos?rev=52615&view=rev Log: [RTL] - Revert r52612 - It came before its time ;) Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=52615… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Jul 10 17:46:27 2011 @@ -2763,12 +2763,13 @@ RtlActivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, IN PVOID Context) { +#if NEW_NTDLL_LOADER RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame; /* Get the curren active frame */ ActiveFrame = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; - DPRINT("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); + DPRINT1("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); /* Actually activate it */ Frame->Frame.Previous = ActiveFrame; @@ -2800,6 +2801,18 @@ /* Return pointer to the activation frame */ return &Frame->Frame; +#else + + RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame = &Frame->Frame; + + frame->Previous = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; + frame->ActivationContext = Context; + frame->Flags = 0; + + NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame; + + return STATUS_SUCCESS; +#endif } PRTL_ACTIVATION_CONTEXT_STACK_FRAME

13 years, 5 months

[jgardou] 52614: [NTOSKRNL/MM] - fix broken logic - simplify calculation of remainig space to alter - call ExFreePoolWithTag instead of ExFreePool - return error on failure

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Jul 10 17:21:38 2011 New Revision: 52614 URL: http://svn.reactos.org/svn/reactos?rev=52614&view=rev Log: [NTOSKRNL/MM] - fix broken logic - simplify calculation of remainig space to alter - call ExFreePoolWithTag instead of ExFreePool - return error on failure Modified: trunk/reactos/ntoskrnl/mm/region.c Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Sun Jul 10 17:21:38 2011 @@ -53,7 +53,7 @@ TAG_MM_REGION); if (NewRegion1 == NULL) { - ExFreePool(NewRegion2); + ExFreePoolWithTag(NewRegion2, TAG_MM_REGION); return(NULL); } NewRegion1->Type = NewType; @@ -86,14 +86,14 @@ } else { - ExFreePool(NewRegion2); + ExFreePoolWithTag(NewRegion2, TAG_MM_REGION); } /* Either remove or shrink the initial region. */ if (InitialBaseAddress == StartAddress) { RemoveEntryList(&InitialRegion->RegionListEntry); - ExFreePool(InitialRegion); + ExFreePoolWithTag(InitialRegion, TAG_MM_REGION); } else { @@ -123,17 +123,6 @@ */ InitialRegion = MmFindRegion(BaseAddress, RegionListHead, StartAddress, &InitialBaseAddress); - if (((char*)StartAddress + Length) > - ((char*)InitialBaseAddress + InitialRegion->Length)) - { - RemainingLength = ((char*)StartAddress + Length) - - ((char*)InitialBaseAddress + InitialRegion->Length); - } - else - { - RemainingLength = 0; - } - /* * If necessary then split the region into the affected and unaffected parts. */ @@ -151,6 +140,11 @@ { NewRegion = InitialRegion; } + + if(NewRegion->Length < Length) + RemainingLength = Length - NewRegion->Length; + else + RemainingLength = 0; /* * Free any complete regions that are containing in the range of addresses @@ -163,7 +157,7 @@ while (RemainingLength > 0 && CurrentRegion->Length <= RemainingLength && CurrentEntry != RegionListHead) { - if (CurrentRegion->Type != NewType && + if (CurrentRegion->Type != NewType || CurrentRegion->Protect != NewProtect) { AlterFunc(AddressSpace, CurrentBaseAddress, CurrentRegion->Length, @@ -176,7 +170,7 @@ RemainingLength -= CurrentRegion->Length; CurrentEntry = CurrentEntry->Flink; RemoveEntryList(&CurrentRegion->RegionListEntry); - ExFreePool(CurrentRegion); + ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION); CurrentRegion = CONTAINING_RECORD(CurrentEntry, MM_REGION, RegionListEntry); } @@ -188,10 +182,10 @@ { CurrentRegion = CONTAINING_RECORD(CurrentEntry, MM_REGION, RegionListEntry); - if (CurrentRegion->Type != NewType && + if (CurrentRegion->Type != NewType || CurrentRegion->Protect != NewProtect) { - AlterFunc(AddressSpace, CurrentBaseAddress, CurrentRegion->Length, + AlterFunc(AddressSpace, CurrentBaseAddress, RemainingLength, CurrentRegion->Type, CurrentRegion->Protect, NewType, NewProtect); } @@ -212,7 +206,7 @@ { NewRegion->Length += CurrentRegion->Length; RemoveEntryList(&CurrentRegion->RegionListEntry); - ExFreePool(CurrentRegion); + ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION); } } @@ -229,9 +223,12 @@ { NewRegion->Length += CurrentRegion->Length; RemoveEntryList(&CurrentRegion->RegionListEntry); - ExFreePool(CurrentRegion); - } - } + ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION); + } + } + + if(NewRegion->Length < Length) + return(STATUS_NO_MEMORY); return(STATUS_SUCCESS); }

13 years, 5 months

← Newer
1
...
37
38
39
40
41
42
43
...
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