Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akorotaev] 31572: Fix some bugs. Now it bugchecks.
by akorotaev＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: akorotaev Date: Thu Jan 3 00:49:19 2008 New Revision: 31572 URL: http://svn.reactos.org/svn/reactos?rev=31572&view=rev Log: Fix some bugs. Now it bugchecks. Added: branches/cache_manager_rewrite/mm/sysldr.c (with props) Modified: branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Thu Jan 3 00:49:19 2008 @@ -493,29 +493,10 @@ return TRUE; } -#if 0 - -VOID static -MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page != 0) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Page); - } -} - VOID NTAPI MiFreeInitMemory(VOID) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - (PVOID)&_init_start__, - MiFreeInitMemoryPage, - NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } -#endif Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Thu Jan 3 00:49:19 2008 @@ -3197,6 +3197,7 @@ OBJECT_ATTRIBUTES Obj; UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); LARGE_INTEGER SectionSize; + HANDLE Handle; /* * Create the section mapping physical memory @@ -3225,11 +3226,12 @@ SECTION_ALL_ACCESS, 0, NULL, - NULL); + &Handle); if (!NT_SUCCESS(Status)) { ObDereferenceObject(PhysSection); } + ObCloseHandle(Handle, KernelMode); PhysSection->AllocationAttributes |= SEC_PHYSICALMEMORY; PhysSection->Segment->Flags &= ~MM_PAGEFILE_SEGMENT; Added: branches/cache_manager_rewrite/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sysldr… ============================================================================== --- branches/cache_manager_rewrite/mm/sysldr.c (added) +++ branches/cache_manager_rewrite/mm/sysldr.c Thu Jan 3 00:49:19 2008 @@ -1,0 +1,2009 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/mm/sysldr.c +* PURPOSE: Contains the Kernel Loader (SYSLDR) for loading PE files. +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GCC's incompetence strikes again */ +FORCEINLINE +VOID +sprintf_nt(IN PCHAR Buffer, + IN PCHAR Format, + IN ...) +{ + va_list ap; + va_start(ap, Format); + vsprintf(Buffer, Format, ap); + va_end(ap); +} + +/* GLOBALS *******************************************************************/ + +LIST_ENTRY PsLoadedModuleList; +KSPIN_LOCK PsLoadedModuleSpinLock; +ULONG PsNtosImageBase; +KMUTANT MmSystemLoadLock; +extern ULONG NtGlobalFlag; + +/* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +MiCacheImageSymbols(IN PVOID BaseAddress) +{ + ULONG DebugSize; + PVOID DebugDirectory = NULL; + PAGED_CODE(); + + /* Make sure it's safe to access the image */ + _SEH_TRY + { + /* Get the debug directory */ + DebugDirectory = RtlImageDirectoryEntryToData(BaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_DEBUG, + &DebugSize); + } + _SEH_HANDLE + { + /* Nothing */ + } + _SEH_END; + + /* Return the directory */ + return DebugDirectory; +} + +VOID +NTAPI +MiFreeBootDriverMemory(PVOID BaseAddress, + ULONG Length) +{ + ULONG i; + + /* Loop each page */ + for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) + { + /* Free the page */ + MmDeleteVirtualMapping(NULL, + (PVOID)((ULONG_PTR)BaseAddress + i * PAGE_SIZE), + TRUE, + NULL, + NULL); + } +} + +NTSTATUS +NTAPI +MiLoadImageSection(IN OUT PVOID *SectionPtr, + OUT PVOID *ImageBase, + IN PUNICODE_STRING FileName, + IN BOOLEAN SessionLoad, + IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PROS_SECTION_OBJECT Section = *SectionPtr; + NTSTATUS Status; + PEPROCESS Process; + PVOID Base = NULL; + SIZE_T ViewSize = 0; + KAPC_STATE ApcState; + LARGE_INTEGER SectionOffset = {{0}}; + BOOLEAN LoadSymbols = FALSE; + ULONG DriverSize; + PVOID DriverBase; + PAGED_CODE(); + + /* Detect session load */ + if (SessionLoad) + { + /* Fail */ + DPRINT1("Session loading not yet supported!\n"); + while (TRUE); + } + + /* Not session load, shouldn't have an entry */ + ASSERT(LdrEntry == NULL); + + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + + /* Check if we need to load symbols */ + if (NtGlobalFlag & FLG_ENABLE_KDEBUG_SYMBOL_LOAD) + { + /* Yes we do */ + LoadSymbols = TRUE; + NtGlobalFlag &= ~FLG_ENABLE_KDEBUG_SYMBOL_LOAD; + } + + /* Map the driver */ + Process = PsGetCurrentProcess(); + Status = MmMapViewOfSection(Section, + Process, + &Base, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE); + + /* Re-enable the flag */ + if (LoadSymbols) NtGlobalFlag |= FLG_ENABLE_KDEBUG_SYMBOL_LOAD; + + /* Check if we failed with distinguished status code */ + if (Status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) + { + /* Change it to something more generic */ + Status = STATUS_INVALID_IMAGE_FORMAT; + } + + /* Now check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Detach and return */ + KeUnstackDetachProcess(&ApcState); + return Status; + } + + /* Get the driver size */ + DriverSize = Section->ImageSection->ImageSize; + + /* Allocate a virtual section for the module */ + DriverBase = MmAllocateSection(DriverSize, NULL); + *ImageBase = DriverBase; + + /* Copy the image */ + RtlCopyMemory(DriverBase, Base, DriverSize); + + /* Now unmap the view */ + Status = MmUnmapViewOfSection(Process, Base); + ASSERT(NT_SUCCESS(Status)); + + /* Detach and return status */ + KeUnstackDetachProcess(&ApcState); + return Status; +} + +NTSTATUS +NTAPI +MiDereferenceImports(IN PLOAD_IMPORTS ImportList) +{ + SIZE_T i; + + /* Check if there's no imports or if we're a boot driver */ + if ((ImportList == (PVOID)-1) || + (ImportList == (PVOID)-2) || + (ImportList->Count == 0)) + { + /* Then there's nothing to do */ + return STATUS_SUCCESS; + } + + /* Otherwise, FIXME */ + DPRINT1("%u imports not dereferenced!\n", ImportList->Count); + for (i = 0; i < ImportList->Count; i++) + { + DPRINT1("%wZ <%wZ>\n", &ImportList->Entry[i]->FullDllName, &ImportList->Entry[i]->BaseDllName); + } + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +MiClearImports(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PAGED_CODE(); + + /* Check if there's no imports or we're a boot driver or only one entry */ + if ((LdrEntry->LoadedImports == (PVOID)-1) || + (LdrEntry->LoadedImports == (PVOID)-2) || + ((ULONG_PTR)LdrEntry->LoadedImports & 1)) + { + /* Nothing to do */ + return; + } + + /* Otherwise, free the import list */ + ExFreePool(LdrEntry->LoadedImports); +} + +PVOID +NTAPI +MiFindExportedRoutineByName(IN PVOID DllBase, + IN PANSI_STRING ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LONG Low = 0, Mid = 0, High, Ret; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(ExportName->Buffer, (PCHAR)DllBase + NameTable[Mid]); + if (Ret < 0) + { + /* Update high */ + High = Mid - 1; + } + else if (Ret > 0) + { + /* Update low */ + Low = Mid + 1; + } + else + { + /* We got it */ + break; + } + } + + /* Check if we couldn't find it */ + if (High < Low) return NULL; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + + /* We found it! */ + ASSERT((Function > (PVOID)ExportDirectory) && + (Function < (PVOID)((ULONG_PTR)ExportDirectory + ExportSize))); + return Function; +} + +PVOID +NTAPI +MiLocateExportName(IN PVOID DllBase, + IN PCHAR ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LONG Low = 0, Mid = 0, High, Ret; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(ExportName, (PCHAR)DllBase + NameTable[Mid]); + if (Ret < 0) + { + /* Update high */ + High = Mid - 1; + } + else if (Ret > 0) + { + /* Update low */ + Low = Mid + 1; + } + else + { + /* We got it */ + break; + } + } + + /* Check if we couldn't find it */ + if (High < Low) return NULL; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + + /* Check if the function is actually a forwarder */ + if (((ULONG_PTR)Function > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + { + /* It is, fail */ + return NULL; + } + + /* We found it */ + return Function; +} + +NTSTATUS +NTAPI +MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PLIST_ENTRY ListHead) +{ + PMM_DLL_INITIALIZE DllInit; + + /* Try to see if the image exports a DllInitialize routine */ + DllInit = (PMM_DLL_INITIALIZE)MiLocateExportName(LdrEntry->DllBase, + "DllInitialize"); + if (!DllInit) return STATUS_SUCCESS; + + /* FIXME: TODO */ + DPRINT1("DllInitialize not called!\n"); + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +MiProcessLoaderEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN BOOLEAN Insert) +{ + KIRQL OldIrql; + + /* Acquire the lock */ + KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql); + + /* Insert or remove from the list */ + Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks) : + RemoveEntryList(&LdrEntry->InLoadOrderLinks); + + /* Release the lock */ + KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql); +} + +VOID +NTAPI +MiUpdateThunks(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PVOID OldBase, + IN PVOID NewBase, + IN ULONG Size) +{ + ULONG_PTR OldBaseTop, Delta; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY NextEntry; + ULONG ImportSize; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; + PULONG ImageThunk; + + /* Calculate the top and delta */ + OldBaseTop = (ULONG_PTR)OldBase + Size - 1; + Delta = (ULONG_PTR)NewBase - (ULONG_PTR)OldBase; + + /* Loop the loader block */ + for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; + NextEntry != &LoaderBlock->LoadOrderListHead; + NextEntry = NextEntry->Flink) + { + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Get the import table */ + ImportDescriptor = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &ImportSize); + if (!ImportDescriptor) continue; + + /* Make sure we have an IAT */ + DPRINT("[Mm0]: Updating thunks in: %wZ\n", &LdrEntry->BaseDllName); + while ((ImportDescriptor->Name) && + (ImportDescriptor->OriginalFirstThunk)) + { + /* Get the image thunk */ + ImageThunk = (PVOID)((ULONG_PTR)LdrEntry->DllBase + + ImportDescriptor->FirstThunk); + while (*ImageThunk) + { + /* Check if it's within this module */ + if ((*ImageThunk >= (ULONG_PTR)OldBase) && (*ImageThunk <= OldBaseTop)) + { + /* Relocate it */ + DPRINT("[Mm0]: Updating IAT at: %p. Old Entry: %p. New Entry: %p.\n", + ImageThunk, *ImageThunk, *ImageThunk + Delta); + *ImageThunk += Delta; + } + + /* Go to the next thunk */ + ImageThunk++; + } + + /* Go to the next import */ + ImportDescriptor++; + } + } +} + +NTSTATUS +NTAPI +MiSnapThunk(IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA Name, + IN PIMAGE_THUNK_DATA Address, + IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, + IN ULONG ExportSize, + IN BOOLEAN SnapForwarder, + OUT PCHAR *MissingApi) +{ + BOOLEAN IsOrdinal; + USHORT Ordinal; + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_IMPORT_BY_NAME NameImport; + USHORT Hint; + ULONG Low = 0, Mid = 0, High; + LONG Ret; + NTSTATUS Status; + PCHAR MissingForwarder; + CHAR NameBuffer[MAXIMUM_FILENAME_LENGTH]; + PULONG ExportTable; + ANSI_STRING DllName; + UNICODE_STRING ForwarderName; + PLIST_ENTRY NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + ULONG ForwardExportSize; + PIMAGE_EXPORT_DIRECTORY ForwardExportDirectory; + PIMAGE_IMPORT_BY_NAME ForwardName; + ULONG ForwardLength; + IMAGE_THUNK_DATA ForwardThunk; + PAGED_CODE(); + + /* Check if this is an ordinal */ + IsOrdinal = IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal); + if ((IsOrdinal) && !(SnapForwarder)) + { + /* Get the ordinal number and set it as missing */ + Ordinal = (USHORT)(IMAGE_ORDINAL(Name->u1.Ordinal) - + ExportDirectory->Base); + *MissingApi = (PCHAR)(ULONG_PTR)Ordinal; + } + else + { + /* Get the VA if we don't have to snap */ + if (!SnapForwarder) Name->u1.AddressOfData += (ULONG_PTR)ImageBase; + NameImport = (PIMAGE_IMPORT_BY_NAME)Name->u1.AddressOfData; + + /* Copy the procedure name */ + strncpy(*MissingApi, + (PCHAR)&NameImport->Name[0], + MAXIMUM_FILENAME_LENGTH - 1); + + /* Setup name tables */ + DPRINT("Import name: %s\n", NameImport->Name); + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Get the hint and check if it's valid */ + Hint = NameImport->Hint; + if ((Hint < ExportDirectory->NumberOfNames) && + !(strcmp((PCHAR) NameImport->Name, (PCHAR)DllBase + NameTable[Hint]))) + { + /* We have a match, get the ordinal number from here */ + Ordinal = OrdinalTable[Hint]; + } + else + { + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp((PCHAR)NameImport->Name, (PCHAR)DllBase + NameTable[Mid]); + if (Ret < 0) + { + /* Update high */ + High = Mid - 1; + } + else if (Ret > 0) + { + /* Update low */ + Low = Mid + 1; + } + else + { + /* We got it */ + break; + } + } + + /* Check if we couldn't find it */ + if (High < Low) return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + } + } + + /* Check if the ordinal is invalid */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) + { + /* Fail */ + Status = STATUS_DRIVER_ORDINAL_NOT_FOUND; + } + else + { + /* In case the forwarder is missing */ + MissingForwarder = NameBuffer; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Address->u1.Function = (ULONG_PTR)DllBase + ExportTable[Ordinal]; + + /* Assume success from now on */ + Status = STATUS_SUCCESS; + + /* Check if the function is actually a forwarder */ + if ((Address->u1.Function > (ULONG_PTR)ExportDirectory) && + (Address->u1.Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + { + /* Now assume failure in case the forwarder doesn't exist */ + Status = STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + + /* Build the forwarder name */ + DllName.Buffer = (PCHAR)Address->u1.Function; + DllName.Length = strchr(DllName.Buffer, '.') - + DllName.Buffer + + sizeof(ANSI_NULL); + DllName.MaximumLength = DllName.Length; + + /* Convert it */ + if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ForwarderName, + &DllName, + TRUE))) + { + /* We failed, just return an error */ + return Status; + } + + /* Loop the module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check if it matches */ + if (RtlPrefixString((PSTRING)&ForwarderName, + (PSTRING)&LdrEntry->BaseDllName, + TRUE)) + { + /* Get the forwarder export directory */ + ForwardExportDirectory = + RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ForwardExportSize); + if (!ForwardExportDirectory) break; + + /* Allocate a name entry */ + ForwardLength = strlen(DllName.Buffer + DllName.Length) + + sizeof(ANSI_NULL); + ForwardName = ExAllocatePoolWithTag(PagedPool, + sizeof(*ForwardName) + + ForwardLength, + TAG_LDR_WSTR); + if (!ForwardName) break; + + /* Copy the data */ + RtlCopyMemory(&ForwardName->Name[0], + DllName.Buffer + DllName.Length, + ForwardLength); + ForwardName->Hint = 0; + + /* Set the new address */ + *(PULONG)&ForwardThunk.u1.AddressOfData = (ULONG)ForwardName; + + /* Snap the forwarder */ + Status = MiSnapThunk(LdrEntry->DllBase, + ImageBase, + &ForwardThunk, + &ForwardThunk, + ForwardExportDirectory, + ForwardExportSize, + TRUE, + &MissingForwarder); + + /* Free the forwarder name and set the thunk */ + ExFreePool(ForwardName); + Address->u1 = ForwardThunk.u1; + break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Free the name */ + RtlFreeUnicodeString(&ForwarderName); + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +MmUnloadSystemImage(IN PVOID ImageHandle) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry = ImageHandle; + PVOID BaseAddress = LdrEntry->DllBase; + NTSTATUS Status; + ANSI_STRING TempName; + BOOLEAN HadEntry = FALSE; + + /* Acquire the loader lock */ + KeEnterCriticalRegion(); + KeWaitForSingleObject(&MmSystemLoadLock, + WrVirtualMemory, + KernelMode, + FALSE, + NULL); + + /* Check if this driver was loaded at boot and didn't get imports parsed */ + if (LdrEntry->LoadedImports == (PVOID)-1) goto Done; + + /* We should still be alive */ + ASSERT(LdrEntry->LoadCount != 0); + LdrEntry->LoadCount--; + + /* Check if we're still loaded */ + if (LdrEntry->LoadCount) goto Done; + + /* We should cleanup... are symbols loaded */ + if (LdrEntry->Flags & LDRP_DEBUG_SYMBOLS_LOADED) + { + /* Create the ANSI name */ + Status = RtlUnicodeStringToAnsiString(&TempName, + &LdrEntry->BaseDllName, + TRUE); + if (NT_SUCCESS(Status)) + { + /* Unload the symbols */ + DbgUnLoadImageSymbols(&TempName, BaseAddress, -1); + RtlFreeAnsiString(&TempName); + } + } + + /* FIXME: Free the driver */ + //MmFreeSection(LdrEntry->DllBase); + + /* Check if we're linked in */ + if (LdrEntry->InLoadOrderLinks.Flink) + { + /* Remove us */ + MiProcessLoaderEntry(LdrEntry, FALSE); + HadEntry = TRUE; + } + + /* Dereference and clear the imports */ + MiDereferenceImports(LdrEntry->LoadedImports); + MiClearImports(LdrEntry); + + /* Check if the entry needs to go away */ + if (HadEntry) + { + /* Check if it had a name */ + if (LdrEntry->FullDllName.Buffer) + { + /* Free it */ + ExFreePool(LdrEntry->FullDllName.Buffer); + } + + /* Check if we had a section */ + if (LdrEntry->SectionPointer) + { + /* Dereference it */ + ObDereferenceObject(LdrEntry->SectionPointer); + } + + /* Free the entry */ + ExFreePool(LdrEntry); + } + + /* Release the system lock and return */ +Done: + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MiResolveImageReferences(IN PVOID ImageBase, + IN PUNICODE_STRING ImageFileDirectory, + IN PUNICODE_STRING NamePrefix OPTIONAL, + OUT PCHAR *MissingApi, + OUT PWCHAR *MissingDriver, + OUT PLOAD_IMPORTS *LoadImports) +{ + PCHAR MissingApiBuffer = *MissingApi, ImportName; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; + ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; + PLOAD_IMPORTS LoadedImports, NewImports; + ULONG GdiLink, NormalLink, i; + BOOLEAN ReferenceNeeded, Loaded; + ANSI_STRING TempString; + UNICODE_STRING NameString, DllName; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL, DllEntry, ImportEntry = NULL; + PVOID ImportBase, DllBase; + PLIST_ENTRY NextEntry; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + NTSTATUS Status; + PIMAGE_THUNK_DATA OrigThunk, FirstThunk; + PAGED_CODE(); + DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n", + __FUNCTION__, ImageBase, ImageFileDirectory); + + /* Assume no imports */ + *LoadImports = (PVOID)-2; + + /* Get the import descriptor */ + ImportDescriptor = RtlImageDirectoryEntryToData(ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &ImportSize); + if (!ImportDescriptor) return STATUS_SUCCESS; + + /* Loop all imports to count them */ + for (CurrentImport = ImportDescriptor; + (CurrentImport->Name) && (CurrentImport->OriginalFirstThunk); + CurrentImport++) + { + /* One more */ + ImportCount++; + } + + /* Make sure we have non-zero imports */ + if (ImportCount) + { + /* Calculate and allocate the list we'll need */ + LoadedImportsSize = ImportCount * sizeof(PVOID) + sizeof(SIZE_T); + LoadedImports = ExAllocatePoolWithTag(PagedPool, + LoadedImportsSize, + TAG_LDR_WSTR); + if (LoadedImports) + { + /* Zero it */ + RtlZeroMemory(LoadedImports, LoadedImportsSize); + } + } + else + { + /* No table */ + LoadedImports = NULL; + } + + /* Reset the import count and loop descriptors again */ + ImportCount = GdiLink = NormalLink = 0; + while ((ImportDescriptor->Name) && (ImportDescriptor->OriginalFirstThunk)) + { + /* Get the name */ + ImportName = (PCHAR)((ULONG_PTR)ImageBase + ImportDescriptor->Name); + + /* Check if this is a GDI driver */ + GdiLink = GdiLink | + !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)); + + /* We can also allow dxapi */ + NormalLink = NormalLink | + ((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) && + (_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1))); + + /* Check if this is a valid GDI driver */ + if ((GdiLink) && (NormalLink)) + { + /* It's not, it's importing stuff it shouldn't be! */ + MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return STATUS_PROCEDURE_NOT_FOUND; + } + + /* Check if this is a "core" import, which doesn't get referenced */ + if (!(_strnicmp(ImportName, "ntoskrnl", sizeof("ntoskrnl") - 1)) || + !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) || + !(_strnicmp(ImportName, "hal", sizeof("hal") - 1))) + { + /* Don't reference this */ + ReferenceNeeded = FALSE; + } + else + { + /* Reference these modules */ + ReferenceNeeded = TRUE; + } + + /* Now setup a unicode string for the import */ + RtlInitAnsiString(&TempString, ImportName); + Status = RtlAnsiStringToUnicodeString(&NameString, &TempString, TRUE); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return Status; + } + + /* We don't support name prefixes yet */ + if (NamePrefix) DPRINT1("Name Prefix not yet supported!\n"); + + /* Remember that we haven't loaded the import at this point */ +CheckDllState: + Loaded = FALSE; + ImportBase = NULL; + + /* Loop the driver list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the loader entry and compare the name */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (RtlEqualUnicodeString(&NameString, + &LdrEntry->BaseDllName, + TRUE)) + { + /* Get the base address */ + ImportBase = LdrEntry->DllBase; + + /* Check if we haven't loaded yet, and we need references */ + if (!(Loaded) && (ReferenceNeeded)) + { + /* Make sure we're not already loading */ + if (!(LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)) + { + /* Increase the load count */ + LdrEntry->LoadCount++; + } + } + + /* Done, break out */ + break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we haven't loaded the import yet */ + if (!ImportBase) + { + /* Setup the import DLL name */ + DllName.MaximumLength = NameString.Length + + ImageFileDirectory->Length + + sizeof(UNICODE_NULL); + DllName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + DllName.MaximumLength, + TAG_LDR_WSTR); + if (DllName.Buffer) + { + /* Setup the base length and copy it */ + DllName.Length = ImageFileDirectory->Length; + RtlCopyMemory(DllName.Buffer, + ImageFileDirectory->Buffer, + ImageFileDirectory->Length); + + /* Now add the import name and null-terminate it */ + RtlAppendStringToString((PSTRING)&DllName, + (PSTRING)&NameString); + DllName.Buffer[(DllName.MaximumLength - 1) / 2] = UNICODE_NULL; + + /* Load the image */ + Status = MmLoadSystemImage(&DllName, + NamePrefix, + NULL, + 0, + (PVOID)&DllEntry, + &DllBase); + if (NT_SUCCESS(Status)) + { + /* We can free the DLL Name */ + ExFreePool(DllName.Buffer); + } + else + { + /* Fill out the information for the error */ + *MissingDriver = DllName.Buffer; + *(PULONG)MissingDriver |= 1; + *MissingApi = NULL; + } + } + else + { + /* We're out of resources */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* Check if we're OK until now */ + if (NT_SUCCESS(Status)) + { + /* We're now loaded */ + Loaded = TRUE; + + /* Sanity check */ + ASSERT(DllBase = DllEntry->DllBase); + + /* Call the initialization routines */ + Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList); + if (!NT_SUCCESS(Status)) + { + /* We failed, unload the image */ + MmUnloadSystemImage(DllEntry); + while (TRUE); + Loaded = FALSE; + } + } + + /* Check if we failed by here */ + if (!NT_SUCCESS(Status)) + { + /* Cleanup and return */ + RtlFreeUnicodeString(&NameString); + MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return Status; + } + + /* Loop again to make sure that everything is OK */ + goto CheckDllState; + } + + /* Check if we're support to reference this import */ + if ((ReferenceNeeded) && (LoadedImports)) + { + /* Make sure we're not already loading */ + if (!(LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)) + { + /* Add the entry */ + LoadedImports->Entry[LoadedImports->Count] = LdrEntry; + LoadedImports->Count++; + } + } + + /* Free the import name */ + RtlFreeUnicodeString(&NameString); + + /* Set the missing driver name and get the export directory */ + *MissingDriver = LdrEntry->BaseDllName.Buffer; + ExportDirectory = RtlImageDirectoryEntryToData(ImportBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) + { + /* Cleanup and return */ + MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + } + + /* Make sure we have an IAT */ + if (ImportDescriptor->OriginalFirstThunk) + { + /* Get the first thunks */ + OrigThunk = (PVOID)((ULONG_PTR)ImageBase + + ImportDescriptor->OriginalFirstThunk); + FirstThunk = (PVOID)((ULONG_PTR)ImageBase + + ImportDescriptor->FirstThunk); + + /* Loop the IAT */ + while (OrigThunk->u1.AddressOfData) + { + /* Snap thunk */ + Status = MiSnapThunk(ImportBase, + ImageBase, + OrigThunk++, + FirstThunk++, + ExportDirectory, + ExportSize, + FALSE, + MissingApi); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and return */ + MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return Status; + } + + /* Reset the buffer */ + *MissingApi = MissingApiBuffer; + } + } + + /* Go to the next import */ + ImportDescriptor++; + } + + /* Check if we have an import list */ + if (LoadedImports) + { + /* Reset the count again, and loop entries*/ + ImportCount = 0; + for (i = 0; i < LoadedImports->Count; i++) + { + if (LoadedImports->Entry[i]) + { + /* Got an entry, OR it with 1 in case it's the single entry */ + ImportEntry = (PVOID)((ULONG_PTR)LoadedImports->Entry[i] | 1); + ImportCount++; + } + } + + /* Check if we had no imports */ + if (!ImportCount) + { + /* Free the list and set it to no imports */ + ExFreePool(LoadedImports); + LoadedImports = (PVOID)-2; + } + else if (ImportCount == 1) + { + /* Just one entry, we can free the table and only use our entry */ + ExFreePool(LoadedImports); + LoadedImports = (PLOAD_IMPORTS)ImportEntry; + } + else if (ImportCount != LoadedImports->Count) + { + /* Allocate a new list */ + LoadedImportsSize = ImportCount * sizeof(PVOID) + sizeof(SIZE_T); + NewImports = ExAllocatePoolWithTag(PagedPool, + LoadedImportsSize, + TAG_LDR_WSTR); + if (NewImports) + { + /* Set count */ + NewImports->Count = 0; + + /* Loop all the imports */ + for (i = 0; i < LoadedImports->Count; i++) + { + /* Make sure it's valid */ + if (LoadedImports->Entry[i]) + { + /* Copy it */ + NewImports->Entry[NewImports->Count] = LoadedImports->Entry[i]; + NewImports->Count++; + } + } + + /* Free the old copy */ + ExFreePool(LoadedImports); + LoadedImports = NewImports; + } + } + + /* Return the list */ + *LoadImports = LoadedImports; + } + + /* Return success */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +MiReloadBootLoadedDrivers(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextEntry; + ULONG i = 0; + PIMAGE_NT_HEADERS NtHeader; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PIMAGE_FILE_HEADER FileHeader; + BOOLEAN ValidRelocs; + PIMAGE_DATA_DIRECTORY DataDirectory; + PVOID DllBase, NewImageAddress; + NTSTATUS Status; + + /* Loop driver list */ + for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; + NextEntry != &LoaderBlock->LoadOrderListHead; + NextEntry = NextEntry->Flink) + { + /* Get the loader entry and NT header */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + NtHeader = RtlImageNtHeader(LdrEntry->DllBase); + + /* Debug info */ + DPRINT("[Mm0]: Driver at: %p ending at: %p for module: %wZ\n", + LdrEntry->DllBase, + (ULONG_PTR)LdrEntry->DllBase+ LdrEntry->SizeOfImage, + &LdrEntry->FullDllName); + + /* Skip kernel and HAL */ + /* ROS HACK: Skip BOOTVID/KDCOM too */ + i++; + if (i <= 4) continue; + + /* Skip non-drivers */ + if (!NtHeader) continue; + + /* Get the file header and make sure we can relocate */ + FileHeader = &NtHeader->FileHeader; + if (FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) continue; + if (NtHeader->OptionalHeader.NumberOfRvaAndSizes < + IMAGE_DIRECTORY_ENTRY_BASERELOC) continue; + + /* Everything made sense until now, check the relocation section too */ + DataDirectory = &NtHeader->OptionalHeader. + DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + if (!DataDirectory->VirtualAddress) + { + /* We don't really have relocations */ + ValidRelocs = FALSE; + } + else + { + /* Make sure the size is valid */ + if ((DataDirectory->VirtualAddress + DataDirectory->Size) > + LdrEntry->SizeOfImage) + { + /* They're not, skip */ + continue; + } + + /* We have relocations */ + ValidRelocs = TRUE; + } + + /* Remember the original address */ + DllBase = LdrEntry->DllBase; + + /* Allocate a virtual section for the module */ + NewImageAddress = MmAllocateSection(LdrEntry->SizeOfImage, NULL); + if (!NewImageAddress) + { + /* Shouldn't happen */ + DPRINT1("[Mm0]: Couldn't allocate driver section!\n"); + while (TRUE); + } + + /* Sanity check */ + DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress); + ASSERT(ExpInitializationPhase == 0); + + /* Now copy the entire driver over */ + RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage); + + /* Sanity check */ + ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase); + + /* Set the image base to the address where the loader put it */ + NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; + NtHeader = RtlImageNtHeader(NewImageAddress); + NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; + + /* Check if we had relocations */ + if (ValidRelocs) + { + /* Relocate the image */ + Status = LdrRelocateImageWithBias(NewImageAddress, + 0, + "SYSLDR", + STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, + STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) + { + /* This shouldn't happen */ + DPRINT1("Relocations failed!\n"); + while (TRUE); + } + } + + /* Update the loader entry */ + LdrEntry->DllBase = NewImageAddress; + + /* Update the thunks */ + DPRINT("[Mm0]: Updating thunks to: %wZ\n", &LdrEntry->BaseDllName); + MiUpdateThunks(LoaderBlock, + DllBase, + NewImageAddress, + LdrEntry->SizeOfImage); + + /* Update the loader entry */ + LdrEntry->Flags |= 0x01000000; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress + + NtHeader->OptionalHeader.AddressOfEntryPoint); + LdrEntry->SizeOfImage = LdrEntry->SizeOfImage; + + /* Free the old copy */ + MiFreeBootDriverMemory(DllBase, LdrEntry->SizeOfImage); + } +} + +BOOLEAN +NTAPI +MiInitializeLoadedModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry, NewEntry; + PLIST_ENTRY ListHead, NextEntry; + ULONG EntrySize; + + /* Setup the loaded module list and lock */ + KeInitializeSpinLock(&PsLoadedModuleSpinLock); + InitializeListHead(&PsLoadedModuleList); + + /* Get loop variables and the kernel entry */ + ListHead = &LoaderBlock->LoadOrderListHead; + NextEntry = ListHead->Flink; + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + PsNtosImageBase = (ULONG)LdrEntry->DllBase; + + /* Loop the loader block */ + while (NextEntry != ListHead) + { + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* FIXME: ROS HACK. Make sure this is a driver */ + if (!RtlImageNtHeader(LdrEntry->DllBase)) + { + /* Skip this entry */ + NextEntry= NextEntry->Flink; + continue; + } + + /* Calculate the size we'll need and allocate a copy */ + EntrySize = sizeof(LDR_DATA_TABLE_ENTRY) + + LdrEntry->BaseDllName.MaximumLength + + sizeof(UNICODE_NULL); + NewEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_LDR_WSTR); + if (!NewEntry) return FALSE; + + /* Copy the entry over */ + *NewEntry = *LdrEntry; + + /* Allocate the name */ + NewEntry->FullDllName.Buffer = + ExAllocatePoolWithTag(PagedPool, + LdrEntry->FullDllName.MaximumLength + + sizeof(UNICODE_NULL), + TAG_LDR_WSTR); + if (!NewEntry->FullDllName.Buffer) return FALSE; + + /* Set the base name */ + NewEntry->BaseDllName.Buffer = (PVOID)(NewEntry + 1); + + /* Copy the full and base name */ + RtlCopyMemory(NewEntry->FullDllName.Buffer, + LdrEntry->FullDllName.Buffer, + LdrEntry->FullDllName.MaximumLength); + RtlCopyMemory(NewEntry->BaseDllName.Buffer, + LdrEntry->BaseDllName.Buffer, + LdrEntry->BaseDllName.MaximumLength); + + /* Null-terminate the base name */ + NewEntry->BaseDllName.Buffer[NewEntry->BaseDllName.Length / + sizeof(WCHAR)] = UNICODE_NULL; + + /* Insert the entry into the list */ + InsertTailList(&PsLoadedModuleList, &NewEntry->InLoadOrderLinks); + NextEntry = NextEntry->Flink; + } + + /* Build the import lists for the boot drivers */ + //MiBuildImportsForBootDrivers(); + + /* We're done */ + return TRUE; +} + +#if 0 + +BOOLEAN +NTAPI +MmVerifyImageIsOkForMpUse(IN PVOID BaseAddress) +{ + PIMAGE_NT_HEADERS NtHeader; + PAGED_CODE(); + + /* Get NT Headers */ + NtHeader = RtlImageNtHeader(BaseAddress); + if (NtHeader) + { + /* Check if this image is only safe for UP while we have 2+ CPUs */ + if ((KeNumberProcessors > 1) && + (NtHeader->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY)) + { + /* Fail */ + return FALSE; + } + } + + /* Otherwise, it's safe */ + return TRUE; +} + +NTSTATUS +NTAPI +MmCheckSystemImage(IN HANDLE ImageHandle, + IN BOOLEAN PurgeSection) +{ + NTSTATUS Status; + HANDLE SectionHandle; + PVOID ViewBase = NULL; + SIZE_T ViewSize = 0; + IO_STATUS_BLOCK IoStatusBlock; + FILE_STANDARD_INFORMATION FileStandardInfo; + KAPC_STATE ApcState; + PAGED_CODE(); + + /* Create a section for the DLL */ + Status = ZwCreateSection(&SectionHandle, + SECTION_MAP_EXECUTE, + NULL, + NULL, + PAGE_EXECUTE, + SEC_COMMIT, + ImageHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure we're in the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + + /* Map it */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &ViewBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_EXECUTE); + if (!NT_SUCCESS(Status)) + { + /* We failed, close the handle and return */ + KeUnstackDetachProcess(&ApcState); + ZwClose(SectionHandle); + return Status; + } + + /* Now query image information */ + Status = ZwQueryInformationFile(ImageHandle, + &IoStatusBlock, + &FileStandardInfo, + sizeof(FileStandardInfo), + FileStandardInformation); + if ( NT_SUCCESS(Status) ) + { + /* First, verify the checksum */ + if (!LdrVerifyMappedImageMatchesChecksum(ViewBase, + FileStandardInfo. + EndOfFile.LowPart, + FileStandardInfo. + EndOfFile.LowPart)) + { + /* Set checksum failure */ + Status = STATUS_IMAGE_CHECKSUM_MISMATCH; + } + + /* Check that it's a valid SMP image if we have more then one CPU */ + if (!MmVerifyImageIsOkForMpUse(ViewBase)) + { + /* Otherwise it's not the right image */ + Status = STATUS_IMAGE_MP_UP_MISMATCH; + } + } + + /* Unmap the section, close the handle, and return status */ + ZwUnmapViewOfSection(NtCurrentProcess(), ViewBase); + KeUnstackDetachProcess(&ApcState); + ZwClose(SectionHandle); + return Status; +} + +#endif + +NTSTATUS +NTAPI +MmLoadSystemImage(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING NamePrefix OPTIONAL, + IN PUNICODE_STRING LoadedName OPTIONAL, + IN ULONG Flags, + OUT PVOID *ModuleObject, + OUT PVOID *ImageBaseAddress) +{ + PVOID ModuleLoadBase = NULL; + NTSTATUS Status; + HANDLE FileHandle = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PIMAGE_NT_HEADERS NtHeader; + UNICODE_STRING BaseName, BaseDirectory, PrefixName, UnicodeTemp; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; + ULONG EntrySize, DriverSize; + PLOAD_IMPORTS LoadedImports = (PVOID)-2; + PCHAR MissingApiName, Buffer; + PWCHAR MissingDriverName; + HANDLE SectionHandle; + ACCESS_MASK DesiredAccess; + PVOID Section = NULL; + BOOLEAN LockOwned = FALSE; + PLIST_ENTRY NextEntry; + IMAGE_INFO ImageInfo; + ANSI_STRING AnsiTemp; + PAGED_CODE(); + + /* Detect session-load */ + if (Flags) + { + /* Sanity checks */ + ASSERT(NamePrefix == NULL); + ASSERT(LoadedName == NULL); + + /* Make sure the process is in session too */ + if (!PsGetCurrentProcess()->ProcessInSession) return STATUS_NO_MEMORY; + } + + if (ModuleObject) *ModuleObject = NULL; + if (ImageBaseAddress) *ImageBaseAddress = NULL; + + /* Allocate a buffer we'll use for names */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); + if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Check for a separator */ + if (FileName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + PWCHAR p; + ULONG BaseLength; + + /* Loop the path until we get to the base name */ + p = &FileName->Buffer[FileName->Length / sizeof(WCHAR)]; + while (*(p - 1) != OBJ_NAME_PATH_SEPARATOR) p--; + + /* Get the length */ + BaseLength = (ULONG)(&FileName->Buffer[FileName->Length / sizeof(WCHAR)] - p); + BaseLength *= sizeof(WCHAR); + + /* Setup the string */ + BaseName.Length = (USHORT)BaseLength; + BaseName.Buffer = p; + } + else + { + /* Otherwise, we already have a base name */ + BaseName.Length = FileName->Length; + BaseName.Buffer = FileName->Buffer; + } + + /* Setup the maximum length */ + BaseName.MaximumLength = BaseName.Length; + + /* Now compute the base directory */ + BaseDirectory = *FileName; + BaseDirectory.Length -= BaseName.Length; + BaseDirectory.MaximumLength = BaseDirectory.Length; + + /* And the prefix, which for now is just the name itself */ + PrefixName = *FileName; + + /* Check if we have a prefix */ + if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); + + /* Check if we already have a name, use it instead */ + if (LoadedName) BaseName = *LoadedName; + + /* Acquire the load lock */ +LoaderScan: + ASSERT(LockOwned == FALSE); + LockOwned = TRUE; + KeEnterCriticalRegion(); + KeWaitForSingleObject(&MmSystemLoadLock, + WrVirtualMemory, + KernelMode, + FALSE, + NULL); + + /* Scan the module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the entry and compare the names */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (RtlEqualUnicodeString(&PrefixName, &LdrEntry->FullDllName, TRUE)) + { + /* Found it, break out */ + break; + } + + /* Keep scanning */ + NextEntry = NextEntry->Flink; + } + + /* Check if we found the image */ + if (NextEntry != &PsLoadedModuleList) + { + /* Check if we had already mapped a section */ + if (Section) + { + /* Dereference and clear */ + ObDereferenceObject(Section); + Section = NULL; + } + + /* Check if this was supposed to be a session load */ + if (!Flags) + { + /* It wasn't, so just return the data */ + if (ModuleObject) *ModuleObject = LdrEntry; + if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase; + Status = STATUS_IMAGE_ALREADY_LOADED; + } + else + { + /* We don't support session loading yet */ + DPRINT1("Unsupported Session-Load!\n"); + while (TRUE); + } + + /* Do cleanup */ + goto Quickie; + } + else if (!Section) + { + /* It wasn't loaded, and we didn't have a previous attempt */ + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + LockOwned = FALSE; + + /* Check if KD is enabled */ + if ((KdDebuggerEnabled) && !(KdDebuggerNotPresent)) + { + /* FIXME: Attempt to get image from KD */ + } + + /* We don't have a valid entry */ + LdrEntry = NULL; + + /* Setup image attributes */ + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Open the image */ + Status = ZwOpenFile(&FileHandle, + FILE_EXECUTE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_DELETE, + 0); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Validate it */ + Status = MmCheckSystemImage(FileHandle, FALSE); + if ((Status == STATUS_IMAGE_CHECKSUM_MISMATCH) || + (Status == STATUS_IMAGE_MP_UP_MISMATCH) || + (Status == STATUS_INVALID_IMAGE_FORMAT)) + { + /* Fail loading */ + goto Quickie; + } + + /* Check if this is a session-load */ + if (Flags) + { + /* Then we only need read and execute */ + DesiredAccess = SECTION_MAP_READ | SECTION_MAP_EXECUTE; + } + else + { + /* Otherwise, we can allow write access */ + DesiredAccess = SECTION_ALL_ACCESS; + } + + /* Initialize the attributes for the section */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Create the section */ + Status = ZwCreateSection(&SectionHandle, + DesiredAccess, + &ObjectAttributes, + NULL, + PAGE_EXECUTE, + SEC_IMAGE, + FileHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Now get the section pointer */ + Status = ObReferenceObjectByHandle(SectionHandle, + SECTION_MAP_EXECUTE, + MmSectionObjectType, + KernelMode, + &Section, + NULL); + ZwClose(SectionHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if this was supposed to be a session-load */ + if (Flags) + { + /* We don't support session loading yet */ + DPRINT1("Unsupported Session-Load!\n"); + while (TRUE); + } + + /* Check the loader list again, we should end up in the path below */ + goto LoaderScan; + } + else + { + /* We don't have a valid entry */ + LdrEntry = NULL; + } + + /* Load the image */ + Status = MiLoadImageSection(&Section, + &ModuleLoadBase, + FileName, + FALSE, + NULL); + ASSERT(Status != STATUS_ALREADY_COMMITTED); + + /* Get the size of the driver */ + DriverSize = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; + + /* Make sure we're not being loaded into session space */ + if (!Flags) + { + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* FIXME: Support large pages for drivers */ + } + + /* Dereference the section */ + ObDereferenceObject(Section); + Section = NULL; + } + + /* Get the NT Header */ + NtHeader = RtlImageNtHeader(ModuleLoadBase); + + /* Relocate the driver */ + Status = LdrRelocateImageWithBias(ModuleLoadBase, + 0, + "SYSLDR", + STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, + STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Calculate the size we'll need for the entry and allocate it */ + EntrySize = sizeof(LDR_DATA_TABLE_ENTRY) + + BaseName.Length + + sizeof(UNICODE_NULL); + + /* Allocate the entry */ + LdrEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_MODULE_OBJECT); + if (!LdrEntry) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Setup the entry */ + LdrEntry->Flags = LDRP_LOAD_IN_PROGRESS; + LdrEntry->LoadCount = 1; + LdrEntry->LoadedImports = LoadedImports; + LdrEntry->PatchInformation = NULL; + + /* Check the version */ + if ((NtHeader->OptionalHeader.MajorOperatingSystemVersion >= 5) && + (NtHeader->OptionalHeader.MajorImageVersion >= 5)) + { + /* Mark this image as a native image */ + LdrEntry->Flags |= 0x80000000; + } + + /* Setup the rest of the entry */ + LdrEntry->DllBase = ModuleLoadBase; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)ModuleLoadBase + + NtHeader->OptionalHeader.AddressOfEntryPoint); + LdrEntry->SizeOfImage = DriverSize; + LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; + LdrEntry->SectionPointer = Section; + + /* Now write the DLL name */ + LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1); + LdrEntry->BaseDllName.Length = BaseName.Length; + LdrEntry->BaseDllName.MaximumLength = BaseName.Length; + + /* Copy and null-terminate it */ + RtlCopyMemory(LdrEntry->BaseDllName.Buffer, + BaseName.Buffer, + BaseName.Length); + LdrEntry->BaseDllName.Buffer[BaseName.Length / 2] = UNICODE_NULL; + + /* Now allocate the full name */ + LdrEntry->FullDllName.Buffer = ExAllocatePoolWithTag(PagedPool, + PrefixName.Length + + sizeof(UNICODE_NULL), + TAG_LDR_WSTR); + if (!LdrEntry->FullDllName.Buffer) + { + /* Don't fail, just set it to zero */ + LdrEntry->FullDllName.Length = 0; + LdrEntry->FullDllName.MaximumLength = 0; + } + else + { + /* Set it up */ + LdrEntry->FullDllName.Length = PrefixName.Length; + LdrEntry->FullDllName.MaximumLength = PrefixName.Length; + + /* Copy and null-terminate */ + RtlCopyMemory(LdrEntry->FullDllName.Buffer, + PrefixName.Buffer, + PrefixName.Length); + LdrEntry->FullDllName.Buffer[PrefixName.Length / 2] = UNICODE_NULL; + } + + /* Add the entry */ + MiProcessLoaderEntry(LdrEntry, TRUE); + + /* Resolve imports */ + MissingApiName = Buffer; + Status = MiResolveImageReferences(ModuleLoadBase, + &BaseDirectory, + NULL, + &MissingApiName, + &MissingDriverName, + &LoadedImports); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + MiProcessLoaderEntry(LdrEntry, FALSE); + + /* Check if we need to free the name */ + if (LdrEntry->FullDllName.Buffer) + { + /* Free it */ + ExFreePool(LdrEntry->FullDllName.Buffer); + } + + /* Free the entry itself */ + ExFreePool(LdrEntry); + LdrEntry = NULL; + goto Quickie; + } + + /* Update the loader entry */ + LdrEntry->Flags |= (LDRP_SYSTEM_MAPPED | + LDRP_ENTRY_PROCESSED | + LDRP_MM_LOADED); + LdrEntry->Flags &= ~LDRP_LOAD_IN_PROGRESS; + LdrEntry->LoadedImports = LoadedImports; + + /* FIXME: Apply driver verifier */ + + /* FIXME: Write-protect the system image */ + + /* Check if notifications are enabled */ + if (PsImageNotifyEnabled) + { + /* Fill out the notification data */ + ImageInfo.Properties = 0; + ImageInfo.ImageAddressingMode = IMAGE_ADDRESSING_MODE_32BIT; + ImageInfo.SystemModeImage = TRUE; + ImageInfo.ImageSize = LdrEntry->SizeOfImage; + ImageInfo.ImageBase = LdrEntry->DllBase; + ImageInfo.ImageSectionNumber = ImageInfo.ImageSelector = 0; + + /* Send the notification */ + PspRunLoadImageNotifyRoutines(FileName, NULL, &ImageInfo); + } + + /* Check if there's symbols */ +#ifdef KDBG + /* If KDBG is defined, then we always have symbols */ + if (TRUE) +#else + if (MiCacheImageSymbols(LdrEntry->DllBase)) +#endif + { + /* Check if the system root is present */ + if ((PrefixName.Length > (11 * sizeof(WCHAR))) && + !(_wcsnicmp(PrefixName.Buffer, L"\\SystemRoot", 11))) + { + /* Add the system root */ + UnicodeTemp = PrefixName; + UnicodeTemp.Buffer += 11; + UnicodeTemp.Length -= (11 * sizeof(WCHAR)); + sprintf_nt(Buffer, + "%ws%wZ", + &SharedUserData->NtSystemRoot[2], + &UnicodeTemp); + } + else + { + /* Build the name */ + sprintf_nt(Buffer, "%wZ", &BaseName); + } + + /* Setup the ansi string */ + RtlInitString(&AnsiTemp, Buffer); + + /* Notify the debugger */ + DbgLoadImageSymbols(&AnsiTemp, LdrEntry->DllBase, -1); + LdrEntry->Flags |= LDRP_DEBUG_SYMBOLS_LOADED; + } + + /* FIXME: Page the driver */ + ASSERT(Section == NULL); + + /* Return pointers */ + if (ModuleObject) *ModuleObject = LdrEntry; + if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase; + +Quickie: + /* If we have a file handle, close it */ + if (FileHandle) ZwClose(FileHandle); + + /* Check if we have the lock acquired */ + if (LockOwned) + { + /* Release the lock */ + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + LockOwned = FALSE; + } + + /* Check if we had a prefix */ + if (NamePrefix) ExFreePool(PrefixName.Buffer); + + /* Free the name buffer and return status */ + ExFreePool(Buffer); + return Status; +} + +/* + * @implemented + */ +PVOID +NTAPI +MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) +{ + PVOID ProcAddress = NULL; + ANSI_STRING AnsiRoutineName; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + extern LIST_ENTRY PsLoadedModuleList; + PLDR_DATA_TABLE_ENTRY LdrEntry; + BOOLEAN Found = FALSE; + UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); + UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); + ULONG Modules = 0; + + /* Convert routine to ansi name */ + Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, + SystemRoutineName, + TRUE); + if (!NT_SUCCESS(Status)) return NULL; + + /* Lock the list */ + KeEnterCriticalRegion(); + + /* Loop the loaded module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check if it's the kernel or HAL */ + if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) + { + /* Found it */ + Found = TRUE; + Modules++; + } + else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) + { + /* Found it */ + Found = TRUE; + Modules++; + } + + /* Check if we found a valid binary */ + if (Found) + { + /* Find the procedure name */ + ProcAddress = MiFindExportedRoutineByName(LdrEntry->DllBase, + &AnsiRoutineName); + + /* Break out if we found it or if we already tried both modules */ + if (ProcAddress) break; + if (Modules == 2) break; + } + + /* Keep looping */ + NextEntry = NextEntry->Flink; + } + + /* Release the lock */ + KeLeaveCriticalRegion(); + + /* Free the string and return */ + RtlFreeAnsiString(&AnsiRoutineName); + return ProcAddress; +} + Propchange: branches/cache_manager_rewrite/mm/sysldr.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 31571: Divide by 10 memory requirements for rbuild, from 270MB to 20MB, by deleting unused objects
by hpoussin＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: hpoussin Date: Wed Jan 2 23:37:09 2008 New Revision: 31571 URL: http://svn.reactos.org/svn/reactos?rev=31571&view=rev Log: Divide by 10 memory requirements for rbuild, from 270MB to 20MB, by deleting unused objects Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Jan 2 23:37:09 2008 @@ -412,17 +412,13 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), importedModule, NULL ); + const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation *objectFilename = GetObjectFilename ( compilationName, importedModule, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) - { dep += ssprintf ( " $(%s_HEADERS)", importedModule.name.c_str () ); - break; - } - if ( GetExtension ( *objectFilename ) == ".rc" ) - { - dep += ssprintf ( " $(%s_MCHEADERS)", importedModule.name.c_str () ); - break; - } + else if ( GetExtension ( *objectFilename ) == ".rc" ) + dep += ssprintf ( " $(%s_MCHEADERS)", importedModule.name.c_str () ); + delete compilationName; } } else @@ -487,9 +483,10 @@ { if ( includeGeneratedFiles || !compilationUnits[i]->IsGeneratedFile () ) { - const FileLocation* sourceFileLocation = GetActualSourceFilename ( - compilationUnits[i]->GetFilename () ); + const FileLocation *compilationName = compilationUnits[i]->GetFilename (); + const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationName ); list.push_back ( *sourceFileLocation ); + delete compilationName; delete sourceFileLocation; } } @@ -510,9 +507,10 @@ CompilationUnit& compilationUnit = *compilationUnits[j]; if ( includeGeneratedFiles || !compilationUnit.IsGeneratedFile () ) { - const FileLocation* sourceFileLocation = GetActualSourceFilename ( - compilationUnit.GetFilename () ); + const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationName ); list.push_back ( *sourceFileLocation ); + delete compilationName; delete sourceFileLocation; } } @@ -672,8 +670,10 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - const FileLocation *object_file = GetObjectFilename ( compilationUnits[i]->GetFilename (), module, NULL ); + const FileLocation *compilationName = compilationUnits[i]->GetFilename (); + const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); objectFilenames += backend->GetFullName ( *object_file ); + delete compilationName; delete object_file; } return objectFilenames; @@ -1021,11 +1021,13 @@ for ( i = 0; i < compilationUnits.size(); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; + const FileLocation *compilationName = compilationUnit.GetFilename (); fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), - backend->GetFullName ( *compilationUnit.GetFilename () ).c_str () ); + backend->GetFullName ( *compilationName ).c_str () ); + delete compilationName; } fprintf ( fMakefile, "\n" ); } @@ -1060,11 +1062,13 @@ GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { + const FileLocation *compilationName = sourceCompilationUnits[i]->GetFilename (); fprintf ( fMakefile, "%s += %s\n", sourcesMacro.c_str(), - backend->GetFullName ( *sourceCompilationUnits[i]->GetFilename () ).c_str () ); + backend->GetFullName ( *compilationName ).c_str () ); + delete compilationName; } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -1087,13 +1091,15 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( compilationUnit.IsFirstFile () ) { - const FileLocation *object_file = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); + const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), backend->GetFullName ( *object_file ).c_str (), objectsMacro.c_str() ); delete object_file; + delete compilationName; } } fprintf ( @@ -1106,7 +1112,8 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( !compilationUnit.IsFirstFile () ) { - const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); + const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation *objectFilename = GetObjectFilename ( compilationName, module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) headers.push_back ( objectFilename ); else if ( GetExtension ( *objectFilename ) == ".rc" ) @@ -1124,6 +1131,7 @@ backend->GetFullName ( *objectFilename ).c_str () ); delete objectFilename; } + delete compilationName; } } fprintf ( fMakefile, "\n" ); @@ -1215,13 +1223,15 @@ GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { - const FileLocation *object_file = GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), module, NULL ); + const FileLocation *compilationName = sourceCompilationUnits[i]->GetFilename (); + const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); fprintf ( fMakefile, "%s += %s\n", objectsMacro.c_str(), backend->GetFullName ( *object_file ).c_str () ); delete object_file; + delete compilationName; } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -1508,6 +1518,7 @@ backend->GetFullName ( *sourceFile ).c_str () ); delete generatedHeaderFilename; + delete sourceFile; } /* caller needs to delete the returned object */ @@ -1562,6 +1573,8 @@ widlflagsMacro.c_str (), backend->GetFullName ( EmbeddedTypeLibFilename ).c_str(), backend->GetFullName ( *sourceFile ).c_str () ); + + delete sourceFile; } void @@ -1600,6 +1613,7 @@ backend->GetFullName ( *sourceFile ).c_str () ); delete generatedHeaderFilename; + delete sourceFile; } void @@ -1631,6 +1645,7 @@ backend->GetFullName ( *sourceFile ).c_str () ); delete generatedHeader; + delete sourceFile; } void @@ -1671,7 +1686,6 @@ GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, cc, cflagsMacro ); - return; } else if ( extension == ".cc" || extension == ".CC" || extension == ".cpp" || extension == ".CPP" || @@ -1681,31 +1695,26 @@ GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, cppc, cflagsMacro ); - return; } else if ( extension == ".s" || extension == ".S" ) { GenerateGccAssemblerCommand ( sourceFile, cc, cflagsMacro ); - return; } else if ( extension == ".asm" || extension == ".ASM" ) { GenerateNasmCommand ( sourceFile, nasmflagsMacro ); - return; } else if ( extension == ".rc" || extension == ".RC" ) { GenerateWindresCommand ( sourceFile, windresflagsMacro ); - return; } else if ( extension == ".mc" || extension == ".MC" ) { GenerateWmcCommands ( sourceFile ); - return; } else if ( extension == ".spec" || extension == ".SPEC" ) { @@ -1714,7 +1723,6 @@ extraDependencies, cc, cflagsMacro ); - return; } else if ( extension == ".idl" || extension == ".IDL" ) { @@ -1727,14 +1735,17 @@ cc, cflagsMacro ); } - return; - } - - throw InvalidOperationException ( __FILE__, - __LINE__, - "Unsupported filename extension '%s' in file '%s'", - extension.c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); + } + else + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Unsupported filename extension '%s' in file '%s'", + extension.c_str (), + backend->GetFullName ( *sourceFile ).c_str () ); + } + + delete sourceFile; } void @@ -1822,9 +1833,11 @@ for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *data.compilationUnits[i]; - const FileLocation *object_file = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); + const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation *object_file = GetObjectFilename ( compilationName, module, NULL ); objectFiles.push_back ( *object_file ); delete object_file; + delete compilationName; } } @@ -2010,17 +2023,13 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); + const FileLocation *compilationName = compilationUnit.GetFilename (); + const FileLocation *objectFilename = GetObjectFilename ( compilationName, module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) - { moduleDependencies += ssprintf ( " $(%s_HEADERS)", module.name.c_str () ); - break; - } - if ( GetExtension ( *objectFilename ) == ".rc" ) - { + else if ( GetExtension ( *objectFilename ) == ".rc" ) moduleDependencies += ssprintf ( " $(%s_RESOURCES)", module.name.c_str () ); - break; - } + delete compilationName; delete objectFilename; } @@ -2272,6 +2281,7 @@ delete header; } } + delete sourceFile; } } } @@ -2313,6 +2323,7 @@ string extension = GetExtension ( *sourceFile ); if ( extension == ".spec" || extension == ".SPEC" ) GetSpecObjectDependencies ( s, sourceFile ); + delete sourceFile; } } if ( s.size () > 0 ) @@ -2555,22 +2566,23 @@ dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); - /* Check if any dependent library relays on the generated headers */ + /* Check if any dependent library relays on the generated headers */ for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; - for ( size_t j = 0; j < m.non_if_data.compilationUnits.size (); j++ ) - { + for ( size_t j = 0; j < m.non_if_data.compilationUnits.size (); j++ ) + { CompilationUnit& compilationUnit = *m.non_if_data.compilationUnits[j]; const FileLocation* sourceFile = compilationUnit.GetFilename (); string extension = GetExtension ( *sourceFile ); - if (extension == ".mc" || extension == ".MC" ) - { - string dependency = ssprintf ( " $(%s_MCHEADERS)", m.name.c_str () ); - dependencies.push_back ( dependency ); - } - } - } + if (extension == ".mc" || extension == ".MC" ) + { + string dependency = ssprintf ( " $(%s_MCHEADERS)", m.name.c_str () ); + dependencies.push_back ( dependency ); + } + delete sourceFile; + } + } } void @@ -2747,6 +2759,7 @@ if ( ( module.type == RpcServer ) || ( module.type == RpcClient ) ) GetWidlObjectDependencies ( dependencies, sourceFile ); } + delete sourceFile; } }

