Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[dgorbachev] 38354: [FORMATTING] Fix indentation.

by dgorbachev＠svn.reactos.org

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

15 years, 8 months

[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

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++ ) {

15 years, 8 months

[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

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 ""

15 years, 8 months

[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

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;

15 years, 8 months

[amunger] 38350: Remove the entries for green, as they are imcomplete. Use the provided inf to install green.

by amunger＠svn.reactos.org

Author: amunger Date: Fri Dec 26 03:43:28 2008 New Revision: 38350 URL: http://svn.reactos.org/svn/reactos?rev=38350&view=rev Log: Remove the entries for green, as they are imcomplete. Use the provided inf to install green. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Dec 26 03:43:28 2008 @@ -890,14 +890,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 -; Green driver -;HKLM,"SYSTEM\CurrentControlSet\Services\green","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Group",0x00000000,"Extended base" -;HKLM,"SYSTEM\CurrentControlSet\Services\green","ImagePath",0x00020000,"system32\drivers\green.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Type",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\green\Parameters","AttachedDevice",0x00000000,"\Device\Serial0" - ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port"

15 years, 8 months

[jimtabor] 38349: - Patch by Andre Wisplinghoff: Text is auto-selected when mouse down is hovered outside window (notepad). See bug 953.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 25 18:42:13 2008 New Revision: 38349 URL: http://svn.reactos.org/svn/reactos?rev=38349&view=rev Log: - Patch by Andre Wisplinghoff: Text is auto-selected when mouse down is hovered outside window (notepad). See bug 953. Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Thu Dec 25 18:42:13 2008 @@ -4833,7 +4833,8 @@ EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); + if (!(es->style & ES_MULTILINE)) + SetTimer(es->hwndSelf, 0, 100, NULL); if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf);

15 years, 8 months

[jimtabor] 38348: - Example of a thread overrun? HAX-Fixes wine cursoricon test.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 25 17:44:23 2008 New Revision: 38348 URL: http://svn.reactos.org/svn/reactos?rev=38348&view=rev Log: - Example of a thread overrun? HAX-Fixes wine cursoricon test. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] Thu Dec 25 17:44:23 2008 @@ -412,6 +412,7 @@ ULONG HeaderSize; ULONG ColorCount; PVOID Data; + BOOL Hit = FALSE; if (!(fuLoad & LR_LOADFROMFILE)) { @@ -470,8 +471,26 @@ UnmapViewOfFile(BitmapInfo); return NULL; } + + _SEH2_TRY + { memcpy(PrivateInfo, BitmapInfo, HeaderSize); - + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END; + + if (Hit) + { + DbgPrint("We have a thread overrun, these are already freed! pi -> %d bi -> %d\n", PrivateInfo, BitmapInfo); + RtlFreeHeap(GetProcessHeap(), 0, PrivateInfo); + if (fuLoad & LR_LOADFROMFILE) + UnmapViewOfFile(BitmapInfo); + return NULL; + } + /* FIXME: Handle color conversion and transparency. */ hScreenDc = CreateCompatibleDC(NULL);

15 years, 8 months

[jmorlan] 38347: Allow the DIR command to be interrupted via Ctrl-C even while in the middle of a directory. (Bug 3967)

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Thu Dec 25 17:12:54 2008 New Revision: 38347 URL: http://svn.reactos.org/svn/reactos?rev=38347&view=rev Log: Allow the DIR command to be interrupted via Ctrl-C even while in the middle of a directory. (Bug 3967) Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Thu Dec 25 17:12:54 2008 @@ -989,7 +989,7 @@ INT iSizeFormat; ULARGE_INTEGER u64FileSize; - for (i = 0;i < dwCount;i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Calculate size */ if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) @@ -1097,7 +1097,7 @@ /* Calculate the lines that will be printed */ iLines = (USHORT)((dwCount + iColumns - 1) / iColumns); - for (i = 0; i < iLines; i++) + for (i = 0; i < iLines && !bCtrlBreak; i++) { for (j = 0; j < iColumns; j++) { @@ -1154,7 +1154,7 @@ int iSizeFormat; /* The format of size field */ ULARGE_INTEGER u64FileSize; /* The file size */ - for(i = 0;i < dwCount;i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Broke 8.3 format */ if (*ptrFiles[i]->cAlternateFileName ) @@ -1228,7 +1228,7 @@ TCHAR szFullName[MAX_PATH]; DWORD i; - for (i = 0; i < dwCount; i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) @@ -1681,6 +1681,15 @@ /* Free array */ cmd_free(ptrFileArray); + /* Free linked list */ + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + if (CheckCtrlBreak(BREAK_INPUT)) return 1; @@ -1739,15 +1748,6 @@ } }while(FindNextFile(hRecSearch,&wfdFileInfo)); FindClose(hRecSearch); - } - - /* Free linked list */ - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; } return 0;

15 years, 8 months

[mjmartin] 38346: - ipv4addrs should search for decimals not spaces when calling strtok. See bug 3962 for more info.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Dec 25 06:43:32 2008 New Revision: 38346 URL: http://svn.reactos.org/svn/reactos?rev=38346&view=rev Log: - ipv4addrs should search for decimals not spaces when calling strtok. See bug 3962 for more info. 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] Thu Dec 25 06:43:32 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;

15 years, 8 months

[cwittich] 38345: fix some more typos

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Dec 25 06:27:47 2008 New Revision: 38345 URL: http://svn.reactos.org/svn/reactos?rev=38345&view=rev Log: fix some more typos Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ext2/src/read.c trunk/reactos/drivers/filesystems/ext2/src/write.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/global.cpp Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -588,7 +588,7 @@ #ifdef KEYDEBUG printit("\r \r"); #endif - AllOk = SA.Add(temps);; + AllOk = SA.Add(temps); if ( !AllOk ) break; } else { // cerr << "Unexpected line '" << buf << "'\n"; Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -4029,7 +4029,7 @@ wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wcex.lpszClassName = TEXT("MissTosca_Control"); - return RegisterClassEx(&wcex);; + return RegisterClassEx(&wcex); } static void Shutdown() Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -579,7 +579,7 @@ // BothDirInformation->ShortName[ j ] = PtrDirEntry->name[j]; BothDirInformation->FileName[ j ] = PtrDirEntry->name[j]; // if( j < 11 ) - // BothDirInformation->ShortName[j] = PtrDirEntry->name[j];; + // BothDirInformation->ShortName[j] = PtrDirEntry->name[j]; } /* Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1411,7 +1411,7 @@ PtrVCB->CommonVCBHeader.IsFastIoPossible = FastIoIsNotPossible; PtrVCB->CommonVCBHeader.Resource = &(PtrVCB->VCBResource); - PtrVCB->CommonVCBHeader.PagingIoResource = &(PtrVCB->PagingIoResource);; + PtrVCB->CommonVCBHeader.PagingIoResource = &(PtrVCB->PagingIoResource); // Create a stream file object for this volume. PtrVCB->PtrStreamFileObject = IoCreateStreamFileObject(NULL, Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1045,7 +1045,7 @@ Ext2BreakPoint(); } - PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ];; + PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ]; DbgPrint( "LogicalBlock = 0x%lX", PtrIoRuns[ Index ].LogicalBlock ); } Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1256,7 +1256,7 @@ Ext2BreakPoint(); } - PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ];; + PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ]; DbgPrint( "LogicalBlock = 0x%lX", PtrIoRuns[ Index ].LogicalBlock ); } Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1923,7 +1923,7 @@ break; } - length += (sizeof(SENDCMDOUTPARAMS) > sizeof(SENDCMDINPARAMS)) ? sizeof(SENDCMDOUTPARAMS) : sizeof(SENDCMDINPARAMS);; + length += (sizeof(SENDCMDOUTPARAMS) > sizeof(SENDCMDINPARAMS)) ? sizeof(SENDCMDOUTPARAMS) : sizeof(SENDCMDINPARAMS); srbControl = ExAllocatePool(NonPagedPool, sizeof(SRB_IO_CONTROL) + length); Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/scsi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/scsi.h [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -172,7 +172,7 @@ } Byte2; UCHAR Reserved2[3]; - UCHAR Start_TrackSes;; + UCHAR Start_TrackSes; UCHAR AllocationLength[2]; UCHAR Control : 6; UCHAR Format : 2; Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -2752,7 +2752,7 @@ { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status = STATUS_SUCCESS;; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("ScsiPortDeviceControl()\n"); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -300,7 +300,7 @@ { if (plist == NULL) return 0; - return plist->total_count;; + return plist->total_count; } LONG Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -186,7 +186,7 @@ pif->endp_count = 1; pendp = &pif->endp[0]; - pif->pusb_config = pconfig;; + pif->pusb_config = pconfig; pif->pusb_if_desc = pif_desc; pif->if_ext_size = 0; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -2783,7 +2783,7 @@ uhci->fsbr_cnt++; if (uhci->fsbr_cnt == 1) { - uhci->skel_term_qh->link = uhci->skel_hs_control_qh->phy_addr;; + uhci->skel_term_qh->link = uhci->skel_hs_control_qh->phy_addr; } return TRUE; Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1487,7 +1487,7 @@ */ /* FIXME: The correct bug check code isn't defined. */ /* KEBUGCHECKEX(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); */ - ASSERT(FALSE);; + ASSERT(FALSE); } CurrentAddress = (ULONG_PTR)VirtualAddress + Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=3… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -250,7 +250,7 @@ { ULONG v, ver, maxlvt; ULONG r1, r2, w1, w2; - ULONG CPU = ThisCPU();; + ULONG CPU = ThisCPU(); r1 = lastregr[CPU]; @@ -770,12 +770,12 @@ tmp = GET_APIC_VERSION(APICRead(APIC_VER)); if (!APIC_INTEGRATED(tmp)) { - tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;; + tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR; } else { /* Periodic timer */ - tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;; + tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR; } APICWrite(APIC_LVTT, tmp); Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1745,7 +1745,7 @@ BYTE bLetterform; BYTE bMidline; BYTE bXHeight; -} PANOSE, *LPPANOSE;; +} PANOSE, *LPPANOSE; typedef struct tagLOGFONTA { LONG lfHeight; LONG lfWidth; Modified: trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/thrdin… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -181,7 +181,7 @@ /* And set up the Context Switch Frame */ CtxSwitchFrame->RetAddr = KiThreadStartup; CtxSwitchFrame->ApcBypassDisable = TRUE; - CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; + CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END; /* Save back the new value of the kernel stack. */ Thread->KernelStack = (PVOID)CtxSwitchFrame; Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -54,7 +54,7 @@ KIRQL OldIrql; PKPROFILE_SOURCE_OBJECT SourceBuffer; PKPROFILE_SOURCE_OBJECT CurrentSource; - BOOLEAN FreeBuffer = TRUE, SourceFound = FALSE;; + BOOLEAN FreeBuffer = TRUE, SourceFound = FALSE; PKPROCESS ProfileProcess; PLIST_ENTRY NextEntry; Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=383… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -245,7 +245,7 @@ if (Type == MEMORY_AREA_SECTION_VIEW) { Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset;; + + MemoryArea->Data.SectionData.ViewOffset; /* * Get or create a pageop Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -585,7 +585,7 @@ APIENTRY DxEngReferenceHdev(HDEV hDev) { - IntGdiReferencePdev((PGDIDEVICE) hDev);; + IntGdiReferencePdev((PGDIDEVICE) hDev); /* ALWAYS return true */ return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -3133,7 +3133,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; NTSTATUS Status; - PW32THREADINFO ti;; + PW32THREADINFO ti; DPRINT("Enter NtUserSetShellWindowEx\n"); UserEnterExclusive(); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -3776,7 +3776,7 @@ ExFreePoolWithTag(Buffer, TAG_GDITEXT); } - return Result;; + return Result; } Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/devcp… ============================================================================== --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -244,6 +244,6 @@ m_devFile << "Link=1" << endl; m_devFile << "Priority=1000" << endl; m_devFile << "OverrideBuildCmd=0" << endl; - m_devFile << "BuildCmd=" << endl << endl;; - } -} + m_devFile << "BuildCmd=" << endl << endl; + } +} Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -590,7 +590,7 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - parameters += "-I" + backend->GetFullPath ( *include.directory );; + parameters += "-I" + backend->GetFullPath ( *include.directory ); } return parameters; } Modified: trunk/reactos/tools/rbuild/global.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/global.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/global.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/global.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -31,7 +31,7 @@ void InitializeEnvironment () { - char *SepValue, *ExePostfixValue, *ExePrefixValue;; + char *SepValue, *ExePostfixValue, *ExePrefixValue; SepValue = getenv ( "SEP" ); if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) )

15 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008