Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 38360: - Fix broken behavior of IoBuildPartialMdl, which instead of copying 4 flags from a source mdl to a target one was always setting all of them, thus often making resultant mdl unusable.
by fireball＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: fireball Date: Fri Dec 26 14:34:40 2008 New Revision: 38360 URL: http://svn.reactos.org/svn/reactos?rev=38360&view=rev Log: - Fix broken behavior of IoBuildPartialMdl, which instead of copying 4 flags from a source mdl to a target one was always setting all of them, thus often making resultant mdl unusable. Modified: trunk/reactos/ntoskrnl/io/iomgr/iomdl.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomdl.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomdl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomdl.c [iso-8859-1] Fri Dec 26 14:34:40 2008 @@ -98,6 +98,10 @@ PPFN_NUMBER TargetPages = (PPFN_NUMBER)(TargetMdl + 1); PPFN_NUMBER SourcePages = (PPFN_NUMBER)(SourceMdl + 1); ULONG Offset; + ULONG FlagsMask = (MDL_IO_PAGE_READ | + MDL_SOURCE_IS_NONPAGED_POOL | + MDL_MAPPED_TO_SYSTEM_VA | + MDL_IO_SPACE); /* Calculate the offset */ Offset = (ULONG)((ULONG_PTR)VirtualAddress - @@ -118,10 +122,7 @@ /* Set the MDL Flags */ TargetMdl->MdlFlags = (MDL_ALLOCATED_FIXED_SIZE | MDL_ALLOCATED_MUST_SUCCEED); - TargetMdl->MdlFlags |= (MDL_IO_PAGE_READ | - MDL_SOURCE_IS_NONPAGED_POOL | - MDL_MAPPED_TO_SYSTEM_VA | - MDL_IO_SPACE); + TargetMdl->MdlFlags |= SourceMdl->MdlFlags & FlagsMask; TargetMdl->MdlFlags |= MDL_PARTIAL; /* Set the mapped VA */

1 0

[fireball] 38359: - Don't try to set remaining bits if there are none. Fixes memory corruption. Patch sent to Wine: http://www.winehq.org/pipermail/wine-patches/2008-December/066716.html
by fireball＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: fireball Date: Fri Dec 26 14:21:52 2008 New Revision: 38359 URL: http://svn.reactos.org/svn/reactos?rev=38359&view=rev Log: - Don't try to set remaining bits if there are none. Fixes memory corruption. Patch sent to Wine: http://www.winehq.org/pipermail/wine-patches/2008-December/066716.html Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=38359… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Fri Dec 26 14:21:52 2008 @@ -851,7 +851,8 @@ } /* Set remaining bits, if any */ - *lpOut |= NTDLL_maskBits[NumberToSet & 0x7]; + if (NumberToSet & 0x7) + *lpOut |= NTDLL_maskBits[NumberToSet & 0x7]; }

1 0

[cgutman] 38358: - Don't free memory allocated with ExAllocateFromNPagedLookasideList by using ExFreePool
by cgutman＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: cgutman Date: Fri Dec 26 12:18:04 2008 New Revision: 38358 URL: http://svn.reactos.org/svn/reactos?rev=38358&view=rev Log: - Don't free memory allocated with ExAllocateFromNPagedLookasideList by using ExFreePool Modified: branches/aicom-network-fixes/lib/drivers/ip/network/receive.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/receive.c [iso-8859-1] Fri Dec 26 12:18:04 2008 @@ -250,8 +250,7 @@ __inline VOID Cleanup( PKSPIN_LOCK Lock, KIRQL OldIrql, - PIPDATAGRAM_REASSEMBLY IPDR, - PVOID Buffer OPTIONAL) + PIPDATAGRAM_REASSEMBLY IPDR) /* * FUNCTION: Performs cleaning operations on errors * ARGUMENTS: @@ -266,8 +265,6 @@ TcpipReleaseSpinLock(Lock, OldIrql); RemoveIPDR(IPDR); FreeIPDR(IPDR); - if (Buffer) - exFreePool(Buffer); } @@ -375,7 +372,8 @@ NewHole = CreateHoleDescriptor(Hole->First, FragLast - 1); if (!NewHole) { /* We don't have the resources to process this packet, discard it */ - Cleanup(&IPDR->Lock, OldIrql, IPDR, Hole); + exFreeToNPagedLookasideList(&IPHoleList, Hole); + Cleanup(&IPDR->Lock, OldIrql, IPDR); return; } @@ -385,9 +383,9 @@ if ((FragLast < Hole->Last) && (MoreFragments)) { /* We can reuse the descriptor for the new hole */ - Hole->First = FragLast + 1; - - /* Put the new hole descriptor in the list */ + Hole->First = FragLast + 1; + + /* Put the new hole descriptor in the list */ InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry); } else exFreeToNPagedLookasideList(&IPHoleList, Hole); @@ -407,7 +405,7 @@ Fragment = exAllocateFromNPagedLookasideList(&IPFragmentList); if (!Fragment) { /* We don't have the resources to process this packet, discard it */ - Cleanup(&IPDR->Lock, OldIrql, IPDR, NULL); + Cleanup(&IPDR->Lock, OldIrql, IPDR); return; } @@ -417,7 +415,8 @@ Fragment->Data = exAllocatePool(NonPagedPool, Fragment->Size); if (!Fragment->Data) { /* We don't have the resources to process this packet, discard it */ - Cleanup(&IPDR->Lock, OldIrql, IPDR, Fragment); + exFreeToNPagedLookasideList(&IPFragmentList, Fragment); + Cleanup(&IPDR->Lock, OldIrql, IPDR); return; }