1 0

[fireball] 31570: - Merge 31498 from old widl.
by fireball＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: fireball Date: Wed Jan 2 23:34:43 2008 New Revision: 31570 URL: http://svn.reactos.org/svn/reactos?rev=31570&view=rev Log: - Merge 31498 from old widl. Modified: trunk/reactos/tools/widl_new/widl.c Modified: trunk/reactos/tools/widl_new/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_new/widl.c?rev=… ============================================================================== --- trunk/reactos/tools/widl_new/widl.c (original) +++ trunk/reactos/tools/widl_new/widl.c Wed Jan 2 23:34:43 2008 @@ -367,7 +367,12 @@ } if(do_header) { - header_token = make_token(header_name); + if (strrchr(header_name, '\\')) + header_token = make_token(strrchr(header_name, '\\') + 1); + else if (strrchr(header_name, '/')) + header_token = make_token(strrchr(header_name, '/') + 1); + else + header_token = make_token(header_name); if(!(header = fopen(header_name, "w"))) { fprintf(stderr, "Could not open %s for output\n", header_name);

1 0

[dreimer] 31569: Update for German RC File
by dreimer＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: dreimer Date: Wed Jan 2 23:09:03 2008 New Revision: 31569 URL: http://svn.reactos.org/svn/reactos?rev=31569&view=rev Log: Update for German RC File Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Jan 2 23:09:03 2008 @@ -12,31 +12,31 @@ { 6, 8, - "Language Selection.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Please choose the language used for the installation process.", + "Sprachauswahl.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Bitte waehlen Sie die Sprache, die Sie waehrend des Setups verwenden wollen.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Dann druecken Sie ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "\x07 Diese Sprache wird spaeter als Standardsprache im System verwendet.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsetzen F3 = Beenden", TEXT_STATUS }, {

