Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 52629: [CMAKE] Fix my mistake returning the original space, rather than the mapped area.
by arty＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: arty Date: Mon Jul 11 07:11:12 2011 New Revision: 52629 URL: http://svn.reactos.org/svn/reactos?rev=52629&view=rev Log: [CMAKE] Fix my mistake returning the original space, rather than the mapped area. 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] Mon Jul 11 07:11:12 2011 @@ -678,7 +678,7 @@ NtFreeVirtualMemory(CURRENT_PROCESS, &Base, &RegionSize, MEM_RELEASE); return NULL; } - return &Hdr[1]; + return &MappedHdr[1]; } }

1 0

[tkreuzer] 52628: [NTOSKRNL] Implement the "SLIST hack". It checks whether the access to the Next member of the first list item of an iSList caused the exception, this can happen, when a concurrent...
by tkreuzer＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: tkreuzer Date: Mon Jul 11 03:36:29 2011 New Revision: 52628 URL: http://svn.reactos.org/svn/reactos?rev=52628&view=rev Log: [NTOSKRNL] Implement the "SLIST hack". It checks whether the access to the Next member of the first list item of an iSList caused the exception, this can happen, when a concurrent thread pops the first entry and frees its memory between the point where the address of the entry is loaded and the access to it. This is done before the call to MmAccessFault to handle the theoretical scenario of a guard page exception being triggered by the fault, which we don't want to be handled. Currently only kernel mode is handled. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jul 11 03:36:29 2011 @@ -457,6 +457,7 @@ extern VOID __cdecl KiTrap13(VOID); extern VOID __cdecl KiFastCallEntry(VOID); extern VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); +extern VOID NTAPI ExpInterlockedPopEntrySListResume(VOID); extern VOID __cdecl CopyParams(VOID); extern VOID __cdecl ReadBatch(VOID); extern VOID __cdecl FrRestore(VOID); Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Jul 11 03:36:29 2011 @@ -1199,20 +1199,41 @@ #endif } + /* Check for S-LIST fault in kernel mode */ + if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) + { + PSLIST_HEADER SListHeader; + + /* Sanity check that the assembly is correct: + This must be mov ebx, [eax] + Followed by cmpxchg8b [ebp] */ + ASSERT((((UCHAR*)TrapFrame->Eip)[0] == 0x8B) && + (((UCHAR*)TrapFrame->Eip)[1] == 0x18) && + (((UCHAR*)TrapFrame->Eip)[2] == 0x0F) && + (((UCHAR*)TrapFrame->Eip)[3] == 0xC7) && + (((UCHAR*)TrapFrame->Eip)[4] == 0x4D) && + (((UCHAR*)TrapFrame->Eip)[5] == 0x00)); + + /* Get the pointer to the SLIST_HEADER */ + SListHeader = (PSLIST_HEADER)TrapFrame->Ebp; + + /* Check if the Next member of the SLIST_HEADER was changed */ + if (SListHeader->Next.Next != (PSLIST_ENTRY)TrapFrame->Eax) + { + /* Restart the operation */ + TrapFrame->Eip = (ULONG_PTR)ExpInterlockedPopEntrySListResume; + + /* Continue execution */ + KiEoiHelper(TrapFrame); + } + } + /* Call the access fault handler */ Status = MmAccessFault(TrapFrame->ErrCode & 1, (PVOID)Cr2, TrapFrame->SegCs & MODE_MASK, TrapFrame); if (NT_SUCCESS(Status)) KiEoiHelper(TrapFrame); - - /* Check for S-LIST fault */ - if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) - { - /* Not yet implemented */ - UNIMPLEMENTED; - while (TRUE); - } /* Check for syscall fault */ #if 0

1 0

[cgutman] 52627: [OSKITTCP] - Fix a crash that occurs during BitTorrent downloads - The official BitTorrent client works now
by cgutman＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: cgutman Date: Mon Jul 11 02:44:32 2011 New Revision: 52627 URL: http://svn.reactos.org/svn/reactos?rev=52627&view=rev Log: [OSKITTCP] - Fix a crash that occurs during BitTorrent downloads - The official BitTorrent client works now Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Mon Jul 11 02:44:32 2011 @@ -550,6 +550,12 @@ OSKLock(); inp = (struct inpcb *)so->so_pcb; + if (!inp) + { + OSKUnlock(); + return OSK_ESHUTDOWN; + } + inp->inp_laddr.s_addr = LocalAddress; inp->inp_lport = LocalPort; inp->inp_faddr.s_addr = RemoteAddress; @@ -572,6 +578,12 @@ OSKLock(); inp = (struct inpcb *)so->so_pcb; + if (!inp) + { + OSKUnlock(); + return OSK_ESHUTDOWN; + } + *LocalAddress = inp->inp_laddr.s_addr; *LocalPort = inp->inp_lport; *RemoteAddress = inp->inp_faddr.s_addr;