1 0

[fireball] 38357: - Leftover, fixes build.
by fireball＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: fireball Date: Fri Dec 26 10:27:44 2008 New Revision: 38357 URL: http://svn.reactos.org/svn/reactos?rev=38357&view=rev Log: - Leftover, fixes build. Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Fri Dec 26 10:27:44 2008 @@ -51,7 +51,6 @@ extern std::string sBadSep; extern char cSep; extern char cBadSep; -extern const Path defaultPath; #ifdef WIN32 #define DEF_EXEPREFIX ""

1 0

[sserapion] 38356: Correct SYSTEM_PROCESS_INFORMATION
by sserapion＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: sserapion Date: Fri Dec 26 10:18:50 2008 New Revision: 38356 URL: http://svn.reactos.org/svn/reactos?rev=38356&view=rev Log: Correct SYSTEM_PROCESS_INFORMATION Modified: branches/ros-amd64-bringup/reactos/include/ndk/extypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/extypes.h [iso-8859-1] Fri Dec 26 10:18:50 2008 @@ -861,8 +861,8 @@ // NOTE: *NOT* THE SAME AS VM_COUNTERS! // SIZE_T PeakVirtualSize; - ULONG VirtualSize; - SIZE_T PageFaultCount; + SIZE_T VirtualSize; + ULONG PageFaultCount; SIZE_T PeakWorkingSetSize; SIZE_T WorkingSetSize; SIZE_T QuotaPeakPagedPoolUsage;

1 0

[mjmartin] 38355: - Add missing assignments to CallingProcess variable. Part 1 of ? fixes for bug 2286.
by mjmartin＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: mjmartin Date: Fri Dec 26 09:24:54 2008 New Revision: 38355 URL: http://svn.reactos.org/svn/reactos?rev=38355&view=rev Log: - Add missing assignments to CallingProcess variable. Part 1 of ? fixes for bug 2286. Modified: trunk/reactos/drivers/video/videoprt/int10.c Modified: trunk/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] Fri Dec 26 09:24:54 2008 @@ -34,7 +34,7 @@ { PVOID MemoryAddress; NTSTATUS Status; - PKPROCESS CallingProcess; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; TRACE_(VIDEOPRT, "IntInt10AllocateBuffer\n"); @@ -81,7 +81,7 @@ { PVOID MemoryAddress = (PVOID)((Seg << 4) | Off); NTSTATUS Status; - PKPROCESS CallingProcess; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; TRACE_(VIDEOPRT, "IntInt10FreeBuffer\n"); @@ -104,7 +104,7 @@ OUT PVOID Buffer, IN ULONG Length) { - PKPROCESS CallingProcess; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; TRACE_(VIDEOPRT, "IntInt10ReadMemory\n"); @@ -128,7 +128,7 @@ IN PVOID Buffer, IN ULONG Length) { - PKPROCESS CallingProcess; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; TRACE_(VIDEOPRT, "IntInt10WriteMemory\n"); @@ -152,7 +152,7 @@ { CONTEXT BiosContext; NTSTATUS Status; - PKPROCESS CallingProcess; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; /* Attach to CSRSS */ @@ -204,7 +204,7 @@ { KV86M_REGISTERS Regs; NTSTATUS Status; - PKPROCESS CallingProcess; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); KAPC_STATE ApcState; TRACE_(VIDEOPRT, "VideoPortInt10\n");

1 0

[dgorbachev] 38354: [FORMATTING] Fix indentation.
by dgorbachev＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: dgorbachev Date: Fri Dec 26 07:50:35 2008 New Revision: 38354 URL: http://svn.reactos.org/svn/reactos?rev=38354&view=rev Log: [FORMATTING] Fix indentation. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Fri Dec 26 07:50:35 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ntdll/ldr/startup.c + * FILE: dll/ntdll/ldr/startup.c * PURPOSE: Process startup for PE executables * PROGRAMMERS: Jean Michault * Rex Jolliff (rex(a)lvcablemodem.com) @@ -14,52 +14,56 @@ #include <debug.h> #include <win32k/callback.h> -VOID RtlInitializeHeapManager (VOID); +VOID RtlInitializeHeapManager(VOID); VOID LdrpInitLoader(VOID); VOID NTAPI RtlpInitDeferedCriticalSection(VOID); +NTSTATUS LdrpAttachThread(VOID); +VOID RtlpInitializeVectoredExceptionHandling(VOID); /* GLOBALS *******************************************************************/ - +PLDR_DATA_TABLE_ENTRY ExeModule; static RTL_CRITICAL_SECTION PebLock; static RTL_CRITICAL_SECTION LoaderLock; static RTL_BITMAP TlsBitMap; static RTL_BITMAP TlsExpansionBitMap; -PLDR_DATA_TABLE_ENTRY ExeModule; - -NTSTATUS LdrpAttachThread (VOID); - -VOID RtlpInitializeVectoredExceptionHandling(VOID); - #define VALUE_BUFFER_SIZE 256 -BOOLEAN FASTCALL -ReadCompatibilitySetting(HANDLE Key, LPWSTR Value, PKEY_VALUE_PARTIAL_INFORMATION ValueInfo, DWORD *Buffer) +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +FASTCALL +ReadCompatibilitySetting(HANDLE Key, + LPWSTR Value, + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo, + DWORD * Buffer) { - UNICODE_STRING ValueName; - NTSTATUS Status; - ULONG Length; - - RtlInitUnicodeString(&ValueName, Value); - Status = NtQueryValueKey(Key, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - VALUE_BUFFER_SIZE, - &Length); - - if (!NT_SUCCESS(Status) || (ValueInfo->Type != REG_DWORD)) - { - RtlFreeUnicodeString(&ValueName); - return FALSE; - } - RtlCopyMemory(Buffer, &ValueInfo->Data[0], sizeof(DWORD)); - RtlFreeUnicodeString(&ValueName); - return TRUE; + UNICODE_STRING ValueName; + NTSTATUS Status; + ULONG Length; + + RtlInitUnicodeString(&ValueName, Value); + Status = NtQueryValueKey(Key, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + VALUE_BUFFER_SIZE, + &Length); + + if (!NT_SUCCESS(Status) || (ValueInfo->Type != REG_DWORD)) + { + RtlFreeUnicodeString(&ValueName); + return FALSE; + } + + RtlCopyMemory(Buffer, &ValueInfo->Data[0], sizeof(DWORD)); + RtlFreeUnicodeString(&ValueName); + return TRUE; } -VOID FASTCALL +VOID +FASTCALL LoadImageFileExecutionOptions(PPEB Peb) { NTSTATUS Status = STATUS_SUCCESS; @@ -72,170 +76,179 @@ if (Peb->ProcessParameters && Peb->ProcessParameters->ImagePathName.Length > 0) - { + { DPRINT("%wZ\n", &Peb->ProcessParameters->ImagePathName); ImagePathName = Peb->ProcessParameters->ImagePathName; ImageName.Buffer = ImagePathName.Buffer + ImagePathName.Length / sizeof(WCHAR); ImageName.Length = 0; + while (ImagePathName.Buffer < ImageName.Buffer) { ImageName.Buffer--; if (*ImageName.Buffer == L'\\') { - ImageName.Buffer++; - break; + ImageName.Buffer++; + break; } } - ImageName.Length = ImagePathName.Length - (ImageName.Buffer - ImagePathName.Buffer) * sizeof(WCHAR); - ImageName.MaximumLength = ImageName.Length + ImagePathName.MaximumLength - ImagePathName.Length; + + ImageName.Length = ImagePathName.Length - + (ImageName.Buffer - ImagePathName.Buffer) * sizeof(WCHAR); + ImageName.MaximumLength = ImageName.Length + + ImagePathName.MaximumLength - ImagePathName.Length; DPRINT("%wZ\n", &ImageName); /* global flag */ - Status = LdrQueryImageFileExecutionOptions (&ImageName, - L"GlobalFlag", - REG_SZ, - (PVOID)ValueBuffer, - sizeof(ValueBuffer), - &ValueSize); + Status = LdrQueryImageFileExecutionOptions(&ImageName, + L"GlobalFlag", + REG_SZ, + (PVOID)ValueBuffer, + sizeof(ValueBuffer), + &ValueSize); if (NT_SUCCESS(Status)) - { + { ValueString.Buffer = ValueBuffer; - ValueString.Length = ValueSize - sizeof(WCHAR); - ValueString.MaximumLength = sizeof(ValueBuffer); - Status = RtlUnicodeStringToInteger(&ValueString, 16, &Value); + ValueString.Length = ValueSize - sizeof(WCHAR); + ValueString.MaximumLength = sizeof(ValueBuffer); + Status = RtlUnicodeStringToInteger(&ValueString, 16, &Value); if (NT_SUCCESS(Status)) - { + { Peb->NtGlobalFlag |= Value; - DPRINT("GlobalFlag: Key='%S', Value=0x%lx\n", ValueBuffer, Value); - } - } + DPRINT("GlobalFlag: Key='%S', Value=0x%lx\n", ValueBuffer, Value); + } + } /* - * FIXME: - * read more options + * FIXME: + * read more options */ - } + } } - - - -BOOLEAN FASTCALL +BOOLEAN +FASTCALL LoadCompatibilitySettings(PPEB Peb) { - NTSTATUS Status; - HANDLE UserKey = NULL; - HANDLE KeyHandle; - HANDLE SubKeyHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING( - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"); - UNICODE_STRING ValueName; - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - ULONG Length; - DWORD MajorVersion, MinorVersion, BuildNumber, PlatformId, - SPMajorVersion, SPMinorVersion= 0; - - if(Peb->ProcessParameters && - (Peb->ProcessParameters->ImagePathName.Length > 0)) - { - Status = RtlOpenCurrentUser(KEY_READ, - &UserKey); - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - UserKey, - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - if (UserKey) NtClose(UserKey); - return FALSE; - } - - /* query version name for application */ - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - Status = NtQueryValueKey(KeyHandle, - &Peb->ProcessParameters->ImagePathName, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &Length); - - if (!NT_SUCCESS(Status) || (ValueInfo->Type != REG_SZ)) - { - NtClose(KeyHandle); - if (UserKey) NtClose(UserKey); - return FALSE; - } - - ValueName.Length = ValueInfo->DataLength; - ValueName.MaximumLength = ValueInfo->DataLength; - ValueName.Buffer = (PWSTR)ValueInfo->Data; - - /* load version info */ - InitializeObjectAttributes(&ObjectAttributes, - &ValueName, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - - Status = NtOpenKey(&SubKeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - NtClose(KeyHandle); - if (UserKey) NtClose(UserKey); - return FALSE; - } - - DPRINT("Loading version information for: %wZ\n", &ValueName); - - /* read settings from registry */ - if(!ReadCompatibilitySetting(SubKeyHandle, L"MajorVersion", ValueInfo, &MajorVersion)) - goto finish; - if(!ReadCompatibilitySetting(SubKeyHandle, L"MinorVersion", ValueInfo, &MinorVersion)) - goto finish; - if(!ReadCompatibilitySetting(SubKeyHandle, L"BuildNumber", ValueInfo, &BuildNumber)) - goto finish; - if(!ReadCompatibilitySetting(SubKeyHandle, L"PlatformId", ValueInfo, &PlatformId)) - goto finish; - - /* now assign the settings */ - Peb->OSMajorVersion = (ULONG)MajorVersion; - Peb->OSMinorVersion = (ULONG)MinorVersion; - Peb->OSBuildNumber = (USHORT)BuildNumber; - Peb->OSPlatformId = (ULONG)PlatformId; - - /* optional service pack version numbers */ - if(ReadCompatibilitySetting(SubKeyHandle, L"SPMajorVersion", ValueInfo, &SPMajorVersion) && - ReadCompatibilitySetting(SubKeyHandle, L"SPMinorVersion", ValueInfo, &SPMinorVersion)) - Peb->OSCSDVersion = ((SPMajorVersion & 0xFF) << 8) | (SPMinorVersion & 0xFF); + NTSTATUS Status; + HANDLE UserKey = NULL; + HANDLE KeyHandle; + HANDLE SubKeyHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING( + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers"); + UNICODE_STRING ValueName; + UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + ULONG Length; + DWORD MajorVersion, MinorVersion, BuildNumber, PlatformId, + SPMajorVersion, SPMinorVersion = 0; + + if (Peb->ProcessParameters && + (Peb->ProcessParameters->ImagePathName.Length > 0)) + { + Status = RtlOpenCurrentUser(KEY_READ, &UserKey); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + UserKey, + NULL); + + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + if (UserKey) + NtClose(UserKey); + return FALSE; + } + + /* query version name for application */ + ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION) ValueBuffer; + Status = NtQueryValueKey(KeyHandle, + &Peb->ProcessParameters->ImagePathName, + KeyValuePartialInformation, + ValueBuffer, + VALUE_BUFFER_SIZE, + &Length); + + if (!NT_SUCCESS(Status) || (ValueInfo->Type != REG_SZ)) + { + NtClose(KeyHandle); + if (UserKey) + NtClose(UserKey); + return FALSE; + } + + ValueName.Length = ValueInfo->DataLength; + ValueName.MaximumLength = ValueInfo->DataLength; + ValueName.Buffer = (PWSTR) ValueInfo->Data; + + /* load version info */ + InitializeObjectAttributes(&ObjectAttributes, + &ValueName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + + Status = NtOpenKey(&SubKeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle); + if (UserKey) + NtClose(UserKey); + return FALSE; + } + + DPRINT("Loading version information for: %wZ\n", &ValueName); + + /* read settings from registry */ + if (!ReadCompatibilitySetting(SubKeyHandle, L"MajorVersion", ValueInfo, &MajorVersion)) + goto finish; + if (!ReadCompatibilitySetting(SubKeyHandle, L"MinorVersion", ValueInfo, &MinorVersion)) + goto finish; + if (!ReadCompatibilitySetting(SubKeyHandle, L"BuildNumber", ValueInfo, &BuildNumber)) + goto finish; + if (!ReadCompatibilitySetting(SubKeyHandle, L"PlatformId", ValueInfo, &PlatformId)) + goto finish; + + /* now assign the settings */ + Peb->OSMajorVersion = (ULONG) MajorVersion; + Peb->OSMinorVersion = (ULONG) MinorVersion; + Peb->OSBuildNumber = (USHORT) BuildNumber; + Peb->OSPlatformId = (ULONG) PlatformId; + + /* optional service pack version numbers */ + if (ReadCompatibilitySetting(SubKeyHandle, + L"SPMajorVersion", + ValueInfo, + &SPMajorVersion) && + ReadCompatibilitySetting(SubKeyHandle, + L"SPMinorVersion", + ValueInfo, + &SPMinorVersion)) + { + Peb->OSCSDVersion = ((SPMajorVersion & 0xFF) << 8) | + (SPMinorVersion & 0xFF); + } finish: - /* we're finished */ - NtClose(SubKeyHandle); - NtClose(KeyHandle); - if (UserKey) NtClose(UserKey); - return TRUE; - } - return FALSE; + /* we're finished */ + NtClose(SubKeyHandle); + NtClose(KeyHandle); + if (UserKey) + NtClose(UserKey); + return TRUE; + } + + return FALSE; } - -/* FUNCTIONS *****************************************************************/ VOID NTAPI @@ -243,259 +256,256 @@ PVOID SystemArgument1, PVOID SystemArgument2) { - PIMAGE_NT_HEADERS NTHeaders; - PEPFUNC EntryPoint; - PIMAGE_DOS_HEADER PEDosHeader; - PVOID ImageBase; - PPEB Peb = NtCurrentPeb(); - PLDR_DATA_TABLE_ENTRY NtModule; // ntdll - NLSTABLEINFO NlsTable; - WCHAR FullNtDllPath[MAX_PATH]; - SYSTEM_BASIC_INFORMATION SystemInformation; - NTSTATUS Status; - PVOID BaseAddress = SystemArgument1; - - DPRINT("LdrpInit()\n"); - DPRINT("Peb %p\n", Peb); - ImageBase = Peb->ImageBaseAddress; - DPRINT("ImageBase %p\n", ImageBase); - - if (NtCurrentPeb()->Ldr == NULL) - { - if (ImageBase <= (PVOID)0x1000) - { - DPRINT("ImageBase is null\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); - } - - /* If MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) ImageBase; - DPRINT("PEDosHeader %p\n", PEDosHeader); - - if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE || - PEDosHeader->e_lfanew == 0L || - *(PULONG)((PUCHAR)ImageBase + PEDosHeader->e_lfanew) != IMAGE_NT_SIGNATURE) - { - DPRINT1("Image has bad header\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); - } - - /* normalize process parameters */ - RtlNormalizeProcessParams (Peb->ProcessParameters); - - /* Initialize NLS data */ - RtlInitNlsTables (Peb->AnsiCodePageData, - Peb->OemCodePageData, - Peb->UnicodeCaseTableData, - &NlsTable); - RtlResetRtlTranslations (&NlsTable); - - NTHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)ImageBase + PEDosHeader->e_lfanew); - - /* Get number of processors */ - DPRINT("Here\n"); - Status = ZwQuerySystemInformation(SystemBasicInformation, - &SystemInformation, - sizeof(SYSTEM_BASIC_INFORMATION), - NULL); - DPRINT("Here2\n"); - if (!NT_SUCCESS(Status)) - { - ZwTerminateProcess(NtCurrentProcess(), Status); - } - - Peb->NumberOfProcessors = SystemInformation.NumberOfProcessors; - - /* Initialize Critical Section Data */ - RtlpInitDeferedCriticalSection(); - - /* create process heap */ - RtlInitializeHeapManager(); - Peb->ProcessHeap = RtlCreateHeap(HEAP_GROWABLE, - NULL, - NTHeaders->OptionalHeader.SizeOfHeapReserve, - NTHeaders->OptionalHeader.SizeOfHeapCommit, - NULL, - NULL); - if (Peb->ProcessHeap == 0) - { - DPRINT1("Failed to create process heap\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); - } - - /* initialized vectored exception handling */ - RtlpInitializeVectoredExceptionHandling(); - - /* initalize peb lock support */ - RtlInitializeCriticalSection (&PebLock); - Peb->FastPebLock = &PebLock; - Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; - Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; - - /* initialize tls bitmaps */ - RtlInitializeBitMap (&TlsBitMap, - Peb->TlsBitmapBits, - TLS_MINIMUM_AVAILABLE); - RtlInitializeBitMap (&TlsExpansionBitMap, - Peb->TlsExpansionBitmapBits, - TLS_EXPANSION_SLOTS); - - Peb->TlsBitmap = &TlsBitMap; - Peb->TlsExpansionBitmap = &TlsExpansionBitMap; - Peb->TlsExpansionCounter = TLS_MINIMUM_AVAILABLE; - - /* Initialize table of callbacks for the kernel. */ - Peb->KernelCallbackTable = - RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(PVOID) * (USER32_CALLBACK_MAXIMUM + 1)); - if (Peb->KernelCallbackTable == NULL) - { - DPRINT1("Failed to create callback table\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_INSUFFICIENT_RESOURCES); - } - - /* initalize loader lock */ - RtlInitializeCriticalSection (&LoaderLock); - Peb->LoaderLock = &LoaderLock; - - /* create loader information */ - Peb->Ldr = (PPEB_LDR_DATA)RtlAllocateHeap (Peb->ProcessHeap, - 0, - sizeof(PEB_LDR_DATA)); - if (Peb->Ldr == NULL) - { - DPRINT1("Failed to create loader data\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); - } - Peb->Ldr->Length = sizeof(PEB_LDR_DATA); - Peb->Ldr->Initialized = FALSE; - Peb->Ldr->SsHandle = NULL; - InitializeListHead(&Peb->Ldr->InLoadOrderModuleList); - InitializeListHead(&Peb->Ldr->InMemoryOrderModuleList); - InitializeListHead(&Peb->Ldr->InInitializationOrderModuleList); - - /* Load compatibility settings */ - LoadCompatibilitySettings(Peb); - - /* Load execution options */ - LoadImageFileExecutionOptions(Peb); - - /* build full ntdll path */ - wcscpy (FullNtDllPath, SharedUserData->NtSystemRoot); - wcscat (FullNtDllPath, L"\\system32\\ntdll.dll"); - - /* add entry for ntdll */ - NtModule = (PLDR_DATA_TABLE_ENTRY)RtlAllocateHeap (Peb->ProcessHeap, - 0, - sizeof(LDR_DATA_TABLE_ENTRY)); - if (NtModule == NULL) - { - DPRINT1("Failed to create loader module entry (NTDLL)\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); - } - memset(NtModule, 0, sizeof(LDR_DATA_TABLE_ENTRY)); - - NtModule->DllBase = BaseAddress; - NtModule->EntryPoint = 0; /* no entry point */ - RtlCreateUnicodeString (&NtModule->FullDllName, - FullNtDllPath); - RtlCreateUnicodeString (&NtModule->BaseDllName, - L"ntdll.dll"); - NtModule->Flags = LDRP_IMAGE_DLL|LDRP_ENTRY_PROCESSED; - - NtModule->LoadCount = -1; /* don't unload */ - NtModule->TlsIndex = -1; - NtModule->SectionPointer = NULL; - NtModule->CheckSum = 0; - - NTHeaders = RtlImageNtHeader (NtModule->DllBase); - NtModule->SizeOfImage = LdrpGetResidentSize(NTHeaders); - NtModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; - - InsertTailList(&Peb->Ldr->InLoadOrderModuleList, - &NtModule->InLoadOrderLinks); - InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &NtModule->InInitializationOrderModuleList); + PIMAGE_NT_HEADERS NTHeaders; + PEPFUNC EntryPoint; + PIMAGE_DOS_HEADER PEDosHeader; + PVOID ImageBase; + PPEB Peb = NtCurrentPeb(); + PLDR_DATA_TABLE_ENTRY NtModule; // ntdll + NLSTABLEINFO NlsTable; + WCHAR FullNtDllPath[MAX_PATH]; + SYSTEM_BASIC_INFORMATION SystemInformation; + NTSTATUS Status; + PVOID BaseAddress = SystemArgument1; + + DPRINT("LdrpInit()\n"); + DPRINT("Peb %p\n", Peb); + ImageBase = Peb->ImageBaseAddress; + DPRINT("ImageBase %p\n", ImageBase); + + if (NtCurrentPeb()->Ldr == NULL) + { + if (ImageBase <= (PVOID) 0x1000) + { + DPRINT("ImageBase is null\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); + } + + /* If MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER) ImageBase; + DPRINT("PEDosHeader %p\n", PEDosHeader); + + if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE || + PEDosHeader->e_lfanew == 0L || + *(PULONG)((PUCHAR)ImageBase + PEDosHeader->e_lfanew) != IMAGE_NT_SIGNATURE) + { + DPRINT1("Image has bad header\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); + } + + /* normalize process parameters */ + RtlNormalizeProcessParams(Peb->ProcessParameters); + + /* Initialize NLS data */ + RtlInitNlsTables(Peb->AnsiCodePageData, + Peb->OemCodePageData, + Peb->UnicodeCaseTableData, + &NlsTable); + RtlResetRtlTranslations(&NlsTable); + + NTHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)ImageBase + PEDosHeader->e_lfanew); + + /* Get number of processors */ + DPRINT("Here\n"); + Status = ZwQuerySystemInformation(SystemBasicInformation, + &SystemInformation, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + DPRINT("Here2\n"); + if (!NT_SUCCESS(Status)) + { + ZwTerminateProcess(NtCurrentProcess(), Status); + } + + Peb->NumberOfProcessors = SystemInformation.NumberOfProcessors; + + /* Initialize Critical Section Data */ + RtlpInitDeferedCriticalSection(); + + /* create process heap */ + RtlInitializeHeapManager(); + Peb->ProcessHeap = RtlCreateHeap(HEAP_GROWABLE, + NULL, + NTHeaders->OptionalHeader.SizeOfHeapReserve, + NTHeaders->OptionalHeader.SizeOfHeapCommit, + NULL, + NULL); + if (Peb->ProcessHeap == 0) + { + DPRINT1("Failed to create process heap\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); + } + + /* initialized vectored exception handling */ + RtlpInitializeVectoredExceptionHandling(); + + /* initalize peb lock support */ + RtlInitializeCriticalSection(&PebLock); + Peb->FastPebLock = &PebLock; + Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; + Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; + + /* initialize tls bitmaps */ + RtlInitializeBitMap(&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE); + RtlInitializeBitMap(&TlsExpansionBitMap, Peb->TlsExpansionBitmapBits, TLS_EXPANSION_SLOTS); + + Peb->TlsBitmap = &TlsBitMap; + Peb->TlsExpansionBitmap = &TlsExpansionBitMap; + Peb->TlsExpansionCounter = TLS_MINIMUM_AVAILABLE; + + /* Initialize table of callbacks for the kernel. */ + Peb->KernelCallbackTable = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(PVOID) * + (USER32_CALLBACK_MAXIMUM + 1)); + if (Peb->KernelCallbackTable == NULL) + { + DPRINT1("Failed to create callback table\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); + } + + /* initalize loader lock */ + RtlInitializeCriticalSection(&LoaderLock); + Peb->LoaderLock = &LoaderLock; + + /* create loader information */ + Peb->Ldr = (PPEB_LDR_DATA) RtlAllocateHeap(Peb->ProcessHeap, + 0, + sizeof(PEB_LDR_DATA)); + if (Peb->Ldr == NULL) + { + DPRINT1("Failed to create loader data\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); + } + + Peb->Ldr->Length = sizeof(PEB_LDR_DATA); + Peb->Ldr->Initialized = FALSE; + Peb->Ldr->SsHandle = NULL; + InitializeListHead(&Peb->Ldr->InLoadOrderModuleList); + InitializeListHead(&Peb->Ldr->InMemoryOrderModuleList); + InitializeListHead(&Peb->Ldr->InInitializationOrderModuleList); + + /* Load compatibility settings */ + LoadCompatibilitySettings(Peb); + + /* Load execution options */ + LoadImageFileExecutionOptions(Peb); + + /* build full ntdll path */ + wcscpy(FullNtDllPath, SharedUserData->NtSystemRoot); + wcscat(FullNtDllPath, L"\\system32\\ntdll.dll"); + + /* add entry for ntdll */ + NtModule = (PLDR_DATA_TABLE_ENTRY) + RtlAllocateHeap(Peb->ProcessHeap, + 0, + sizeof(LDR_DATA_TABLE_ENTRY)); + if (NtModule == NULL) + { + DPRINT1("Failed to create loader module entry (NTDLL)\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); + } + memset(NtModule, 0, sizeof(LDR_DATA_TABLE_ENTRY)); + + NtModule->DllBase = BaseAddress; + NtModule->EntryPoint = 0; /* no entry point */ + RtlCreateUnicodeString(&NtModule->FullDllName, FullNtDllPath); + RtlCreateUnicodeString(&NtModule->BaseDllName, L"ntdll.dll"); + NtModule->Flags = LDRP_IMAGE_DLL | LDRP_ENTRY_PROCESSED; + + NtModule->LoadCount = -1; /* don't unload */ + NtModule->TlsIndex = -1; + NtModule->SectionPointer = NULL; + NtModule->CheckSum = 0; + + NTHeaders = RtlImageNtHeader(NtModule->DllBase); + NtModule->SizeOfImage = LdrpGetResidentSize(NTHeaders); + NtModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; + + InsertTailList(&Peb->Ldr->InLoadOrderModuleList, + &NtModule->InLoadOrderLinks); + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &NtModule->InInitializationOrderModuleList); #if defined(DBG) || defined(KDBG) - LdrpLoadUserModuleSymbols(NtModule); + LdrpLoadUserModuleSymbols(NtModule); #endif /* DBG || KDBG */ - } - - if (NtCurrentPeb()->Ldr->Initialized == FALSE) - { - /* add entry for executable (becomes first list entry) */ - ExeModule = (PLDR_DATA_TABLE_ENTRY)RtlAllocateHeap (Peb->ProcessHeap, - 0, - sizeof(LDR_DATA_TABLE_ENTRY)); - if (ExeModule == NULL) - { - DPRINT1("Failed to create loader module infomation\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); - } - ExeModule->DllBase = Peb->ImageBaseAddress; - - if ((Peb->ProcessParameters == NULL) || - (Peb->ProcessParameters->ImagePathName.Length == 0)) - { - DPRINT1("Failed to access the process parameter block\n"); - ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); - } - - RtlCreateUnicodeString(&ExeModule->FullDllName, - Peb->ProcessParameters->ImagePathName.Buffer); - RtlCreateUnicodeString(&ExeModule->BaseDllName, - wcsrchr(ExeModule->FullDllName.Buffer, L'\\') + 1); - - DPRINT("BaseDllName '%wZ' FullDllName '%wZ'\n", - &ExeModule->BaseDllName, - &ExeModule->FullDllName); - - ExeModule->Flags = LDRP_ENTRY_PROCESSED; - ExeModule->LoadCount = -1; /* don't unload */ - ExeModule->TlsIndex = -1; - ExeModule->SectionPointer = NULL; - ExeModule->CheckSum = 0; - - NTHeaders = RtlImageNtHeader (ExeModule->DllBase); - ExeModule->SizeOfImage = LdrpGetResidentSize(NTHeaders); - ExeModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; - - InsertHeadList(&Peb->Ldr->InLoadOrderModuleList, - &ExeModule->InLoadOrderLinks); - - LdrpInitLoader(); + } + + if (NtCurrentPeb()->Ldr->Initialized == FALSE) + { + /* add entry for executable (becomes first list entry) */ + ExeModule = (PLDR_DATA_TABLE_ENTRY) + RtlAllocateHeap(Peb->ProcessHeap, + 0, + sizeof(LDR_DATA_TABLE_ENTRY)); + if (ExeModule == NULL) + { + DPRINT1("Failed to create loader module infomation\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); + } + + ExeModule->DllBase = Peb->ImageBaseAddress; + + if ((Peb->ProcessParameters == NULL) || + (Peb->ProcessParameters->ImagePathName.Length == 0)) + { + DPRINT1("Failed to access the process parameter block\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_UNSUCCESSFUL); + } + + RtlCreateUnicodeString(&ExeModule->FullDllName, + Peb->ProcessParameters->ImagePathName.Buffer); + RtlCreateUnicodeString(&ExeModule->BaseDllName, + wcsrchr(ExeModule->FullDllName.Buffer, L'\\') + 1); + + DPRINT("BaseDllName '%wZ' FullDllName '%wZ'\n", &ExeModule->BaseDllName, &ExeModule->FullDllName); + + ExeModule->Flags = LDRP_ENTRY_PROCESSED; + ExeModule->LoadCount = -1; /* don't unload */ + ExeModule->TlsIndex = -1; + ExeModule->SectionPointer = NULL; + ExeModule->CheckSum = 0; + + NTHeaders = RtlImageNtHeader(ExeModule->DllBase); + ExeModule->SizeOfImage = LdrpGetResidentSize(NTHeaders); + ExeModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; + + InsertHeadList(&Peb->Ldr->InLoadOrderModuleList, + &ExeModule->InLoadOrderLinks); + + LdrpInitLoader(); #if defined(DBG) || defined(KDBG) - LdrpLoadUserModuleSymbols(ExeModule); + LdrpLoadUserModuleSymbols(ExeModule); #endif /* DBG || KDBG */ - EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL); - ExeModule->EntryPoint = EntryPoint; - - /* all required dlls are loaded now */ - Peb->Ldr->Initialized = TRUE; - - /* Check before returning that we can run the image safely. */ - if (EntryPoint == NULL) - { - DPRINT1("Failed to initialize image\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); - } - - /* Break into debugger */ - if (Peb->BeingDebugged) DbgBreakPoint(); - } - - /* attach the thread */ - RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); - LdrpAttachThread(); - RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); + EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL); + ExeModule->EntryPoint = EntryPoint; + + /* all required dlls are loaded now */ + Peb->Ldr->Initialized = TRUE; + + /* Check before returning that we can run the image safely. */ + if (EntryPoint == NULL) + { + DPRINT1("Failed to initialize image\n"); + ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); + } + + /* Break into debugger */ + if (Peb->BeingDebugged) + DbgBreakPoint(); + } + + /* attach the thread */ + RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); + LdrpAttachThread(); + RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); } /* EOF */

1 0

[fireball] 38353: - Fix 38352, XMLLoadFile seems to need a separate instance of Path, so revert that optimisation and leave it only to NormalizeFilename.
by fireball＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: fireball Date: Fri Dec 26 07:25:55 2008 New Revision: 38353 URL: http://svn.reactos.org/svn/reactos?rev=38353&view=rev Log: - Fix 38352, XMLLoadFile seems to need a separate instance of Path, so revert that optimisation and leave it only to NormalizeFilename. Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Fri Dec 26 07:25:55 2008 @@ -24,6 +24,8 @@ using std::string; using std::vector; +static const Path defaultPath; + string Right ( const string& s, size_t n ) { @@ -161,8 +163,9 @@ { if ( filename == "" ) return ""; - string normalizedPath = defaultPath.Fixup ( filename, true ); - string relativeNormalizedPath = defaultPath.RelativeFromWorkingDirectory ( normalizedPath ); + Path path; + string normalizedPath = path.Fixup ( filename, true ); + string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath ); return FixSeparator ( relativeNormalizedPath ); } Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Fri Dec 26 07:25:55 2008 @@ -25,8 +25,6 @@ using std::string; using std::vector; -const Path defaultPath; - /* static */ string Environment::GetVariable ( const string& name ) { @@ -261,7 +259,8 @@ void Project::ReadXml () { - head = XMLLoadFile ( xmlfile, defaultPath, xmlbuildfiles ); + Path path; + head = XMLLoadFile ( xmlfile, path, xmlbuildfiles ); node = NULL; for ( size_t i = 0; i < head->subElements.size (); i++ ) {

1 0

[fireball] 38352: - Add defaultPath global var and use it instead of creating Path objects all the time a filename is queried and/or xml file is read.
by fireball＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: fireball Date: Fri Dec 26 05:03:16 2008 New Revision: 38352 URL: http://svn.reactos.org/svn/reactos?rev=38352&view=rev Log: - Add defaultPath global var and use it instead of creating Path objects all the time a filename is queried and/or xml file is read. Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Fri Dec 26 05:03:16 2008 @@ -161,9 +161,8 @@ { if ( filename == "" ) return ""; - Path path; - string normalizedPath = path.Fixup ( filename, true ); - string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath ); + string normalizedPath = defaultPath.Fixup ( filename, true ); + string relativeNormalizedPath = defaultPath.RelativeFromWorkingDirectory ( normalizedPath ); return FixSeparator ( relativeNormalizedPath ); } Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Fri Dec 26 05:03:16 2008 @@ -25,6 +25,8 @@ using std::string; using std::vector; +const Path defaultPath; + /* static */ string Environment::GetVariable ( const string& name ) { @@ -259,8 +261,7 @@ void Project::ReadXml () { - Path path; - head = XMLLoadFile ( xmlfile, path, xmlbuildfiles ); + head = XMLLoadFile ( xmlfile, defaultPath, xmlbuildfiles ); node = NULL; for ( size_t i = 0; i < head->subElements.size (); i++ ) { Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Fri Dec 26 05:03:16 2008 @@ -51,6 +51,7 @@ extern std::string sBadSep; extern char cSep; extern char cBadSep; +extern const Path defaultPath; #ifdef WIN32 #define DEF_EXEPREFIX ""

1 0

[mjmartin] 38351: - Revert r38346 as its incorrect fix. Real problem is implementation of inet_aton in compat.c. So back to address 255.255.255.255 failing.
by mjmartin＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: mjmartin Date: Fri Dec 26 04:38:21 2008 New Revision: 38351 URL: http://svn.reactos.org/svn/reactos?rev=38351&view=rev Log: - Revert r38346 as its incorrect fix. Real problem is implementation of inet_aton in compat.c. So back to address 255.255.255.255 failing. Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Fri Dec 26 04:38:21 2008 @@ -2056,7 +2056,7 @@ note("Input: %s", buf); do { - tmp = strtok(buf, "."); + tmp = strtok(buf, " "); note("got %s", tmp); if( tmp && inet_aton(tmp, &jnk) ) i++; buf = NULL;

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