Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

10 Jul '11

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

1 0

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

10 Jul '11

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

1 0

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

10 Jul '11

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

1 0

[jgardou] 52616: [NTOSKRNL/MM] - The initial region does not necessarily begins with the asked address, calculate remaining space acccordingly.
by jgardou＠svn.reactos.org 10 Jul '11

10 Jul '11

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

1 0

[cgutman] 52615: [RTL] - Revert r52612 - It came before its time ; )
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

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

1 0

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

10 Jul '11

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

1 0

[tkreuzer] 52613: [NTDLL] add some stubs for amd64
by tkreuzer＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: tkreuzer Date: Sun Jul 10 16:43:03 2011 New Revision: 52613 URL: http://svn.reactos.org/svn/reactos?rev=52613&view=rev Log: [NTDLL] add some stubs for amd64 Modified: trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c Modified: trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/amd64/s… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] Sun Jul 10 16:43:03 2011 @@ -41,3 +41,27 @@ UNIMPLEMENTED; return; } + +VOID +NTAPI +KiRaiseUserExceptionDispatcher() +{ + UNIMPLEMENTED; + return; +} + +VOID +NTAPI +KiUserCallbackDispatcher() +{ + UNIMPLEMENTED; + return; +} + +VOID +NTAPI +KiUserExceptionDispatcher() +{ + UNIMPLEMENTED; + return; +}

1 0

[cgutman] 52612: [RTL] - Enable the proper implementation of RtlActivateActivationContextUnsafeFast
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 16:33:23 2011 New Revision: 52612 URL: http://svn.reactos.org/svn/reactos?rev=52612&view=rev Log: [RTL] - Enable the proper implementation of RtlActivateActivationContextUnsafeFast 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=52612… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Jul 10 16:33:23 2011 @@ -2763,13 +2763,12 @@ 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; - DPRINT1("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); + DPRINT("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); /* Actually activate it */ Frame->Frame.Previous = ActiveFrame; @@ -2801,18 +2800,6 @@ /* 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

1 0

[cgutman] 52611: [NTDLL] - Fix memory corruption by reverting part of r52603
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 16:25:42 2011 New Revision: 52611 URL: http://svn.reactos.org/svn/reactos?rev=52611&view=rev Log: [NTDLL] - Fix memory corruption by reverting part of r52603 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] Sun Jul 10 16:25:42 2011 @@ -1292,7 +1292,7 @@ /* Set up the Act Ctx */ ActCtx.Size = sizeof(ActCtx); ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; - RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); + RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); /* Activate the ActCtx */ RtlActivateActivationContextUnsafeFast(&ActCtx, @@ -1416,7 +1416,7 @@ /* Set up the Act Ctx */ ActCtx.Size = sizeof(ActCtx); ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; - RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); + RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); /* Activate the ActCtx */ RtlActivateActivationContextUnsafeFast(&ActCtx,

1 0

[rharabien] 52610: [EVENTLOG] - Fix MSVC warnings
by rharabien＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: rharabien Date: Sun Jul 10 15:39:32 2011 New Revision: 52610 URL: http://svn.reactos.org/svn/reactos?rev=52610&view=rev Log: [EVENTLOG] - Fix MSVC warnings Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/file.c trunk/reactos/include/reactos/idl/eventlogrpc.idl Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sun Jul 10 15:39:32 2011 @@ -463,7 +463,7 @@ SystemTimeToFileTime(pSystemTime, &Time.ft); SystemTimeToFileTime(&st1970, &u1970.ft); - *pEventTime = (Time.ll - u1970.ll) / 10000000; + *pEventTime = (DWORD)((Time.ll - u1970.ll) / 10000000ull); } VOID PRINT_HEADER(PEVENTLOGHEADER header) Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Jul 10 15:39:32 2011 @@ -896,17 +896,17 @@ BOOL LogfDeleteOffsetInformation(PLOGFILE LogFile, ULONG ulNumber) { - int i; + DWORD i; if (ulNumber != LogFile->OffsetInfo[0].EventNumber) { return FALSE; } - for (i=0;i<LogFile->OffsetInfoNext-1; i++) - { - LogFile->OffsetInfo[i].EventNumber = LogFile->OffsetInfo[i+1].EventNumber; - LogFile->OffsetInfo[i].EventOffset = LogFile->OffsetInfo[i+1].EventOffset; + for (i = 0; i < LogFile->OffsetInfoNext - 1; i++) + { + LogFile->OffsetInfo[i].EventNumber = LogFile->OffsetInfo[i + 1].EventNumber; + LogFile->OffsetInfo[i].EventOffset = LogFile->OffsetInfo[i + 1].EventOffset; } LogFile->OffsetInfoNext--; return TRUE; @@ -1102,4 +1102,4 @@ } LogfFreeRecord(logBuffer); -} +} Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun Jul 10 15:39:32 2011 @@ -190,24 +190,15 @@ /* Function 19 */ NTSTATUS ElfrRegisterClusterSvc( -#ifndef __midl - [in] handle_t BindingHandle -#endif - ); /* FIXME */ + [in] handle_t BindingHandle); /* Function 20 */ NTSTATUS ElfrDeregisterClusterSvc( -#ifndef __midl - [in] handle_t BindingHandle -#endif - ); /* FIXME */ + [in] handle_t BindingHandle); /* Function 21 */ NTSTATUS ElfrWriteClusterEvents( -#ifndef __midl - [in] handle_t BindingHandle -#endif - ); /* FIXME */ + [in] handle_t BindingHandle); /* Function 22 */ NTSTATUS ElfrGetLogInformation(

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