1 0

[akorotaev] 31568: Merge that too. Now it links, but asserts at early boot phase.
by akorotaev＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: akorotaev Date: Wed Jan 2 22:36:10 2008 New Revision: 31568 URL: http://svn.reactos.org/svn/reactos?rev=31568&view=rev Log: Merge that too. Now it links, but asserts at early boot phase. Modified: branches/cache_manager_rewrite/mm/i386/page.c Modified: branches/cache_manager_rewrite/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/i386/p… ============================================================================== --- branches/cache_manager_rewrite/mm/i386/page.c (original) +++ branches/cache_manager_rewrite/mm/i386/page.c Wed Jan 2 22:36:10 2008 @@ -75,22 +75,23 @@ BOOLEAN MmUnmapPageTable(PULONG Pt); -VOID -STDCALL -MiFlushTlbIpiRoutine(PVOID Address) -{ - if (Address == (PVOID)0xffffffff) +ULONG_PTR +NTAPI +MiFlushTlbIpiRoutine(ULONG_PTR Address) +{ + if (Address == (ULONG_PTR)-1) { KeFlushCurrentTb(); } - else if (Address == (PVOID)0xfffffffe) + else if (Address == (ULONG_PTR)-2) { KeFlushCurrentTb(); } else { - __invlpg(Address); - } + __invlpg((PVOID)Address); + } + return 0; } VOID @@ -101,13 +102,13 @@ { MmUnmapPageTable(Pt); } - if (KeNumberProcessors>1) - { - KeIpiGenericCall(MiFlushTlbIpiRoutine, Address); - } - else - { - MiFlushTlbIpiRoutine(Address); + if (KeNumberProcessors > 1) + { + KeIpiGenericCall(MiFlushTlbIpiRoutine, (ULONG_PTR)Address); + } + else + { + MiFlushTlbIpiRoutine((ULONG_PTR)Address); } #else if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) @@ -325,17 +326,33 @@ } NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + /* Share the directory base with the idle process */ + *DirectoryTableBase = PsGetCurrentProcess()->Pcb.DirectoryTableBase; + + /* Initialize the Addresss Space */ + MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); + + /* The process now has an address space */ + Process->HasAddressSpace = TRUE; + return STATUS_SUCCESS; +} + +BOOLEAN STDCALL -MmCopyMmInfo(PEPROCESS Src, - PEPROCESS Dest, - PPHYSICAL_ADDRESS DirectoryTableBase) +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) { NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[7]; ULONG Count; - DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); + DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); Count = Ke386Pae ? 7 : 2; @@ -344,11 +361,12 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn[i]); if (!NT_SUCCESS(Status)) { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); - } - return Status; + for (j = 0; j < i; j++) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn[j]); + } + + return FALSE; } } @@ -400,7 +418,7 @@ DirectoryTableBase->QuadPart = PFN_TO_PTE(Pfn[0]); DPRINT("Finished MmCopyMmInfo(): %I64x\n", DirectoryTableBase->QuadPart); - return(STATUS_SUCCESS); + return TRUE; } VOID @@ -625,7 +643,7 @@ if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { - PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); + PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.LowPart)); if (PageDir == NULL) { KEBUGCHECK(0); @@ -1925,8 +1943,16 @@ { if (!MmIsUsablePage(Pages[i])) { - DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); - KEBUGCHECK(0); + /* Is this an attempt to map KUSER_SHARED_DATA? */ + if ((Address == (PVOID)0x7FFE0000) && (PageCount == 1) && (Pages[0] == 2)) + { + // allow + } + else + { + DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); + } } }

1 0

[akorotaev] 31567: Merge changes from HEAD. It still doesn't link.
by akorotaev＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: akorotaev Date: Wed Jan 2 22:12:58 2008 New Revision: 31567 URL: http://svn.reactos.org/svn/reactos?rev=31567&view=rev Log: Merge changes from HEAD. It still doesn't link. Modified: branches/cache_manager_rewrite/mm/anonmem.c branches/cache_manager_rewrite/mm/cont.c branches/cache_manager_rewrite/mm/drvlck.c branches/cache_manager_rewrite/mm/elf.inc.h branches/cache_manager_rewrite/mm/elf32.c branches/cache_manager_rewrite/mm/elf64.c branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/iospace.c branches/cache_manager_rewrite/mm/marea.c branches/cache_manager_rewrite/mm/mm.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/mpw.c branches/cache_manager_rewrite/mm/npool.c branches/cache_manager_rewrite/mm/pagefile.c Modified: branches/cache_manager_rewrite/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/anonme… ============================================================================== --- branches/cache_manager_rewrite/mm/anonmem.c (original) +++ branches/cache_manager_rewrite/mm/anonmem.c Wed Jan 2 22:12:58 2008 @@ -27,14 +27,14 @@ * Ge van Geldorp * Eric Kohl * Royce Mitchell III - * Aleksey Bragin + * Aleksey Bragin * Jason Filby * Art Yerkes * Gunnar Andre' Dalsnes * Filip Navara * Thomas Weidenmueller * Alex Ionescu - * Trevor McCort + * Trevor McCort * Steven Edwards */ @@ -516,12 +516,12 @@ * @implemented */ NTSTATUS STDCALL -NtAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID* UBaseAddress, - IN ULONG ZeroBits, +NtAllocateVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID* UBaseAddress, + IN ULONG ZeroBits, IN OUT PULONG URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) + IN ULONG AllocationType, + IN ULONG Protect) /* * FUNCTION: Allocates a block of virtual memory in the process address space * ARGUMENTS: @@ -542,6 +542,10 @@ * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, * PAGE_NOACCESS * RETURNS: Status + * NOTES: Must run at IRQL PASSIVE_LEVEL? (or is APC_LEVEL cool too?) + * MSDN states that ZwAllocateVirtualMemory IRQL must be PASSIVE_LEVEL, + * but why wouldn't APC_LEVEL be valid (or is that only for the Zw* version + * and Nt* can indeed run at APC_LEVEL?) */ { PEPROCESS Process; @@ -555,6 +559,12 @@ PVOID PBaseAddress; ULONG PRegionSize; PHYSICAL_ADDRESS BoundaryAddressMultiple; + KPROCESSOR_MODE PreviousMode; + + // TMN: Someone Pick one of these. Until it's clear which + // level is allowed, I play it safe and check for <= APC_LEVEL + PAGED_CODE(); +// ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); DPRINT("NtAllocateVirtualMemory(*UBaseAddress %x, " "ZeroBits %d, *URegionSize %x, AllocationType %x, Protect %x)\n", @@ -576,7 +586,7 @@ } /* Check for valid Allocation Types */ - if ((AllocationType &~ (MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | MEM_TOP_DOWN | MEM_WRITE_WATCH))) { DPRINT1("Invalid Allocation Type\n"); @@ -589,11 +599,11 @@ DPRINT1("No memory allocation base type\n"); return STATUS_INVALID_PARAMETER_5; } - + /* MEM_RESET is an exclusive flag, make sure that is valid too */ if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) { - DPRINT1("MEM_RESET used illegaly\n"); + DPRINT1("Invalid use of MEM_RESET\n"); return STATUS_INVALID_PARAMETER_5; } @@ -623,27 +633,45 @@ } } - PBaseAddress = *UBaseAddress; - PRegionSize = *URegionSize; + PreviousMode = KeGetPreviousMode(); + + _SEH_TRY + { + if (PreviousMode != KernelMode) + { + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); + } + PBaseAddress = *UBaseAddress; + PRegionSize = *URegionSize; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + _SEH_YIELD(return Status); + } + _SEH_END; + BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); - /* + /* * We've captured and calculated the data, now do more checks * Yes, MmCreateMemoryArea does similar checks, but they don't return * the right status codes that a caller of this routine would expect. */ if (BaseAddress >= MM_HIGHEST_USER_ADDRESS) { - DPRINT1("Virtual allocation above User Space\n"); + DPRINT1("Virtual allocation base above User Space\n"); return STATUS_INVALID_PARAMETER_2; } if (!RegionSize) { - DPRINT1("Region size is invalid\n"); + DPRINT1("Region size is invalid (zero)\n"); return STATUS_INVALID_PARAMETER_4; } if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)BaseAddress) < RegionSize) @@ -652,12 +680,12 @@ return STATUS_INVALID_PARAMETER_4; } - /* + /* * Copy on Write is reserved for system use. This case is a certain failure * but there may be other cases...needs more testing */ - if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - ((Protect & PAGE_WRITECOPY) || (Protect & PAGE_EXECUTE_WRITECOPY))) + if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) { DPRINT1("Copy on write is not supported by VirtualAlloc\n"); return STATUS_INVALID_PAGE_PROTECTION; @@ -666,8 +694,8 @@ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, - NULL, - UserMode, + PsProcessType, + PreviousMode, (PVOID*)(&Process), NULL); if (!NT_SUCCESS(Status)) @@ -750,10 +778,10 @@ MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && - ((Protect & PAGE_READWRITE) || - (Protect & PAGE_EXECUTE_READWRITE))) - { - MmReserveSwapPages(MemoryAreaLength); + (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + MmReserveSwapPages(nPages); } *UBaseAddress = BaseAddress; @@ -816,17 +844,11 @@ { ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - - /* FiN TODO: Optimize loop counter! */ - for (i = 0; i < PAGE_ROUND_UP(MemoryAreaLength) / PAGE_SIZE; i++) + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + + for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) { PMM_PAGEOP PageOp; - - if (MemoryArea->PageOpCount == 0) - { - break; - } - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), NULL, 0); @@ -919,9 +941,8 @@ MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } switch (FreeType) @@ -931,14 +952,13 @@ if (MemoryArea->StartingAddress != BaseAddress || MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } + MmFreeVirtualMemory(Process, MemoryArea); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_SUCCESS); + Status = STATUS_SUCCESS; + goto unlock_deref_and_return; case MEM_DECOMMIT: Status = @@ -950,13 +970,17 @@ MEM_RESERVE, PAGE_NOACCESS, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(Status); - } + goto unlock_deref_and_return; + } + + Status = STATUS_NOT_IMPLEMENTED; + +unlock_deref_and_return: + MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); - return(STATUS_NOT_IMPLEMENTED); + + return(Status); } NTSTATUS Modified: branches/cache_manager_rewrite/mm/cont.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/cont.c… ============================================================================== --- branches/cache_manager_rewrite/mm/cont.c (original) +++ branches/cache_manager_rewrite/mm/cont.c Wed Jan 2 22:12:58 2008 @@ -16,7 +16,7 @@ /* FUNCTIONS *****************************************************************/ -static VOID +static VOID MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) Modified: branches/cache_manager_rewrite/mm/drvlck.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/drvlck… ============================================================================== --- branches/cache_manager_rewrite/mm/drvlck.c (original) +++ branches/cache_manager_rewrite/mm/drvlck.c Wed Jan 2 22:12:58 2008 @@ -14,6 +14,8 @@ #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ + +#undef MmLockPagableDataSection #if 0 VOID Modified: branches/cache_manager_rewrite/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf.in… ============================================================================== --- branches/cache_manager_rewrite/mm/elf.inc.h (original) +++ branches/cache_manager_rewrite/mm/elf.inc.h Wed Jan 2 22:12:58 2008 @@ -1,6 +1,5 @@ /* $Id$ */ -#include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> Modified: branches/cache_manager_rewrite/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf32.… ============================================================================== --- branches/cache_manager_rewrite/mm/elf32.c (original) +++ branches/cache_manager_rewrite/mm/elf32.c Wed Jan 2 22:12:58 2008 @@ -7,7 +7,7 @@ * * PROGRAMMERS: No programmer listed. */ - +#include <ntoskrnl.h> #define __ELF_WORD_SIZE 32 #include "elf.inc.h" Modified: branches/cache_manager_rewrite/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf64.… ============================================================================== --- branches/cache_manager_rewrite/mm/elf64.c (original) +++ branches/cache_manager_rewrite/mm/elf64.c Wed Jan 2 22:12:58 2008 @@ -7,6 +7,6 @@ * * PROGRAMMERS: No programmer listed. */ - +#include <ntoskrnl.h> #define __ELF_WORD_SIZE 64 #include "elf.inc.h" Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Wed Jan 2 22:12:58 2008 @@ -190,9 +190,9 @@ { start = -1; length = 0; - /* First try to allocate the pages above the 16MB area. This may fail - * because there are not enough continuous pages or we cannot allocate - * pages above the 16MB area because the caller has specify an upper limit. + /* First try to allocate the pages above the 16MB area. This may fail + * because there are not enough continuous pages or we cannot allocate + * pages above the 16MB area because the caller has specify an upper limit. * The second try uses the specified lower limit. */ for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.QuadPart / PAGE_SIZE; i <= last; ) @@ -428,7 +428,7 @@ if (j == 0) { /* - * Page zero is reserved + * Page zero is reserved for the IVT */ MmPageArray[0].Flags.Type = MM_PHYSICAL_PAGE_BIOS; MmPageArray[0].Flags.Consumer = MC_NPPOOL; @@ -450,6 +450,19 @@ MmPageArray[1].ReferenceCount = 0; InsertTailList(&BiosPageListHead, &MmPageArray[1].ListEntry); + MmStats.NrReservedPages++; + } + else if (j == 2) + { + /* + * Page two is reserved for the KUSER_SHARED_DATA + */ + MmPageArray[2].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPageArray[2].Flags.Consumer = MC_NPPOOL; + MmPageArray[2].Flags.Zero = 0; + MmPageArray[2].ReferenceCount = 0; + InsertTailList(&BiosPageListHead, + &MmPageArray[2].ListEntry); MmStats.NrReservedPages++; } /* Protect the Page Directory. This will be changed in r3 */ Modified: branches/cache_manager_rewrite/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/iospac… ============================================================================== --- branches/cache_manager_rewrite/mm/iospace.c (original) +++ branches/cache_manager_rewrite/mm/iospace.c Wed Jan 2 22:12:58 2008 @@ -95,7 +95,7 @@ DPRINT("MmMapIoSpace failed (%lx)\n", Status); return (NULL); } - Pfn = PhysicalAddress.QuadPart >> PAGE_SHIFT; + Pfn = PhysicalAddress.LowPart >> PAGE_SHIFT; for (i = 0; i < PAGE_ROUND_UP(NumberOfBytes); i += PAGE_SIZE, Pfn++) { Status = MmCreateVirtualMappingForKernel((char*)Result + i, Modified: branches/cache_manager_rewrite/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/marea.… ============================================================================== --- branches/cache_manager_rewrite/mm/marea.c (original) +++ branches/cache_manager_rewrite/mm/marea.c Wed Jan 2 22:12:58 2008 @@ -29,7 +29,7 @@ * Eric Kohl * Ge van Geldorp * Royce Mitchell III - * Aleksey Bragin + * Aleksey Bragin * Jason Filby * Thomas Weidenmueller * Gunnar Andre' Dalsnes @@ -713,7 +713,7 @@ NTAPI MmInitMemoryAreas(VOID) { - DPRINT("MmInitMemoryAreas()\n",0); + DPRINT("MmInitMemoryAreas()\n"); return(STATUS_SUCCESS); } Modified: branches/cache_manager_rewrite/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/mm.c (original) +++ branches/cache_manager_rewrite/mm/mm.c Wed Jan 2 22:12:58 2008 @@ -193,17 +193,6 @@ CPRINT("Page fault at high IRQL was %d, address %x\n", KeGetCurrentIrql(), Address); return(STATUS_UNSUCCESSFUL); } - if (PsGetCurrentProcess() == NULL) - { - /* Allow this! It lets us page alloc much earlier! It won't be needed - * after my init patch anyways - */ - DPRINT("No current process\n"); - if (Address < (ULONG_PTR)MmSystemRangeStart) - { - return(STATUS_ACCESS_VIOLATION); - } - } /* * Find the memory area for the faulting address @@ -274,7 +263,7 @@ break; case MEMORY_AREA_SHARED_DATA: - Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; + Pfn = MmSharedDataPagePhysicalAddress.LowPart >> PAGE_SHIFT; Status = MmCreateVirtualMapping(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address), @@ -310,12 +299,14 @@ /* Cute little hack for ROS */ if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart) { +#ifdef _M_IX86 /* Check for an invalid page directory in kernel mode */ if (Mmi386MakeKernelPageTableGlobal(Address)) { /* All is well with the world */ return STATUS_SUCCESS; } +#endif } /* Keep same old ReactOS Behaviour */ @@ -399,70 +390,6 @@ return (FALSE); } -/* - * @implemented - */ -PVOID -NTAPI -MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) -{ - PVOID ProcAddress; - ANSI_STRING AnsiRoutineName; - NTSTATUS Status; - PLIST_ENTRY NextEntry; - extern LIST_ENTRY ModuleListHead; - PLDR_DATA_TABLE_ENTRY LdrEntry; - BOOLEAN Found = FALSE; - UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); - UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); - - /* Convert routine to ansi name */ - Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, - SystemRoutineName, - TRUE); - if (!NT_SUCCESS(Status)) return NULL; - - /* Loop the loaded module list */ - NextEntry = ModuleListHead.Flink; - while (NextEntry != &ModuleListHead) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Check if it's the kernel or HAL */ - if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - - /* Check if we found a valid binary */ - if (Found) - { - /* Find the procedure name */ - Status = LdrGetProcedureAddress(LdrEntry->DllBase, - &AnsiRoutineName, - 0, - &ProcAddress); - break; - } - - /* Keep looping */ - NextEntry = NextEntry->Flink; - } - - /* Free the string and return */ - RtlFreeAnsiString(&AnsiRoutineName); - return (NT_SUCCESS(Status) ? ProcAddress : NULL); -} - NTSTATUS NTAPI NtGetWriteWatch(IN HANDLE ProcessHandle, Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Wed Jan 2 22:12:58 2008 @@ -19,6 +19,7 @@ /* * Compiler defined symbols */ +#if 0 extern unsigned int _image_base__; extern unsigned int _text_start__; extern unsigned int _text_end__; @@ -27,7 +28,7 @@ extern unsigned int _init_end__; extern unsigned int _bss_end__; - +#endif static BOOLEAN IsThisAnNtAsSystem = FALSE; MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; @@ -37,14 +38,9 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; +ULONG MmNumberOfPhysicalPages; + VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitVirtualMemory) -#pragma alloc_text(INIT, MmInit1) -#pragma alloc_text(INIT, MmInit2) -#pragma alloc_text(INIT, MmInit3) -#endif /* FUNCTIONS ****************************************************************/ @@ -83,10 +79,8 @@ { PVOID BaseAddress; ULONG Length; - ULONG ParamLength = KernelLength; NTSTATUS Status; PHYSICAL_ADDRESS BoundaryAddressMultiple; - PFN_TYPE Pfn; PMEMORY_AREA MArea; DPRINT("MmInitVirtualMemory(%x, %x)\n",LastKernelAddress, KernelLength); @@ -96,14 +90,19 @@ MmInitMemoryAreas(); - /* Start the paged and nonpaged pool at a 4MB boundary. */ - MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x400000); + /* + * FreeLDR Marks 6MB "in use" at the start of the kernel base, + * so start the non-paged pool at a boundary of 6MB from where + * the last driver was loaded. This should be the end of the + * FreeLDR-marked region. + */ + MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x600000); MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; MmPagedPoolBase = (PVOID)ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength + PAGE_SIZE, 0x400000); MmPagedPoolSize = MM_PAGED_POOL_SIZE; - DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1, + DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1, MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize - 1); MiInitializeNonPagedPool(); @@ -159,73 +158,6 @@ 0, BoundaryAddressMultiple); - BaseAddress = (PVOID)&_image_base__; - Length = PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)) - (ULONG_PTR)&_image_base__; - ParamLength = ParamLength - Length; - - /* - * No need to lock the address space at this point since no - * other threads are running. - */ - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_EXECUTE_READ, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); - ASSERT(BaseAddress == (PVOID)&_init_start__); - Length = PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)) - - PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); - ParamLength = ParamLength - Length; - - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_EXECUTE_READ, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - Length = PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)) - - PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); - ParamLength = ParamLength - Length; - DPRINT("Length %x\n",Length); - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_init_end__)); - DPRINT("BaseAddress %x\n",BaseAddress); - - /* - * No need to lock the address space at this point since we are - * the only thread running. - */ - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)); - Length = LastKernelAddress - (ULONG_PTR)BaseAddress; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - BaseAddress = MiNonPagedPoolStart; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, @@ -264,18 +196,7 @@ TRUE, 0, BoundaryAddressMultiple); - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pfn); - MmSharedDataPagePhysicalAddress.QuadPart = Pfn << PAGE_SHIFT; - Status = MmCreateVirtualMapping(NULL, - (PVOID)KI_USER_SHARED_DATA, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } + MmSharedDataPagePhysicalAddress.QuadPart = 2 << PAGE_SHIFT; RtlZeroMemory(BaseAddress, Length); /* @@ -283,6 +204,35 @@ */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } + +PCHAR +MemType[] = { + "ExceptionBlock ", // ? + "SystemBlock ", // ? + "Free ", + "Bad ", // used + "LoadedProgram ", // == Free + "FirmwareTemporary ", // == Free + "FirmwarePermanent ", // == Bad + "OsloaderHeap ", // used + "OsloaderStack ", // == Free + "SystemCode ", + "HalCode ", + "BootDriver ", // not used + "ConsoleInDriver ", // ? + "ConsoleOutDriver ", // ? + "StartupDpcStack ", // ? + "StartupKernelStack", // ? + "StartupPanicStack ", // ? + "StartupPcrPage ", // ? + "StartupPdrPage ", // ? + "RegistryData ", // used + "MemoryData ", // not used + "NlsData ", // used + "SpecialMemory ", // == Bad + "BBTMemory ", + "LoaderReserve "// == Bad +}; VOID INIT_FUNCTION @@ -306,6 +256,25 @@ FirstKrnlPhysAddr, LastKrnlPhysAddr, LastKernelAddress); + + /* Dump memory descriptors */ + { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + DPRINT("Base\t\tLength\t\tType\n"); + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + DPRINT("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); + TotalPages += Md->PageCount; + } + + DPRINT("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); + } /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory(); @@ -350,6 +319,7 @@ } /* Set memory limits */ + MmSystemRangeStart = (PVOID)KSEG0_BASE; MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); @@ -379,6 +349,7 @@ * Free physical memory not used by the kernel */ MmStats.NrTotalPages = MmFreeLdrMemHigher/4; + MmNumberOfPhysicalPages = MmStats.NrTotalPages; if (!MmStats.NrTotalPages) { DbgPrint("Memory not detected, default to 8 MB\n"); @@ -451,47 +422,78 @@ MmInitializeMdlImplementation(); } -VOID +BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; +extern KMUTANT MmSystemLoadLock; + +BOOLEAN NTAPI -INIT_FUNCTION -MmInit2(VOID) -{ - MmInitializeRmapList(); - MmInitializePageOp(); - MmInitSectionImplementation(); - MmInitPagingFile(); -} - -VOID -MmInitSectionImplementation2(VOID); - -VOID -INIT_FUNCTION -NTAPI -MmInit3(VOID) -{ - /* - * Unmap low memory - */ -#ifdef CONFIG_SMP - /* In SMP mode we can unmap the low memory - if all processors are started. */ - MmDeletePageTable(NULL, 0); -#endif - - MmCreatePhysicalMemorySection(); - MiInitBalancerThread(); - - /* - * Initialise the modified page writer. - */ - if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); - - /* FIXME: Read parameters from memory */ - MmInitSectionImplementation2(); - - -} +MmInitSystem(IN ULONG Phase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + ULONG Flags = 0; + if (Phase == 0) + { + /* Initialize the Loader Lock */ + KeInitializeMutant(&MmSystemLoadLock, FALSE); + + /* Initialize the address space for the system process */ + MmInitializeProcessAddressSpace(PsGetCurrentProcess(), + NULL, + NULL, + &Flags, + NULL); + + /* Reload boot drivers */ + MiReloadBootLoadedDrivers(LoaderBlock); + + /* Initialize the loaded module list */ + MiInitializeLoadedModuleList(LoaderBlock); + + /* We're done, for now */ + DPRINT("Mm0: COMPLETE\n"); + } + else if (Phase == 1) + { + MmInitializeRmapList(); + RmapReady = TRUE; + MmInitializePageOp(); + PageOpReady = TRUE; + MmInitSectionImplementation(); + SectionsReady = TRUE; + MmInitPagingFile(); + PagingReady = TRUE; + MmCreatePhysicalMemorySection(); + + /* Setup shared user data settings that NT does as well */ + ASSERT(SharedUserData->NumberOfPhysicalPages == 0); + SharedUserData->NumberOfPhysicalPages = MmStats.NrTotalPages; + SharedUserData->LargePageMinimum = 0; + + /* For now, we assume that we're always Workstation */ + SharedUserData->NtProductType = NtProductWinNt; + } + else if (Phase == 2) + { + /* + * Unmap low memory + */ + MiInitBalancerThread(); + + /* + * Initialise the modified page writer. + */ + MmInitMpwThread(); + + /* Initialize the balance set manager */ + MmInitBsmThread(); + + /* FIXME: Read parameters from memory */ + } + + return TRUE; +} + +#if 0 VOID static MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, @@ -516,3 +518,4 @@ NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } +#endif Modified: branches/cache_manager_rewrite/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mpw.c?… ============================================================================== --- branches/cache_manager_rewrite/mm/mpw.c (original) +++ branches/cache_manager_rewrite/mm/mpw.c Wed Jan 2 22:12:58 2008 @@ -123,3 +123,26 @@ return(STATUS_SUCCESS); } + +NTSTATUS +NTAPI +MmInitBsmThread(VOID) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE ThreadHandle; + + /* Create the thread */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = PsCreateSystemThread(&ThreadHandle, + THREAD_ALL_ACCESS, + &ObjectAttributes, + NULL, + NULL, + KeBalanceSetManager, + NULL); + + /* Close the handle and return status */ + ZwClose(ThreadHandle); + return Status; +} Modified: branches/cache_manager_rewrite/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/npool.… ============================================================================== --- branches/cache_manager_rewrite/mm/npool.c (original) +++ branches/cache_manager_rewrite/mm/npool.c Wed Jan 2 22:12:58 2008 @@ -83,7 +83,7 @@ LIST_ENTRY TagListEntry; #if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) ULONG UserSize; -#endif +#endif BOOLEAN Dumped; } HDR_USED, *PHDR_USED; @@ -911,7 +911,7 @@ } DbgPrint("***************** Dump Complete ***************\n"); KeReleaseSpinLock(&MmNpoolLock, oldIrql); -#endif +#endif } #ifdef ENABLE_VALIDATE_POOL @@ -1327,7 +1327,7 @@ break; } } - + if (best) { if (size < PAGE_SIZE) @@ -1346,7 +1346,7 @@ } } p = avl_get_next(FreeBlockListRoot, p); - } + } /* * We didn't find anything suitable at all. */ @@ -1487,7 +1487,7 @@ HiOK = FALSE; } } - + if (!HiOK || !LoOK) { c[0] = (CHAR)((hdr->Tag >> 24) & 0xFF); @@ -1514,7 +1514,7 @@ KEBUGCHECK(0); } } -#endif +#endif #ifdef NPOOL_REDZONE_CHECK_FULL void check_redzone_list(void) Modified: branches/cache_manager_rewrite/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pagefi… ============================================================================== --- branches/cache_manager_rewrite/mm/pagefile.c (original) +++ branches/cache_manager_rewrite/mm/pagefile.c Wed Jan 2 22:12:58 2008 @@ -323,6 +323,8 @@ return(Status); } +extern BOOLEAN PagingReady; + VOID INIT_FUNCTION NTAPI @@ -366,11 +368,16 @@ KIRQL oldIrql; ULONG MiAvailSwapPages; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); MiAvailSwapPages = (MiFreeSwapPages * MM_PAGEFILE_COMMIT_RATIO) + MM_PAGEFILE_COMMIT_GRACE; MiReservedSwapPages = MiReservedSwapPages + Nr; - if (MM_PAGEFILE_COMMIT_RATIO != 0 && MiAvailSwapPages < MiReservedSwapPages) + if ((MM_PAGEFILE_COMMIT_RATIO != 0) && (MiAvailSwapPages < MiReservedSwapPages)) { KeReleaseSpinLock(&PagingFileListLock, oldIrql); return(FALSE); @@ -385,6 +392,11 @@ { KIRQL oldIrql; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); MiReservedSwapPages = MiReservedSwapPages - Nr; KeReleaseSpinLock(&PagingFileListLock, oldIrql); @@ -396,6 +408,11 @@ KIRQL oldIrql; ULONG i, j; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } KeAcquireSpinLock(&PagingFile->AllocMapLock, &oldIrql); for (i = 0; i < PagingFile->AllocMapSize; i++) @@ -425,6 +442,11 @@ ULONG off; KIRQL oldIrql; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry); @@ -469,6 +491,11 @@ ULONG off; SWAPENTRY entry; + if (!PagingReady) + { + DPRINT1("PAGING USED TOO SOON!!!\n"); + while (TRUE); + } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (MiFreeSwapPages == 0) @@ -553,12 +580,14 @@ Headers->Type = MmCoreDumpType; if (TrapFrame != NULL) { +#ifdef _M_IX86 if (!(TrapFrame->EFlags & (1 << 17))) { memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); } else +#endif { memcpy(&Headers->TrapFrame, TrapFrame, sizeof(KTRAP_FRAME)); } @@ -672,7 +701,7 @@ UNICODE_STRING DiskDumpName = RTL_CONSTANT_STRING(L"DiskDump"); ANSI_STRING ProcName; PIO_STACK_LOCATION StackPtr; - PLDR_DATA_TABLE_ENTRY ModuleObject; + PLDR_DATA_TABLE_ENTRY ModuleObject = NULL; Status = ZwFsControlFile(PageFileHandle, 0,

