Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 15399: Implement IRP_MN_QUERY_RESOURCE_REQUIREMENTS
by hpoussin＠svn.reactos.com 18 May '05

18 May '05

Implement IRP_MN_QUERY_RESOURCE_REQUIREMENTS Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-18 20:19:22 UTC (rev 15398) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-18 21:23:54 UTC (rev 15399) @@ -119,12 +119,16 @@ static BOOLEAN AcpiCreateResourceList(PCM_RESOURCE_LIST* pResourceList, PULONG ResourceListSize, + PIO_RESOURCE_REQUIREMENTS_LIST* pRequirementsList, + PULONG RequirementsListSize, RESOURCE* resources) { BOOLEAN Done; ULONG NumberOfResources = 0; PCM_RESOURCE_LIST ResourceList; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + PIO_RESOURCE_DESCRIPTOR RequirementDescriptor; RESOURCE* resource; ULONG i; KIRQL Dirql; @@ -176,6 +180,24 @@ ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; + *RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); + RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePool(PagedPool, *RequirementsListSize); + *pRequirementsList = RequirementsList; + if (!RequirementsList) + { + ExFreePool(ResourceList); + return FALSE; + } + RequirementsList->ListSize = *RequirementsListSize; + RequirementsList->InterfaceType = ResourceList->List[0].InterfaceType; + RequirementsList->BusNumber = ResourceList->List[0].BusNumber; + RequirementsList->SlotNumber = 0; /* Not used by WDM drivers */ + RequirementsList->AlternativeLists = 1; + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + RequirementsList->List[0].Count = NumberOfResources; + RequirementDescriptor = RequirementsList->List[0].Descriptors; + /* Fill resources list structure */ Done = FALSE; resource = resources; @@ -199,7 +221,16 @@ &Dirql, &ResourceDescriptor->u.Interrupt.Affinity); ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + + RequirementDescriptor->Option = 0; /* Required */ + RequirementDescriptor->Type = ResourceDescriptor->Type; + RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; + RequirementDescriptor->Flags = ResourceDescriptor->Flags; + RequirementDescriptor->u.Interrupt.MinimumVector = RequirementDescriptor->u.Interrupt.MaximumVector + = irq_data->interrupts[i]; + ResourceDescriptor++; + RequirementDescriptor++; } break; } @@ -225,7 +256,16 @@ case TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; } ResourceDescriptor->u.Dma.Channel = dma_data->channels[i]; + + RequirementDescriptor->Option = 0; /* Required */ + RequirementDescriptor->Type = ResourceDescriptor->Type; + RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; + RequirementDescriptor->Flags = ResourceDescriptor->Flags; + RequirementDescriptor->u.Dma.MinimumChannel = RequirementDescriptor->u.Dma.MaximumChannel + = ResourceDescriptor->u.Dma.Channel; + ResourceDescriptor++; + RequirementDescriptor++; } break; } @@ -242,7 +282,18 @@ ResourceDescriptor->u.Port.Start.u.HighPart = 0; ResourceDescriptor->u.Port.Start.u.LowPart = io_data->min_base_address; ResourceDescriptor->u.Port.Length = io_data->range_length; + + RequirementDescriptor->Option = 0; /* Required */ + RequirementDescriptor->Type = ResourceDescriptor->Type; + RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; + RequirementDescriptor->Flags = ResourceDescriptor->Flags; + RequirementDescriptor->u.Port.Length = ResourceDescriptor->u.Port.Length; + RequirementDescriptor->u.Port.Alignment = 1; /* Start address is specified, so it doesn't matter */ + RequirementDescriptor->u.Port.MinimumAddress = RequirementDescriptor->u.Port.MaximumAddress + = ResourceDescriptor->u.Port.Start; + ResourceDescriptor++; + RequirementDescriptor++; break; } case end_tag: @@ -366,6 +417,8 @@ } if (!AcpiCreateResourceList(&PdoDeviceExtension->ResourceList, &PdoDeviceExtension->ResourceListSize, + &PdoDeviceExtension->ResourceRequirementsList, + &PdoDeviceExtension->ResourceRequirementsListSize, (RESOURCE*)Buffer.pointer)) { ASSERT(FALSE); _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h --- trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h 2005-05-18 20:19:22 UTC (rev 15398) +++ trunk/reactos/drivers/bus/acpi/ospm/include/acpisys.h 2005-05-18 21:23:54 UTC (rev 15399) @@ -50,6 +50,9 @@ // Resource list PCM_RESOURCE_LIST ResourceList; ULONG ResourceListSize; + // Requirement list + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; + ULONG ResourceRequirementsListSize; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c --- trunk/reactos/drivers/bus/acpi/ospm/pdo.c 2005-05-18 20:19:22 UTC (rev 15398) +++ trunk/reactos/drivers/bus/acpi/ospm/pdo.c 2005-05-18 21:23:54 UTC (rev 15399) @@ -108,6 +108,35 @@ static NTSTATUS +PdoQueryResourceRequirements( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; + + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->ResourceRequirementsListSize == 0) + { + return Irp->IoStatus.Status; + } + + ResourceRequirementsList = ExAllocatePool(PagedPool, DeviceExtension->ResourceRequirementsListSize); + if (!ResourceRequirementsList) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(ResourceRequirementsList, DeviceExtension->ResourceRequirementsList, DeviceExtension->ResourceRequirementsListSize); + Irp->IoStatus.Information = (ULONG_PTR)ResourceRequirementsList; + return STATUS_SUCCESS; +} + + +static NTSTATUS PdoQueryResources( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -227,6 +256,9 @@ break; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + Status = PdoQueryResourceRequirements(DeviceObject, + Irp, + IrpSp); break; case IRP_MN_QUERY_RESOURCES:

1 0

[greatlrd] 15398: Swdish translations by irc:anders1 proofread by Andreas Bjerkeholt, Wacko and by Me (GreatLord)
by greatlrd＠svn.reactos.com 18 May '05

18 May '05

Swdish translations by irc:anders1 proofread by Andreas Bjerkeholt, Wacko and by Me (GreatLord) Added: trunk/reactos/lib/shdocvw/Sv.rc Modified: trunk/reactos/lib/shdocvw/shdocvw.rc _____ Added: trunk/reactos/lib/shdocvw/Sv.rc --- trunk/reactos/lib/shdocvw/Sv.rc 2005-05-18 19:58:27 UTC (rev 15397) +++ trunk/reactos/lib/shdocvw/Sv.rc 2005-05-18 20:19:22 UTC (rev 15398) @@ -0,0 +1,35 @@ +/* + * Copyright 2005 Anders Bergh + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Laddar ner Mozilla ActiveX-komponent" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Avbryt", IDAvbryt, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "Programmet krõver en ActiveX-komponent som inte õr tillgõnglig.\n" + "Vill du ladda ner och installera Mozillas ActiveX-komponent?" +END _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.rc --- trunk/reactos/lib/shdocvw/shdocvw.rc 2005-05-18 19:58:27 UTC (rev 15397) +++ trunk/reactos/lib/shdocvw/shdocvw.rc 2005-05-18 20:19:22 UTC (rev 15398) @@ -29,3 +29,4 @@ #include "Fr.rc" #include "Nl.rc" #include "Pt.rc" +#include "Sv.rc"

1 0

[ion] 15395: Object Manager Patch. This patch continues the work done in the previous patch and makes the following changes in order to support OB 2.0 (it basically temporarily fixes a highly incorrect implementation so that caller code will be ready to work with the OB 2.0 without change):
by ion＠svn.reactos.com 18 May '05

18 May '05

Object Manager Patch. This patch continues the work done in the previous patch and makes the following changes in order to support OB 2.0 (it basically temporarily fixes a highly incorrect implementation so that caller code will be ready to work with the OB 2.0 without change): 1) The documented Object Create Information Structure and semantics implemented. All Object Attributes and passed data from user-mode is now probed and saved into this object create structure when ObCreateObject is called. 2) ObCreateObject does NOT PERFORM ANY OTHER OPERATION EXCEPT CREATING THE OBJECT ANYMORE. ObCreateObject will NOT insert the Object into the tree and other operations. These are now done correctly by ObInsertObject. Therefore, the biggest hurdle was changing pieces of code which assumed ObCreateObject would be enough. 3) ObInsertObject uses the captured create info for all operations isntead of the Object Attributes. 4) ObFindObject now uses the captured info as well. 5) The OBject name and directory are now stored in the documented Object Name Information, always allocated and freed from non paged pool. HACKS: 5) Because the registry code is horribly broken and doesn't use ObFindObjectByName, the old ObFindObject had to be temporarily duplicated into CmpFindObject. 7) Win32k used ObInsertObject in CsrInsertObject as a way to create a handle inside csrss. However, OBInsertObject now does more then this. As a temporary hack, ObpCreateHandle is exported from the kernel and called from win32k. A fix needs to be done for this, but I don't know the design of win32k+csrss well enough to find a solution. 8) SEH has been commented out in some places of the new probing code because it breaks smss and explorer. These need to be investigated (seh did not exist in the previous code, so this is not really a hack) 9) Named objects with a parent directory are NOT allowed. However because of bugs in kernel32, the new check has been temporarily disabled. (this check did not exist in the previous code, so this is not really a hack) The next patch will add a proper ObFindObject which will support a more complete Parse Procedure with context and security information. This is needed for proper registry access (requested by Eric Kohl) and for proper functionality of the Desktop/File creation, which should use the Parse routine, and not the Create Handle Routine. This will also make it possible to remove some previous hacks and pave the way for a fixed Iop/IoCreateFile Modified: trunk/reactos/include/ddk/obfuncs.h Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ob/dirobj.c Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/ntobj.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ddk/obfuncs.h --- trunk/reactos/include/ddk/obfuncs.h 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/include/ddk/obfuncs.h 2005-05-18 19:26:47 UTC (rev 15395) @@ -63,6 +63,15 @@ PSECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength); +typedef struct _OBJECT_HEADER_NAME_INFO +{ + struct _DIRECTORY_OBJECT *Directory; + UNICODE_STRING Name; + ULONG QueryReferences; + ULONG Reserved2; + ULONG DbgReferenceCount; +} OBJECT_HEADER_NAME_INFO, *POBJECT_HEADER_NAME_INFO; + typedef struct _OBJECT_CREATE_INFORMATION { ULONG Attributes; _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-05-18 19:26:47 UTC (rev 15395) @@ -744,4 +744,11 @@ CmiSaveTempHive (PREGISTRY_HIVE Hive, HANDLE FileHandle); +/* TEMPORARY HACK UNTIL PROPER PARSE ROUTINES SOON. DO NOT REMOVE -- Alex */ +NTSTATUS +CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes, + PVOID* ReturnedObject, + PUNICODE_STRING RemainingPath, + POBJECT_TYPE ObjectType); + #endif /*__INCLUDE_CM_H*/ _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -30,6 +30,138 @@ /* FUNCTIONS ****************************************************************/ +/* TEMPORARY HACK UNTIL PROPER PARSE ROUTINES SOON. DO NOT REMOVE -- Alex */ +NTSTATUS +CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes, + PVOID* ReturnedObject, + PUNICODE_STRING RemainingPath, + POBJECT_TYPE ObjectType) +{ + PVOID NextObject; + PVOID CurrentObject; + PVOID RootObject; + POBJECT_HEADER CurrentHeader; + NTSTATUS Status; + PWSTR current; + UNICODE_STRING PathString; + ULONG Attributes; + PUNICODE_STRING ObjectName; + + PAGED_CODE(); + + DPRINT("CmpFindObject(ObjectAttributes %x, ReturnedObject %x, " + "RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath); + DPRINT("ObjectAttributes->ObjectName %wZ\n", + ObjectAttributes->ObjectName); + + RtlInitUnicodeString (RemainingPath, NULL); + + if (ObjectAttributes->RootDirectory == NULL) + { + ObReferenceObjectByPointer(NameSpaceRoot, + DIRECTORY_TRAVERSE, + NULL, + UserMode); + CurrentObject = NameSpaceRoot; + } + else + { + Status = ObReferenceObjectByHandle(ObjectAttributes->RootDirectory, + 0, + NULL, + UserMode, + &CurrentObject, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + ObjectName = ObjectAttributes->ObjectName; + if (ObjectName->Length == 0 || + ObjectName->Buffer[0] == UNICODE_NULL) + { + *ReturnedObject = CurrentObject; + return STATUS_SUCCESS; + } + + if (ObjectAttributes->RootDirectory == NULL && + ObjectName->Buffer[0] != L'\\') + { + ObDereferenceObject (CurrentObject); + return STATUS_UNSUCCESSFUL; + } + + /* Create a zero-terminated copy of the object name */ + PathString.Length = ObjectName->Length; + PathString.MaximumLength = ObjectName->Length + sizeof(WCHAR); + PathString.Buffer = ExAllocatePool (NonPagedPool, + PathString.MaximumLength); + if (PathString.Buffer == NULL) + { + ObDereferenceObject (CurrentObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory (PathString.Buffer, + ObjectName->Buffer, + ObjectName->Length); + PathString.Buffer[PathString.Length / sizeof(WCHAR)] = UNICODE_NULL; + + current = PathString.Buffer; + + RootObject = CurrentObject; + Attributes = ObjectAttributes->Attributes; + if (ObjectType == ObSymbolicLinkType) + Attributes |= OBJ_OPENLINK; + + while (TRUE) + { + DPRINT("current %S\n",current); + CurrentHeader = BODY_TO_HEADER(CurrentObject); + + DPRINT("Current ObjectType %wZ\n", + &CurrentHeader->ObjectType->TypeName); + + if (CurrentHeader->ObjectType->TypeInfo.ParseProcedure == NULL) + { + DPRINT("Current object can't parse\n"); + break; + } + Status = CurrentHeader->ObjectType->TypeInfo.ParseProcedure(CurrentObject, + &NextObject, + &PathString, + &current, + Attributes); + if (Status == STATUS_REPARSE) + { + /* reparse the object path */ + NextObject = NameSpaceRoot; + current = PathString.Buffer; + + ObReferenceObjectByPointer(NextObject, + DIRECTORY_TRAVERSE, + NULL, + UserMode); + } + + if (NextObject == NULL) + { + break; + } + ObDereferenceObject(CurrentObject); + CurrentObject = NextObject; + } + + if (current) + RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); + RtlFreeUnicodeString (&PathString); + *ReturnedObject = CurrentObject; + + return STATUS_SUCCESS; +} + /* * @implemented */ @@ -199,13 +331,13 @@ KeyHandle, ObjectAttributes->RootDirectory); - Status = ObFindObject(ObjectAttributes, + Status = CmpFindObject(ObjectAttributes, &Object, &RemainingPath, CmiKeyType); if (!NT_SUCCESS(Status)) { - DPRINT("ObFindObject failed, Status: 0x%x\n", Status); + DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); return(Status); } @@ -379,7 +511,7 @@ PAGED_CODE(); - DPRINT1("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); + DPRINT("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); PreviousMode = ExGetPreviousMode(); @@ -418,7 +550,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - DPRINT1("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); + DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); /* Dereference the object */ ObDereferenceObject(KeyObject); @@ -1146,14 +1278,14 @@ return(STATUS_BUFFER_OVERFLOW);*/ RemainingPath.Buffer = NULL; - Status = ObFindObject(ObjectAttributes, + Status = CmpFindObject(ObjectAttributes, &Object, &RemainingPath, CmiKeyType); if (!NT_SUCCESS(Status)) { - DPRINT("ObFindObject() returned 0x%08lx\n", Status); - Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ + DPRINT("CmpFindObject() returned 0x%08lx\n", Status); + Status = STATUS_INVALID_HANDLE; /* Because CmpFindObject returns STATUS_UNSUCCESSFUL */ hKey = *KeyHandle; /* Preserve hkResult value */ goto openkey_cleanup; } _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -702,7 +702,7 @@ DPRINT("CmiConnectHive(%p, %p) called.\n", KeyObjectAttributes, RegistryHive); - Status = ObFindObject(KeyObjectAttributes, + Status = CmpFindObject(KeyObjectAttributes, (PVOID*)&ParentKey, &RemainingPath, CmiKeyType); @@ -746,6 +746,7 @@ 0, 0, (PVOID*)&NewKey); + if (!NT_SUCCESS(Status)) { DPRINT1 ("ObCreateObject() failed (Status %lx)\n", Status); @@ -753,7 +754,14 @@ RtlFreeUnicodeString(&RemainingPath); return Status; } - + DPRINT("Inserting Key into Object Tree\n"); + Status = ObInsertObject((PVOID)NewKey, + NULL, + KEY_ALL_ACCESS, + 0, + NULL, + NULL); +DPRINT("Status %x\n", Status); NewKey->RegistryHive = RegistryHive; NewKey->KeyCellOffset = RegistryHive->HiveHeader->RootKeyOffset; NewKey->KeyCell = CmiGetCell (RegistryHive, NewKey->KeyCellOffset, NULL); _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -176,6 +176,15 @@ RtlFreeUnicodeString(&KeyName); return(Status); } + DPRINT("Inserting Key into Object Tree\n"); + Status = ObInsertObject((PVOID)FoundObject, + NULL, + KEY_ALL_ACCESS, + 0, + NULL, + NULL); + DPRINT("Status %x\n", Status); + /* Add the keep-alive reference */ ObReferenceObject(FoundObject); @@ -503,7 +512,7 @@ else { /* KeyObject is the root key */ - Status = ObQueryNameString (BODY_TO_HEADER(KeyObject)->Parent, + Status = ObQueryNameString (BODY_TO_HEADER(KeyObject)->NameInfo->Directory, LocalInfo, MAX_PATH * sizeof(WCHAR), &LocalReturnLength); _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-18 19:26:47 UTC (rev 15395) @@ -385,11 +385,6 @@ PVOID* SystemArgument2); NTSTATUS STDCALL -IopCreateFile(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes); -NTSTATUS STDCALL IopCreateDevice(PVOID ObjectBody, PVOID Parent, PWSTR RemainingPath, @@ -553,7 +548,7 @@ IopCreateFile(PVOID ObjectBody, PVOID Parent, PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes); + POBJECT_CREATE_INFORMATION ObjectAttributes); VOID STDCALL _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-18 19:26:47 UTC (rev 15395) @@ -29,14 +29,14 @@ * PURPOSE: Header for every object managed by the object manager */ { - UNICODE_STRING Name; + POBJECT_HEADER_NAME_INFO NameInfo; LIST_ENTRY Entry; LONG RefCount; LONG HandleCount; BOOLEAN Permanent; BOOLEAN Inherit; - struct _DIRECTORY_OBJECT* Parent; POBJECT_TYPE ObjectType; + POBJECT_CREATE_INFORMATION ObjectCreateInfo; PSECURITY_DESCRIPTOR SecurityDescriptor; /* @@ -133,7 +133,8 @@ VOID ObCreateHandleTable(struct _EPROCESS* Parent, BOOLEAN Inherit, struct _EPROCESS* Process); -NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes, +NTSTATUS ObFindObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, + PUNICODE_STRING ObjectName, PVOID* ReturnedObject, PUNICODE_STRING RemainingPath, POBJECT_TYPE ObjectType); @@ -148,7 +149,7 @@ NTSTATUS STDCALL -ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, +ObpCreateTypeObject(struct _OBJECT_TYPE_INITIALIZER *ObjectTypeInitializer, PUNICODE_STRING TypeName, POBJECT_TYPE *ObjectType); @@ -224,18 +225,22 @@ } CAPTURED_OBJECT_ATTRIBUTES, *PCAPTURED_OBJECT_ATTRIBUTES; NTSTATUS -ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, +STDCALL +ObpCaptureObjectName(IN PUNICODE_STRING CapturedName, + IN PUNICODE_STRING ObjectName, + IN KPROCESSOR_MODE AccessMode); + +NTSTATUS +STDCALL +ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, IN KPROCESSOR_MODE AccessMode, - IN POOL_TYPE PoolType, - IN BOOLEAN CaptureIfKernel, - OUT PCAPTURED_OBJECT_ATTRIBUTES CapturedObjectAttributes OPTIONAL, - OUT PUNICODE_STRING ObjectName OPTIONAL); + IN POBJECT_TYPE ObjectType, + IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, + OUT PUNICODE_STRING ObjectName); VOID -ObpReleaseObjectAttributes(IN PCAPTURED_OBJECT_ATTRIBUTES CapturedObjectAttributes OPTIONAL, - IN PUNICODE_STRING ObjectName OPTIONAL, - IN KPROCESSOR_MODE AccessMode, - IN BOOLEAN CaptureIfKernel); +STDCALL +ObpReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo); /* object information classes */ _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -218,6 +218,17 @@ { return Status; } + + Status = ObInsertObject(Object, + NULL, + FILE_ALL_ACCESS, + 0, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } if (Status == STATUS_OBJECT_EXISTS) { _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -47,7 +47,7 @@ IopCreateFile(PVOID ObjectBody, PVOID Parent, PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes) + POBJECT_CREATE_INFORMATION ObjectCreateInfo) { PDEVICE_OBJECT DeviceObject; PFILE_OBJECT FileObject = (PFILE_OBJECT) ObjectBody; @@ -73,8 +73,8 @@ ParentObjectType != IoFileObjectType) { DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", - &BODY_TO_HEADER(Parent)->Name, - BODY_TO_HEADER(Parent)->ObjectType->TypeName.Buffer, + &BODY_TO_HEADER(Parent)->NameInfo->Name, + BODY_TO_HEADER(Parent)->ObjectType->Name.Buffer, RemainingPath); return(STATUS_UNSUCCESSFUL); } @@ -852,6 +852,7 @@ if (CreateDisposition == FILE_OPEN || CreateDisposition == FILE_OPEN_IF) { + Status = ObOpenObjectByName(ObjectAttributes, NULL, NULL, @@ -859,6 +860,7 @@ DesiredAccess, NULL, &LocalHandle); + if (NT_SUCCESS(Status)) { Status = ObReferenceObjectByHandle(LocalHandle, @@ -1012,7 +1014,7 @@ */ Status = IofCallDriver(FileObject->DeviceObject, Irp ); DPRINT("Status :%x\n", Status); - + if (Status == STATUS_PENDING) { KeWaitForSingleObject(&FileObject->Event, _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -2099,6 +2099,16 @@ DbgPrint("Failed to create PhysicalMemory section\n"); KEBUGCHECK(0); } + Status = ObInsertObject(PhysSection, + NULL, + SECTION_ALL_ACCESS, + 0, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(PhysSection); + } PhysSection->AllocationAttributes |= SEC_PHYSICALMEMORY; return(STATUS_SUCCESS); @@ -2239,7 +2249,6 @@ { return(Status); } - /* * Initialize it */ @@ -3140,6 +3149,7 @@ UserMode, (PVOID*)(PVOID)&FileObject, NULL); + if (!NT_SUCCESS(Status)) { return Status; _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-05-18 19:26:47 UTC (rev 15395) @@ -823,6 +823,7 @@ ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 ObCreateObject@36 +ObpCreateHandle ; FIXME! See win32k/ntuser/csr.c! ObFindHandleForObject@20 ObGetObjectPointerCount@4 ObGetObjectSecurity@12 _____ Modified: trunk/reactos/ntoskrnl/ob/dirobj.c --- trunk/reactos/ntoskrnl/ob/dirobj.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/ob/dirobj.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -253,7 +253,7 @@ EntryHeader = CONTAINING_RECORD(ListEntry, OBJECT_HEADER, Entry); /* calculate the size of the required buffer space for this entry */ - Name = (EntryHeader->Name.Length != 0 ? &EntryHeader->Name : NULL); + Name = (EntryHeader->NameInfo->Name.Length != 0 ? &EntryHeader->NameInfo->Name : NULL); Type = &EntryHeader->ObjectType->Name; EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + ((Name != NULL) ? ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + @@ -440,8 +440,8 @@ PAGED_CODE(); DPRINT("NtCreateDirectoryObject(DirectoryHandle %x, " - "DesiredAccess %x, ObjectAttributes %x\n", - DirectoryHandle, DesiredAccess, ObjectAttributes); + "DesiredAccess %x, ObjectAttributes %x\n", + DirectoryHandle, DesiredAccess, ObjectAttributes); PreviousMode = ExGetPreviousMode(); _____ Modified: trunk/reactos/ntoskrnl/ob/handle.c --- trunk/reactos/ntoskrnl/ob/handle.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/ob/handle.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -46,6 +46,14 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL; +/* TEMPORARY HACK. DO NOT REMOVE -- Alex */ +NTSTATUS +STDCALL +ExpDesktopCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + POBJECT_CREATE_INFORMATION ObjectCreateInformation); + /* FUNCTIONS ***************************************************************/ static VOID @@ -64,7 +72,7 @@ if(NewHandleCount == 0) { - if(ObjectHeader->Parent != NULL && !ObjectHeader->Permanent) + if(ObjectHeader->NameInfo->Directory != NULL && !ObjectHeader->Permanent) { /* delete the object from the namespace when the last handle got closed. Only do this if it's actually been inserted into the namespace and @@ -925,27 +933,221 @@ /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL ObInsertObject(IN PVOID Object, - IN PACCESS_STATE PassedAccessState OPTIONAL, - IN ACCESS_MASK DesiredAccess, - IN ULONG AdditionalReferences, - OUT PVOID* ReferencedObject OPTIONAL, - OUT PHANDLE Handle) + IN PACCESS_STATE PassedAccessState OPTIONAL, + IN ACCESS_MASK DesiredAccess, + IN ULONG AdditionalReferences, + OUT PVOID* ReferencedObject OPTIONAL, + OUT PHANDLE Handle) { - POBJECT_HEADER ObjectHeader; - ACCESS_MASK Access; + POBJECT_CREATE_INFORMATION ObjectCreateInfo; + POBJECT_HEADER Header; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + PVOID FoundObject = NULL; + POBJECT_HEADER FoundHeader = NULL; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING RemainingPath; + BOOLEAN ObjectAttached = FALSE; + PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; + SECURITY_SUBJECT_CONTEXT SubjectContext; - PAGED_CODE(); + PAGED_CODE(); + + /* Get the Header and Create Info */ + DPRINT("ObInsertObject: %x\n", Object); + Header = BODY_TO_HEADER(Object); + ObjectCreateInfo = Header->ObjectCreateInfo; + ObjectNameInfo = Header->NameInfo; + + /* First try to find the Object */ + if (ObjectNameInfo && ObjectNameInfo->Name.Buffer) + { + DPRINT("Object has a name. Trying to find it: %wZ.\n", &ObjectNameInfo->Name); + Status = ObFindObject(ObjectCreateInfo, + &ObjectNameInfo->Name, + &FoundObject, + &RemainingPath, + NULL); + DPRINT("FoundObject: %x, Path: %wZ\n", FoundObject, &RemainingPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObFindObject() failed! (Status 0x%x)\n", Status); + return Status; + } + + if (FoundObject) + { + DPRINT("Getting header: %x\n", FoundObject); + FoundHeader = BODY_TO_HEADER(FoundObject); + } + + if (FoundHeader && RemainingPath.Buffer == NULL) + { + DPRINT("Object exists\n"); + if (FoundHeader->ObjectType != Header->ObjectType + || !(ObjectCreateInfo->Attributes & OBJ_OPENIF)) + { + ObDereferenceObject(FoundObject); + return STATUS_OBJECT_NAME_COLLISION; + } + return STATUS_OBJECT_EXISTS; + } + } + else + { + DPRINT("No name, empty remaining path\n"); + RtlInitUnicodeString(&RemainingPath, NULL); + } - Access = DesiredAccess; - ObjectHeader = BODY_TO_HEADER(Object); + if (FoundHeader && FoundHeader->ObjectType == ObDirectoryType && + RemainingPath.Buffer) + { + DPRINT("Adding to Object Directory\n"); + ObpAddEntryDirectory(FoundObject, Header, NULL); + ObjectAttached = TRUE; + + /* The name was changed so let's update it */ + /* FIXME: TEMPORARY HACK This will go in ObFindObject in the next commit */ + PVOID NewName; + PWSTR BufferPos = RemainingPath.Buffer; + + NewName = ExAllocatePool(NonPagedPool, RemainingPath.MaximumLength); + ObjectNameInfo = Header->NameInfo; + + if (BufferPos[0] == L'\\') + { + BufferPos++; + } + + RtlMoveMemory(NewName, BufferPos, RemainingPath.MaximumLength); + if (ObjectNameInfo->Name.Buffer) ExFreePool(ObjectNameInfo->Name.Buffer); + ObjectNameInfo->Name.Buffer = NewName; + ObjectNameInfo->Name.Length = RemainingPath.Length; + ObjectNameInfo->Name.MaximumLength = RemainingPath.MaximumLength; + DPRINT("Name: %S\n", ObjectNameInfo->Name.Buffer); + } - return(ObpCreateHandle(PsGetCurrentProcess(), - Object, - Access, - ObjectHeader->Inherit, - Handle)); + if ((Header->ObjectType == IoFileObjectType) || + (Header->ObjectType == ExDesktopObjectType) || + (Header->ObjectType->TypeInfo.OpenProcedure != NULL)) + { + DPRINT("About to call Open Routine\n"); + if (Header->ObjectType == IoFileObjectType) + { + /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ + DPRINT("Calling IopCreateFile: %x\n", FoundObject); + Status = IopCreateFile(HEADER_TO_BODY(Header), + FoundObject, + RemainingPath.Buffer, + ObjectCreateInfo); + DPRINT("Called IopCreateFile: %x\n", Status); + + } + else if (Header->ObjectType == ExDesktopObjectType) + { + /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ + DPRINT("Calling ExpDesktopCreate\n"); + Status = ExpDesktopCreate(HEADER_TO_BODY(Header), + FoundObject, + RemainingPath.Buffer, + ObjectCreateInfo); + } + else if (Header->ObjectType->TypeInfo.OpenProcedure != NULL) + { + DPRINT("Calling %x\n", Header->ObjectType->TypeInfo.OpenProcedure); + Status = Header->ObjectType->TypeInfo.OpenProcedure(ObCreateHandle, + HEADER_TO_BODY(Header), + NULL, + 0, + 0); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT("Create Failed\n"); + if (ObjectAttached == TRUE) + { + ObpRemoveEntryDirectory(Header); + } + if (FoundObject) + { + ObDereferenceObject(FoundObject); + } + RtlFreeUnicodeString(&RemainingPath); + return Status; + } + } + + RtlFreeUnicodeString(&RemainingPath); + + DPRINT("Security Assignment in progress\n"); + SeCaptureSubjectContext(&SubjectContext); + + /* Build the new security descriptor */ + Status = SeAssignSecurity((FoundHeader != NULL) ? FoundHeader->SecurityDescriptor : NULL, + (ObjectCreateInfo != NULL) ? ObjectCreateInfo->SecurityDescriptor : NULL, + &NewSecurityDescriptor, + (Header->ObjectType == ObDirectoryType), + &SubjectContext, + &Header->ObjectType->TypeInfo.GenericMapping, + PagedPool); + + if (NT_SUCCESS(Status)) + { + DPRINT("NewSecurityDescriptor %p\n", NewSecurityDescriptor); + + if (Header->ObjectType->TypeInfo.SecurityProcedure != NULL) + { + /* Call the security method */ + Status = Header->ObjectType->TypeInfo.SecurityProcedure(HEADER_TO_BODY(Header), + AssignSecurityDescriptor, + 0, + NewSecurityDescriptor, + NULL); + } + else + { + /* Assign the security descriptor to the object header */ + Status = ObpAddSecurityDescriptor(NewSecurityDescriptor, + &Header->SecurityDescriptor); + DPRINT("Object security descriptor %p\n", Header->SecurityDescriptor); + } + + /* Release the new security descriptor */ + SeDeassignSecurity(&NewSecurityDescriptor); + } + + DPRINT("Security Complete\n"); + SeReleaseSubjectContext(&SubjectContext); + + /* We can delete the Create Info now */ + Header->ObjectCreateInfo = NULL; + ObpReleaseCapturedAttributes(ObjectCreateInfo); + ExFreePool(ObjectCreateInfo); + + /* Create the Handle */ + /* HACKHACK: Because of ROS's incorrect startup, this can be called + * without a valid Process until I finalize the startup patch, + * so don't create a handle if this is the case. We also don't create + * a handle if Handle is NULL when the Registry Code calls it, because + * the registry code totally bastardizes the Ob and needs to be fixed + */ + DPRINT("Creating handle\n"); + if (Handle != NULL) + { + Status = ObpCreateHandle(PsGetCurrentProcess(), + HEADER_TO_BODY(Header), + DesiredAccess, + Header->Inherit, + Handle); + DPRINT("handle Created: %d. refcount. handlecount %d %d\n", + *Handle, Header->RefCount, Header->HandleCount); + } + + DPRINT("Status %x\n", Status); + return Status; } _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-18 19:08:00 UTC (rev 15394) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-18 19:26:47 UTC (rev 15395) @@ -40,7 +40,8 @@ NTSTATUS STDCALL -ObpAllocateObject(POBJECT_ATTRIBUTES ObjectAttributes, +ObpAllocateObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, + PUNICODE_STRING ObjectName, POBJECT_TYPE ObjectType, ULONG ObjectSize, POBJECT_HEADER *ObjectHeader); @@ -62,7 +63,9 @@ { PVOID Object = NULL; UNICODE_STRING RemainingPath; + UNICODE_STRING ObjectName; OBJECT_ATTRIBUTES ObjectAttributes; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; PAGED_CODE(); @@ -72,10 +75,26 @@ Attributes | OBJ_OPENIF, NULL, NULL); - Status = ObFindObject(&ObjectAttributes, + + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(&ObjectAttributes, + AccessMode, + ObjectType, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } + + Status = ObFindObject(&ObjectCreateInfo, + &ObjectName, &Object, &RemainingPath, ObjectType); + if (!NT_SUCCESS(Status)) { return(Status); @@ -136,13 +155,29 @@ { UNICODE_STRING RemainingPath; PVOID Object = NULL; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; PAGED_CODE(); DPRINT("ObOpenObjectByName(...)\n"); - Status = ObFindObject(ObjectAttributes, + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(ObjectAttributes, + AccessMode, + ObjectType, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) + { + DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); + return Status; + } + + Status = ObFindObject(&ObjectCreateInfo, + &ObjectName, &Object, &RemainingPath, ObjectType); @@ -152,9 +187,12 @@ return Status; } + DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath); if (Object == NULL) { RtlFreeUnicodeString(&RemainingPath); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return STATUS_UNSUCCESSFUL; } if (RemainingPath.Buffer != NULL) @@ -165,9 +203,11 @@ Status =STATUS_OBJECT_PATH_NOT_FOUND; RtlFreeUnicodeString(&RemainingPath); ObDereferenceObject(Object); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; } - + Status = ObpCreateHandle(PsGetCurrentProcess(), Object, DesiredAccess, @@ -176,6 +216,8 @@ ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; } @@ -217,8 +259,7 @@ { KIRQL oldlvl; - RtlpCreateUnicodeString(&Header->Name, Name, NonPagedPool); - Header->Parent = Parent; + Header->NameInfo->Directory = Parent; KeAcquireSpinLock(&Parent->Lock, &oldlvl); InsertTailList(&Parent->head, &Header->Entry); @@ -238,13 +279,13 @@ DPRINT("ObpRemoveEntryDirectory(Header %x)\n",Header); - KeAcquireSpinLock(&(Header->Parent->Lock),&oldlvl); + KeAcquireSpinLock(&(Header->NameInfo->Directory->Lock),&oldlvl); if (Header->Entry.Flink && Header->Entry.Blink) { RemoveEntryList(&(Header->Entry)); Header->Entry.Flink = Header->Entry.Blink = NULL; } - KeReleaseSpinLock(&(Header->Parent->Lock),oldlvl); + KeReleaseSpinLock(&(Header->NameInfo->Directory->Lock),oldlvl); } NTSTATUS @@ -286,15 +327,15 @@ } if (Name[0]=='.' && Name[1]=='.' && Name[2]==0) { - return(BODY_TO_HEADER(DirectoryObject)->Parent); + return(BODY_TO_HEADER(DirectoryObject)->NameInfo->Directory); } while (current!=(&(DirectoryObject->head))) { current_obj = CONTAINING_RECORD(current,OBJECT_HEADER,Entry); - DPRINT(" Scanning: %S for: %S\n",current_obj->Name.Buffer, Name); + DPRINT(" Scanning: %S for: %S\n",current_obj->NameInfo->Name.Buffer, Name); if (Attributes & OBJ_CASE_INSENSITIVE) { - if (_wcsicmp(current_obj->Name.Buffer, Name)==0) + if (_wcsicmp(current_obj->NameInfo->Name.Buffer, Name)==0) { DPRINT("Found it %x\n",HEADER_TO_BODY(current_obj)); return(HEADER_TO_BODY(current_obj)); @@ -302,7 +343,7 @@ } else { - if ( wcscmp(current_obj->Name.Buffer, Name)==0) + if ( wcscmp(current_obj->NameInfo->Name.Buffer, Name)==0) { DPRINT("Found it %x\n",HEADER_TO_BODY(current_obj)); return(HEADER_TO_BODY(current_obj)); @@ -389,7 +430,7 @@ ObpInitSdCache(); /* Create the Type Type */ - DPRINT1("Creating Type Type\n"); + DPRINT("Creating Type Type\n"); RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Type"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); @@ -402,7 +443,7 @@ ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObTypeObjectType); /* Create the Directory Type */ - DPRINT1("Creating Directory Type\n"); + DPRINT("Creating Directory Type\n"); RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Directory"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); @@ -430,7 +471,7 @@ FALSE); /* Create root directory */ - DPRINT1("Creating Root Directory\n"); + DPRINT("Creating Root Directory\n"); [truncated at 1000 lines; 1272 more skipped]

2 1

[greatlrd] 15397: Swdish translations by irc:anders1 proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 18 May '05

18 May '05

Swdish translations by irc:anders1 proofread by Andreas Bjerkeholt Modified: trunk/reactos/lib/msacm/msacm.rc Added: trunk/reactos/lib/msacm/msacm_Sv.rc _____ Modified: trunk/reactos/lib/msacm/msacm.rc --- trunk/reactos/lib/msacm/msacm.rc 2005-05-18 19:46:40 UTC (rev 15396) +++ trunk/reactos/lib/msacm/msacm.rc 2005-05-18 19:58:27 UTC (rev 15397) @@ -30,3 +30,4 @@ #include "msacm_Ja.rc" #include "msacm_Nl.rc" #include "msacm_Pt.rc" +#include "msacm_Sv.rc" _____ Added: trunk/reactos/lib/msacm/msacm_Sv.rc --- trunk/reactos/lib/msacm/msacm_Sv.rc 2005-05-18 19:46:40 UTC (rev 15396) +++ trunk/reactos/lib/msacm/msacm_Sv.rc 2005-05-18 19:58:27 UTC (rev 15397) @@ -0,0 +1,56 @@ +/* + * Swedish resource file for MS ACM + * + * Copyright 2005 Anders Bergh + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ljudval" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Namn:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Spara som...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Ta bort", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Attribut:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Hjõlp", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

[greatlrd] 15396: Swdish translations by irc:anders1 proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 18 May '05

18 May '05

Swdish translations by irc:anders1 proofread by Andreas Bjerkeholt Added: trunk/reactos/lib/setupapi/Sv.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Added: trunk/reactos/lib/setupapi/Sv.rc --- trunk/reactos/lib/setupapi/Sv.rc 2005-05-18 19:26:47 UTC (rev 15395) +++ trunk/reactos/lib/setupapi/Sv.rc 2005-05-18 19:46:40 UTC (rev 15396) @@ -0,0 +1,34 @@ +/* + * Swedish resources for SETUPAPI + * + * Copyright 2005 Anders Bergh + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopierar filer..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Avbryt", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kõlla:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-05-18 19:26:47 UTC (rev 15395) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-05-18 19:46:40 UTC (rev 15396) @@ -35,3 +35,4 @@ #include "Nl.rc" #include "Pt.rc" #include "Ru.rc" +#include "Sv.rc"

1 0

[ion] 15394: Prettify usetup a bit, show a warranty page before continuing installation (not a license agreement, simply a message stating this is a beta foss product with no warranty), make progressbars have a double border and change the copy file dialog a bit. Also changed setupldr and ntoskrnl to have a more unified text-mode look/appearance when installing. The effect is really nice and the blue screen with gray status-bar appears as soon as the CD boots and takes you all the way to usetup
by ion＠svn.reactos.com 18 May '05

18 May '05

Prettify usetup a bit, show a warranty page before continuing installation (not a license agreement, simply a message stating this is a beta foss product with no warranty), make progressbars have a double border and change the copy file dialog a bit. Also changed setupldr and ntoskrnl to have a more unified text-mode look/appearance when installing. The effect is really nice and the blue screen with gray status-bar appears as soon as the CD boots and takes you all the way to usetup without any breakages or black/blue/black/blue fades and confusing messages. Also, fixed ntoskrnl not to break into KDBG if /NODEBUG is set. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/subsys/system/usetup/format.c Modified: trunk/reactos/subsys/system/usetup/progress.c Modified: trunk/reactos/subsys/system/usetup/progress.h Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -756,6 +756,16 @@ if (!FrLdrLoadDriver(szHalName, 10)) return; +#if 0 + /* Load bootvid */ + strcpy(value, "INBV.DLL"); + strcpy(szHalName, szBootPath); + strcat(szHalName, "SYSTEM32\\"); + strcat(szHalName, value); + + if (!FrLdrLoadDriver(szHalName, 10)) + return; +#endif /* * Load the System hive from disk */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -34,7 +34,7 @@ #include "registry.h" -//#define USE_UI +#define USE_UI static BOOL @@ -88,7 +88,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -155,7 +155,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -220,7 +220,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -232,6 +232,7 @@ return(TRUE); } +BOOL SetupUiInitialize(VOID); VOID RunLoader(VOID) { @@ -294,7 +295,7 @@ #endif #ifdef USE_UI - UiInitialize(); + SetupUiInitialize(); UiDrawStatusText(""); #endif _____ Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -27,6 +27,7 @@ #include <inifile.h> #include <version.h> #include <video.h> +#include <reactos/buildno.h> ULONG UiScreenWidth = 80; // Screen Width ULONG UiScreenHeight = 25; // Screen Height @@ -197,7 +198,40 @@ UserInterfaceUp = TRUE; DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n")); + return TRUE; +} +BOOL SetupUiInitialize(VOID) +{ + + CHAR DisplayModeText[260]; + ULONG Depth; + + + DisplayModeText[0] = '\0'; + + + UiDisplayMode = MachVideoSetDisplayMode(DisplayModeText, TRUE); + MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); + + TuiInitialize(); + + // Draw the backdrop and fade it in if special effects are enabled + TuiFillArea(0, + 0, + UiScreenWidth - 1, + UiScreenHeight - 2, + 0, + ATTR(UiBackdropFgColor, UiBackdropBgColor)); + + UiStatusBarBgColor = 7; + UserInterfaceUp = TRUE; + + TuiDrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor)); + TuiDrawText(3, 2, "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xC D\xCD\xCD\xCD\xCD\xCD\xCD", ATTR(COLOR_GRAY, UiBackdropBgColor)); + + DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n")); + return TRUE; } _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -29,6 +29,7 @@ extern LIST_ENTRY KiProfileListHead; extern LIST_ENTRY KiProfileSourceListHead; extern KSPIN_LOCK KiProfileLock; +BOOLEAN SetupMode = TRUE; VOID PspPostInitSystemProcess(VOID); @@ -258,7 +259,7 @@ inline VOID STDCALL -ParseAndCacheLoadedModules(PBOOLEAN SetupBoot) +ParseAndCacheLoadedModules(VOID) { ULONG i; PCHAR Name; @@ -294,7 +295,7 @@ } else if (!_stricmp(Name, "system") || !_stricmp(Name, "system.hiv")) { CachedModules[SystemRegistry] = &KeLoaderModules[i]; - *SetupBoot = FALSE; + SetupMode = FALSE; } else if (!_stricmp(Name, "hardware") || !_stricmp(Name, "hardware.hiv")) { @@ -369,20 +370,54 @@ p1 = p2; } } + +VOID +INIT_FUNCTION +ExpDisplayNotice(VOID) +{ + CHAR str[50]; + + if (SetupMode) + { + HalDisplayString( + "\n\n\n ReactOS " KERNEL_VERSION_STR " Setup \n"); + HalDisplayString( + " \xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD \xCD\xCD\xCD"); + HalDisplayString( + "\xCD\xCD\n"); + return; + } + + HalDisplayString("Starting ReactOS "KERNEL_VERSION_STR" (Build " + KERNEL_VERSION_BUILD_STR")\n"); + HalDisplayString(RES_STR_LEGAL_COPYRIGHT); + HalDisplayString("\n\nReactOS is free software, covered by the GNU General " + "Public License, and you\n"); + HalDisplayString("are welcome to change it and/or distribute copies of it " + "under certain\n"); + HalDisplayString("conditions. There is absolutely no warranty for " + "ReactOS.\n\n"); + /* Display number of Processors */ + sprintf(str, + "Found %x system processor(s). [%lu MB Memory]\n", + (int)KeNumberProcessors, + (KeLoaderBlock.MemHigher + 1088)/ 1024); + HalDisplayString(str); + +} + VOID INIT_FUNCTION STDCALL ExpInitializeExecutive(VOID) { - CHAR str[50]; UNICODE_STRING EventName; HANDLE InitDoneEventHandle; OBJECT_ATTRIBUTES ObjectAttributes; BOOLEAN NoGuiBoot = FALSE; BOOLEAN BootLog = FALSE; ULONG MaxMem = 0; - BOOLEAN SetupBoot = TRUE; BOOLEAN ForceAcpiDisable = FALSE; LARGE_INTEGER Timeout; HANDLE ProcessHandle; @@ -413,7 +448,7 @@ MaxMem > 8 ? MaxMem : 4096); /* Parse the Loaded Modules (by FreeLoader) and cache the ones we'll need */ - ParseAndCacheLoadedModules(&SetupBoot); + ParseAndCacheLoadedModules(); /* Initialize the kernel debugger parameters */ KdInitSystem(0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); @@ -511,28 +546,13 @@ /* Report all resources used by hal */ HalReportResourceUsage(); - + /* Clear the screen to blue */ HalInitSystem(2, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); /* Display version number and copyright/warranty message */ - HalDisplayString("Starting ReactOS "KERNEL_VERSION_STR" (Build " - KERNEL_VERSION_BUILD_STR")\n"); - HalDisplayString(RES_STR_LEGAL_COPYRIGHT); - HalDisplayString("\n\nReactOS is free software, covered by the GNU General " - "Public License, and you\n"); - HalDisplayString("are welcome to change it and/or distribute copies of it " - "under certain\n"); - HalDisplayString("conditions. There is absolutely no warranty for " - "ReactOS.\n\n"); + ExpDisplayNotice(); - /* Display number of Processors */ - sprintf(str, - "Found %d system processor(s). [%lu MB Memory]\n", - KeNumberProcessors, - (KeLoaderBlock.MemHigher + 1088)/ 1024); - HalDisplayString(str); - /* Call KD Providers at Phase 2 */ KdInitSystem(2, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); @@ -540,13 +560,13 @@ RtlpInitNls(); /* Import and Load Registry Hives */ - CmInitHives(SetupBoot); + CmInitHives(SetupMode); /* Initialize the time zone information from the registry */ ExpInitTimeZoneInfo(); - /* Enter the kernel debugger before starting up the boot drivers */ - KdbEnter(); + /* Enter the kernel debugger before starting up the boot drivers */ + if (KdDebuggerEnabled) KdbEnter(); /* Setup Drivers and Root Device Node */ IoInit2(BootLog); _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -18,6 +18,7 @@ /* ke/main.c */ extern LOADER_PARAMETER_BLOCK EXPORTED KeLoaderBlock; extern ULONG KeTickCount; +extern BOOLEAN SetupMode; NTSTATUS LdrProcessModule(PVOID ModuleLoadBase, @@ -272,12 +273,23 @@ * Display 'Loading XXX...' message. */ -VOID FASTCALL -IopDisplayLoadingMessage(PWCHAR ServiceName) +VOID +FASTCALL +INIT_FUNCTION +IopDisplayLoadingMessage(PVOID ServiceName, + BOOLEAN Unicode) { - CHAR TextBuffer[256]; - sprintf(TextBuffer, "Loading %S...\n", ServiceName); - HalDisplayString(TextBuffer); + if (SetupMode) return; + CHAR TextBuffer[256]; + if (Unicode) + { + sprintf(TextBuffer, "Loading %S...\n", (PWCHAR)ServiceName); + } + else + { + sprintf(TextBuffer, "Loading %s...\n", (PCHAR)ServiceName); + } + HalDisplayString(TextBuffer); } /* @@ -390,9 +402,9 @@ DPRINT("RtlQueryRegistryValues() failed (Status %x)\n", Status); return Status; } + + IopDisplayLoadingMessage(ServiceName->Buffer, TRUE); - IopDisplayLoadingMessage(ServiceName->Buffer); - /* * Normalize the image path for all later processing. */ @@ -1122,7 +1134,6 @@ PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; NTSTATUS Status; - CHAR TextBuffer[256]; PCHAR FileNameWithoutPath; LPWSTR FileExtension; @@ -1130,12 +1141,10 @@ FileName, ModuleLoadBase, ModuleLength); /* - * Display 'Initializing XXX...' message + * Display 'Loading XXX...' message */ + IopDisplayLoadingMessage(FileName, FALSE); - sprintf(TextBuffer, "Initializing %s...\n", FileName); - HalDisplayString(TextBuffer); - /* * Determine the right device object */ @@ -1307,7 +1316,7 @@ { NTSTATUS Status = STATUS_UNSUCCESSFUL; - IopDisplayLoadingMessage(Service->ServiceName.Buffer); + IopDisplayLoadingMessage(Service->ServiceName.Buffer, TRUE); Status = ZwLoadDriver(&Service->RegistryPath); IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -792,7 +792,7 @@ CPRINT("Failed to allocate a virtual section for driver\n"); return STATUS_UNSUCCESSFUL; } - DbgPrint("DriverBase for %wZ: %x\n", FileName, DriverBase); + DPRINT("DriverBase for %wZ: %x\n", FileName, DriverBase); /* Copy headers over */ memcpy(DriverBase, ModuleLoadBase, PENtHeaders->OptionalHeader.SizeOfHeaders); _____ Modified: trunk/reactos/subsys/system/usetup/format.c --- trunk/reactos/subsys/system/usetup/format.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/subsys/system/usetup/format.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -107,7 +107,8 @@ ProgressBar = CreateProgressBar (6, yScreen - 14, xScreen - 7, - yScreen - 10); + yScreen - 10, + "Setup is formatting your disk"); ProgressSetStepCount (ProgressBar, 100); _____ Modified: trunk/reactos/subsys/system/usetup/progress.c --- trunk/reactos/subsys/system/usetup/progress.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/subsys/system/usetup/progress.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -84,13 +84,86 @@ &Written); } +static VOID +DrawThickBorder(PPROGRESSBAR Bar) +{ + COORD coPos; + ULONG Written; + SHORT i; + /* draw upper left corner */ + coPos.X = Bar->Left; + coPos.Y = Bar->Top + 1; + FillConsoleOutputCharacter(0xC9, // '+', + 1, + coPos, + &Written); + + /* draw upper edge */ + coPos.X = Bar->Left + 1; + coPos.Y = Bar->Top + 1; + FillConsoleOutputCharacter(0xCD, // '-', + Bar->Right - Bar->Left - 1, + coPos, + &Written); + + /* draw upper right corner */ + coPos.X = Bar->Right; + coPos.Y = Bar->Top + 1; + FillConsoleOutputCharacter(0xBB, // '+', + 1, + coPos, + &Written); + + /* draw left and right edge */ + for (i = Bar->Top + 2; i < Bar->Bottom; i++) + { + coPos.X = Bar->Left; + coPos.Y = i; + FillConsoleOutputCharacter(0xBA, // '|', + 1, + coPos, + &Written); + + coPos.X = Bar->Right; + FillConsoleOutputCharacter(0xBA, //'|', + 1, + coPos, + &Written); + } + + /* draw lower left corner */ + coPos.X = Bar->Left; + coPos.Y = Bar->Bottom; + FillConsoleOutputCharacter(0xC8, // '+', + 1, + coPos, + &Written); + + /* draw lower edge */ + coPos.X = Bar->Left + 1; + coPos.Y = Bar->Bottom; + FillConsoleOutputCharacter(0xCD, // '-', + Bar->Right - Bar->Left - 1, + coPos, + &Written); + + /* draw lower right corner */ + coPos.X = Bar->Right; + coPos.Y = Bar->Bottom; + FillConsoleOutputCharacter(0xBC, // '+', + 1, + coPos, + &Written); +} + static VOID DrawProgressBar(PPROGRESSBAR Bar) { CHAR TextBuffer[8]; COORD coPos; ULONG Written; + PROGRESSBAR BarBorder = *Bar; /* Print percentage */ sprintf(TextBuffer, "%-3lu%%", Bar->Percent); @@ -101,7 +174,18 @@ 4, coPos); + /* Draw the progress bar border */ DrawBorder(Bar); + + /* Write Text Associated with Bar */ + SetTextXY(10, 24, Bar->Text); + + /* Draw the progress bar "border" border */ + BarBorder.Top -= 5; + BarBorder.Bottom += 2; + BarBorder.Right += 5; + BarBorder.Left -= 5; + DrawThickBorder(&BarBorder); /* Draw the bar */ coPos.X = Bar->Left + 1; @@ -126,7 +210,8 @@ CreateProgressBar(SHORT Left, SHORT Top, SHORT Right, - SHORT Bottom) + SHORT Bottom, + char* Text) { PPROGRESSBAR Bar; @@ -140,6 +225,7 @@ Bar->Top = Top; Bar->Right = Right; Bar->Bottom = Bottom; + Bar->Text = Text; Bar->Width = Bar->Right - Bar->Left + 1; _____ Modified: trunk/reactos/subsys/system/usetup/progress.h --- trunk/reactos/subsys/system/usetup/progress.h 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/subsys/system/usetup/progress.h 2005-05-18 19:08:00 UTC (rev 15394) @@ -42,6 +42,8 @@ ULONG StepCount; ULONG CurrentStep; + + CHAR *Text; } PROGRESSBAR, *PPROGRESSBAR; /* FUNCTIONS ****************************************************************/ @@ -50,7 +52,8 @@ CreateProgressBar(SHORT Left, SHORT Top, SHORT Right, - SHORT Bottom); + SHORT Bottom, + char* Text); VOID DestroyProgressBar(PPROGRESSBAR Bar); _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-05-18 17:54:16 UTC (rev 15393) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-05-18 19:08:00 UTC (rev 15394) @@ -59,6 +59,7 @@ START_PAGE, INTRO_PAGE, LICENSE_PAGE, + WARNING_PAGE, INSTALL_INTRO_PAGE, // SCSI_CONTROLLER_PAGE, @@ -88,8 +89,6 @@ REPAIR_INTRO_PAGE, - EMERGENCY_INTRO_PAGE, - SUCCESS_PAGE, QUIT_PAGE, FLUSH_PAGE, @@ -710,12 +709,11 @@ SetTextXY(6, 12, "computer and prepares the second part of the setup."); SetTextXY(8, 15, "\x07 Press ENTER to install ReactOS."); - SetTextXY(8, 17, "\x07 Press L to view the licensing terms for ReactOS."); - SetTextXY(8, 19, "\x07 Press E to start the emergency console."); - SetTextXY(8, 21, "\x07 Press R to repair ReactOS."); - SetTextXY(8, 23, "\x07 Press F3 to quit without installing ReactOS."); + SetTextXY(8, 17, "\x07 Press R to repair ReactOS."); + SetTextXY(8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions"); + SetTextXY(8, 21, "\x07 Press F3 to quit without installing ReactOS."); - SetStatusText(" ENTER = Continue F3 = Quit"); + SetStatusText(" ENTER = Continue R = Repair F3 = Quit"); if (IsUnattendedSetup) { @@ -735,20 +733,19 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - return INSTALL_INTRO_PAGE; + return WARNING_PAGE; + break; } - else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* L */ - { - return LICENSE_PAGE; - } - else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'E') /* E */ - { - return EMERGENCY_INTRO_PAGE; - } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { return REPAIR_INTRO_PAGE; + break; } + else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* R */ + { + return LICENSE_PAGE; + break; + } } return INTRO_PAGE; @@ -779,61 +776,62 @@ SetTextXY(8, 23, "GNU General Public License with ReactOS please visit"); SetHighlightedTextXY(8, 25, "http://www.gnu.org/licenses/licenses.html"); - SetStatusText("ENTER = Continue F3 = Quit"); + SetStatusText(" ENTER = Return"); while (TRUE) { ConInKey(Ir); - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - return QUIT_PAGE; - break; - } - else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ - { - return INTRO_PAGE; - } + if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + { + return INTRO_PAGE; + break; + } } return LICENSE_PAGE; } +/* + * Warning Page + * RETURNS + * Continues to setup + */ static PAGE_NUMBER -EmergencyIntroPage(PINPUT_RECORD Ir) +WarningPage(PINPUT_RECORD Ir) { - SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); - SetTextXY(6, 9, "support all the functions of a fully usable setup application."); + SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Warranty Statement"); + SetHighlightedTextXY(6, 8, "Warranty:"); - SetTextXY(6, 12, "The emergency console is not implemented yet."); + SetTextXY(8, 11, "This is free software; see the source for copying conditions."); + SetTextXY(8, 12, "There is NO warranty; not even for MERCHANTABILITY or"); + SetTextXY(8, 13, "FITNESS FOR A PARTICULAR PURPOSE"); - SetTextXY(8, 15, "\x07 Press ESC to return to the main page."); + SetTextXY(8, 15, "For more information on ReactOS, please visit:"); + SetHighlightedTextXY(8, 16, "http://www.reactos.org"); - SetTextXY(8, 17, "\x07 Press ENTER to reboot your computer."); + SetStatusText(" F8 = Continue ESC = Exit"); - SetStatusText(" ESC = Main page ENTER = Reboot"); - - while(TRUE) + while (TRUE) { ConInKey(Ir); - if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ + if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F8)) /* F8 */ { - return REBOOT_PAGE; + return INSTALL_INTRO_PAGE; + break; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - return INTRO_PAGE; + return QUIT_PAGE; } } - return REPAIR_INTRO_PAGE; + return LICENSE_PAGE; } - static PAGE_NUMBER RepairIntroPage(PINPUT_RECORD Ir) { @@ -842,9 +840,11 @@ SetTextXY(6, 12, "The repair functions are not implemented yet."); - SetTextXY(8, 15, "\x07 Press ESC to return to the main page."); + SetTextXY(8, 15, "\x07 Press R for the Recovery Console."); + + SetTextXY(8, 17, "\x07 Press ESC to return to the main page."); - SetTextXY(8, 17, "\x07 Press ENTER to reboot your computer."); + SetTextXY(8, 19, "\x07 Press ENTER to reboot your computer."); SetStatusText(" ESC = Main page ENTER = Reboot"); @@ -856,6 +856,10 @@ { return REBOOT_PAGE; } + else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ + { + return INTRO_PAGE; + } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { @@ -870,6 +874,8 @@ static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { + SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); + SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); SetTextXY(6, 9, "support all the functions of a fully usable setup application."); @@ -3140,11 +3146,7 @@ case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - PrintTextXYN(6, 16, 60, "Copying file: %S", (PWSTR)Param1); - - PrintTextXYN(6, 18, 60, "File %lu of %lu", - CopyContext->CompletedOperations + 1, - CopyContext->TotalOperations); + SetStatusText(" \xB3 Copying file: %S", (PWSTR)Param1); break; case SPFILENOTIFY_ENDCOPY: @@ -3164,18 +3166,20 @@ SHORT xScreen; SHORT yScreen; - SetStatusText(" Please wait..."); + SetStatusText(" \xB3 Please wait... "); - SetTextXY(6, 8, "Copying files"); + SetTextXY(11, 12, "Please wait while ReactOS Setup copies files to your ReactOS"); + SetTextXY(30, 13, "installation folder."); + SetTextXY(20, 14, "This may take several minutes to complete."); - GetScreenSize(&xScreen, &yScreen); - + GetScreenSize(&xScreen, &yScreen); CopyContext.TotalOperations = 0; CopyContext.CompletedOperations = 0; - CopyContext.ProgressBar = CreateProgressBar(6, - yScreen - 14, - xScreen - 7, - yScreen - 10); + CopyContext.ProgressBar = CreateProgressBar(13, + 26, + xScreen - 13, + yScreen - 20, + "Setup is copying files..."); SetupCommitFileQueue(SetupFileQueue, DestinationRootPath.Buffer, @@ -3811,6 +3815,11 @@ case LICENSE_PAGE: Page = LicensePage(&Ir); break; + + /* Warning page */ + case WARNING_PAGE: + Page = WarningPage(&Ir); + break; /* Intro page */ case INTRO_PAGE: @@ -3916,13 +3925,6 @@ Page = RepairIntroPage(&Ir); break; - - /* Emergency pages */ - case EMERGENCY_INTRO_PAGE: - Page = EmergencyIntroPage(&Ir); - break; - - case SUCCESS_PAGE: Page = SuccessPage(&Ir); break;

1 0

[ion] 15393: Svn maintenance
by ion＠svn.reactos.com 18 May '05

18 May '05

Svn maintenance Property changes on: trunk/reactos/apps/utils ___________________________________________________________________ Name: svn:ignore + Property changes on: trunk/reactos/subsys/system/expand ___________________________________________________________________ Name: svn:ignore - *.o *.a *.sym *.map *.exe + *.o *.a *.sym *.map *.exe *.coff Property changes on: trunk/reactos/subsys/system/sm ___________________________________________________________________ Name: svn:ignore + *.o *.d *.exe *.coff *.sym *.map *.a Property changes on: trunk/reactos/tools ___________________________________________________________________ Name: svn:ignore - *.exe buildno depends rcopy rline rmkdir rrmdir mkconfig mkflpimg rdel rsym rtouch regtests + *.exe buildno depends rcopy rline rmkdir rrmdir mkconfig mkflpimg rdel rsym rtouch regtests hack-coff raddr2line ppc-le2be Property changes on: trunk/reactos/tools/widl ___________________________________________________________________ Name: svn:ignore - *.o *.d *.exe *.coff *.sym *.map + *.o *.d *.exe *.coff *.sym *.map widl

1 0

[ion] 15392: Fix usetup. This hack needs to remain even though it's incorrect since it's what ROS expects. I am working on rewriting IoCreateFile so these hacks can go away. Please do not remove it
by ion＠svn.reactos.com 18 May '05

18 May '05

Fix usetup. This hack needs to remain even though it's incorrect since it's what ROS expects. I am working on rewriting IoCreateFile so these hacks can go away. Please do not remove it Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-17 22:15:18 UTC (rev 15391) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-18 17:17:34 UTC (rev 15392) @@ -1148,7 +1148,7 @@ CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; /* HACK */ - //CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; CreatedFileObject->Flags |= FO_STREAM_FILE; /* Initialize Lock and Event */

1 0

[gvg] 15391: Move final stage of boot to architecture-dependent files
by gvg＠svn.reactos.com 17 May '05

17 May '05

Move final stage of boot to architecture-dependent files Modified: branches/xen/reactos/boot/freeldr/freeldr/Makefile Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386boot.c Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386boot.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcboot.c Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxboot.c Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenboot.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h Modified: branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: branches/xen/reactos/boot/freeldr/freeldr/machine.c Modified: branches/xen/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/Makefile --- branches/xen/reactos/boot/freeldr/freeldr/Makefile 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/Makefile 2005-05-17 22:15:18 UTC (rev 15391) @@ -135,7 +135,7 @@ # fathelp.o must come first in the link line because it contains bootsector helper code # arch.o must come second in the link line because it contains the startup code -ARCH_I386_OBJS = fathelp.o \ +ARCH_I386_OBJS = fathelp.o \ arch.o \ i386idt.o \ i386trap.o \ @@ -144,8 +144,9 @@ boot.o \ linux.o \ mb.o \ - i386rtl.o \ - i386vid.o \ + i386boot.o \ + i386rtl.o \ + i386vid.o \ drvmap.o \ int386.o \ i386disk.o \ @@ -159,18 +160,21 @@ machpc.o \ machxbox.o \ machxen.o \ + pcboot.o \ pccons.o \ pcdisk.o \ pcmem.o \ pcrtc.o \ - pcvideo.o \ + pcvideo.o \ + xboxboot.o \ xboxcons.o \ xboxdisk.o \ xboxfont.o \ xboxhw.o \ - xboxmem.o \ - xboxrtc.o \ - xboxvideo.o \ + xboxmem.o \ + xboxrtc.o \ + xboxvideo.o \ + xenboot.o \ xencons.o \ xenctrlif.o \ xendisk.o \ _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386boot.c (from rev 15334, branches/xen/reactos/boot/freeldr/freeldr/multiboot.c) --- branches/xen/reactos/boot/freeldr/freeldr/multiboot.c 2005-05-16 11:06:57 UTC (rev 15334) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386boot.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -0,0 +1,449 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Freeloader + * FILE: boot/freeldr/freeldr/multiboot.c + * PURPOSE: ReactOS Loader + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Hartmut Birr - SMP/PAE Code + */ + +#include <freeldr.h> +#include <internal/i386/ke.h> + +#define NDEBUG +#include <debug.h> + +#include "i386boot.h" + +/* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ +#define PFN_SHIFT 12 + +/* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ +#define PDE_SHIFT 20 +#define PDE_SHIFT_PAE 18 + + +/* Converts a Phsyical Address Pointer into a Page Frame Number */ +#define PaPtrToPfn(p) \ + (((ULONG_PTR)&p) >> PFN_SHIFT) + +/* Converts a Phsyical Address into a Page Frame Number */ +#define PaToPfn(p) \ + ((p) >> PFN_SHIFT) + +#define STARTUP_BASE 0xF0000000 +#define HYPERSPACE_BASE 0xF0800000 +#define APIC_BASE 0xFEC00000 +#define KPCR_BASE 0xFF000000 + +#define LowMemPageTableIndex 0 +#define StartupPageTableIndex (STARTUP_BASE >> 20) / sizeof(HARDWARE_PTE_X86) +#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 20) / sizeof(HARDWARE_PTE_X86) +#define KpcrPageTableIndex (KPCR_BASE >> 20) / sizeof(HARDWARE_PTE_X86) +#define ApicPageTableIndex (APIC_BASE >> 20) / sizeof(HARDWARE_PTE_X86) + +#define LowMemPageTableIndexPae 0 +#define StartupPageTableIndexPae (STARTUP_BASE >> 21) +#define HyperspacePageTableIndexPae (HYPERSPACE_BASE >> 21) +#define KpcrPageTableIndexPae (KPCR_BASE >> 21) +#define ApicPageTableIndexPae (APIC_BASE >> 21) + + +#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase + +/* Unrelocated Kernel Base in Virtual Memory */ +extern ULONG_PTR KernelBase; + +/* Kernel Entrypoint in Physical Memory */ +extern ULONG_PTR KernelEntry; + +/* Page Directory and Tables for non-PAE Systems */ +extern ULONG_PTR startup_pagedirectory; +extern ULONG_PTR lowmem_pagetable; +extern ULONG_PTR kernel_pagetable; +extern ULONG_PTR hyperspace_pagetable; +extern ULONG_PTR _pae_pagedirtable; +extern ULONG_PTR apic_pagetable; +extern ULONG_PTR kpcr_pagetable; + +/* Page Directory and Tables for PAE Systems */ +extern ULONG_PTR startup_pagedirectorytable_pae; +extern ULONG_PTR startup_pagedirectory_pae; +extern ULONG_PTR lowmem_pagetable_pae; +extern ULONG_PTR kernel_pagetable_pae; +extern ULONG_PTR hyperspace_pagetable_pae; +extern ULONG_PTR pagedirtable_pae; +extern ULONG_PTR apic_pagetable_pae; +extern ULONG_PTR kpcr_pagetable_pae; + +typedef struct _HARDWARE_PTE_X86 { + ULONG Valid : 1; + ULONG Write : 1; + ULONG Owner : 1; + ULONG WriteThrough : 1; + ULONG CacheDisable : 1; + ULONG Accessed : 1; + ULONG Dirty : 1; + ULONG LargePage : 1; + ULONG Global : 1; + ULONG CopyOnWrite : 1; + ULONG Prototype : 1; + ULONG reserved : 1; + ULONG PageFrameNumber : 20; +} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; + +typedef struct _HARDWARE_PTE_X64 { + ULONG Valid : 1; + ULONG Write : 1; + ULONG Owner : 1; + ULONG WriteThrough : 1; + ULONG CacheDisable : 1; + ULONG Accessed : 1; + ULONG Dirty : 1; + ULONG LargePage : 1; + ULONG Global : 1; + ULONG CopyOnWrite : 1; + ULONG Prototype : 1; + ULONG reserved : 1; + ULONG PageFrameNumber : 20; + ULONG reserved2 : 31; + ULONG NoExecute : 1; +} HARDWARE_PTE_X64, *PHARDWARE_PTE_X64; + +typedef struct _PAGE_DIRECTORY_X86 { + HARDWARE_PTE_X86 Pde[1024]; +} PAGE_DIRECTORY_x86, *PPAGE_DIRECTORY_X86; + +typedef struct _PAGE_DIRECTORY_X64 { + HARDWARE_PTE_X64 Pde[2048]; +} PAGE_DIRECTORY_X64, *PPAGE_DIRECTORY_X64; + +typedef struct _PAGE_DIRECTORY_TABLE_X64 { + HARDWARE_PTE_X64 Pde[4]; +} PAGE_DIRECTORY_TABLE_X64, *PPAGE_DIRECTORY_TABLE_X64; + +/* FUNCTIONS *****************************************************************/ + +/*++ + * i386BootStartup + * INTERNAL + * + * Prepares the system for loading the Kernel. + * + * Params: + * Magic - Multiboot Magic + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +STDCALL +i386BootStartup(ULONG Magic) +{ + BOOLEAN PaeModeEnabled; + + /* Disable Interrupts */ + Ke386DisableInterrupts(); + + /* Re-initalize EFLAGS */ + Ke386EraseFlags(); + + /* Get the PAE Mode */ + PaeModeEnabled = i386BootGetPaeMode(); + + /* Initialize the page directory */ + i386BootSetupPageDirectory(PaeModeEnabled); + + /* Initialize Paging, Write-Protection and Load NTOSKRNL */ + i386BootSetupPae(PaeModeEnabled, Magic); +} + +/*++ + * i386BootSetupPae + * INTERNAL + * + * Configures PAE on a MP System, and sets the PDBR if it's supported, or if + * the system is UP. + * + * Params: + * PaeModeEnabled - TRUE if booting in PAE mode + * Magic - Multiboot Magic + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +FASTCALL +i386BootSetupPae(BOOLEAN PaeModeEnabled, ULONG Magic) +{ + ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; + ASMCODE PagedJump; + + if (PaeModeEnabled) + { + PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectorytable_pae; + + /* Enable PAE */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_PAE); + } + + /* Set the PDBR */ + Ke386SetPageTableDirectory(PageDirectoryBaseAddress); + + /* Enable Paging and Write Protect*/ + Ke386SetCr0(Ke386GetCr0() | X86_CR0_PG | X86_CR0_WP); + + /* Jump to Kernel */ + PagedJump = (ASMCODE)KernelEntryPoint; + PagedJump(Magic, &LoaderBlock); +} + +/*++ + * i386BootGetPaeMode + * INTERNAL + * + * Determines whether PAE mode should be enabled or not. + * + * Params: + * None. + * + * Returns: + * PAE mode + * + * Remarks: + * None. + * + *--*/ +BOOLEAN +FASTCALL +i386BootGetPaeMode(VOID) +{ + BOOLEAN PaeModeEnabled; + + /* FIXME: Read command line */ + PaeModeEnabled = FALSE; + + if (PaeModeEnabled) + { + } + + return PaeModeEnabled; +} + +/*++ + * i386BootSetupPageDirectory + * INTERNAL + * + * Sets up the ReactOS Startup Page Directory. + * + * Params: + * None. + * + * Returns: + * None. + * + * Remarks: + * We are setting PDEs, but using the equvivalent (for our purpose) PTE structure. + * As such, please note that PageFrameNumber == PageEntryNumber. + * + *--*/ +VOID +FASTCALL +i386BootSetupPageDirectory(BOOLEAN PaeModeEnabled) +{ + PPAGE_DIRECTORY_X86 PageDir; + PPAGE_DIRECTORY_TABLE_X64 PageDirTablePae; + PPAGE_DIRECTORY_X64 PageDirPae; + ULONG KernelPageTableIndex; + ULONG i; + + if (PaeModeEnabled) { + + /* Get the Kernel Table Index */ + KernelPageTableIndex = (KernelBase >> 21); + + /* Get the Startup Page Directory Table */ + PageDirTablePae = (PPAGE_DIRECTORY_TABLE_X64)&startup_pagedirectorytable_pae; + + /* Get the Startup Page Directory */ + PageDirPae = (PPAGE_DIRECTORY_X64)&startup_pagedirectory_pae; + + /* Set the Startup page directory table */ + for (i = 0; i < 4; i++) + { + PageDirTablePae->Pde[i].Valid = 1; + PageDirTablePae->Pde[i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i; + } + + /* Set up the Low Memory PDE */ + for (i = 0; i < 2; i++) + { + PageDirPae->Pde[LowMemPageTableIndexPae + i].Valid = 1; + PageDirPae->Pde[LowMemPageTableIndexPae + i].Write = 1; + PageDirPae->Pde[LowMemPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(lowmem_pagetable_pae) + i; + } + + /* Set up the Kernel PDEs */ + for (i = 0; i < 3; i++) + { + PageDirPae->Pde[KernelPageTableIndex + i].Valid = 1; + PageDirPae->Pde[KernelPageTableIndex + i].Write = 1; + PageDirPae->Pde[KernelPageTableIndex + i].PageFrameNumber = PaPtrToPfn(kernel_pagetable_pae) + i; + } + + /* Set up the Startup PDE */ + for (i = 0; i < 4; i++) + { + PageDirPae->Pde[StartupPageTableIndexPae + i].Valid = 1; + PageDirPae->Pde[StartupPageTableIndexPae + i].Write = 1; + PageDirPae->Pde[StartupPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i; + } + + /* Set up the Hyperspace PDE */ + for (i = 0; i < 2; i++) + { + PageDirPae->Pde[HyperspacePageTableIndexPae + i].Valid = 1; + PageDirPae->Pde[HyperspacePageTableIndexPae + i].Write = 1; + PageDirPae->Pde[HyperspacePageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable_pae) + i; + } + + /* Set up the Apic PDE */ + for (i = 0; i < 2; i++) + { + PageDirPae->Pde[ApicPageTableIndexPae + i].Valid = 1; + PageDirPae->Pde[ApicPageTableIndexPae + i].Write = 1; + PageDirPae->Pde[ApicPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(apic_pagetable_pae) + i; + } + + /* Set up the KPCR PDE */ + PageDirPae->Pde[KpcrPageTableIndexPae].Valid = 1; + PageDirPae->Pde[KpcrPageTableIndexPae].Write = 1; + PageDirPae->Pde[KpcrPageTableIndexPae].PageFrameNumber = PaPtrToPfn(kpcr_pagetable_pae); + + /* Set up Low Memory PTEs */ + PageDirPae = (PPAGE_DIRECTORY_X64)&lowmem_pagetable_pae; + for (i=0; i<1024; i++) { + + PageDirPae->Pde[i].Valid = 1; + PageDirPae->Pde[i].Write = 1; + PageDirPae->Pde[i].Owner = 1; + PageDirPae->Pde[i].PageFrameNumber = i; + } + + /* Set up Kernel PTEs */ + PageDirPae = (PPAGE_DIRECTORY_X64)&kernel_pagetable_pae; + for (i=0; i<1536; i++) { + + PageDirPae->Pde[i].Valid = 1; + PageDirPae->Pde[i].Write = 1; + PageDirPae->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS) + i; + } + + /* Set up APIC PTEs */ + PageDirPae = (PPAGE_DIRECTORY_X64)&apic_pagetable_pae; + PageDirPae->Pde[0].Valid = 1; + PageDirPae->Pde[0].Write = 1; + PageDirPae->Pde[0].CacheDisable = 1; + PageDirPae->Pde[0].WriteThrough = 1; + PageDirPae->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); + PageDirPae->Pde[0x200].Valid = 1; + PageDirPae->Pde[0x200].Write = 1; + PageDirPae->Pde[0x200].CacheDisable = 1; + PageDirPae->Pde[0x200].WriteThrough = 1; + PageDirPae->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); + + /* Set up KPCR PTEs */ + PageDirPae = (PPAGE_DIRECTORY_X64)&kpcr_pagetable_pae; + PageDirPae->Pde[0].Valid = 1; + PageDirPae->Pde[0].Write = 1; + PageDirPae->Pde[0].PageFrameNumber = 1; + + } else { + + /* Get the Kernel Table Index */ + KernelPageTableIndex = (KernelBase >> PDE_SHIFT) / sizeof(HARDWARE_PTE_X86); + + /* Get the Startup Page Directory */ + PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory; + + /* Set up the Low Memory PDE */ + PageDir->Pde[LowMemPageTableIndex].Valid = 1; + PageDir->Pde[LowMemPageTableIndex].Write = 1; + PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable); + + /* Set up the Kernel PDEs */ + PageDir->Pde[KernelPageTableIndex].Valid = 1; + PageDir->Pde[KernelPageTableIndex].Write = 1; + PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable); + PageDir->Pde[KernelPageTableIndex + 1].Valid = 1; + PageDir->Pde[KernelPageTableIndex + 1].Write = 1; + PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096); + + /* Set up the Startup PDE */ + PageDir->Pde[StartupPageTableIndex].Valid = 1; + PageDir->Pde[StartupPageTableIndex].Write = 1; + PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory); + + /* Set up the Hyperspace PDE */ + PageDir->Pde[HyperspacePageTableIndex].Valid = 1; + PageDir->Pde[HyperspacePageTableIndex].Write = 1; + PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); + + /* Set up the Apic PDE */ + PageDir->Pde[ApicPageTableIndex].Valid = 1; + PageDir->Pde[ApicPageTableIndex].Write = 1; + PageDir->Pde[ApicPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); + + /* Set up the KPCR PDE */ + PageDir->Pde[KpcrPageTableIndex].Valid = 1; + PageDir->Pde[KpcrPageTableIndex].Write = 1; + PageDir->Pde[KpcrPageTableIndex].PageFrameNumber = PaPtrToPfn(kpcr_pagetable); + + /* Set up Low Memory PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; + for (i=0; i<1024; i++) { + + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].Owner = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE); + } + + /* Set up Kernel PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; + for (i=0; i<1536; i++) { + + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); + } + + /* Set up APIC PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; + PageDir->Pde[0].Valid = 1; + PageDir->Pde[0].Write = 1; + PageDir->Pde[0].CacheDisable = 1; + PageDir->Pde[0].WriteThrough = 1; + PageDir->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); + PageDir->Pde[0x200].Valid = 1; + PageDir->Pde[0x200].Write = 1; + PageDir->Pde[0x200].CacheDisable = 1; + PageDir->Pde[0x200].WriteThrough = 1; + PageDir->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); + + /* Set up KPCR PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&kpcr_pagetable; + PageDir->Pde[0].Valid = 1; + PageDir->Pde[0].Write = 1; + PageDir->Pde[0].PageFrameNumber = 1; + } + return; +} _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386boot.h (from rev 15334, branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h) --- branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-16 11:06:57 UTC (rev 15334) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386boot.h 2005-05-17 22:15:18 UTC (rev 15391) @@ -0,0 +1,20 @@ +#ifndef I386BOOT_H_INCLUDED +#define I386BOOT_H_INCLUDED + +VOID +STDCALL +i386BootStartup(ULONG Magic); + +VOID +FASTCALL +i386BootSetupPae(BOOLEAN PaeModeEnabled, ULONG Magic); + +BOOLEAN +FASTCALL +i386BootGetPaeMode(VOID); + +VOID +FASTCALL +i386BootSetupPageDirectory(BOOLEAN PaeModeEnabled); + +#endif /* ! defined I386BOOT_H_INCLUDED */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -46,7 +46,6 @@ MachVtbl.VideoSetPaletteColor = PcVideoSetPaletteColor; MachVtbl.VideoGetPaletteColor = PcVideoGetPaletteColor; MachVtbl.VideoSync = PcVideoSync; - MachVtbl.VideoPrepareForReactOS = PcVideoPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; @@ -59,6 +58,7 @@ MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; MachVtbl.HwDetect = PcHwDetect; + MachVtbl.BootReactOS = PcBootReactOS; MachVtbl.Die = PcDie; } _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-05-17 22:15:18 UTC (rev 15391) @@ -55,6 +55,8 @@ VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +VOID PcBootReactOS(VOID); + VOID PcHwDetect(VOID); VOID PcDie(VOID); _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -44,7 +44,6 @@ MachVtbl.VideoSetPaletteColor = XboxVideoSetPaletteColor; MachVtbl.VideoGetPaletteColor = XboxVideoGetPaletteColor; MachVtbl.VideoSync = XboxVideoSync; - MachVtbl.VideoPrepareForReactOS = XboxVideoPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; @@ -57,6 +56,7 @@ MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = XboxRTCGetCurrentDateTime; MachVtbl.HwDetect = XboxHwDetect; + MachVtbl.BootReactOS = XboxBootReactOS; MachVtbl.Die = XboxDie; } _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-05-17 22:15:18 UTC (rev 15391) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * FreeLoader * * This program is free software; you can redistribute it and/or modify @@ -60,6 +59,8 @@ VOID XboxHwDetect(VOID); +VOID XboxBootReactOS(VOID); + VOID XboxDie(VOID); #endif /* __I386_HWXBOX_H_ */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -109,7 +109,6 @@ MachVtbl.VideoSetPaletteColor = XenVideoSetPaletteColor; MachVtbl.VideoGetPaletteColor = XenVideoGetPaletteColor; MachVtbl.VideoSync = XenVideoSync; - MachVtbl.VideoPrepareForReactOS = XenVideoPrepareForReactOS; MachVtbl.GetMemoryMap = XenMemGetMemoryMap; MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; @@ -122,6 +121,7 @@ MachVtbl.DiskGetCacheableBlockCount = XenDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = XenRTCGetCurrentDateTime; MachVtbl.HwDetect = XenHwDetect; + MachVtbl.BootReactOS = XenBootReactOS; MachVtbl.Die = XenDie; XenCtrlIfInit(); @@ -193,47 +193,6 @@ XenDie(); } -#define XEN_UNIMPLEMENTED(routine) \ - printf(routine " unimplemented. Shutting down\n"); \ - XenDie() - -VOID -XenVideoSetTextCursorPosition(ULONG X, ULONG Y) - { - XEN_UNIMPLEMENTED("XenVideoSetTextCursorPosition"); - } - -BOOL -XenVideoIsPaletteFixed(VOID) - { - XEN_UNIMPLEMENTED("XenVideoIsPaletteFixed"); - return TRUE; - } - -VOID -XenVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue) - { - XEN_UNIMPLEMENTED("XenVideoSetPaletteColor"); - } - -VOID -XenVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue) - { - XEN_UNIMPLEMENTED("XenVideoGetPaletteColor"); - } - -VOID -XenVideoSync(VOID) - { - XEN_UNIMPLEMENTED("XenVideoSync"); - } - -VOID -XenVideoPrepareForReactOS(VOID) - { - XEN_UNIMPLEMENTED("XenVideoPrepareForReactOS"); - } - /* emit the elf segment Xen builder expects in kernel image */ asm(".section __xen_guest;" ".ascii \"GUEST_OS=linux,GUEST_VER=2.6\";" _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-05-17 22:15:18 UTC (rev 15391) @@ -69,7 +69,6 @@ VOID XenVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID XenVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID XenVideoSync(VOID); -VOID XenVideoPrepareForReactOS(VOID); ULONG XenMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); VOID XenMemInit(start_info_t *StartInfo); @@ -86,7 +85,10 @@ VOID XenHwDetect(VOID); +VOID XenBootReactOS(VOID); + VOID XenDie(VOID); + VOID XenHypervisorCallback(VOID); VOID XenFailsafeCallback(VOID); _____ Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcboot.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcboot.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcboot.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -0,0 +1,33 @@ +/* + * FreeLoader + * + * 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. + */ + +#include "freeldr.h" +#include "arch.h" +#include "i386boot.h" +#include "machine.h" +#include "machpc.h" + +VOID +PcBootReactOS(VOID) + { + DiskStopFloppyMotor(); + PcVideoPrepareForReactOS(); + i386BootStartup(0x2badb002); + } + +/* EOF */ Property changes on: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcboot.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxboot.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxboot.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxboot.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -0,0 +1,32 @@ +/* + * FreeLoader + * + * 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. + */ + +#include "freeldr.h" +#include "arch.h" +#include "i386boot.h" +#include "machine.h" +#include "machxbox.h" + +VOID +XboxBootReactOS(VOID) + { + XboxVideoPrepareForReactOS(); + i386BootStartup(0x2badb002); + } + +/* EOF */ Property changes on: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxboot.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenboot.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenboot.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenboot.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -0,0 +1,50 @@ +/* + * FreeLoader + * + * 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. + */ + +#include "freeldr.h" +#include "arch.h" +#include "i386boot.h" +#include "machine.h" +#include "machxen.h" + +VOID +XenBootReactOS(VOID) + { + BOOLEAN PaeModeEnabled; + + XenVideoClearScreen(0x07); + + /* Disable events */ +#ifdef TODO + XenEvtchnDisableEvents(); +#endif + + /* Re-initalize EFLAGS */ + Ke386EraseFlags(); + + /* PAE Mode not supported yet */ + PaeModeEnabled = FALSE; + + /* Initialize the page directory */ + i386BootSetupPageDirectory(PaeModeEnabled); + + /* Initialize Paging, Write-Protection and Load NTOSKRNL */ + i386BootSetupPae(PaeModeEnabled, 0x2badb002); + } + +/* EOF */ Property changes on: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenboot.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -187,5 +187,34 @@ AnsiMoveToPos(COLS, ROWS); XenConsFlush(); } +VOID +XenVideoSetTextCursorPosition(ULONG X, ULONG Y) + { + AnsiMoveToPos(X, Y); + } +BOOL +XenVideoIsPaletteFixed(VOID) + { + return TRUE; + } + +VOID +XenVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue) + { + /* Should never be called */ + } + +VOID +XenVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue) + { + /* Should never be called */ + } + +VOID +XenVideoSync(VOID) + { + /* Nothing to do */ + } + /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h --- branches/xen/reactos/boot/freeldr/freeldr/include/machine.h 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/include/machine.h 2005-05-17 22:15:18 UTC (rev 15391) @@ -52,7 +52,6 @@ VOID (*VideoSetPaletteColor)(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue); VOID (*VideoGetPaletteColor)(UCHAR Color, UCHAR* Red, UCHAR* Green, UCHAR* Blue); VOID (*VideoSync)(VOID); - VOID (*VideoPrepareForReactOS)(VOID); ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); @@ -70,6 +69,8 @@ VOID (*HwDetect)(VOID); + VOID (*BootReactOS)(VOID); + VOID (*Die)(VOID); } MACHVTBL, *PMACHVTBL; @@ -92,7 +93,6 @@ #define MachVideoSetPaletteColor(Col, R, G, B) MachVtbl.VideoSetPaletteColor((Col), (R), (G), (B)) #define MachVideoGetPaletteColor(Col, R, G, B) MachVtbl.VideoGetPaletteColor((Col), (R), (G), (B)) #define MachVideoSync() MachVtbl.VideoSync() -#define MachVideoPrepareForReactOS() MachVtbl.VideoPrepareForReactOS() #define MachGetMemoryMap(MMap, Size) MachVtbl.GetMemoryMap((MMap), (Size)) #define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) #define MachDiskGetSystemVolume(SysPath, RemPath, Dev, Drv, Start, Cnt, FsType) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev), (Drv), (Start), (Cnt), (FsType)) @@ -105,6 +105,7 @@ #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) #define MachRTCGetCurrentDateTime(Y, Mo, D, H, Mi, S) MachVtbl.RTCGetCurrentDateTime((Y), (Mo), (D), (H), (Mi), (S)); #define MachHwDetect() MachVtbl.HwDetect() +#define MachBootReactOS() MachVtbl.BootReactOS() #define MachDie() MachVtbl.Die() #endif /* __MACHINE_H_ */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h --- branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-17 22:15:18 UTC (rev 15391) @@ -133,6 +133,9 @@ } memory_map_t; +/* Base Addres of Kernel in Physical Memory */ +#define KERNEL_BASE_PHYS 0x200000 + LOADER_PARAMETER_BLOCK LoaderBlock; /* Multiboot info structure passed to kernel */ char multiboot_kernel_cmdline[255]; // Command line passed to kernel FRLDR_MODULE multiboot_modules[64]; // Array to hold boot module info loaded for the kernel @@ -190,36 +193,16 @@ ULONG dwModuleSize); VOID -STDCALL -FrLdrStartup(ULONG Magic); - -VOID FASTCALL FrLdrGetKernelBase(VOID); VOID -FASTCALL -FrLdrSetupPae(ULONG Magic); - -VOID -FASTCALL -FrLdrGetPaeMode(VOID); - -VOID -FASTCALL -FrLdrSetupPageDirectory(VOID); - -VOID LoadAndBootReactOS(PCHAR OperatingSystemName); VOID FASTCALL AsmCode(VOID); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock); -int GetBootPartition(char *OperatingSystemName); - - - #endif /* ! ASM */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/machine.c --- branches/xen/reactos/boot/freeldr/freeldr/machine.c 2005-05-17 21:18:04 UTC (rev 15390) +++ branches/xen/reactos/boot/freeldr/freeldr/machine.c 2005-05-17 22:15:18 UTC (rev 15391) @@ -35,7 +35,6 @@ #undef MachVideoSetPaletteColor #undef MachVideoGetPaletteColor #undef MachVideoSync -#undef MachVideoPrepareForReactOS #undef MachGetMemoryMap #undef MachDiskGetBootVolume #undef MachDiskGetSystemVolume @@ -47,6 +46,7 @@ #undef MachDiskGetDriveGeometry #undef MachDiskGetCacheableBlockCount #undef MachRTCGetCurrentDateTime +#undef MachBootReactOS #undef MachHwDetect #undef MachDie @@ -142,12 +142,6 @@ MachVtbl.VideoSync(); } -VOID -MachVideoPrepareForReactOS(VOID) -{ - MachVtbl.VideoPrepareForReactOS(); -} - ULONG [truncated at 1000 lines; 510 more skipped]

1 0

[greatlrd] 15390: Fix unicode / ansi build problem for -D_DEBUG build
by greatlrd＠svn.reactos.com 17 May '05

17 May '05

Fix unicode / ansi build problem for -D_DEBUG build a old bug in cmd. Bug report 629 in bugzila fix by tinus and his patch at bugzila Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-17 20:51:39 UTC (rev 15389) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-17 21:18:04 UTC (rev 15390) @@ -1668,7 +1668,7 @@ if (ptrStartNode == NULL) { #ifdef _DEBUG - ConErrPrintf("DEBUG: Cannot allocate memory for ptrStartNode!\n"); + ConErrPrintf(_T("DEBUG: Cannot allocate memory for ptrStartNode!\n")); #endif return 1; /* Error cannot allocate memory for 1st object */ } @@ -1688,7 +1688,7 @@ if (ptrNextNode->ptrNext == NULL) { #ifdef _DEBUG - ConErrPrintf("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n"); + ConErrPrintf(_T("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n")); #endif while (ptrStartNode) { @@ -1748,7 +1748,7 @@ if (ptrFileArray == NULL) { #ifdef _DEBUG - ConErrPrintf("DEBUG: Cannot allocate memory for ptrFileArray!\n"); + ConErrPrintf(_T("DEBUG: Cannot allocate memory for ptrFileArray!\n")); #endif while (ptrStartNode) {

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