1 0

[ion] 52626: [NTDLL]: Always compile your code before comitting, like my cat used to say.
by ion＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: ion Date: Mon Jul 11 01:22:01 2011 New Revision: 52626 URL: http://svn.reactos.org/svn/reactos?rev=52626&view=rev Log: [NTDLL]: Always compile your code before comitting, like my cat used to say. 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=52626&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 01:22:01 2011 @@ -167,7 +167,7 @@ RtlGetCurrentDirectory_U(IN ULONG MaximumLength, IN PWSTR Buffer) { - ULONG Length; + ULONG Length, Bytes; PCURDIR CurDir; PWSTR CurDirName; DPRINT("RtlGetCurrentDirectory %lu %p\n", MaximumLength, Buffer); @@ -183,7 +183,7 @@ /* Check for x:\ vs x:\path\foo (note the trailing slash) */ Bytes = Length * sizeof(WCHAR); - if ((Length <= 1) || (CurDirName[Length - 2] == ":")) + if ((Length <= 1) || (CurDirName[Length - 2] == L':')) { /* Check if caller does not have enough space */ if (MaximumLength <= Bytes) @@ -211,7 +211,7 @@ ASSERT(Buffer[Length - 1] == L'\\'); /* Again check for our two cases (drive root vs path) */ - if ((Length <= 1) || (Buffer[Length - 2] != ":")) + if ((Length <= 1) || (Buffer[Length - 2] != L':')) { /* Replace the trailing slash with a null */ Buffer[Length - 1] = UNICODE_NULL;

1 0

[ion] 52625: [NTDLL]: Reimplement RtlGetCurrentDirectory_U... I couldn't even understand what the old version was doing. This one is at least commented and makes more sense.
by ion＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: ion Date: Mon Jul 11 01:13:34 2011 New Revision: 52625 URL: http://svn.reactos.org/svn/reactos?rev=52625&view=rev Log: [NTDLL]: Reimplement RtlGetCurrentDirectory_U... I couldn't even understand what the old version was doing. This one is at least commented and makes more sense. 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=52625&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 01:13:34 2011 @@ -159,49 +159,75 @@ return 0; } - /* * @implemented */ -ULONG NTAPI -RtlGetCurrentDirectory_U(ULONG MaximumLength, - PWSTR Buffer) -{ - ULONG Length; - PCURDIR cd; - - DPRINT ("RtlGetCurrentDirectory %lu %p\n", MaximumLength, Buffer); - - RtlAcquirePebLock(); - - cd = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); - Length = cd->DosPath.Length / sizeof(WCHAR); - if (cd->DosPath.Buffer[Length - 1] == L'\\' && - cd->DosPath.Buffer[Length - 2] != L':') - Length--; - - DPRINT ("cd->DosPath.Buffer %S Length %lu\n", - cd->DosPath.Buffer, Length); - - if (MaximumLength / sizeof(WCHAR) > Length) - { - memcpy (Buffer, - cd->DosPath.Buffer, - Length * sizeof(WCHAR)); - Buffer[Length] = 0; - } - else - { - Length++; - } - - RtlReleasePebLock (); - - DPRINT ("CurrentDirectory %S\n", Buffer); - - return (Length * sizeof(WCHAR)); -} - +ULONG +NTAPI +RtlGetCurrentDirectory_U(IN ULONG MaximumLength, + IN PWSTR Buffer) +{ + ULONG Length; + PCURDIR CurDir; + PWSTR CurDirName; + DPRINT("RtlGetCurrentDirectory %lu %p\n", MaximumLength, Buffer); + + /* Lock the PEB to get the current directory */ + RtlAcquirePebLock(); + CurDir = &NtCurrentPeb()->ProcessParameters->CurrentDirectory; + + /* Get the buffer and character length */ + CurDirName = CurDir->DosPath.Buffer; + Length = CurDir->DosPath.Length / sizeof(WCHAR); + ASSERT((CurDirName != NULL) && (Length > 0)); + + /* Check for x:\ vs x:\path\foo (note the trailing slash) */ + Bytes = Length * sizeof(WCHAR); + if ((Length <= 1) || (CurDirName[Length - 2] == ":")) + { + /* Check if caller does not have enough space */ + if (MaximumLength <= Bytes) + { + /* Call has no space for it, fail, add the trailing slash */ + RtlReleasePebLock(); + return Bytes + sizeof(L'\\'); + } + } + else + { + /* Check if caller does not have enough space */ + if (MaximumLength <= Bytes) + { + /* Call has no space for it, fail */ + RtlReleasePebLock(); + return Bytes; + } + } + + /* Copy the buffer since we seem to have space */ + RtlCopyMemory(Buffer, CurDirName, Bytes); + + /* The buffer should end with a path separator */ + ASSERT(Buffer[Length - 1] == L'\\'); + + /* Again check for our two cases (drive root vs path) */ + if ((Length <= 1) || (Buffer[Length - 2] != ":")) + { + /* Replace the trailing slash with a null */ + Buffer[Length - 1] = UNICODE_NULL; + --Length; + } + else + { + /* Append the null char since there's no trailing slash */ + Buffer[Length] = UNICODE_NULL; + } + + /* Release PEB lock */ + RtlReleasePebLock(); + DPRINT("CurrentDirectory %S\n", Buffer); + return Length * sizeof(WCHAR); +} /* * @implemented