1 0

[mpiulachs] 31566: Patch by Olaf Siejka <olaf_siejka (at) o2 (dot) pl> - Partial usetup polish translation - Adds missing "Setup" word in ERROR_WRITE_BOOT section by me: - Activate all current (10) usetup translations in txtsetup.sif - Add polish localization in mui.c See issue #2930 for more details.
by mpiulachs＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: mpiulachs Date: Wed Jan 2 21:54:54 2008 New Revision: 31566 URL: http://svn.reactos.org/svn/reactos?rev=31566&view=rev Log: Patch by Olaf Siejka <olaf_siejka (at) o2 (dot) pl> - Partial usetup polish translation - Adds missing "Setup" word in ERROR_WRITE_BOOT section by me: - Activate all current (10) usetup translations in txtsetup.sif - Add polish localization in mui.c See issue #2930 for more details. Added: trunk/reactos/base/setup/usetup/lang/pl-PL.h (with props) Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc Wed Jan 2 21:54:54 2008 @@ -11,7 +11,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "Instalator ReactOS" - IDS_TEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio z tego CD!\n\nProszê zrestartowaæ komputer i uruchomiæ z tego CD, aby zainstalowaæ ReactOS." + IDS_TEXT "Nie mo¿esz zainstalowaæ ReactOS bezporednio!\n\nProszê zrestartowaæ komputer i uruchomiæ z tego CD, aby zainstalowaæ ReactOS." END /* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc Wed Jan 2 21:54:54 2008 @@ -15,8 +15,8 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" -#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" }, { Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { @@ -1561,3 +1561,4 @@ + Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Jan 2 21:54:54 2008 @@ -1470,8 +1470,8 @@ itITLanguagePageEntries }, { - START_PAGE, - itITWelcomePageEntries + START_PAGE, + itITWelcomePageEntries }, { INSTALL_INTRO_PAGE, Added: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (added) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Jan 2 21:54:54 2008 @@ -1,0 +1,1569 @@ +/* + * translated by Caemyr (Jan,2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + + +#ifndef LANG_PL_PL_H__ +#define LANG_PL_PL_H__ + +static MUI_ENTRY plPLLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Wybór jêzyka", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Proszê wybraæ jêzyk dla procesu instalacji systemu", + TEXT_NORMAL + }, + { + 8, + 11, + " i nacisn¹æ ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Wybrany jêzyk bêdzie domylnym dla zainstalowanego systemu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Witamy w programie instalacyjnym systemu ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Na tym etapie, instalator skopiuje niezbêdne pliki systemu operacyjnego", + TEXT_NORMAL + }, + { + 6, + 12, + " na twój komputer i przygotuje kolejny etap procesu instalacji.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Nacinij ENTER aby zainstalowaæ system ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Nacinij R aby naprawiæ zainstalowany system ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Nacinij L aby zapoznaæ siê z licencj¹ i warunkami korzystania z ReactOS", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Nacinij F3 aby wyjæ bez instalacji systemu ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Wiêcej informacji o systemie ReactOS, mo¿na znaleæ na stronie:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Kontynuacja R = Naprawa F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator ReactOS wci¹¿ jest we wczesnej fazie rozwoju. Nadal nie", + TEXT_NORMAL + }, + { + 6, + 9, + "obs³uguje wszystkich funkcji, niezbêdnych dla programu instalacyjnego.", + TEXT_NORMAL + }, + { + 6, + 12, + "Najwa¿niejsze ograniczenia:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Instalator nie obs³uguje wiêcej ni¿ jednej partycji Podstawowej na dysku.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Instalator nie mo¿e skasowaæ partycji podstawowej z dysku", + TEXT_NORMAL + }, + { + 8, + 15, + " o ile nadal znajduje siê na nim tak¿e partycja Rozszerzona.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Instalator nie mo¿e skasowaæ pierwszej partycji Rozszerzonej z dysku", + TEXT_NORMAL + }, + { + 8, + 17, + " o ile nadal znajduj¹ siê na nim kolejne partycje Rozszerzone.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Instalator obs³uguje jedynie system plików FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- Brakuje sprawdzenia poprawnoci systemu plików.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Nacinij ENTER aby zainstalowaæ system ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Nacinij F3 aby wyjæ bez instalacji systemu ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 6, + "Licencja:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "System ReactOS jest licencjonowany na warunkach licencji", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL z elementami kodu pochodz¹cego z kompatybilnych", + TEXT_NORMAL + }, + { + 8, + 10, + "licencji, takich jak X11 czy BSD albo GNU LGPL. Ca³e", + TEXT_NORMAL + }, + { + 8, + 11, + "oprogramowanie, bêd¹ce czêsci¹ system ReactOS podlega wiêc", + TEXT_NORMAL + }, + { + 8, + 12, + "licencji GNU GPL jak i odpowiedniej licencji oryginalnej.", + TEXT_NORMAL + }, + { + 8, + 13, + "To oprogramowanie wydawane jest BEZ JAKIEJKOLWIEK gwarancji", + TEXT_NORMAL + }, + { + 8, + 15, + "czy te¿ ograniczeñ w u¿yciu, poza przepisami prawa lokalnego", + TEXT_NORMAL + }, + { + 8, + 16, + "b¹d miêdzynarodowego. Licencja systemu ReactOS", + TEXT_NORMAL + }, + { + 8, + 17, + "reguluje wy³¹cznie zasady dystrybucji dla osób trzecich.", + TEXT_NORMAL + }, + { + 8, + 18, + "Jeli z jakiego powodu nie otrzyma³e kopii licencji", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU GPL wraz z systemem ReactOS, prosimy odwiedziæ stronê:", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Gwarancja:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "Niniejszy program jest wolnym oprogramowaniem; szczegó³y", + TEXT_NORMAL + }, + { + 8, + 25, + "dotycz¹ce kopiowania w ród³ach. Nie ma ¯ADNEJ gwarancji", + TEXT_NORMAL + }, + { + 8, + 26, + "PRZYDATNOCI HANDLOWEJ LUB DO OKRELONYCH ZASTOSOWAÑ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Powrót", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Poni¿sza lista zawiera obecne ustawienia sprzêtu.", + TEXT_NORMAL + }, + { + 8, + 11, + " Komputer:", + TEXT_NORMAL + }, + { + 8, + 12, + " Ekran:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Klawiatura:", + TEXT_NORMAL + }, + { + 8, + 14, + "Uk³ad klawiatury:", + TEXT_NORMAL + }, + { + 8, + 16, + " Zaakceptuj:", + TEXT_NORMAL + }, + { + 25, + 16, "Zaakceptuj te ustawienia sprzêtu", + TEXT_NORMAL + }, + { + 6, + 19, + "Mo¿esz zmieniæ poszczególne ustawienia za pomoc¹ klawiszy GÓRA i DÓ£", + TEXT_NORMAL + }, + { + 6, + 20, + "aby wybraæ kategoriê. Potem nacinij ENTER by przejæ do menu z ", + TEXT_NORMAL + }, + { + 6, + 21, + "ustawieniami szczegó³owymi do wyboru.", + TEXT_NORMAL + }, + { + 6, + 23, + "Kiedy wszystkie ustawienia s¹ poprawne, wybierz \"Zaakceptuj te ustawienia sprzêtu\"", + TEXT_NORMAL + }, + { + 6, + 24, + "i nacinij ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator ReactOS wci¹¿ jest we wczesnej fazie rozwoju. Nadal nie", + TEXT_NORMAL + }, + { + 6, + 9, + "obs³uguje wszystkich funkcji, niezbêdnych dla programu instalacyjnego.", + TEXT_NORMAL + }, + { + 6, + 12, + "Naprawa istniej¹cej instalacji systemu nie jest jeszcze mo¿liwa.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Nacinij U ¿eby uaktualniæ system.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Nacinij R by uruchomiæ Konsolê Odtwarzania.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Nacinij ESC by powróciæ do g³ównego menu.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Nacinij ENTER by zrestartowaæ komputer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Menu g³ówne ENTER = Restart", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY plPLComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Aby zmieniæ typ komputera, na którym chcesz zainstalowaæ", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni typ komputera.", + TEXT_NORMAL + }, + { + 8, + 11, + " Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " typu komputera.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "System obecnie sprawdza czy dane s¹ poprawnie zapisane na dysku", + TEXT_NORMAL + }, + { + 10, + 8, + "To mo¿e zaj¹æ minutê.", + TEXT_NORMAL + }, + { + 10, + 9, + "Po zakoñczeniu, system zrestartuje komputer automatycznie.", + TEXT_NORMAL + }, + { + 0, + 0, + " Czyszczenie pamieci Cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "ReactOS zosta³ ju¿ poprawnie zainstalowany", + TEXT_NORMAL + }, + { + 10, + 8, + "Upewnij siê ze w Napêdzie A: nie ma dyskietki i", + TEXT_NORMAL + }, + { + 10, + 9, + "w napêdach optycznych - ¿adnych CD-ROMów.", + TEXT_NORMAL + }, + { + 10, + 11, + "Nacinij ENTER by zrestartowaæ komputer.", + TEXT_NORMAL + }, + { + 0, + 0, + " Proszê czekaæ ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz zmieniæ rozdzielczoæ ekranu.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni typ komputera.", + TEXT_NORMAL + }, + { + 8, + 11, + " Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " rodzaju ekranu.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Podstawowe sk³adniki systemu ReactOS zosta³y zainstalowane.", + TEXT_NORMAL + }, + { + 10, + 8, + "Upewnij siê ze w Napêdzie A: nie ma dyskietki i", + TEXT_NORMAL + }, + { + 10, + 9, + "w napêdach optycznych - ¿adnych CD-ROMów.", + TEXT_NORMAL + }, + { + 10, + 11, + "Nacinij ENTER by zrestartowaæ komputer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Restart komputera", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator ReactOS nie mo¿e wgraæ bootloadera na twój", + TEXT_NORMAL + }, + { + 6, + 9, + "dysk twardy", + TEXT_NORMAL + }, + { + 6, + 13, + "Proszê umieciæ sformatowan¹ dyskietkê w napêdzie A:", + TEXT_NORMAL + }, + { + 6, + 14, + "i nacisn¹æ klawisz ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY plPLSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Poni¿sza lista pokazuje istniej¹ce partycje i puste", + TEXT_NORMAL + }, + { + 6, + 9, + "miejsce na nowe partycje.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Nacinij GÓRA lub DÓ£ by wybraæ pozycjê z listy.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ENTER by zainstalowaæ ReactOS na wybranej partycji.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Nacinij C by stworzyæ now¹ partycjê.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Nacinij D by skasowaæ istniej¹c¹ partycjê.", + TEXT_NORMAL + }, + { + 0, + 0, + " Proszê czekaæ...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Formatowanie partycji", + TEXT_NORMAL + }, + { + 6, + 10, + "Instalator sformatuje teraz partycjê. Nacinij ENTER aby kontynuowaæ.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY plPLInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator przegra pliki systemu na wybran¹ partycjê. Wybierz", + TEXT_NORMAL + }, + { + 6, + 9, + "katalog do którego chcesz zainstalowaæ system ReactOS:", + TEXT_NORMAL + }, + { + 6, + 14, + "Aby zmieniæ domylny katalog, u¿yj klawisza BACKSPACE by skasowaæ", + TEXT_NORMAL + }, + { + 6, + 15, + "a nastêpnie wprowad now¹ cie¿kê do katalogu, do którego system", + TEXT_NORMAL + }, + { + 6, + 16, + "ma zostaæ zainstalowany.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 11, + 12, + "Proszê czekaæ, Instalator ReactOS kopiuje pliki do wybranego", + TEXT_NORMAL + }, + { + 30, + 13, + "katalogu.", + TEXT_NORMAL + }, + { + 20, + 14, + "To mo¿e zaj¹æ kilka minut.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Proszê czekaæ... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator musi teraz wgraæ bootloader", + TEXT_NORMAL + }, + { + 8, + 12, + "Wgraj bootloader na dysk twardy (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Wgraj bootloader na dyskietkê.", + TEXT_NORMAL + }, + { + 8, + 14, + "Pomiñ wgrywanie bootloadera.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz zmieniæ typ klawiatury, jaki ma byæ zainstalowany.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni typ klawiatury.", + TEXT_NORMAL + }, + { + 8, + 11, + " Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " typu klawiatury.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz zmieniæ uk³ad klawiatury, jaki ma byæ zainstalowany.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Nacinij klawisz GÓRA albo DÓ£ by wybraæ odpowiedni uk³ad", + TEXT_NORMAL + }, + { + 8, + 11, + " klawiatury. Nastêpnie nacinij ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Nacinij ESC key aby powróciæ do poprzedniej strony bez zmiany", + TEXT_NORMAL + }, + { + 8, + 14, + " uk³adu klawiatury.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY plPLPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator przygotuje twój komputer do skopiowania plików systemu. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Tworzenie listy plików do skopiowania...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY plPLSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 17, + "Wybierz system plików z listy poni¿ej.", + 0 + }, + { + 8, + 19, + "\x07 Nacinij klawisz GÓRa alub DÓ£ by wybraæ system plików.", + 0 + }, + { + 8, + 21, + "\x07 Nacinij ENTER aby sformatowaæ partycjê.", + 0 + }, + { + 8, + 23, + "\x07 Nacinij ESC aby wybraæ inn¹ partycjê.", + 0 + }, + { + 0, + 0, + " ENTER = Kontynuacja ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcesz skasowaæ wybran¹ partycjê", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Nacinij D by skasowaæ partycjê.", + TEXT_NORMAL + }, + { + 11, + 19, + "UWAGA: Wszystkie dane, zapisane na tej partycji zostan¹ skasowane!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Nacinij ESC aby anulowaæ.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Skasowanie partycji ESC = Anulowanie F3 = Wyjcie", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY plPLRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Instalator ReactOS ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Instalator uaktualnia w³anie konfiguracjê systemu. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Tworzenie ga³êzi rejestru...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR plPLErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS nie zosta³ w pe³ni zainstalowany na twoim\n" + "komputerze. Jeli wyjdziesz teraz, trzeba bêdzie\n" + "ponownie uruchomiæ instalator by zainstalowaæ ReactOS.\n" + "\n" + " \x07 Nacinij ENTER aby kontynuowaæ instalacjê.\n" + " \x07 Nacinij F3 aby wyjæ z instalatora.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Instalator nie znalaz³ ¿adnego dysku twardego.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Instalator nie znalaz³ napêdu ród³owego.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Instalator nie móg³ za³adowaæ pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Instalator znalaz³ uszkodzony plik TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Instalator znalaz³ nieprawid³owy wpis w TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_DRIVE_INFORMATION + "Instalator nie móg³ odczytaæ informacji o napêdzie.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_WRITE_BOOT, + "Nieudane zapisanie FAT bootcode na partycji systemowej.", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_COMPUTER, + "Instalator failed to load the computer type list.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_DISPLAY, + "Instalator nie móg³ za³adowaæ listy ustawieñ ekranu.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_KEYBOARD, + "Instalator nie móg³ za³adowaæ listy typów klawiatury.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Instalator nie móg³ za³adowaæ listy uk³adów klawiatury.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_WARN_PARTITION, + "Instalator wykry³, ¿e co najmniej jeden dysk twardy zawiera niekompatybiln¹ \n" + "tablicê partycji, która nie bêdzie poprawnie obs³ugiwana!\n" + "\n" + "Tworzenie lub kasowanie partycji mo¿e zniszczyæ ca³¹ tablicê partycji.\n" + "\n" + " \x07 Nacinij F3 aby wyjæ z instalatora." + " \x07 Nacinij ENTER aby kontynuowaæ.", + "F3= Wyjcie ENTER = Kontynuacja" + }, + { + //ERROR_NEW_PARTITION, + "Nie mo¿esz stworzyæ nowej partycji w miejscu ju¿\n" + "istniej¹cej!\n" + "\n" + " * Nacinij dowolny klawisz aby kontynuowaæ.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Nie mo¿esz skasowaæ pustej przestrzeni, gdzie nie ma ¿adnej partycji!\n" + "\n" + " * Nacinij dowolny klawisz aby kontynuowaæ.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Nieudana instalacja FAT bootcode na partycji systemowej.", + "ENTER = Restart komputera" + }, + { + //ERROR_NO_FLOPPY, + "Brak dyskietki w napêdzie A:.", + "ENTER = Kontynuacja" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Instalator nie móg³ zmieniæ uk³adu klawiatury.", + "ENTER = Restart komputera" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Instalator nie móg³ zmieniæ ustawieñ ekranu w rejestrze.", + "ENTER = Restart komputera" + }, + { + //ERROR_IMPORT_HIVE, + "Instalator nie by³ w stanie zaimportowaæ pliku ga³êzi rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_FIND_REGISTRY + "Instalator nie by³ w stanie znaleæ plików z danymi rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_CREATE_HIVE, + "Instalator nie móg³ stworzyæ ga³êzi rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Instalator nie by³ w stanie ustawic inicjalizacji rejestru.", + "ENTER = Restart komputera" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet nie zawiera prawid³owego pliku inf.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet nie zosta³ znaleziony.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet nie zawiera skryptu instalacji.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_COPY_QUEUE, + "Instalator nie by³ w stanie otworzyæ kolejki kopiowania pliku.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CREATE_DIR, + "Instalator nie móg³ stworzyæ katalogów.", + "ENTER = Restart komputera" + }, + { + //ERROR_TXTSETUP_SECTION, + "Instalator nie by³ w stanie znaleæ sekcji 'Directories'\n" + "w pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CABINET_SECTION, + "Instalator nie by³ w stanie znaleæ sekcji 'Directories'\n" + "w pliku cabinet.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Instalator nie móg³ stworzyæ katalogu instalacji.", + "ENTER = Restart komputera" + }, + { + //ERROR_FIND_SETUPDATA, + "Instalator nie by³ w stanie znaleæ sekcji 'SetupData'\n" + "w pliku TXTSETUP.SIF.\n", + "ENTER = Restart komputera" + }, + { + //ERROR_WRITE_PTABLE, + "Instalator nie móg³ zapisaæ zmian w tablicy partycji.\n" + "ENTER = Restart komputera" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE plPLPages[] = +{ + { + LANGUAGE_PAGE, + plPLLanguagePageEntries + }, + { + START_PAGE, + plPLWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + plPLIntroPageEntries + }, + { + LICENSE_PAGE, + plPLLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + plPLDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + plPLRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + plPLComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + plPLDisplayPageEntries + }, + { + FLUSH_PAGE, + plPLFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + plPLSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + plPLSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + plPLFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + plPLDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + plPLInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + plPLPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + plPLFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + plPLKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + plPLBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + plPLLayoutSettingsEntries + }, + { + QUIT_PAGE, + plPLQuitPageEntries + }, + { + SUCCESS_PAGE, + plPLSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + plPLBootPageEntries + }, + { + REGISTRY_PAGE, + plPLRegistryEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/pl-PL.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Jan 2 21:54:54 2008 @@ -1309,7 +1309,7 @@ }, { //ERROR_WRITE_BOOT, - "failed to install FAT bootcode on the system partition.", + "Setup failed to install FAT bootcode on the system partition.", "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 2 21:54:54 2008 @@ -34,6 +34,7 @@ #include "lang/es-ES.h" #include "lang/fr-FR.h" #include "lang/it-IT.h" +#include "lang/pl-PL.h" #include "lang/ru-RU.h" #include "lang/sv-SE.h" #include "lang/uk-UA.h" @@ -88,6 +89,13 @@ L"Spanish", esESPages, esESErrorEntries + }, + { + L"00000415", + L"00000415", + L"Polish", + plPLPages, + plPLErrorEntries }, { L"0000041D", Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Wed Jan 2 21:54:54 2008 @@ -106,17 +106,18 @@ ;0000040B = "Finnish" 0000040C = "French" 00000407 = "German" -;00000408 = "Greek" +00000408 = "Greek" ;0000040D = "Hebrew" ;0000040E = "Hungarian" 00000410 = "Italian" ;00000411 = "Japanese" ;00000414 = "Norwegian" -;00000415 = "Polish" +00000415 = "Polish" ;00000816 = "Portuguese" -;00000419 = "Russian" +00000419 = "Russian" ;0000041B = "Slovak" 0000040A = "Spanish" +0000041D = "Swedish" 00000422 = "Ukrainian"

1 0

[fireball] 31565: - Get rid of possible buffer overflows and memory corruptions due to an assumption that UNICODE_STRING's buffers are always NULL-terminated.
by fireball＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: fireball Date: Wed Jan 2 19:06:03 2008 New Revision: 31565 URL: http://svn.reactos.org/svn/reactos?rev=31565&view=rev Log: - Get rid of possible buffer overflows and memory corruptions due to an assumption that UNICODE_STRING's buffers are always NULL-terminated. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Jan 2 19:06:03 2008 @@ -222,27 +222,31 @@ if (InputImagePath.Length == 0) { - ImagePath->Length = (33 * sizeof(WCHAR)) + ServiceName->Length; - ImagePath->MaximumLength = ImagePath->Length + sizeof(UNICODE_NULL); + ImagePath->Length = 0; + ImagePath->MaximumLength = + (33 * sizeof(WCHAR)) + ServiceName->Length + sizeof(UNICODE_NULL); ImagePath->Buffer = ExAllocatePool(NonPagedPool, ImagePath->MaximumLength); if (ImagePath->Buffer == NULL) return STATUS_NO_MEMORY; - wcscpy(ImagePath->Buffer, L"\\SystemRoot\\system32\\drivers\\"); - wcscat(ImagePath->Buffer, ServiceName->Buffer); - wcscat(ImagePath->Buffer, L".sys"); + RtlAppendUnicodeToString(ImagePath, L"\\SystemRoot\\system32\\drivers\\"); + RtlAppendUnicodeStringToString(ImagePath, ServiceName); + RtlAppendUnicodeToString(ImagePath, L".sys"); } else if (InputImagePath.Buffer[0] != L'\\') { - ImagePath->Length = (12 * sizeof(WCHAR)) + InputImagePath.Length; - ImagePath->MaximumLength = ImagePath->Length + sizeof(UNICODE_NULL); + ImagePath->Length = 0; + ImagePath->MaximumLength = + 12 * sizeof(WCHAR) + InputImagePath.Length + sizeof(UNICODE_NULL); ImagePath->Buffer = ExAllocatePool(NonPagedPool, ImagePath->MaximumLength); if (ImagePath->Buffer == NULL) return STATUS_NO_MEMORY; - wcscpy(ImagePath->Buffer, L"\\SystemRoot\\"); - wcscat(ImagePath->Buffer, InputImagePath.Buffer); - ExFreePool(InputImagePath.Buffer); + RtlAppendUnicodeToString(ImagePath, L"\\SystemRoot\\"); + RtlAppendUnicodeStringToString(ImagePath, &InputImagePath); + + /* Free caller's string */ + RtlFreeUnicodeString(&InputImagePath); } return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Jan 2 19:06:03 2008 @@ -1593,7 +1593,6 @@ PUNICODE_STRING ParentIdPrefix) { ULONG KeyNameBufferLength; - PWSTR KeyNameBuffer = NULL; PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; UNICODE_STRING KeyName; UNICODE_STRING KeyValue; @@ -1620,15 +1619,20 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } - KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); - if (!KeyNameBuffer) + + + KeyName.Buffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); + if (!KeyName.Buffer) { Status = STATUS_INSUFFICIENT_RESOURCES; goto cleanup; } - wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); - RtlInitUnicodeString(&KeyName, KeyNameBuffer); + KeyName.Length = 0; + KeyName.MaximumLength = (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length; + + RtlAppendUnicodeToString(&KeyName, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->Parent->InstancePath); + Status = IopOpenRegistryKeyEx(&hKey, NULL, &KeyName, KEY_QUERY_VALUE | KEY_SET_VALUE); if (!NT_SUCCESS(Status)) goto cleanup; @@ -1678,7 +1682,7 @@ Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); } ExFreePool(ParentIdPrefixInformation); - ExFreePool(KeyNameBuffer); + RtlFreeUnicodeString(&KeyName); if (hKey != NULL) ZwClose(hKey); return Status; @@ -1713,7 +1717,6 @@ WCHAR InstancePath[MAX_PATH]; IO_STACK_LOCATION Stack; NTSTATUS Status; - PWSTR KeyBuffer; PWSTR Ptr; USHORT Length; USHORT TotalLength; @@ -1851,18 +1854,11 @@ /* * Create registry key for the instance id, if it doesn't exist yet */ - KeyBuffer = ExAllocatePool( - PagedPool, - (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); - wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer); - Status = IopCreateDeviceKeyPath(/*KeyBuffer*/&DeviceNode->InstancePath, &InstanceKey); - ExFreePool(KeyBuffer); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); } - { /* Set 'Capabilities' value */

1 0

[mpiulachs] 31564: - Add missing REGISTRY_PAGE localizations note: "make usetup_clean" may be required
by mpiulachs＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: mpiulachs Date: Wed Jan 2 18:07:27 2008 New Revision: 31564 URL: http://svn.reactos.org/svn/reactos?rev=31564&view=rev Log: - Add missing REGISTRY_PAGE localizations note: "make usetup_clean" may be required Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Jan 2 18:07:27 2008 @@ -2975,9 +2975,7 @@ BOOLEAN Delete; NTSTATUS Status; - CONSOLE_SetTextXY(6, 8, "Setup is updating the system configuration"); - - CONSOLE_SetStatusText(" Creating registry hives..."); + MUIDisplayPage(REGISTRY_PAGE); if (RepairUpdateFlag) { Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Jan 2 18:07:27 2008 @@ -1242,6 +1242,34 @@ } }; +static MUI_ENTRY deDERegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR deDEErrorEntries[] = { @@ -1527,6 +1555,10 @@ deDEBootPageEntries }, { + REGISTRY_PAGE, + deDERegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Wed Jan 2 18:07:27 2008 @@ -1236,6 +1236,34 @@ } }; +static MUI_ENTRY elGRRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR elGRErrorEntries[] = { @@ -1521,6 +1549,10 @@ elGRBootPageEntries }, { + REGISTRY_PAGE, + elGRRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY enUSRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR enUSErrorEntries[] = @@ -1436,8 +1465,8 @@ enUSLanguagePageEntries }, { - START_PAGE, - enUSWelcomePageEntries + START_PAGE, + enUSWelcomePageEntries }, { INSTALL_INTRO_PAGE, @@ -1520,6 +1549,10 @@ enUSBootPageEntries }, { + REGISTRY_PAGE, + enUSRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY esESRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR esESErrorEntries[] = @@ -1519,6 +1548,10 @@ esESBootPageEntries }, { + REGISTRY_PAGE, + esESRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Jan 2 18:07:27 2008 @@ -1248,6 +1248,34 @@ } }; +static MUI_ENTRY frFRRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR frFRErrorEntries[] = { @@ -1533,6 +1561,10 @@ frFRBootPageEntries }, { + REGISTRY_PAGE, + frFRRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Jan 2 18:07:27 2008 @@ -1242,6 +1242,34 @@ } }; +static MUI_ENTRY itITRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; MUI_ERROR itITErrorEntries[] = { @@ -1526,6 +1554,10 @@ itITBootPageEntries }, { + REGISTRY_PAGE, + itITRegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY ruRURegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR ruRUErrorEntries[] = @@ -1519,6 +1548,10 @@ ruRUBootPageEntries }, { + REGISTRY_PAGE, + ruRURegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY svSERegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR svSEErrorEntries[] = @@ -1519,6 +1548,10 @@ svSEBootPageEntries }, { + REGISTRY_PAGE, + svSERegistryEntries + }, + { -1, NULL } Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Jan 2 18:07:27 2008 @@ -1234,6 +1234,35 @@ NULL, 0 } +}; + +static MUI_ENTRY ukUARegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + }; MUI_ERROR ukUAErrorEntries[] = @@ -1520,6 +1549,10 @@ ukUABootPageEntries }, { + REGISTRY_PAGE, + ukUARegistryEntries + }, + { -1, NULL }

1 0

[mpiulachs] 31563: - Show localized error messages
by mpiulachs＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: mpiulachs Date: Wed Jan 2 17:34:51 2008 New Revision: 31563 URL: http://svn.reactos.org/svn/reactos?rev=31563&view=rev Log: - Show localized error messages Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h (original) +++ trunk/reactos/base/setup/usetup/errorcode.h Wed Jan 2 17:34:51 2008 @@ -1,6 +1,31 @@ -#ifndef ERROR_CODE_H__ -#define ERROR_CODE_H__ +/* + * ReactOS kernel + * Copyright (C) 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: registry.h 21704 2006-04-22 13:55:01Z tretiakov $ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/errcode.h + * PURPOSE: + * PROGRAMMER: + */ +#ifndef __ERROR_CODE_H__ +#define __ERROR_CODE_H__ typedef enum { @@ -41,16 +66,7 @@ ERROR_LAST_ERROR_CODE }ERROR_NUMBER; -typedef struct -{ - CHAR * ErrorText; - CHAR * ErrorStatus; -}MUI_ERROR; +#endif /* __ERROR_CODE_H__ */ +/* EOF */ -VOID -MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); - - - -#endif Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Jan 2 17:34:51 2008 @@ -1241,12 +1241,12 @@ { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Presione ENTER para continuar el Setup.\n" + " \x07 Presione F3 para abandonar el Setup.", + "F3 = Salir ENTER = Continuar" }, { //ERROR_NO_HDD @@ -1305,14 +1305,14 @@ }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" - "\n" - "Creating or deleting partitions can destroy the partiton table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partiton table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1414,8 +1414,8 @@ { //ERROR_FIND_SETUPDATA, "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" }, { //ERROR_WRITE_PTABLE, @@ -1527,3 +1527,4 @@ #endif + Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 2 17:34:51 2008 @@ -41,58 +41,67 @@ static MUI_LANGUAGE LanguageList[] = { { - L"00000409", /* The Language ID */ - L"00000409", /* Default Keyboard Layout for this language */ - L"English", /* Language Name , not used just to make things easier when updating this file */ - enUSPages /* Translated strings */ + L"00000409", /* The Language ID */ + L"00000409", /* Default Keyboard Layout for this language */ + L"English", /* Language Name , not used just to make things easier when updating this file */ + enUSPages, /* Translated page strings */ + enUSErrorEntries /* Translated error strings */ }, { L"0000040C", L"0000040C", L"French", - frFRPages + frFRPages, + frFRErrorEntries }, { L"00000407", L"00000407", L"German", - deDEPages + deDEPages, + deDEErrorEntries }, { L"00000408", L"00000409", L"Greek", - elGRPages + elGRPages, + elGRErrorEntries }, { L"00000410", L"00000410", L"Italian", - itITPages + itITPages, + itITErrorEntries }, { L"00000419", L"00000419", L"Russian", - ruRUPages + ruRUPages, + ruRUErrorEntries }, { L"0000040A", L"0000040A", L"Spanish", - esESPages + esESPages, + esESErrorEntries }, { L"0000041D", L"0000041D", L"Swedish", - svSEPages + svSEPages, + svSEErrorEntries }, { L"00000422", L"00000422", L"Ukrainian", - ukUAPages + ukUAPages, + ukUAErrorEntries }, { NULL, @@ -142,6 +151,28 @@ return NULL; } +static +MUI_ERROR * +FindMUIErrorEntries () +{ + ULONG lngIndex = 0; + + do + { + /* First we search the language list till we find current selected language messages */ + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + /* Get all available error messages for this language */ + return LanguageList[lngIndex].MuiErrors; + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + + return NULL; +} + VOID MUIDisplayPage(ULONG page) { @@ -188,18 +219,30 @@ VOID MUIDisplayError(ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent) { + MUI_ERROR * entry; + if (ErrorNum >= ERROR_LAST_ERROR_CODE) { - PopupError("invalid error number provided", - "press enter to continue", - Ir, - POPUP_WAIT_ENTER); + PopupError("Pnvalid error number provided", + "Press ENTER to continue", + Ir, + POPUP_WAIT_ENTER); return; } - PopupError(enUSErrorEntries[ErrorNum].ErrorText, - enUSErrorEntries[ErrorNum].ErrorStatus, + entry = FindMUIErrorEntries (); + if (!entry) + { + PopupError("Error: Failed to find translated error message", + NULL, + NULL, + POPUP_WAIT_NONE); + return; + } + + PopupError(entry[ErrorNum].ErrorText, + entry[ErrorNum].ErrorStatus, Ir, WaitEvent); } Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Wed Jan 2 17:34:51 2008 @@ -11,6 +11,12 @@ typedef struct { + CHAR * ErrorText; + CHAR * ErrorStatus; +}MUI_ERROR; + +typedef struct +{ long Number; MUI_ENTRY * MuiEntry; }MUI_PAGE; @@ -21,19 +27,24 @@ PWCHAR LanguageKeyboardLayoutID; PWCHAR LanguageDescriptor; MUI_PAGE * MuiPages; + MUI_ERROR * MuiErrors; }MUI_LANGUAGE; + #define TEXT_NORMAL 0 #define TEXT_HIGHLIGHT 1 #define TEXT_UNDERLINE 2 #define TEXT_STATUS 4 -#define TEXT_ALIGN_DEFAULT 5 -#define TEXT_ALIGN_RIGHT 6 -#define TEXT_ALIGN_LEFT 7 -#define TEXT_ALIGN_CENTER 8 +#define TEXT_ALIGN_DEFAULT 8 +#define TEXT_ALIGN_RIGHT 16 +#define TEXT_ALIGN_LEFT 32 +#define TEXT_ALIGN_CENTER 64 VOID MUIDisplayPage (ULONG PageNumber); +VOID +MUIDisplayError (ULONG ErrorNum, PINPUT_RECORD Ir, ULONG WaitEvent); + #endif

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