Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26692: - Remove unusued, complex hive checking code from regfile.c. - Implement CmpInitializeHive based on Cm Rewrite but keep code compatible with the current EREGISTRY_HIVE structure in the current Cm. - Remove CmiCreateVolatileHive and CmiCreateTemp since they're unused. - Implement CmpCreateRootNode based on CmRewrite and CmCreateRootNode in cmlib, CmpCopyName and CmpNameSize from Cm Rewrite and use them. - Use CmpInitializeHive + CmpCreateRootNode for the master volatile hive.
by ion＠svn.reactos.org 11 May '07

11 May '07

Author: ion Date: Fri May 11 08:59:38 2007 New Revision: 26692 URL: http://svn.reactos.org/svn/reactos?rev=26692&view=rev Log: - Remove unusued, complex hive checking code from regfile.c. - Implement CmpInitializeHive based on Cm Rewrite but keep code compatible with the current EREGISTRY_HIVE structure in the current Cm. - Remove CmiCreateVolatileHive and CmiCreateTemp since they're unused. - Implement CmpCreateRootNode based on CmRewrite and CmCreateRootNode in cmlib, CmpCopyName and CmpNameSize from Cm Rewrite and use them. - Use CmpInitializeHive + CmpCreateRootNode for the master volatile hive. Modified: trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmname.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Fri May 11 08:59:38 2007 @@ -15,9 +15,7 @@ #include <internal/debug.h> #include "cm.h" - -/* uncomment to enable hive checks (incomplete and probably buggy) */ -//#define HIVE_CHECK +#include "..\config\cm.h" /* LOCAL MACROS *************************************************************/ @@ -164,276 +162,6 @@ return(Status); } - - -#ifdef HIVE_CHECK - -static ULONG -CmiCalcChecksum(PULONG Buffer) -{ - ULONG Sum = 0; - ULONG i; - - for (i = 0; i < 127; i++) - Sum ^= Buffer[i]; - if (Sum == (ULONG)-1) - Sum = (ULONG)-2; - if (Sum == 0) - Sum = 1; - - return(Sum); -} - -static NTSTATUS -CmiCheckAndFixHive(PEREGISTRY_HIVE RegistryHive) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION fsi; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE HiveHandle = INVALID_HANDLE_VALUE; - HANDLE LogHandle = INVALID_HANDLE_VALUE; - PHBASE_BLOCK HiveHeader = NULL; - PHBASE_BLOCK LogHeader = NULL; - LARGE_INTEGER FileOffset; - ULONG FileSize; - ULONG BufferSize; - ULONG BitmapSize; - RTL_BITMAP BlockBitMap; - NTSTATUS Status; - - DPRINT("CmiCheckAndFixHive() called\n"); - - /* Try to open the hive file */ - InitializeObjectAttributes(&ObjectAttributes, - &RegistryHive->HiveFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwCreateFile(&HiveHandle, - FILE_READ_DATA | FILE_READ_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OPEN, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - return(STATUS_SUCCESS); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateFile() failed (Status %lx)\n", Status); - return(Status); - } - - /* Try to open the log file */ - InitializeObjectAttributes(&ObjectAttributes, - &RegistryHive->LogFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwCreateFile(&LogHandle, - FILE_READ_DATA | FILE_READ_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OPEN, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - LogHandle = INVALID_HANDLE_VALUE; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("ZwCreateFile() failed (Status %lx)\n", Status); - ZwClose(HiveHandle); - return(Status); - } - - /* Allocate hive header */ - HiveHeader = ExAllocatePool(PagedPool, - sizeof(HBASE_BLOCK)); - if (HiveHeader == NULL) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - /* Read hive base block */ - FileOffset.QuadPart = 0ULL; - Status = ZwReadFile(HiveHandle, - 0, - 0, - 0, - &IoStatusBlock, - HiveHeader, - sizeof(HBASE_BLOCK), - &FileOffset, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwReadFile() failed (Status %lx)\n", Status); - goto ByeBye; - } - - if (LogHandle == INVALID_HANDLE_VALUE) - { - if (HiveHeader->Checksum != CmiCalcChecksum((PULONG)HiveHeader) || - HiveHeader->Sequence1 != HiveHeader->Sequence2) - { - /* There is no way to fix the hive without log file - BSOD! */ - DPRINT("Hive header inconsistent and no log file available!\n"); - KEBUGCHECK(CONFIG_LIST_FAILED); - } - - Status = STATUS_SUCCESS; - goto ByeBye; - } - else - { - /* Allocate hive header */ - LogHeader = ExAllocatePool(PagedPool, - HV_LOG_HEADER_SIZE); - if (LogHeader == NULL) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - /* Read log file header */ - FileOffset.QuadPart = 0ULL; - Status = ZwReadFile(LogHandle, - 0, - 0, - 0, - &IoStatusBlock, - LogHeader, - HV_LOG_HEADER_SIZE, - &FileOffset, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwReadFile() failed (Status %lx)\n", Status); - goto ByeBye; - } - - /* Check log file header integrity */ - if (LogHeader->Checksum != CmiCalcChecksum((PULONG)LogHeader) || - LogHeader->Sequence1 != LogHeader->Sequence2) - { - if (HiveHeader->Checksum != CmiCalcChecksum((PULONG)HiveHeader) || - HiveHeader->Sequence1 != HiveHeader->Sequence2) - { - DPRINT("Hive file and log file are inconsistent!\n"); - KEBUGCHECK(CONFIG_LIST_FAILED); - } - - /* Log file damaged but hive is okay */ - Status = STATUS_SUCCESS; - goto ByeBye; - } - - if (HiveHeader->Sequence1 == HiveHeader->Sequence2 && - HiveHeader->Sequence1 == LogHeader->Sequence1) - { - /* Hive and log file are up-to-date */ - Status = STATUS_SUCCESS; - goto ByeBye; - } - - /* - * Hive needs an update! - */ - - /* Get file size */ - Status = ZwQueryInformationFile(LogHandle, - &IoStatusBlock, - &fsi, - sizeof(fsi), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryInformationFile() failed (Status %lx)\n", Status); - goto ByeBye; - } - FileSize = fsi.EndOfFile.u.LowPart; - - /* Calculate bitmap and block size */ - BitmapSize = ROUND_UP((FileSize / HV_BLOCK_SIZE) - 1, sizeof(ULONG) * 8) / 8; - BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; - BufferSize = ROUND_UP(BufferSize, HV_BLOCK_SIZE); - - /* Reallocate log header block */ - ExFreePool(LogHeader); - LogHeader = ExAllocatePool(PagedPool, - BufferSize); - if (LogHeader == NULL) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - /* Read log file header */ - FileOffset.QuadPart = 0ULL; - Status = ZwReadFile(LogHandle, - 0, - 0, - 0, - &IoStatusBlock, - LogHeader, - BufferSize, - &FileOffset, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwReadFile() failed (Status %lx)\n", Status); - goto ByeBye; - } - - /* Initialize bitmap */ - RtlInitializeBitMap(&BlockBitMap, - (PVOID)((ULONG_PTR)LogHeader + HV_BLOCK_SIZE + sizeof(ULONG)), - BitmapSize * 8); - - /* FIXME: Update dirty blocks */ - - - /* FIXME: Update hive header */ - - - Status = STATUS_SUCCESS; - } - - - /* Clean up the mess */ -ByeBye: - if (HiveHeader != NULL) - ExFreePool(HiveHeader); - - if (LogHeader != NULL) - ExFreePool(LogHeader); - - if (LogHandle != INVALID_HANDLE_VALUE) - ZwClose(LogHandle); - - ZwClose(HiveHandle); - - return(Status); -} -#endif static NTSTATUS CmiInitNonVolatileRegistryHive (PEREGISTRY_HIVE RegistryHive, @@ -476,18 +204,6 @@ Filename); wcscat(RegistryHive->LogFileName.Buffer, L".log"); - -#ifdef HIVE_CHECK - /* Check and eventually fix a hive */ - Status = CmiCheckAndFixHive(RegistryHive); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - RtlFreeUnicodeString(&RegistryHive->LogFileName); - DPRINT1("CmiCheckAndFixHive() failed (Status %lx)\n", Status); - return(Status); - } -#endif InitializeObjectAttributes(&ObjectAttributes, &RegistryHive->HiveFileName, @@ -603,71 +319,143 @@ return STATUS_SUCCESS; } +ULONG +NTAPI +CmCheckRegistry(IN PEREGISTRY_HIVE RegistryHive, + IN ULONG Flags) +{ + /* FIXME: HACK! */ + return 0; +} NTSTATUS -CmiCreateTempHive(PEREGISTRY_HIVE *RegistryHive) -{ - PEREGISTRY_HIVE Hive; - NTSTATUS Status; - - *RegistryHive = NULL; - - Hive = ExAllocatePool (NonPagedPool, - sizeof(EREGISTRY_HIVE)); - if (Hive == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory (Hive, - sizeof(EREGISTRY_HIVE)); - - DPRINT("Hive 0x%p\n", Hive); - - Status = HvInitialize(&Hive->Hive, HV_OPERATION_CREATE_HIVE, 0, 0, 0, 0, - CmpAllocate, CmpFree, - CmpFileRead, CmpFileWrite, CmpFileSetSize, - CmpFileFlush, NULL); - if (!NT_SUCCESS(Status)) - { - ExFreePool (Hive); - return Status; - } - - if (!CmCreateRootNode (&Hive->Hive, L"")) - { - HvFree (&Hive->Hive); - ExFreePool (Hive); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Hive->Flags = HIVE_NO_FILE; - - /* Acquire hive list lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite (&CmiRegistryLock, TRUE); - - /* Add the new hive to the hive list */ - InsertTailList (&CmiHiveListHead, - &Hive->HiveList); - - /* Release hive list lock */ - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - - VERIFY_REGISTRY_HIVE (Hive); - - *RegistryHive = Hive; - - return STATUS_SUCCESS; -} - - -NTSTATUS -CmiCreateVolatileHive(PEREGISTRY_HIVE *RegistryHive) -{ - DPRINT ("CmiCreateVolatileHive() called\n"); - return CmiCreateTempHive(RegistryHive); -} - +NTAPI +CmpInitializeHive(OUT PEREGISTRY_HIVE *RegistryHive, + IN ULONG OperationType, + IN ULONG HiveFlags, + IN ULONG FileType, + IN PVOID HiveData OPTIONAL, + IN HANDLE Primary, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName OPTIONAL, + IN ULONG CheckFlags) +{ + PEREGISTRY_HIVE Hive; + IO_STATUS_BLOCK IoStatusBlock; + FILE_FS_SIZE_INFORMATION FileSizeInformation; + NTSTATUS Status; + ULONG Cluster; + + /* Assume failure */ + *RegistryHive = NULL; + + /* + * The following are invalid: + * An external hive that is also internal. + * A log hive that's not a primary hive too. + * A volatile hive that's linked to permanent storage. + * An in-memory initialization without hive data. + * A log hive that's not linked to a correct file type. + */ + if (((External) && ((Primary) || (Log))) || + ((Log) && !(Primary)) || + ((HiveFlags & HIVE_VOLATILE) && ((Primary) || (External) || (Log))) || + ((OperationType == HINIT_MEMORY) && (!HiveData)) || + ((Log) && (FileType != HFILE_TYPE_LOG))) + { + /* Fail the request */ + return STATUS_INVALID_PARAMETER; + } + + /* Check if this is a primary hive */ + if (Primary) + { + /* Get the cluster size */ + Status = ZwQueryVolumeInformationFile(Primary, + &IoStatusBlock, + &FileSizeInformation, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure it's not larger then the block size */ + if (FileSizeInformation.BytesPerSector > HBLOCK_SIZE) + { + /* Fail */ + return STATUS_REGISTRY_IO_FAILED; + } + + /* Otherwise, calculate the cluster */ + Cluster = FileSizeInformation.BytesPerSector / HSECTOR_SIZE; + Cluster = max(1, Cluster); + } + else + { + /* Otherwise use cluster 1 */ + Cluster = 1; + } + + /* Allocate and clear the hive */ + Hive = ExAllocatePoolWithTag(NonPagedPool, sizeof(EREGISTRY_HIVE), TAG_CM); + if (!Hive) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(Hive, sizeof(EREGISTRY_HIVE)); + + /* Initialize it */ + Status = HvInitialize(&Hive->Hive, + OperationType, + HiveFlags, + FileType, + (ULONG_PTR)HiveData, + Cluster, + CmpAllocate, + CmpFree, + CmpFileRead, + CmpFileWrite, + CmpFileSetSize, + CmpFileFlush, + FileName); + if (!NT_SUCCESS(Status)) + { + /* Clear allocations and fail */ + ExFreePool(Hive); + return Status; + } + + /* Set flag */ + Hive->Flags = HIVE_NO_FILE; + + /* Check if we should verify the registry */ + if ((OperationType == HINIT_FILE) || + (OperationType == HINIT_MEMORY) || + (OperationType == HINIT_MEMORY_INPLACE) || + (OperationType == HINIT_MAPFILE)) + { + /* Verify integrity */ + if (CmCheckRegistry(Hive, TRUE)) + { + /* Free all alocations */ + ExFreePool(Hive); + return STATUS_REGISTRY_CORRUPT; + } + } + + /* Acquire hive list lock exclusively */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + + /* Add the new hive to the hive list */ + InsertTailList(&CmiHiveListHead, &Hive->HiveList); + + /* Release hive list lock */ + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + + /* Return the hive and success */ + VERIFY_REGISTRY_HIVE(Hive); + *RegistryHive = Hive; + return STATUS_SUCCESS; +} NTSTATUS CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Fri May 11 08:59:38 2007 @@ -19,6 +19,7 @@ #include <internal/debug.h> #include "cm.h" +#include "..\config\cm.h" #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, CmInitSystem1) @@ -77,6 +78,30 @@ NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpInitializeHive(PEREGISTRY_HIVE *RegistryHive, + ULONG OperationType, + ULONG HiveFlags, + ULONG FileType, + PVOID HiveData OPTIONAL, + HANDLE Primary, + HANDLE Log, + HANDLE External, + PUNICODE_STRING FileName OPTIONAL, + ULONG CheckFlags); + +USHORT +NTAPI +CmpCopyName(IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source); + +USHORT +NTAPI +CmpNameSize(IN PHHIVE Hive, + IN PUNICODE_STRING Name); static VOID STDCALL CmiHiveSyncDpcRoutine(PKDPC Dpc, @@ -305,13 +330,77 @@ BOOLEAN NTAPI +CmpCreateRootNode(IN PHHIVE Hive, + IN PCWSTR Name, + OUT PHCELL_INDEX Index) +{ + UNICODE_STRING KeyName; + PCM_KEY_NODE KeyCell; + LARGE_INTEGER SystemTime; + PAGED_CODE(); + + /* Initialize the node name and allocate it */ + RtlInitUnicodeString(&KeyName, Name); + *Index = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_NODE, Name) + + CmpNameSize(Hive, &KeyName), + HvStable); // FIXME: , HCELL_NIL); + if (*Index == HCELL_NIL) return FALSE; + + /* Set the cell index and get the data */ + Hive->HiveHeader->RootCell = *Index; + KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, *Index); + if (!KeyCell) return FALSE; + + /* Setup the cell */ + KeyCell->Id = (USHORT)CM_KEY_NODE_SIGNATURE;; + KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; + KeQuerySystemTime(&SystemTime); + KeyCell->LastWriteTime = SystemTime; + KeyCell->Parent = HCELL_NIL; + KeyCell->SubKeyCounts[HvStable] = 0; + KeyCell->SubKeyCounts[HvVolatile] = 0; + KeyCell->SubKeyLists[HvStable] = HCELL_NIL; + KeyCell->SubKeyLists[HvVolatile] = HCELL_NIL; + KeyCell->ValueList.Count = 0; + KeyCell->ValueList.List = HCELL_NIL; + KeyCell->SecurityKeyOffset = HCELL_NIL; + KeyCell->ClassNameOffset = HCELL_NIL; + KeyCell->ClassSize = 0; + + /* Copy the name (this will also set the length) */ + KeyCell->NameSize = CmpCopyName(Hive, (PWCHAR)KeyCell->Name, &KeyName); + + /* Check if the name was compressed */ + if (KeyCell->NameSize < KeyName.Length) + { + /* Set the flag */ + KeyCell->Flags |= KEY_COMP_NAME; + } + + /* Return success */ + HvReleaseCell(Hive, *Index); + return TRUE; +} + +BOOLEAN +NTAPI CmpCreateRegistryRoot(VOID) { UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; PKEY_OBJECT RootKey; HANDLE RootKeyHandle; + HCELL_INDEX RootIndex; NTSTATUS Status; + PAGED_CODE(); + + /* Setup the root node */ + if (!CmpCreateRootNode(&CmiVolatileHive->Hive, L"REGISTRY", &RootIndex)) + { + /* We failed */ + return FALSE; + } /* Create '\Registry' key. */ RtlInitUnicodeString(&KeyName, REG_ROOT_KEY_NAME); @@ -333,8 +422,8 @@ /* Setup the root key */ RootKey->RegistryHive = CmiVolatileHive; - RootKey->KeyCellOffset = CmiVolatileHive->Hive.HiveHeader->RootCell; - RootKey->KeyCell = HvGetCell(&CmiVolatileHive->Hive, RootKey->KeyCellOffset); + RootKey->KeyCellOffset = RootIndex; + RootKey->KeyCell = HvGetCell(&CmiVolatileHive->Hive, RootIndex); RootKey->ParentKey = RootKey; RootKey->Flags = 0; RootKey->SubKeyCounts = 0; @@ -421,8 +510,17 @@ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 1, Status, 0); } - /* Build volatile registry store */ - Status = CmiCreateVolatileHive(&CmiVolatileHive); + /* Build the master hive */ + Status = CmpInitializeHive(&CmiVolatileHive, + HINIT_CREATE, + HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + NULL, + NULL, + NULL, + NULL, + NULL, + 0); if (!NT_SUCCESS(Status)) { /* Bugcheck */ @@ -433,7 +531,7 @@ if (!CmpCreateRegistryRoot()) { /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 4, 0, 0); + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 3, 0, 0); } /* Create '\Registry\Machine' key. */ Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri May 11 08:59:38 2007 @@ -84,7 +84,7 @@ // // Cell Masks // -#define HCELL_NIL 0 +#define HCELL_NIL -1 #define HCELL_CACHED 1 // @@ -157,6 +157,8 @@ PAGE_SIZE / sizeof(CM_KEY_CONTROL_BLOCK) #define CM_DELAYS_PER_PAGE \ PAGE_SIZE / sizeof(CM_DELAYED_CLOSE_ENTRY) + +#ifndef __INCLUDE_CM_H // // Key Hash @@ -984,3 +986,5 @@ // Inlined functions // #include "cm_x.h" + +#endif Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Fri May 11 08:59:38 2007 @@ -17,6 +17,62 @@ /* FUNCTIONS *****************************************************************/ +USHORT +NTAPI +CmpCopyName(IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source) +{ + ULONG i; + + /* Check for old hives */ + if (Hive->Version == 1) + { + /* Just copy the source directly */ + RtlCopyMemory(Destination, Source->Buffer, Source->Length); + return Source->Length; + } + + /* For new versions, check for compressed name */ + for (i = 0; i < (Source->Length / sizeof(WCHAR)); i++) + { + /* Check if the name is non compressed */ + if (Source->Buffer[i] > (UCHAR)-1) + { + /* Do the copy */ + RtlCopyMemory(Destination, Source->Buffer, Source->Length); + return Source->Length; + } + + /* Copy this character */ + Destination[i] = Source->Buffer[i]; + } + + /* Compressed name, return length */ + return Source->Length / sizeof(WCHAR); +} + +USHORT +NTAPI +CmpNameSize(IN PHHIVE Hive, + IN PUNICODE_STRING Name) +{ + ULONG i; + + /* For old hives, just retun the length */ + if (Hive->Version == 1) return Name->Length; + + /* For new versions, check for compressed name */ + for (i = 0; i < (Name->Length / sizeof(WCHAR)); i++) + { + /* Check if the name is non compressed */ + if (Name->Buffer[i] > (UCHAR)-1) return Name->Length; + } + + /* Compressed name, return length */ + return Name->Length / sizeof(WCHAR); +} + LONG NTAPI CmpCompareCompressedName(IN PUNICODE_STRING SearchName,

1 0

[gedmurphy] 26691: write initial default config file to registry
by gedmurphy＠svn.reactos.org 10 May '07

10 May '07

Author: gedmurphy Date: Fri May 11 03:28:20 2007 New Revision: 26691 URL: http://svn.reactos.org/svn/reactos?rev=26691&view=rev Log: write initial default config file to registry Modified: trunk/tools/RosTE/RosTE.nsi Modified: trunk/tools/RosTE/RosTE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/RosTE.nsi?rev=26691&r1… ============================================================================== --- trunk/tools/RosTE/RosTE.nsi (original) +++ trunk/tools/RosTE/RosTE.nsi Fri May 11 03:28:20 2007 @@ -69,6 +69,7 @@ CreateDirectory "$SMPROGRAMS\RosTE" CreateShortCut "$SMPROGRAMS\RosTE\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" CreateShortCut "$DESKTOP\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" + WriteRegStr HKCU "Software\RosTE" "DefaultConfig" "$INSTDIR\GUI\config.xml" SectionEnd Section "InstallQemu" SEC02

1 0

[gedmurphy] 26690: fix script to include VDK and the default config file
by gedmurphy＠svn.reactos.org 10 May '07

10 May '07

Author: gedmurphy Date: Fri May 11 03:17:53 2007 New Revision: 26690 URL: http://svn.reactos.org/svn/reactos?rev=26690&view=rev Log: fix script to include VDK and the default config file Modified: trunk/tools/RosTE/LICENSE.txt trunk/tools/RosTE/RosTE.nsi Modified: trunk/tools/RosTE/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/LICENSE.txt?rev=26690&… ============================================================================== --- trunk/tools/RosTE/LICENSE.txt (original) +++ trunk/tools/RosTE/LICENSE.txt Fri May 11 03:17:53 2007 @@ -1,16 +1,12 @@ - ReactOS Test Environment v0.1 + == ReactOS Test Environment v0.1 == The components of the ReactOS Test Environment are released under the following licenses: ReactOS Test Environment installer and any accompanying data - GPLv2. - ReactOS QEmu Manager - GPLv2 - QEmu - LGPLv2 - KQEmu - GPLv2 - VDK - GPLv2 The respective licenses are detailed below Modified: trunk/tools/RosTE/RosTE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/RosTE.nsi?rev=26690&r1… ============================================================================== --- trunk/tools/RosTE/RosTE.nsi (original) +++ trunk/tools/RosTE/RosTE.nsi Fri May 11 03:17:53 2007 @@ -65,6 +65,7 @@ SetOutPath "$INSTDIR\GUI" SetOverwrite ifnewer File "${SOURCE_DIR}\GUI\QemuGUI.exe" + File "${SOURCE_DIR}\GUI\config.xml" CreateDirectory "$SMPROGRAMS\RosTE" CreateShortCut "$SMPROGRAMS\RosTE\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" CreateShortCut "$DESKTOP\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" @@ -134,7 +135,17 @@ File "${SOURCE_DIR}\qemu-0.9.0-windows\License\README.TXT" SectionEnd -Section "InstallQemu" SEC03 +Section "Installvdk" SEC03 + SetOutPath "$INSTDIR\VDK" + SetOverwrite ifnewer + File "${SOURCE_DIR}\vdk\COPYING.TXT" + File "${SOURCE_DIR}\vdk\README.TXT" + File "${SOURCE_DIR}\vdk\READMEJ.TXT" + File "${SOURCE_DIR}\vdk\vdk.exe" + File "${SOURCE_DIR}\vdk\vdk.sys" +SectionEnd + +Section "InstallQemu" SEC04 SetOutPath "$INSTDIR\Kqemu" SetOverwrite ifnewer File "${SOURCE_DIR}\Kqemu\LICENSE" @@ -190,6 +201,7 @@ RMDir /r /REBOOTOK "$SMPROGRAMS\RosTE" RMDir /r /REBOOTOK "$INSTDIR\GUI" RMDir /r /REBOOTOK "$INSTDIR\QEmu" + RMDir /r /REBOOTOK "$INSTDIR\VDK" RMDir /r /REBOOTOK "$INSTDIR\Kqemu" RMDir /r /REBOOTOK "$INSTDIR"

1 0

[gedmurphy] 26689: - Add RosTE script. - requires nsSCM to build [http://nsis.sourceforge.net/Service_Control_Manager_plugin_(install_services_and_drivers_on_NT/2K/XP)]
by gedmurphy＠svn.reactos.org 10 May '07

10 May '07

Author: gedmurphy Date: Fri May 11 02:39:26 2007 New Revision: 26689 URL: http://svn.reactos.org/svn/reactos?rev=26689&view=rev Log: - Add RosTE script. - requires nsSCM to build [http://nsis.sourceforge.net/Service_Control_Manager_plugin_(install_service…] Added: trunk/tools/RosTE/ trunk/tools/RosTE/LICENSE.txt trunk/tools/RosTE/RosTE.nsi trunk/tools/RosTE/ros.ico (with props) trunk/tools/RosTE/unros.ico (with props) Added: trunk/tools/RosTE/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/LICENSE.txt?rev=26689&… ============================================================================== --- trunk/tools/RosTE/LICENSE.txt (added) +++ trunk/tools/RosTE/LICENSE.txt Fri May 11 02:39:26 2007 @@ -1,0 +1,873 @@ + ReactOS Test Environment v0.1 + + The components of the ReactOS Test Environment are released under +the following licenses: + + ReactOS Test Environment installer and any accompanying data - GPLv2. + + ReactOS QEmu Manager - GPLv2 + + QEmu - LGPLv2 + + KQEmu - GPLv2 + + VDK - GPLv2 + + The respective licenses are detailed below + + + +*** The complete text of the GNU GENERAL PUBLIC LICENSE v2 + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. + + + + + + + + +*** The complete text of the GNU LESSER GENERAL PUBLIC LICENSE v2.1 + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! Added: trunk/tools/RosTE/RosTE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/RosTE.nsi?rev=26689&vi… ============================================================================== --- trunk/tools/RosTE/RosTE.nsi (added) +++ trunk/tools/RosTE/RosTE.nsi Fri May 11 02:39:26 2007 @@ -1,0 +1,209 @@ +!define PRODUCT_NAME "ReactOS Test Environment" +!define PRODUCT_VERSION "0.1" +!define PRODUCT_PUBLISHER "ReactOS" +!define PRODUCT_WEB_SITE "http://www.reactos.org" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosTE" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define SOURCE_DIR "D:\ReactOS\trunk\tools\RosTE\files" +!define MODULE_NAME "RosTE" + +;; Basic installer options +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "RosTE-${PRODUCT_VERSION}.exe" +InstallDir "$PROGRAMFILES\RosTE" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +;; Add version/product information metadata to the installation file. +VIAddVersionKey /LANG=1033 "FileVersion" "0.0.0.1" +VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" +VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Ged Murphy using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" +VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 Ged Murphy (gedmurphy(a)reactos.org)" +VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" +VIProductVersion "0.0.1.0" + +CRCCheck force +SetCompressor /FINAL /SOLID lzma + +; MUI 1.67 compatible +!include "MUI.nsh" + +; MUI Settings +!define MUI_ABORTWARNING +!define MUI_ICON "ros.ico" +!define MUI_UNICON "unros.ico" + +; Welcome page +!insertmacro MUI_PAGE_WELCOME +; License page +!insertmacro MUI_PAGE_LICENSE "D:\ReactOS\trunk\tools\RosTE\LICENSE.txt" +; Directory page +!insertmacro MUI_PAGE_DIRECTORY +; Instfiles page +!insertmacro MUI_PAGE_INSTFILES +; Finish page +!define MUI_FINISHPAGE_RUN "$INSTDIR\GUI\QemuGUI.exe" +!insertmacro MUI_PAGE_FINISH + +; Uninstaller pages +!insertmacro MUI_UNPAGE_INSTFILES + +; Language files +!insertmacro MUI_LANGUAGE "English" + +; MUI end ------ + +ShowInstDetails show +ShowUnInstDetails show + +Section "InstallGui" SEC01 + SetOutPath "$INSTDIR\GUI" + SetOverwrite ifnewer + File "${SOURCE_DIR}\GUI\QemuGUI.exe" + CreateDirectory "$SMPROGRAMS\RosTE" + CreateShortCut "$SMPROGRAMS\RosTE\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" + CreateShortCut "$DESKTOP\RosTE.lnk" "$INSTDIR\GUI\QemuGUI.exe" +SectionEnd + +Section "InstallQemu" SEC02 + SetOutPath "$INSTDIR\QEmu" + SetOverwrite ifnewer + File "${SOURCE_DIR}\qemu-0.9.0-windows\bios.bin" + File "${SOURCE_DIR}\qemu-0.9.0-windows\fmod.dll" + File "${SOURCE_DIR}\qemu-0.9.0-windows\libusb0.dll" + File "${SOURCE_DIR}\qemu-0.9.0-windows\linux_boot.bin" + File "${SOURCE_DIR}\qemu-0.9.0-windows\pxe-ne2k_pci.bin" + File "${SOURCE_DIR}\qemu-0.9.0-windows\pxe-pcnet.bin" + File "${SOURCE_DIR}\qemu-0.9.0-windows\pxe-rtl8139.bin" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-doc.html" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-img.exe" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-system-x86_64.exe" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-tech.html" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-win.bat" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu-x86_64.bat" + File "${SOURCE_DIR}\qemu-0.9.0-windows\qemu.exe" + File "${SOURCE_DIR}\qemu-0.9.0-windows\README-en.txt" + File "${SOURCE_DIR}\qemu-0.9.0-windows\README-ja.txt" + File "${SOURCE_DIR}\qemu-0.9.0-windows\SDL.dll" + File "${SOURCE_DIR}\qemu-0.9.0-windows\vgabios-cirrus.bin" + File "${SOURCE_DIR}\qemu-0.9.0-windows\vgabios.bin" + SetOutPath "$INSTDIR\QEmu\keymaps" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\ar" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\common" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\da" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\de" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\de-ch" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\en-gb" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\en-us" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\es" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\et" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fi" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fo" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr-be" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr-ca" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\fr-ch" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\hr" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\hu" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\is" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\it" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\ja" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\lt" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\lv" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\mk" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\modifiers" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\nl" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\nl-be" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\no" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\pl" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\pt" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\pt-br" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\ru" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\sl" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\sv" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\th" + File "${SOURCE_DIR}\qemu-0.9.0-windows\keymaps\tr" + SetOutPath "$INSTDIR\QEmu\License" + File "${SOURCE_DIR}\qemu-0.9.0-windows\License\LICENSE" + File "${SOURCE_DIR}\qemu-0.9.0-windows\License\README-SDL.txt" + File "${SOURCE_DIR}\qemu-0.9.0-windows\License\README.TXT" +SectionEnd + +Section "InstallQemu" SEC03 + SetOutPath "$INSTDIR\Kqemu" + SetOverwrite ifnewer + File "${SOURCE_DIR}\Kqemu\LICENSE" + File "${SOURCE_DIR}\Kqemu\COPYING" + File "${SOURCE_DIR}\Kqemu\kqemu-doc.html" + File "${SOURCE_DIR}\Kqemu\kqemu-tech.html" + SetOutPath "$SYSDIR\drivers" + File "${SOURCE_DIR}\Kqemu\kqemu.sys" + SetOutPath "$SMPROGRAMS" +SectionEnd + +Section -AdditionalIcons + WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" + CreateShortCut "$SMPROGRAMS\RosTE\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" + CreateShortCut "$SMPROGRAMS\RosTE\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + ;; Start kqemu after install + ;; Service control manager plugin is used. Inf file isn't used. + nsSCM::Install /NOUNLOAD "kqemu" "KQEmu virtualisation module for QEmu" 1 2 "$SYSDIR\drivers\kqemu.sys" "" "" "" "" + Pop $0 + DetailPrint "snSCM::Install : $0" + nsSCM::Start /NOUNLOAD "kqemu" + Pop $0 + DetailPrint "nsSCM::Start : $0" + + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\GUI\QemuGUI.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\GUI\QemuGUI.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." +FunctionEnd + +Function un.onInit + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 + Abort +FunctionEnd + +Section Uninstall + Delete "$INSTDIR\${PRODUCT_NAME}.url" + Delete "$INSTDIR\uninst.exe" + Delete "$DESKTOP\RosTE.lnk" + RMDir /r /REBOOTOK "$SMPROGRAMS\RosTE" + RMDir /r /REBOOTOK "$INSTDIR\GUI" + RMDir /r /REBOOTOK "$INSTDIR\QEmu" + RMDir /r /REBOOTOK "$INSTDIR\Kqemu" + RMDir /r /REBOOTOK "$INSTDIR" + + ;; Stop kqemu + nsSCM::Stop /NOUNLOAD "kqemu" + Pop $0 + DetailPrint "nsSCM::Stop : $0" + nsSCM::Remove /NOUNLOAD "kqemu" + Pop $0 + DetailPrint "nsSCM::Remove : $0" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + ; delete user defined default config value + DeleteRegKey HKCU "Software\RosTE" + SetAutoClose false +SectionEnd Added: trunk/tools/RosTE/ros.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/ros.ico?rev=26689&view… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosTE/ros.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosTE/unros.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/unros.ico?rev=26689&vi… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosTE/unros.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[gedmurphy] 26688: add the manifest
by gedmurphy＠svn.reactos.org 10 May '07

10 May '07

Author: gedmurphy Date: Fri May 11 02:35:27 2007 New Revision: 26688 URL: http://svn.reactos.org/svn/reactos?rev=26688&view=rev Log: add the manifest Added: trunk/tools/Qemu GUI/Properties/app.manifest Added: trunk/tools/Qemu GUI/Properties/app.manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Properties/app.ma… ============================================================================== --- trunk/tools/Qemu GUI/Properties/app.manifest (added) +++ trunk/tools/Qemu GUI/Properties/app.manifest Fri May 11 02:35:27 2007 @@ -1,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <applicationRequestMinimum> + <defaultAssemblyRequest permissionSetReference="Custom" /> + <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" /> + </applicationRequestMinimum> + </security> + </trustInfo> +</asmv1:assembly>

1 0

[ion] 26686: - CmpInitializeMachineDependentConfiguration: Finish up by using the same code as for System BIOS Version detection for the Video BIOS Detection. This routine should be pretty much finished now since all required hardware keys are created.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Fri May 11 01:40:39 2007 New Revision: 26686 URL: http://svn.reactos.org/svn/reactos?rev=26686&view=rev Log: - CmpInitializeMachineDependentConfiguration: Finish up by using the same code as for System BIOS Version detection for the Video BIOS Detection. This routine should be pretty much finished now since all required hardware keys are created. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 01:40:39 2007 @@ -646,55 +646,55 @@ /* Close the bios information handle */ NtClose(BiosHandle); - - /* Get the BIOS Version */ - if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) - { - /* Start at the beginning of our buffer */ - CurrentVersion = BiosVersion; - do - { - /* Convert to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - - /* Calculate the length of this string and copy it in */ - Length = Data.Length + sizeof(UNICODE_NULL); - RtlMoveMemory(CurrentVersion, Data.Buffer, Length); - - /* Free the unicode string */ - RtlFreeUnicodeString(&Data); - - /* Update the total length and see if we're out of space */ - TotalLength += Length; - if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) - { - /* One more string would push us out, so stop here */ - break; - } - - /* Go to the next string inside the multi-string buffer */ - CurrentVersion += Length; - - /* Query the next BIOS Version */ - } while (CmpGetBiosVersion(NULL, 0, Buffer)); - - /* Check if we found any strings at all */ - if (TotalLength) - { - /* Add the final null-terminator */ - *(PWSTR)CurrentVersion = UNICODE_NULL; - TotalLength += sizeof(UNICODE_NULL); - - /* Write the BIOS Version to the registry */ - RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); - Status = NtSetValueKey(SystemHandle, - &ValueName, - 0, - REG_MULTI_SZ, - BiosVersion, - TotalLength); - } + } + + /* Get the BIOS Version */ + if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) + { + /* Start at the beginning of our buffer */ + CurrentVersion = BiosVersion; + do + { + /* Convert to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Calculate the length of this string and copy it in */ + Length = Data.Length + sizeof(UNICODE_NULL); + RtlMoveMemory(CurrentVersion, Data.Buffer, Length); + + /* Free the unicode string */ + RtlFreeUnicodeString(&Data); + + /* Update the total length and see if we're out of space */ + TotalLength += Length; + if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) + { + /* One more string would push us out, so stop here */ + break; + } + + /* Go to the next string inside the multi-string buffer */ + CurrentVersion += Length; + + /* Query the next BIOS Version */ + } while (CmpGetBiosVersion(NULL, 0, Buffer)); + + /* Check if we found any strings at all */ + if (TotalLength) + { + /* Add the final null-terminator */ + *(PWSTR)CurrentVersion = UNICODE_NULL; + TotalLength += sizeof(UNICODE_NULL); + + /* Write the BIOS Version to the registry */ + RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_MULTI_SZ, + BiosVersion, + TotalLength); } } @@ -741,6 +741,56 @@ RtlFreeUnicodeString(&Data); } + /* Get the Video BIOS Version */ + if (CmpGetBiosVersion(BaseAddress, 8* PAGE_SIZE, Buffer)) + { + /* Start at the beginning of our buffer */ + CurrentVersion = BiosVersion; + do + { + /* Convert to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Calculate the length of this string and copy it in */ + Length = Data.Length + sizeof(UNICODE_NULL); + RtlMoveMemory(CurrentVersion, Data.Buffer, Length); + + /* Free the unicode string */ + RtlFreeUnicodeString(&Data); + + /* Update the total length and see if we're out of space */ + TotalLength += Length; + if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) + { + /* One more string would push us out, so stop here */ + break; + } + + /* Go to the next string inside the multi-string buffer */ + CurrentVersion += Length; + + /* Query the next BIOS Version */ + } while (CmpGetBiosVersion(NULL, 0, Buffer)); + + /* Check if we found any strings at all */ + if (TotalLength) + { + /* Add the final null-terminator */ + *(PWSTR)CurrentVersion = UNICODE_NULL; + TotalLength += sizeof(UNICODE_NULL); + + /* Write the BIOS Version to the registry */ + RtlInitUnicodeString(&ValueName, L"VideoBiosVersion"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_MULTI_SZ, + BiosVersion, + TotalLength); + } + } + /* Unmap the section */ ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); }

1 0

[ion] 26685: - Add code to detect and save the BIOS Version string to the registry. We use the same detection patterns as Windows for now (Ver, Rev, Rel, v0-9). - All BIOS Version strings are scanned and saved in a REG_MULTI_SZ key, as on Windows. QEMU BIOS Version String is correctly detected as the CVS/SVN $ID tag, which is good enough.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Fri May 11 01:36:24 2007 New Revision: 26685 URL: http://svn.reactos.org/svn/reactos?rev=26685&view=rev Log: - Add code to detect and save the BIOS Version string to the registry. We use the same detection patterns as Windows for now (Ver, Rev, Rel, v0-9). - All BIOS Version strings are scanned and saved in a REG_MULTI_SZ key, as on Windows. QEMU BIOS Version String is correctly detected as the CVS/SVN $ID tag, which is good enough. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 01:36:24 2007 @@ -17,6 +17,17 @@ PCHAR CmpID1 = "80%u86-%c%x"; PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; +PCHAR CmpBiosStrings[] = +{ + "Ver", + "Rev", + "Rel", + "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", + "v 0", "v 1", "v 2", "v 3", "v 4", "v 5", "v 6", "v 7", "v 8", "v 9", + NULL +}; + +PCHAR CmpBiosBegin, CmpBiosSearchStart, CmpBiosSearchEnd; /* FUNCTIONS *****************************************************************/ @@ -117,30 +128,126 @@ return FALSE; } +BOOLEAN +NTAPI +CmpGetBiosVersion(IN PCHAR BiosStart, + IN ULONG BiosLength, + IN PCHAR BiosVersion) +{ + CHAR Buffer[128]; + PCHAR p, pp; + USHORT i; + + /* Check if we were given intitial data for the search */ + if (BiosStart) + { + /* Save it for later use */ + CmpBiosBegin = BiosStart; + CmpBiosSearchStart = BiosStart + 1; + CmpBiosSearchEnd = BiosStart + BiosLength - 2; + } + + /* Now loop the BIOS area */ + for (;;) + { + /* Start an initial search looking for numbers and periods */ + pp = NULL; + while (CmpBiosSearchStart <= CmpBiosSearchEnd) + { + /* Check if we have an "x.y" version string */ + if ((*CmpBiosSearchStart == '.') && + (*(CmpBiosSearchStart + 1) >= '0') && + (*(CmpBiosSearchStart + 1) <= '9') && + (*(CmpBiosSearchStart - 1) >= '0') && + (*(CmpBiosSearchStart - 1) <= '9')) + { + /* Start looking in this area for the actual BIOS Version */ + pp = CmpBiosSearchStart; + break; + } + else + { + /* Keep searching */ + CmpBiosSearchStart++; + } + } + + /* Break out if we're went past the BIOS area */ + if (CmpBiosSearchStart > CmpBiosSearchEnd) return FALSE; + + /* Move to the next 2 bytes */ + CmpBiosSearchStart += 2; + + /* Null-terminate our scratch buffer and start the string here */ + Buffer[127] = ANSI_NULL; + p = &Buffer[127]; + + /* Go back one character since we're doing this backwards */ + pp--; + + /* Loop the identifier we found as long as it's valid */ + i = 0; + while ((i++ < 127) && + (pp >= CmpBiosBegin) && + (*pp >= ' ') && + (*pp != '$')) + { + /* Copy the character */ + *--p = *pp--; + } + + /* Go past the last character since we went backwards */ + pp++; + + /* Loop the strings we recognize */ + for (i = 0; CmpBiosStrings[i]; i++) + { + /* Check if a match was found */ + if (strstr(p, CmpBiosStrings[i])) goto Match; + } + } + +Match: + /* Skip until we find a space */ + for (; *pp == ' '; pp++); + + /* Loop the final string */ + i = 0; + do + { + /* Copy the character into the final string */ + BiosVersion[i] = *pp++; + } while ((++i < 127) && + (pp <= (CmpBiosSearchEnd + 1)) && + (*pp >= ' ') && + (*pp != '$')); + + /* Null-terminate the version string */ + BiosVersion[i] = ANSI_NULL; + return TRUE; +} + NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { UNICODE_STRING KeyName, ValueName, Data, SectionName; OBJECT_ATTRIBUTES ObjectAttributes; - ULONG HavePae; + ULONG HavePae, CacheSize, ViewSize, Length, TotalLength = 0, i, Disposition; NTSTATUS Status; HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; - ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; - ULONG i, ExtendedId, Dummy; + ULONG ExtendedId, Dummy; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; ANSI_STRING TempString; - PCHAR PartialString = NULL; + PCHAR PartialString = NULL, BiosVersion; CHAR CpuString[48]; - ULONG CacheSize; PVOID BaseAddress = NULL; LARGE_INTEGER ViewBase = {{0}}; ULONG_PTR VideoRomBase; - ULONG ViewSize; - PCHAR BiosVersion; + PCHAR CurrentVersion; /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, @@ -281,7 +388,7 @@ ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); ConfigData.ComponentEntry.Identifier = Buffer; - /* For 386 cpus, the CPU String is the identifier */ + /* For 386 cpus, the CPU pp is the identifier */ if (Prcb->CpuType == 3) strcpy(Buffer, "80387"); /* Save the ID string length now that we've created it */ @@ -475,7 +582,7 @@ ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); } - /* Allocate BIOS Version String Buffer */ + /* Allocate BIOS Version pp Buffer */ BiosVersion = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); /* Setup settings to map the 64K BIOS ROM */ @@ -539,6 +646,56 @@ /* Close the bios information handle */ NtClose(BiosHandle); + + /* Get the BIOS Version */ + if (CmpGetBiosVersion(BaseAddress, 16* PAGE_SIZE, Buffer)) + { + /* Start at the beginning of our buffer */ + CurrentVersion = BiosVersion; + do + { + /* Convert to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Calculate the length of this string and copy it in */ + Length = Data.Length + sizeof(UNICODE_NULL); + RtlMoveMemory(CurrentVersion, Data.Buffer, Length); + + /* Free the unicode string */ + RtlFreeUnicodeString(&Data); + + /* Update the total length and see if we're out of space */ + TotalLength += Length; + if (TotalLength + 256 + sizeof(UNICODE_NULL) > PAGE_SIZE) + { + /* One more string would push us out, so stop here */ + break; + } + + /* Go to the next string inside the multi-string buffer */ + CurrentVersion += Length; + + /* Query the next BIOS Version */ + } while (CmpGetBiosVersion(NULL, 0, Buffer)); + + /* Check if we found any strings at all */ + if (TotalLength) + { + /* Add the final null-terminator */ + *(PWSTR)CurrentVersion = UNICODE_NULL; + TotalLength += sizeof(UNICODE_NULL); + + /* Write the BIOS Version to the registry */ + RtlInitUnicodeString(&ValueName, L"SystemBiosVersion"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_MULTI_SZ, + BiosVersion, + TotalLength); + } + } } /* Unmap the section */

1 0

[ion] 26684: - Remove CPU Detection code from FreeLDR (hwcpu.c) since our kernel properly does the same job now (and better). - Remove ReactOS hacks from recent code due to FreeLDR, since it doesn't conflict with us anymore.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Fri May 11 00:51:50 2007 New Revision: 26684 URL: http://svn.reactos.org/svn/reactos?rev=26684&view=rev Log: - Remove CPU Detection code from FreeLDR (hwcpu.c) since our kernel properly does the same job now (and better). - Remove ReactOS hacks from recent code due to FreeLDR, since it doesn't conflict with us anymore. Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Fri May 11 00:51:50 2007 @@ -2284,11 +2284,6 @@ return; } -#if 0 - DetectSystemData(); -#endif - DetectCPUs(SystemKey); - /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); DetectApmBios(SystemKey, &BusNumber); Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c (removed) @@ -1,763 +1,0 @@ -/* - * FreeLoader - * - * Copyright (C) 2003 Eric Kohl - * Copyright (C) 2006 Colin Finck <mail(a)colinfinck.de> - * - * 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> - -#define NDEBUG -#include <debug.h> - -#define HZ (100) -#define CLOCK_TICK_RATE (1193182) -#define LATCH (CLOCK_TICK_RATE / HZ) -#define CALIBRATE_LATCH (5 * LATCH) -#define CALIBRATE_TIME (5 * 1000020/HZ) - -#define MP_FP_SIGNATURE 0x5F504D5F /* "_MP_" */ -#define MP_CT_SIGNATURE 0x504D4350 /* "PCMP" */ - - -typedef struct _MP_FLOATING_POINT_TABLE -{ - ULONG Signature; /* "_MP_" */ - ULONG PhysicalAddressPointer; - UCHAR Length; - UCHAR SpecRev; - UCHAR Checksum; - UCHAR FeatureByte[5]; -} PACKED MP_FLOATING_POINT_TABLE, *PMP_FLOATING_POINT_TABLE; - - -typedef struct _MPS_CONFIG_TABLE_HEADER -{ - ULONG Signature; /* "PCMP" */ - USHORT BaseTableLength; - UCHAR SpecRev; - UCHAR Checksum; - UCHAR OemIdString[8]; - UCHAR ProductIdString[12]; - ULONG OemTablePointer; - USHORT OemTableLength; - USHORT EntryCount; - ULONG AddressOfLocalAPIC; - USHORT ExtendedTableLength; - UCHAR ExtendedTableChecksum; - UCHAR Reserved; -} PACKED MP_CONFIGURATION_TABLE, *PMP_CONFIGURATION_TABLE; - - -typedef struct _MP_PROCESSOR_ENTRY -{ - UCHAR EntryType; - UCHAR LocalApicId; - UCHAR LocalApicVersion; - UCHAR CpuFlags; - ULONG CpuSignature; - ULONG FeatureFlags; - ULONG Reserved1; - ULONG Reserved2; -} PACKED MP_PROCESSOR_ENTRY, *PMP_PROCESSOR_ENTRY; - - -/* FUNCTIONS ****************************************************************/ - -static ULONG -GetCpuSpeed(BOOLEAN DualCoreSpeedMesure) -{ - ULONGLONG Timestamp1; - ULONGLONG Timestamp2; - ULONGLONG Diff; - ULONG Count = 0; - - /* - FIXME - if the DualCoreSpeedMesure is true we need - use the wrmsr and rdmsr to mesure the speed - - The rdtc are outdate to use if cpu support - the wrmsr and rdmsr, see intel doc AP-485 - for more informations and how to use it. - - Follow code is good on cpu that does not - support dual core or have a mmx unit or - more. - */ - - - /* Initialise timer channel 2 */ - /* Set the Gate high, disable speaker */ - WRITE_PORT_UCHAR((PUCHAR)0x61, (READ_PORT_UCHAR((PUCHAR)0x61) & ~0x02) | 0x01); - WRITE_PORT_UCHAR((PUCHAR)0x43, 0xB0); /* binary, mode 0, LSB/MSB, ch 2 */ - WRITE_PORT_UCHAR((PUCHAR)0x42, CALIBRATE_LATCH & 0xff); /* LSB */ - WRITE_PORT_UCHAR((PUCHAR)0x42, CALIBRATE_LATCH >> 8); /* MSB */ - - /* Read TSC (Time Stamp Counter) */ - Timestamp1 = RDTSC(); - - /* Wait */ - do - { - Count++; - } - while ((READ_PORT_UCHAR((PUCHAR)0x61) & 0x20) == 0); - - /* Read TSC (Time Stamp Counter) again */ - Timestamp2 = RDTSC(); - - /* Calculate elapsed time (check for counter overrun) */ - if (Timestamp2 > Timestamp1) - { - Diff = Timestamp2 - Timestamp1; - } - else - { - Diff = Timestamp2 + (((ULONGLONG)-1) - Timestamp1); - } - - return (ULONG)(Diff / CALIBRATE_TIME); -} - - -static VOID -DetectCPU(FRLDRHKEY CpuKey, - FRLDRHKEY FpuKey) -{ - WCHAR VendorIdentifier[13]; - WCHAR ProcessorNameString[49]; - CHAR tmpVendorIdentifier[13]; - CHAR tmpProcessorNameString[49]; - WCHAR Identifier[64]; - ULONG FeatureSet; - FRLDRHKEY CpuInstKey; - FRLDRHKEY FpuInstKey; - ULONG eax = 0; - ULONG ebx = 0; - ULONG ecx = 0; - ULONG edx = 0; - ULONG i; - ULONG *Ptr; - LONG Error; - BOOLEAN SupportTSC = FALSE; - ULONG CpuSpeed; - BOOLEAN DualCoreSpeedMesure = FALSE; - - /* Create the CPU instance key */ - Error = RegCreateKey(CpuKey, - L"0", - &CpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Create the FPU instance key */ - Error = RegCreateKey(FpuKey, - L"0", - &FpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - eax = CpuidSupported(); - if (eax & 1) - { - DbgPrint((DPRINT_HWDETECT, "CPUID supported\n")); - - /* Get vendor identifier */ - GetCpuid(0, &eax, &ebx, &ecx, &edx); - tmpVendorIdentifier[12] = 0; - Ptr = (ULONG*)&tmpVendorIdentifier[0]; - *Ptr = ebx; - Ptr++; - *Ptr = edx; - Ptr++; - *Ptr = ecx; - swprintf(VendorIdentifier, L"%S", tmpVendorIdentifier); - - /* Get Identifier */ - GetCpuid(1, &eax, &ebx, &ecx, &edx); - swprintf(Identifier, - L"x86 Family %u Model %u Stepping %u", - (unsigned int)((eax >> 8) & 0x0F), - (unsigned int)((eax >> 4) & 0x0F), - (unsigned int)(eax & 0x0F)); - FeatureSet = edx; - - if ((FeatureSet & 0x10) == 0x10) - SupportTSC = TRUE; - - if ((FeatureSet & 0x20) == 0x20) - DualCoreSpeedMesure = TRUE; - - /* Check if Extended CPUID information is supported */ - GetCpuid(0x80000000, &eax, &ebx, &ecx, &edx); - - if(eax >= 0x80000004) - { - /* Get Processor Name String */ - tmpProcessorNameString[48] = 0; - Ptr = (ULONG*)&tmpProcessorNameString[0]; - - for (i = 0x80000002; i <= 0x80000004; i++) - { - GetCpuid(i, &eax, &ebx, &ecx, &edx); - *Ptr = eax; - Ptr++; - *Ptr = ebx; - Ptr++; - *Ptr = ecx; - Ptr++; - *Ptr = edx; - Ptr++; - } - - swprintf(ProcessorNameString, L"%S", tmpProcessorNameString); - - - /* Set 'ProcessorNameString' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Processor Name String: %S\n", ProcessorNameString)); - - Error = RegSetValue(CpuInstKey, - L"ProcessorNameString", - REG_SZ, - (PCHAR)ProcessorNameString, - (wcslen(ProcessorNameString) + 1) * sizeof(WCHAR)); - - if (Error != ERROR_SUCCESS) - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } - else - { - DbgPrint((DPRINT_HWDETECT, "CPUID not supported\n")); - - wcscpy(VendorIdentifier, L"Unknown"); - swprintf(Identifier, - L"x86 Family %u Model %u Stepping %u", - (unsigned int)((eax >> 8) & 0x0F), - (unsigned int)((eax >> 4) & 0x0F), - (unsigned int)(eax & 0x0F)); - FeatureSet = 0; - } - - /* Set 'Conmponent Information' value (CPU and FPU) */ - SetComponentInformation(CpuInstKey, 0, 0, 1); - SetComponentInformation(FpuInstKey, 0, 0, 1); - - /* Set 'FeatureSet' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "FeatureSet: %x\n", FeatureSet)); - - Error = RegSetValue(CpuInstKey, - L"FeatureSet", - REG_DWORD, - (PCHAR)&FeatureSet, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'Identifier' value (CPU and FPU) */ - DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); - - Error = RegSetValue(CpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - Error = RegSetValue(FpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'VendorIdentifier' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %S\n", VendorIdentifier)); - - Error = RegSetValue(CpuInstKey, - L"VendorIdentifier", - REG_SZ, - (PCHAR)VendorIdentifier, - (wcslen(VendorIdentifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* FIXME: Set 'Update Signature' value (CPU only) */ - - /* FIXME: Set 'Update Status' value (CPU only) */ - - /* Set '~MHz' value (CPU only) */ - if (SupportTSC) - { - CpuSpeed = GetCpuSpeed(DualCoreSpeedMesure); - - Error = RegSetValue(CpuInstKey, - L"~MHz", - REG_DWORD, - (PCHAR)&CpuSpeed, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } -} - - -static VOID -SetMpsProcessor(FRLDRHKEY CpuKey, - FRLDRHKEY FpuKey, - PMP_PROCESSOR_ENTRY CpuEntry) -{ - WCHAR ProcessorNameString[49]; - WCHAR VendorIdentifier[13]; - CHAR tmpProcessorNameString[49]; - CHAR tmpVendorIdentifier[13]; - WCHAR Identifier[64]; - WCHAR Buffer[8]; - ULONG FeatureSet; - FRLDRHKEY CpuInstKey; - FRLDRHKEY FpuInstKey; - ULONG eax = 0; - ULONG ebx = 0; - ULONG ecx = 0; - ULONG edx = 0; - ULONG i; - ULONG *Ptr; - LONG Error; - ULONG CpuSpeed; - - /* Get processor instance number */ - swprintf(Buffer, L"%u", CpuEntry->LocalApicId); - - /* Create the CPU instance key */ - Error = RegCreateKey(CpuKey, - Buffer, - &CpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Create the FPU instance key */ - Error = RegCreateKey(FpuKey, - Buffer, - &FpuInstKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Get 'VendorIdentifier' */ - GetCpuid(0, &eax, &ebx, &ecx, &edx); - tmpVendorIdentifier[12] = 0; - Ptr = (ULONG*)&tmpVendorIdentifier[0]; - *Ptr = ebx; - Ptr++; - *Ptr = edx; - Ptr++; - *Ptr = ecx; - swprintf(VendorIdentifier, L"%S", tmpVendorIdentifier); - - /* Get 'Identifier' */ - swprintf(Identifier, - L"x86 Family %u Model %u Stepping %u", - (ULONG)((CpuEntry->CpuSignature >> 8) & 0x0F), - (ULONG)((CpuEntry->CpuSignature >> 4) & 0x0F), - (ULONG)(CpuEntry->CpuSignature & 0x0F)); - - /* Get FeatureSet */ - FeatureSet = CpuEntry->FeatureFlags; - - /* Check if Extended CPUID information is supported */ - GetCpuid(0x80000000, &eax, &ebx, &ecx, &edx); - - if(eax >= 0x80000004) - { - /* Get 'ProcessorNameString' */ - tmpProcessorNameString[48] = 0; - Ptr = (ULONG*)&tmpProcessorNameString[0]; - - for (i = 0x80000002; i <= 0x80000004; i++) - { - GetCpuid(i, &eax, &ebx, &ecx, &edx); - *Ptr = eax; - Ptr++; - *Ptr = ebx; - Ptr++; - *Ptr = ecx; - Ptr++; - *Ptr = edx; - Ptr++; - } - - swprintf(ProcessorNameString, L"%S", tmpProcessorNameString); - - - /* Set 'ProcessorNameString' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Processor Name String: %S\n", ProcessorNameString)); - - Error = RegSetValue(CpuInstKey, - L"ProcessorNameString", - REG_SZ, - (PCHAR)ProcessorNameString, - (wcslen(ProcessorNameString) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'Configuration Data' value (CPU and FPU) */ - SetComponentInformation(CpuInstKey, - 0, - CpuEntry->LocalApicId, - 1 << CpuEntry->LocalApicId); - - SetComponentInformation(FpuInstKey, - 0, - CpuEntry->LocalApicId, - 1 << CpuEntry->LocalApicId); - - /* Set 'FeatureSet' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "FeatureSet: %x\n", FeatureSet)); - - Error = RegSetValue(CpuInstKey, - L"FeatureSet", - REG_DWORD, - (PCHAR)&FeatureSet, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'Identifier' value (CPU and FPU) */ - DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); - - Error = RegSetValue(CpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - Error = RegSetValue(FpuInstKey, - L"Identifier", - REG_SZ, - (PCHAR)Identifier, - (wcslen(Identifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* Set 'VendorIdentifier' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %S\n", VendorIdentifier)); - - Error = RegSetValue(CpuInstKey, - L"VendorIdentifier", - REG_SZ, - (PCHAR)VendorIdentifier, - (wcslen(VendorIdentifier) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - - /* FIXME: Set 'Update Signature' value (CPU only) */ - - /* FIXME: Set 'Update Status' value (CPU only) */ - - /* Set '~MHz' value (CPU only) */ - - - if ((CpuEntry->FeatureFlags & 0x10) == 0x10) - { - if ((CpuEntry->FeatureFlags & 0x20) == 0x20) - { - CpuSpeed = GetCpuSpeed(TRUE); - } - else - { - DbgPrint((DPRINT_HWDETECT, "Does not support MSR that are need for mesure the speed correct\n", (int)Error)); - CpuSpeed = GetCpuSpeed(FALSE); - } - - Error = RegSetValue(CpuInstKey, - L"~MHz", - REG_DWORD, - (PCHAR)&CpuSpeed, - sizeof(ULONG)); - if (Error != ERROR_SUCCESS) - { - - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } -} - - -static PMP_FLOATING_POINT_TABLE -GetMpFloatingPointTable(VOID) -{ - PMP_FLOATING_POINT_TABLE FpTable; - char *Ptr; - UCHAR Sum; - ULONG Length; - ULONG i; - - FpTable = (PMP_FLOATING_POINT_TABLE)0xF0000; - while ((ULONG)FpTable < 0x100000) - { - if (FpTable->Signature == MP_FP_SIGNATURE) - { - Length = FpTable->Length * 0x10; - Ptr = (char *)FpTable; - Sum = 0; - for (i = 0; i < Length; i++) - { - Sum += Ptr[i]; - } - DbgPrint((DPRINT_HWDETECT, - "Checksum: %u\n", - Sum)); - - if (Sum != 0) - { - DbgPrint((DPRINT_HWDETECT, - "Invalid MP floating point checksum: %u\n", - Sum)); - return NULL; - } - - return FpTable; - } - - FpTable = (PMP_FLOATING_POINT_TABLE)((ULONG)FpTable + 0x10); - } - - return NULL; -} - - -static PMP_CONFIGURATION_TABLE -GetMpConfigurationTable(PMP_FLOATING_POINT_TABLE FpTable) -{ - PMP_CONFIGURATION_TABLE ConfigTable; - char *Ptr; - UCHAR Sum; - ULONG Length; - ULONG i; - - if (FpTable->FeatureByte[0] != 0 || - FpTable->PhysicalAddressPointer == 0) - return NULL; - - ConfigTable = (PMP_CONFIGURATION_TABLE)FpTable->PhysicalAddressPointer; - if (ConfigTable->Signature != MP_CT_SIGNATURE) - return NULL; - - DbgPrint((DPRINT_HWDETECT, - "MP Configuration Table at: %x\n", - (ULONG)ConfigTable)); - - /* Calculate base table checksum */ - Length = ConfigTable->BaseTableLength; - Ptr = (char *)ConfigTable; - Sum = 0; - for (i = 0; i < Length; i++) - { - Sum += Ptr[i]; - } - DbgPrint((DPRINT_HWDETECT, - "MP Configuration Table base checksum: %u\n", - Sum)); - - if (Sum != 0) - { - DbgPrint((DPRINT_HWDETECT, - "Invalid MP Configuration Table base checksum: %u\n", - Sum)); - return NULL; - } - - if (ConfigTable->ExtendedTableLength != 0) - { - /* FIXME: Check extended table */ - } - - return ConfigTable; -} - - -static BOOLEAN -DetectMps(FRLDRHKEY CpuKey, - FRLDRHKEY FpuKey) -{ - PMP_FLOATING_POINT_TABLE FpTable; - PMP_CONFIGURATION_TABLE ConfigTable; - PMP_PROCESSOR_ENTRY CpuEntry; - char *Ptr; - ULONG Offset; - - /* Get floating point table */ - FpTable = GetMpFloatingPointTable(); - if (FpTable == NULL) - return FALSE; - - DbgPrint((DPRINT_HWDETECT, - "MP Floating Point Table at: %x\n", - (ULONG)FpTable)); - - if (FpTable->FeatureByte[0] == 0) - { - /* Get configuration table */ - ConfigTable = GetMpConfigurationTable(FpTable); - if (ConfigTable == NULL) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to find the MP Configuration Table\n")); - return FALSE; - } - - Offset = sizeof(MP_CONFIGURATION_TABLE); - while (Offset < ConfigTable->BaseTableLength) - { - Ptr = (char*)((ULONG)ConfigTable + Offset); - - switch (*Ptr) - { - case 0: - CpuEntry = (PMP_PROCESSOR_ENTRY)Ptr; - - DbgPrint((DPRINT_HWDETECT, "Processor Entry\n")); - DbgPrint((DPRINT_HWDETECT, - "APIC Id %u APIC Version %u Flags %x Signature %x Feature %x\n", - CpuEntry->LocalApicId, - CpuEntry->LocalApicVersion, - CpuEntry->CpuFlags, - CpuEntry->CpuSignature, - CpuEntry->FeatureFlags)); - DbgPrint((DPRINT_HWDETECT, - "Processor %u: x86 Family %u Model %u Stepping %u\n", - CpuEntry->LocalApicId, - (ULONG)((CpuEntry->CpuSignature >> 8) & 0x0F), - (ULONG)((CpuEntry->CpuSignature >> 4) & 0x0F), - (ULONG)(CpuEntry->CpuSignature & 0x0F))); - - SetMpsProcessor(CpuKey, FpuKey, CpuEntry); - Offset += 0x14; - break; - - case 1: - DbgPrint((DPRINT_HWDETECT, "Bus Entry\n")); - Offset += 0x08; - break; - - case 2: - DbgPrint((DPRINT_HWDETECT, "I/0 APIC Entry\n")); - Offset += 0x08; - break; - - case 3: - DbgPrint((DPRINT_HWDETECT, "I/0 Interrupt Assignment Entry\n")); - Offset += 0x08; - break; - - case 4: - DbgPrint((DPRINT_HWDETECT, "Local Interrupt Assignment Entry\n")); - Offset += 0x08; - break; - - default: - DbgPrint((DPRINT_HWDETECT, "Unknown Entry %u\n",(ULONG)*Ptr)); - return FALSE; - } - } - } - else - { - DbgPrint((DPRINT_HWDETECT, - "Unsupported MPS configuration: %x\n", - FpTable->FeatureByte[0])); - - /* FIXME: Identify default configurations */ - - return FALSE; - } - - return TRUE; -} - - - -VOID -DetectCPUs(FRLDRHKEY SystemKey) -{ - FRLDRHKEY CpuKey; - FRLDRHKEY FpuKey; - LONG Error; - - /* Create the 'CentralProcessor' key */ - Error = RegCreateKey(SystemKey, - L"CentralProcessor", - &CpuKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Create the 'FloatingPointProcessor' key */ - Error = RegCreateKey(SystemKey, - L"FloatingPointProcessor", - &FpuKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } - - /* Detect CPUs */ - if (!DetectMps(CpuKey, FpuKey)) - { - DetectCPU(CpuKey, FpuKey); - } -} - -/* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Fri May 11 00:51:50 2007 @@ -17,7 +17,6 @@ <file>hardware.c</file> <file>hwacpi.c</file> <file>hwapm.c</file> - <file>hwcpu.c</file> <file>hwpci.c</file> <file>i386disk.c</file> <file>i386rtl.c</file> Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Fri May 11 00:51:50 2007 @@ -87,9 +87,7 @@ /* Fail if the key couldn't be created, and make sure it's a new key */ if (!NT_SUCCESS(Status)) return Status; - - /* These keys should -not- exist, but FreeLDR creates them :( */ - //ASSERT(Disposition == REG_CREATED_NEW_KEY); + ASSERT(Disposition == REG_CREATED_NEW_KEY); } /* Sstup the compnent information key */ Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 00:51:50 2007 @@ -215,8 +215,8 @@ &Disposition); NtClose(KeyHandle); - /* This key -never- exists on x86 machines, except in ReactOS! */ - //if (Disposition == REG_CREATED_NEW_KEY) + /* The key shouldn't already exist */ + if (Disposition == REG_CREATED_NEW_KEY) { /* Allocate the configuration data for cmconfig.c */ CmpConfigurationData = ExAllocatePoolWithTag(PagedPool,

1 0

[ion] 26683: - CmpInitializeMachineDependentConfiguration: Use the same strategy as for the BIOS to get the Video ROM BIOS Date as well and save it into VideoBiosDate.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Fri May 11 00:43:40 2007 New Revision: 26683 URL: http://svn.reactos.org/svn/reactos?rev=26683&view=rev Log: - CmpInitializeMachineDependentConfiguration: Use the same strategy as for the BIOS to get the Video ROM BIOS Date as well and save it into VideoBiosDate. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 00:43:40 2007 @@ -540,7 +540,59 @@ /* Close the bios information handle */ NtClose(BiosHandle); } - } + + /* Unmap the section */ + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } + + /* Now prepare for Video BIOS Mapping of 32KB */ + BaseAddress = 0; + ViewSize = 8 * PAGE_SIZE; + ViewBase.LowPart = VideoRomBase; + ViewBase.HighPart = 0; + + /* Map it */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &ViewBase, + &ViewSize, + ViewUnmap, + MEM_DOS_LIM, + PAGE_READWRITE); + if (NT_SUCCESS(Status)) + { + /* Scan the ROM to get the BIOS Date */ + if (CmpGetBiosDate(BaseAddress, 8 * PAGE_SIZE, Buffer, FALSE)) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Write the date into the registry */ + RtlInitUnicodeString(&ValueName, L"VideoBiosDate"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Unmap the section */ + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } + + /* Close the section */ + ZwClose(SectionHandle); + + /* Free the BIOS version string buffer */ + if (BiosVersion) ExFreePool(BiosVersion); Quickie: /* Close the procesor handle */

1 0

[ion] 26682: - Create \Device\PhysicalMemory in Phase 1 instead of Phase 2, since CmInit needs it. - CmpInitializeMachineDependentConfiguration: Map the IVT to detect the Video ROM Area and save it (corretly detected on QEMU at 0xC000). Then map the BIOS at 0xF0000 and scan it for the newest BIOS Date. - Save detected BIOS date in the System Node's SystemBiosVersion, and save BIOS-default date (11 bytes before the ROM end) in Control\BIOSINFO.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Fri May 11 00:36:15 2007 New Revision: 26682 URL: http://svn.reactos.org/svn/reactos?rev=26682&view=rev Log: - Create \Device\PhysicalMemory in Phase 1 instead of Phase 2, since CmInit needs it. - CmpInitializeMachineDependentConfiguration: Map the IVT to detect the Video ROM Area and save it (corretly detected on QEMU at 0xC000). Then map the BIOS at 0xF0000 and scan it for the newest BIOS Date. - Save detected BIOS date in the System Node's SystemBiosVersion, and save BIOS-default date (11 bytes before the ROM end) in Control\BIOSINFO. Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Fri May 11 00:36:15 2007 @@ -20,15 +20,112 @@ /* FUNCTIONS *****************************************************************/ +BOOLEAN +NTAPI +CmpGetBiosDate(IN PCHAR BiosStart, + IN ULONG BiosLength, + IN PCHAR BiosDate, + IN BOOLEAN FromBios) +{ + CHAR LastDate[11] = {0}, CurrentDate[11]; + PCHAR p, pp; + + /* Skip the signature and the magic, and loop the BIOS ROM */ + p = BiosStart + 2; + pp = BiosStart + BiosLength - 5; + while (p < pp) + { + /* Check for xx/yy/zz which we assume to be a date */ + if ((p[0] == '/') && + (p[3] == '/') && + (isdigit(p[-1])) && + (isdigit(p[1])) && + (isdigit(p[2])) && + (isdigit(p[4])) && + (isdigit(p[5]))) + { + /* Copy the string proper */ + RtlMoveMemory(&CurrentDate[5], p - 2, 5); + + /* Add a 0 if the month only has one digit */ + if (!isdigit(CurrentDate[5])) CurrentDate[5] = '0'; + + /* Now copy the year */ + CurrentDate[2] = p[4]; + CurrentDate[3] = p[5]; + CurrentDate[4] = CurrentDate[7] = CurrentDate[10] = ANSI_NULL; + + /* If the date comes from the BIOS, check if it's a 4-digit year */ + if ((FromBios) && + (isdigit(p[6])) && + (isdigit(p[7])) && + ((RtlEqualMemory(&p[4], "19", 2)) || + (RtlEqualMemory(&p[4], "20", 2)))) + { + /* Copy the year proper */ + CurrentDate[0] = p[4]; + CurrentDate[1] = p[5]; + CurrentDate[2] = p[6]; + CurrentDate[3] = p[7]; + } + else + { + /* Otherwise, we'll just assume anything under 80 is 2000 */ + if (strtoul(&CurrentDate[2], NULL, 10) < 80) + { + /* Hopefully your BIOS wasn't made in 1979 */ + CurrentDate[0] = '2'; + CurrentDate[1] = '0'; + } + else + { + /* Anything over 80, was probably made in the 1900s... */ + CurrentDate[0] = '1'; + CurrentDate[1] = '9'; + } + } + + /* Add slashes were we previously had NULLs */ + CurrentDate[4] = CurrentDate[7] = '/'; + + /* Check which date is newer */ + if (memcmp(LastDate, CurrentDate, 10) < 0) + { + /* Found a newer date, select it */ + RtlMoveMemory(LastDate, CurrentDate, 10); + } + + p += 2; + } + p++; + } + + /* Make sure we found a date */ + if (LastDate[0]) + { + /* Copy the year at the pp, and keep only the last two digits */ + RtlMoveMemory(BiosDate, &LastDate[5], 5); + BiosDate[5] = '/'; + BiosDate[6] = LastDate[2]; + BiosDate[7] = LastDate[3]; + BiosDate[8] = ANSI_NULL; + return TRUE; + } + + /* No date found, return empty string */ + BiosDate[0] = ANSI_NULL; + return FALSE; +} + NTSTATUS NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNICODE_STRING KeyName, ValueName, Data; + UNICODE_STRING KeyName, ValueName, Data, SectionName; OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; - HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle; + HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; @@ -38,6 +135,12 @@ ANSI_STRING TempString; PCHAR PartialString = NULL; CHAR CpuString[48]; + ULONG CacheSize; + PVOID BaseAddress = NULL; + LARGE_INTEGER ViewBase = {{0}}; + ULONG_PTR VideoRomBase; + ULONG ViewSize; + PCHAR BiosVersion; /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, @@ -233,6 +336,9 @@ } } + /* Get the cache size while we're still localized */ + CacheSize = ((PKIPCR)KeGetPcr())->SecondLevelCacheSize; + /* Go back to user affinity */ KeRevertToUserAffinityThread(); @@ -317,6 +423,8 @@ /* Close the processor handle */ NtClose(KeyHandle); + + /* FIXME: Detect CPU mismatches */ } } @@ -324,6 +432,118 @@ ExFreePool(CmpConfigurationData); } - /* All done*/ + /* Open physical memory */ + RtlInitUnicodeString(&SectionName, L"\\Device\\PhysicalMemory"); + InitializeObjectAttributes(&ObjectAttributes, + &SectionName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenSection(&SectionHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Map the first 1KB of memory to get the IVT */ + ViewSize = PAGE_SIZE; + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &ViewBase, + &ViewSize, + ViewUnmap, + MEM_DOS_LIM, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + /* Assume default */ + VideoRomBase = 0xC0000; + } + else + { + /* Calculate the base address from the vector */ + VideoRomBase = (*((PULONG)BaseAddress + 0x10) >> 12) & 0xFFFF0; + VideoRomBase += *((PULONG)BaseAddress + 0x10) & 0xFFF0; + + /* Now get to the actual ROM Start and make sure it's not invalid*/ + VideoRomBase &= 0xFFFF8000; + if (VideoRomBase < 0xC0000) VideoRomBase = 0xC0000; + + /* And unmap the section */ + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } + + /* Allocate BIOS Version String Buffer */ + BiosVersion = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + + /* Setup settings to map the 64K BIOS ROM */ + BaseAddress = 0; + ViewSize = 16 * PAGE_SIZE; + ViewBase.LowPart = 0xF0000; + ViewBase.HighPart = 0; + + /* Map it */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &ViewBase, + &ViewSize, + ViewUnmap, + MEM_DOS_LIM, + PAGE_READWRITE); + if (NT_SUCCESS(Status)) + { + /* Scan the ROM to get the BIOS Date */ + if (CmpGetBiosDate(BaseAddress, 16 * PAGE_SIZE, Buffer, TRUE)) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Buffer); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Write the date into the registry */ + RtlInitUnicodeString(&ValueName, L"SystemBiosDate"); + Status = NtSetValueKey(SystemHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + + /* Get the BIOS Date Identifier */ + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + Buffer[8] = ANSI_NULL; + + /* Convert it to unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + if (NT_SUCCESS(Status)) + { + /* Save it to the registry */ + Status = NtSetValueKey(BiosHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Close the bios information handle */ + NtClose(BiosHandle); + } + } + +Quickie: + /* Close the procesor handle */ + NtClose(KeyHandle); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri May 11 00:36:15 2007 @@ -496,6 +496,7 @@ SectionsReady = TRUE; MmInitPagingFile(); PagingReady = TRUE; + MmCreatePhysicalMemorySection(); /* Setup shared user data settings that NT does as well */ ASSERT(SharedUserData->NumberOfPhysicalPages == 0); @@ -510,7 +511,6 @@ /* * Unmap low memory */ - MmCreatePhysicalMemorySection(); MiInitBalancerThread(); /*

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