1 0

[ion] 52624: [RTL]: RtlDetermineDosPathNameType_U Path is not optional. Checked build ASSERTs if not present. Also, \\? is valid, not only \\., so this should fix a bunch of incorrect path determin...
by ion＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: ion Date: Mon Jul 11 00:47:44 2011 New Revision: 52624 URL: http://svn.reactos.org/svn/reactos?rev=52624&view=rev Log: [RTL]: RtlDetermineDosPathNameType_U Path is not optional. Checked build ASSERTs if not present. Also, \\? is valid, not only \\., so this should fix a bunch of incorrect path determinations. Aren't there supposed to be unit tests for these things?! 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=52624&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 11 00:47:44 2011 @@ -66,32 +66,29 @@ * @implemented * */ -ULONG NTAPI -RtlDetermineDosPathNameType_U(PCWSTR Path) -{ - DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); - - if (Path == NULL) - { - return RtlPathTypeUnknown; - } - - if (IS_PATH_SEPARATOR(Path[0])) - { - if (!IS_PATH_SEPARATOR(Path[1])) return RtlPathTypeRooted; /* \xxx */ - if (Path[2] != L'.') return RtlPathTypeUncAbsolute; /* \\xxx */ - if (IS_PATH_SEPARATOR(Path[3])) return RtlPathTypeLocalDevice; /* \\.\xxx */ - if (Path[3]) return RtlPathTypeUncAbsolute; /* \\.xxxx */ - - return RtlPathTypeRootLocalDevice; /* \\. */ - } - else - { - if (!Path[0] || Path[1] != L':') return RtlPathTypeRelative; /* xxx */ - if (IS_PATH_SEPARATOR(Path[2])) return RtlPathTypeDriveAbsolute; /* x:\xxx */ - - return RtlPathTypeDriveRelative; /* x:xxx */ - } +ULONG +NTAPI +RtlDetermineDosPathNameType_U(IN PCWSTR Path) +{ + DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); + ASSERT(Path != NULL); + + if (IS_PATH_SEPARATOR(Path[0])) + { + if (!IS_PATH_SEPARATOR(Path[1])) return RtlPathTypeRooted; /* \xxx */ + if ((Path[2] != L'.') && (Path[2] != L'?')) return RtlPathTypeUncAbsolute;/* \\xxx */ + if (IS_PATH_SEPARATOR(Path[3])) return RtlPathTypeLocalDevice; /* \\.\xxx */ + if (Path[3]) return RtlPathTypeUncAbsolute; /* \\.xxxx */ + + return RtlPathTypeRootLocalDevice; /* \\. */ + } + else + { + if (!(Path[0]) || (Path[1] != L':')) return RtlPathTypeRelative; /* xxx */ + if (IS_PATH_SEPARATOR(Path[2])) return RtlPathTypeDriveAbsolute; /* x:\xxx */ + + return RtlPathTypeDriveRelative; /* x:xxx */ + } }

1 0

[ion] 52623: [RTL]: Clarify what RtlGetLongestNtPathLength returns instead of using "+9" as a magic constant.
by ion＠svn.reactos.org 11 Jul '11

11 Jul '11

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)); }

1 0

[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 11 Jul '11

11 Jul '11

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 */

1 0

[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 11 Jul '11

11 Jul '11

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; }

1 0

[ion] 52620: [RTL]: One day, Microsoft is going to stop using flags that are negatives. Fix boot/etc.
by ion＠svn.reactos.org 11 Jul '11

11 Jul '11

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)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs