Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 26681: - CmpInitializeMachineDependentConfiguration: Add Processor Name and Vendor ID as well (the former doesnt' work on QEMU because QEMU desn't support CPUID-EX, but on VMWare, I get: Dual Core AMD Opteron(tm) Processor 185.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Thu May 10 23:06:52 2007 New Revision: 26681 URL: http://svn.reactos.org/svn/reactos?rev=26681&view=rev Log: - CmpInitializeMachineDependentConfiguration: Add Processor Name and Vendor ID as well (the former doesnt' work on QEMU because QEMU desn't support CPUID-EX, but on VMWare, I get: Dual Core AMD Opteron(tm) Processor 185. 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 Thu May 10 23:06:52 2007 @@ -24,7 +24,7 @@ NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNICODE_STRING KeyName, ValueName; + UNICODE_STRING KeyName, ValueName, Data; OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; @@ -32,9 +32,12 @@ ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; - ULONG i; + ULONG i, ExtendedId, Dummy; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; + ANSI_STRING TempString; + PCHAR PartialString = NULL; + CHAR CpuString[48]; /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, @@ -198,6 +201,81 @@ /* Close this new handle */ NtClose(FpuHandle); + /* Stay on this CPU only */ + KeSetSystemAffinityThread(Prcb->SetMember); + if (!Prcb->CpuID) + { + /* Uh oh, no CPUID! */ + } + else + { + /* Check if we have extended CPUID that supports name ID */ + Ki386Cpuid(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); + if (ExtendedId >= 0x80000004) + { + /* Do all the CPUIDs requred to get the full name */ + PartialString = CpuString; + for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) + { + /* Do the CPUID and save the name string */ + Ki386Cpuid(0x80000000 | ExtendedId, + (PULONG)PartialString, + (PULONG)PartialString + 1, + (PULONG)PartialString + 2, + (PULONG)PartialString + 3); + + /* Go to the next name string */ + PartialString += 16; + } + + /* Null-terminate it */ + CpuString[48] = ANSI_NULL; + } + } + + /* Go back to user affinity */ + KeRevertToUserAffinityThread(); + + /* Check if we have a CPU Name */ + if (PartialString) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, CpuString); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"ProcessorNameString"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the temporary buffer */ + RtlFreeUnicodeString(&Data); + } + + /* Check if we had a Vendor ID */ + if (Prcb->VendorString) + { + /* Convert it to Unicode */ + RtlInitAnsiString(&TempString, Prcb->VendorString); + RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the temporary buffer */ + RtlFreeUnicodeString(&Data); + } + /* Check if we have features bits */ if (Prcb->FeatureBits) {

1 0

[ion] 26680: - CmpInitializeMachineDependentConfiguration: Write FeatureSet, MHZ and Update Signature to registry CentralProcessor node.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Thu May 10 22:11:11 2007 New Revision: 26680 URL: http://svn.reactos.org/svn/reactos?rev=26680&view=rev Log: - CmpInitializeMachineDependentConfiguration: Write FeatureSet, MHZ and Update Signature to registry CentralProcessor node. 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 Thu May 10 22:11:11 2007 @@ -197,6 +197,48 @@ /* Close this new handle */ NtClose(FpuHandle); + + /* Check if we have features bits */ + if (Prcb->FeatureBits) + { + /* Add them to the registry */ + RtlInitUnicodeString(&ValueName, L"FeatureSet"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_DWORD, + &Prcb->FeatureBits, + sizeof(Prcb->FeatureBits)); + } + + /* Check if we detected the CPU Speed */ + if (Prcb->MHz) + { + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"~MHz"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_DWORD, + &Prcb->MHz, + sizeof(Prcb->MHz)); + } + + /* Check if we have an update signature */ + if (Prcb->UpdateSignature.QuadPart) + { + /* Add it to the registry */ + RtlInitUnicodeString(&ValueName, L"Update Signature"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + &Prcb->UpdateSignature, + sizeof(Prcb->UpdateSignature)); + } + + /* Close the processor handle */ + NtClose(KeyHandle); } }

1 0

[mbosma] 26679: reformatted options.c using gnu indent.
by mbosma＠svn.reactos.org 10 May '07

10 May '07

Author: mbosma Date: Thu May 10 22:09:36 2007 New Revision: 26679 URL: http://svn.reactos.org/svn/reactos?rev=26679&view=rev Log: reformatted options.c using gnu indent. Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu May 10 22:09:36 2007 @@ -24,93 +24,98 @@ #include "resources.h" // note: do not change the order - theses are the color under winxp they might differ in another OSes -WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", - L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", - L"cyan", L"light red", L"magenta", L"yellow", L"white" }; +WCHAR *Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", + L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", + L"cyan", L"light red", L"magenta", L"yellow", L"white" +}; -int WriteSettings (HWND hwnd) +int +WriteSettings(HWND hwnd) { - int foreground, background; - BOOL showtime, writelog; - WCHAR logpath [MAX_PATH]; + int foreground, background; + BOOL showtime, writelog; + WCHAR logpath[MAX_PATH]; - showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; - writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; - foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); - background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); - GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; + writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; + foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); + background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); + GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); - FILE * pFile = fopen ("options.cmd","w"); + FILE *pFile = fopen("options.cmd", "w"); - fprintf (pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); - fprintf (pFile, "color %X%X\n",background,foreground); - fprintf (pFile, "set ROSBE_SHOWTIME=%d\n",showtime); - fprintf (pFile, "set ROSBE_WRITELOG=%d\n",writelog); - fprintf (pFile, "set ROSBE_LOGPATH=%S\n",logpath); + fprintf(pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); + fprintf(pFile, "color %X%X\n", background, foreground); + fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime); + fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog); + fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath); - fclose (pFile); + fclose(pFile); } -INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK +DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - int i = 0; - switch (Msg) - { - case WM_INITDIALOG: - { - for(i = 0; i < sizeof(Colors)/sizeof(char*); i++) - { - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); - } - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); - EnableWindow (GetDlgItem(Dlg, ID_BROWSE), FALSE); - EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), FALSE); - return TRUE; - } + int i = 0; + switch (Msg) + { + case WM_INITDIALOG: + { + for(i = 0; i < sizeof(Colors) / sizeof(char *); i++) + { + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + } + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); + EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE); + EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE); + return TRUE; + } - case WM_COMMAND: - { - if (wParam == ID_CANCEL) - { - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - else if (wParam == ID_OK) - { - WriteSettings(Dlg); - PostMessage(Dlg, WM_CLOSE, 0, 0); - } - else if (wParam == ID_BROWSE) - { - WCHAR Path [MAX_PATH]; - BROWSEINFO PathInfo = {0}; - PathInfo.hwndOwner = Dlg; - PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; - LPITEMIDLIST pidl = SHBrowseForFolder ( &PathInfo ); - if(pidl && SHGetPathFromIDList ( pidl, Path )) - SetDlgItemText(Dlg, ID_LOGDIR, Path); - } - else if (wParam == ID_SAVELOGS) - { - BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; - EnableWindow (GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); - EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); - } - return FALSE; - } + case WM_COMMAND: + { + if (wParam == ID_CANCEL) + { + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_OK) + { + WriteSettings(Dlg); + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_BROWSE) + { + WCHAR Path[MAX_PATH]; + BROWSEINFO PathInfo = { 0 }; + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; + LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); + if (pidl && SHGetPathFromIDList(pidl, Path)) + SetDlgItemText(Dlg, ID_LOGDIR, Path); + } + else if (wParam == ID_SAVELOGS) + { + BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, + 0) == BST_CHECKED; + EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); + EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); + } + return FALSE; + } - case WM_CLOSE: - { - EndDialog(Dlg, 0); - return TRUE; - } - } - return FALSE; + case WM_CLOSE: + { + EndDialog(Dlg, 0); + return TRUE; + } + } + return FALSE; } -int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +int WINAPI +WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) { - DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); - return 0; + DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); + return 0; }

1 0

[ion] 26678: - Make CmpInitializeMachineDependentConfiguration create the FloatingPointProcessor hardware key/ARC node.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Thu May 10 22:04:41 2007 New Revision: 26678 URL: http://svn.reactos.org/svn/reactos?rev=26678&view=rev Log: - Make CmpInitializeMachineDependentConfiguration create the FloatingPointProcessor hardware key/ARC node. 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 Thu May 10 22:04:41 2007 @@ -28,7 +28,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; - HANDLE KeyHandle, BiosHandle, SystemHandle; + HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle; ULONG Disposition; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; @@ -129,7 +129,7 @@ ConfigData.ComponentEntry.Class = ProcessorClass; ConfigData.ComponentEntry.Type = CentralProcessor; ConfigData.ComponentEntry.Key = i; - ConfigData.ComponentEntry.AffinityMask = 1 << i; + ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); ConfigData.ComponentEntry.Identifier = Buffer; /* Check if the CPU doesn't support CPUID */ @@ -163,6 +163,41 @@ 0xFFFFFFFF, IndexTable); if (!NT_SUCCESS(Status)) return(Status); + + /* Check if we have an FPU */ + if (KeI386NpxPresent) + { + /* Setup the Configuration Entry for the FPU */ + RtlZeroMemory(&ConfigData, sizeof(ConfigData)); + ConfigData.ComponentEntry.Class = ProcessorClass; + ConfigData.ComponentEntry.Type = FloatingPointProcessor; + ConfigData.ComponentEntry.Key = i; + ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); + ConfigData.ComponentEntry.Identifier = Buffer; + + /* For 386 cpus, the CPU String is the identifier */ + if (Prcb->CpuType == 3) strcpy(Buffer, "80387"); + + /* Save the ID string length now that we've created it */ + ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; + + /* Initialize the registry configuration node for it */ + Status = CmpInitializeRegistryNode(&ConfigData, + SystemHandle, + &FpuHandle, + InterfaceTypeUndefined, + 0xFFFFFFFF, + IndexTable); + if (!NT_SUCCESS(Status)) + { + /* Failed, close the CPU handle and return */ + NtClose(KeyHandle); + return Status; + } + + /* Close this new handle */ + NtClose(FpuHandle); + } } /* Free the configuration data */

1 0

[ion] 26677: - Add more code to CmpInitializeMachineDependentConfiguration to create the BIOSINFO key and to start working on the CentralProcessor key (which, in ReactOS, FreeLDR creates when it shouldn't). Creates the basic CentralProcessor nodes for now. - Add cmconfig.c and implement a helper routine that converts from ARC CONFIGURATION_COMPONENT_DATA to a Hardware Description entry and resource descriptor. - Fix outdated _CONFIGURATION_TYPE definition in our DDK.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Thu May 10 21:52:09 2007 New Revision: 26677 URL: http://svn.reactos.org/svn/reactos?rev=26677&view=rev Log: - Add more code to CmpInitializeMachineDependentConfiguration to create the BIOSINFO key and to start working on the CentralProcessor key (which, in ReactOS, FreeLDR creates when it shouldn't). Creates the basic CentralProcessor nodes for now. - Add cmconfig.c and implement a helper routine that converts from ARC CONFIGURATION_COMPONENT_DATA to a Hardware Description entry and resource descriptor. - Fix outdated _CONFIGURATION_TYPE definition in our DDK. Added: trunk/reactos/ntoskrnl/config/cmconfig.c Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu May 10 21:52:09 2007 @@ -4592,6 +4592,7 @@ SystemMemory, DockingInformation, RealModeIrqRoutingTable, + RealModePCIEnumeration, MaximumType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; 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 Thu May 10 21:52:09 2007 @@ -940,6 +940,20 @@ ); // +// Hardware Configuration Routines +// +NTSTATUS +NTAPI +CmpInitializeRegistryNode( + IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, + IN HANDLE NodeHandle, + OUT PHANDLE NewHandle, + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PUSHORT DeviceIndexTable +); + +// // Global variables accessible from all of Cm // extern BOOLEAN CmpSpecialBootCondition; @@ -961,6 +975,10 @@ extern LANGID PsInstallUILanguageId; extern LANGID PsDefaultUILanguageId; extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[]; +extern ULONG CmpConfigurationAreaSize; +extern PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; +extern UNICODE_STRING CmTypeName[]; +extern BOOLEAN ExpInTextModeSetup; // // Inlined functions Added: 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 (added) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Thu May 10 21:52:09 2007 @@ -1,0 +1,198 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmconfig.c + * PURPOSE: Configuration Manager - System Configuration Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitializeRegistryNode(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, + IN HANDLE NodeHandle, + OUT PHANDLE NewHandle, + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PUSHORT DeviceIndexTable) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName, ValueName, ValueData; + HANDLE KeyHandle, ParentHandle; + ANSI_STRING TempString; + CHAR TempBuffer[12]; + WCHAR Buffer[12]; + PCONFIGURATION_COMPONENT Component; + ULONG Disposition, Length = 0; + + /* Get the component */ + Component = &CurrentEntry->ComponentEntry; + + /* Set system class components to ARC system type */ + if (Component->Class == SystemClass) Component->Type = ArcSystem; + + /* Create a key for the component */ + InitializeObjectAttributes(&ObjectAttributes, + &CmTypeName[Component->Type], + OBJ_CASE_INSENSITIVE, + NodeHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if this is anything but a system class component */ + if (Component->Class != SystemClass) + { + /* Build the sub-component string */ + RtlIntegerToChar(DeviceIndexTable[Component->Type]++, + 10, + 12, + TempBuffer); + RtlInitAnsiString(&TempString, TempBuffer); + + /* Convert it to Unicode */ + RtlInitEmptyUnicodeString(&KeyName, Buffer, sizeof(Buffer)); + RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + + /* Create the key */ + ParentHandle = KeyHandle; + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + NtClose(ParentHandle); + + /* 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); + } + + /* Sstup the compnent information key */ + RtlInitUnicodeString(&ValueName, L"Component Information"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_BINARY, + &Component->Flags, + FIELD_OFFSET(CONFIGURATION_COMPONENT, + ConfigurationDataLength) - + FIELD_OFFSET(CONFIGURATION_COMPONENT, Flags)); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(KeyHandle); + return Status; + } + + /* Check if we have an identifier */ + if (Component->IdentifierLength) + { + /* Build the string and convert it to Unicode */ + RtlInitUnicodeString(&ValueName, L"Identifier"); + RtlInitAnsiString(&TempString, Component->Identifier); + Status = RtlAnsiStringToUnicodeString(&ValueData, + &TempString, + TRUE); + if (NT_SUCCESS(Status)) + { + /* Save the identifier in the registry */ + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(UNICODE_NULL)); + RtlFreeUnicodeString(&ValueData); + } + + /* Check for failure during conversion or registry write */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(KeyHandle); + return Status; + } + } + + /* Setup the configuration data string */ + RtlInitUnicodeString(&ValueName, L"Configuration Data"); + + /* Check if we got configuration data */ + if (CurrentEntry->ConfigurationData) + { + /* Calculate the total length and check if it fits into our buffer */ + Length = Component->ConfigurationDataLength + + FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList); + if (Length > CmpConfigurationAreaSize) + { + ASSERTMSG("Component too large -- need reallocation!", FALSE); + } + else + { + /* Copy the data */ + RtlCopyMemory(&CmpConfigurationData->PartialResourceList.Version, + CurrentEntry->ConfigurationData, + Component->ConfigurationDataLength); + } + } + else + { + /* No configuration data, setup defaults */ + CmpConfigurationData->PartialResourceList.Version = 0; + CmpConfigurationData->PartialResourceList.Revision = 0; + CmpConfigurationData->PartialResourceList.Count = 0; + Length = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + + FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList); + } + + /* Set the interface type and bus number */ + CmpConfigurationData->InterfaceType = InterfaceType; + CmpConfigurationData->BusNumber = BusNumber; + + /* Save the actual data */ + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_FULL_RESOURCE_DESCRIPTOR, + CmpConfigurationData, + Length); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(KeyHandle); + } + else + { + /* Return the new handle */ + *NewHandle = KeyHandle; + } + + /* Return status */ + return Status; +} + Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c Thu May 10 21:52:09 2007 @@ -33,6 +33,55 @@ CMHIVE CmControlHive; +ULONG CmpConfigurationAreaSize = PAGE_SIZE * 4; +PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; + +UNICODE_STRING CmTypeName[MaximumType + 1] = +{ + RTL_CONSTANT_STRING(L"System"), + RTL_CONSTANT_STRING(L"CentralProcessor"), + RTL_CONSTANT_STRING(L"FloatingPointProcessor"), + RTL_CONSTANT_STRING(L"PrimaryICache"), + RTL_CONSTANT_STRING(L"PrimaryDCache"), + RTL_CONSTANT_STRING(L"SecondaryICache"), + RTL_CONSTANT_STRING(L"SecondaryDCache"), + RTL_CONSTANT_STRING(L"SecondaryCache"), + RTL_CONSTANT_STRING(L"EisaAdapter"), + RTL_CONSTANT_STRING(L"TcAdapter"), + RTL_CONSTANT_STRING(L"ScsiAdapter"), + RTL_CONSTANT_STRING(L"DtiAdapter"), + RTL_CONSTANT_STRING(L"MultifunctionAdapter"), + RTL_CONSTANT_STRING(L"DiskController"), + RTL_CONSTANT_STRING(L"TapeController"), + RTL_CONSTANT_STRING(L"CdRomController"), + RTL_CONSTANT_STRING(L"WormController"), + RTL_CONSTANT_STRING(L"SerialController"), + RTL_CONSTANT_STRING(L"NetworkController"), + RTL_CONSTANT_STRING(L"DisplayController"), + RTL_CONSTANT_STRING(L"ParallelController"), + RTL_CONSTANT_STRING(L"PointerController"), + RTL_CONSTANT_STRING(L"KeyboardController"), + RTL_CONSTANT_STRING(L"AudioController"), + RTL_CONSTANT_STRING(L"OtherController"), + RTL_CONSTANT_STRING(L"DiskPeripheral"), + RTL_CONSTANT_STRING(L"FloppyDiskPeripheral"), + RTL_CONSTANT_STRING(L"TapePeripheral"), + RTL_CONSTANT_STRING(L"ModemPeripheral"), + RTL_CONSTANT_STRING(L"MonitorPeripheral"), + RTL_CONSTANT_STRING(L"PrinterPeripheral"), + RTL_CONSTANT_STRING(L"PointerPeripheral"), + RTL_CONSTANT_STRING(L"KeyboardPeripheral"), + RTL_CONSTANT_STRING(L"TerminalPeripheral"), + RTL_CONSTANT_STRING(L"OtherPeripheral"), + RTL_CONSTANT_STRING(L"LinePeripheral"), + RTL_CONSTANT_STRING(L"NetworkPeripheral"), + RTL_CONSTANT_STRING(L"SystemMemory"), + RTL_CONSTANT_STRING(L"DockingInformation"), + RTL_CONSTANT_STRING(L"RealModeIrqRoutingTable"), + RTL_CONSTANT_STRING(L"RealModePCIEnumeration"), + RTL_CONSTANT_STRING(L"Undefined") +}; + CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = { { 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 Thu May 10 21:52:09 2007 @@ -13,6 +13,11 @@ #define NDEBUG #include "debug.h" +/* GLOBALS *******************************************************************/ + +PCHAR CmpID1 = "80%u86-%c%x"; +PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -23,8 +28,15 @@ OBJECT_ATTRIBUTES ObjectAttributes; ULONG HavePae; NTSTATUS Status; - HANDLE KeyHandle; + HANDLE KeyHandle, BiosHandle, SystemHandle; + ULONG Disposition; + CONFIGURATION_COMPONENT_DATA ConfigData; + CHAR Buffer[128]; + ULONG i; + PKPRCB Prcb; + USHORT IndexTable[MaximumType + 1] = {0}; + /* Open the SMSS Memory Management key */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" L"Control\\Session Manager\\Memory Management"); @@ -52,6 +64,111 @@ NtClose(KeyHandle); } + /* Open the hardware description key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\Hardware\\Description\\System"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&SystemHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the BIOS Information key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" + L"Control\\BIOSINFO"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&BiosHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status) && !ExpInTextModeSetup) return Status; + + /* Create the CPU Key, and check if it already existed */ + RtlInitUnicodeString(&KeyName, L"CentralProcessor"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SystemHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + NtClose(KeyHandle); + + /* This key -never- exists on x86 machines, except in ReactOS! */ + //if (Disposition == REG_CREATED_NEW_KEY) + { + /* Allocate the configuration data for cmconfig.c */ + CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, + CmpConfigurationAreaSize, + TAG_CM); + if (!CmpConfigurationData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Loop all CPUs */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB */ + Prcb = KiProcessorBlock[i]; + + /* Setup the Configuration Entry for the Processor */ + RtlZeroMemory(&ConfigData, sizeof (ConfigData)); + ConfigData.ComponentEntry.Class = ProcessorClass; + ConfigData.ComponentEntry.Type = CentralProcessor; + ConfigData.ComponentEntry.Key = i; + ConfigData.ComponentEntry.AffinityMask = 1 << i; + ConfigData.ComponentEntry.Identifier = Buffer; + + /* Check if the CPU doesn't support CPUID */ + if (!Prcb->CpuID) + { + /* Build ID1-style string for older CPUs */ + sprintf(Buffer, + CmpID1, + Prcb->CpuType, + (Prcb->CpuStep >> 8) + 'A', + Prcb->CpuStep & 0xff); + } + else + { + /* Build ID2-style string for newer CPUs */ + sprintf(Buffer, + CmpID2, + Prcb->CpuType, + (Prcb->CpuStep >> 8), + Prcb->CpuStep & 0xff); + } + + /* Save the ID string length now that we've created it */ + ConfigData.ComponentEntry.IdentifierLength = strlen(Buffer) + 1; + + /* Initialize the registry configuration node for it */ + Status = CmpInitializeRegistryNode(&ConfigData, + SystemHandle, + &KeyHandle, + InterfaceTypeUndefined, + 0xFFFFFFFF, + IndexTable); + if (!NT_SUCCESS(Status)) return(Status); + } + + /* Free the configuration data */ + ExFreePool(CmpConfigurationData); + } + /* All done*/ return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu May 10 21:52:09 2007 @@ -91,6 +91,7 @@ </if> <file>cmboot.c</file> <file>cmcontrl.c</file> + <file>cmconfig.c</file> <file>cmdata.c</file> <file>cmindex.c</file> <file>cmhook.c</file>

1 0

[mbosma] 26676: Proper color names.
by mbosma＠svn.reactos.org 10 May '07

10 May '07

Author: mbosma Date: Thu May 10 20:54:52 2007 New Revision: 26676 URL: http://svn.reactos.org/svn/reactos?rev=26676&view=rev Log: Proper color names. Modified: trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu May 10 20:54:52 2007 @@ -24,9 +24,9 @@ #include "resources.h" // note: do not change the order - theses are the color under winxp they might differ in another OSes -WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"violett", - L"olive", L"light grey", L"dark grey", L"light blue", L"light green", - L"don't know what this color is called", L"light red", L"pink", L"yellow", L"white" }; +WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", + L"ochar", L"light grey", L"dark grey", L"light blue", L"light green", + L"cyan", L"light red", L"magenta", L"yellow", L"white" }; int WriteSettings (HWND hwnd) { Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Thu May 10 20:54:52 2007 @@ -1,11 +1,9 @@ ToDo: +- Fix control size / positions - Load old settings - Disable Save button if there are no changes -- Check Log path before saving +- Check validity of log path before saving - Exe and dialog icon -- Fix control size / positions - Use styled controls (uxtheme) for dialog -- Find out how to disable -- Font preview -- ;abye cool logo as Bitmap -- find out the name of color 0xB +- Find out how to disable ... button +- Font preview

1 0

[ion] 26675: - Add i386/cmhardwr.c and start implementing CmpInitializeMachineDependentConfiguration. Currently it only detects and writes the key for PAE. - Call the API from CmInitSystem1.
by ion＠svn.reactos.org 10 May '07

10 May '07

Author: ion Date: Thu May 10 20:42:24 2007 New Revision: 26675 URL: http://svn.reactos.org/svn/reactos?rev=26675&view=rev Log: - Add i386/cmhardwr.c and start implementing CmpInitializeMachineDependentConfiguration. Currently it only detects and writes the key for PAE. - Call the API from CmInitSystem1. Added: trunk/reactos/ntoskrnl/config/i386/ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild 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 Thu May 10 20:42:24 2007 @@ -73,6 +73,10 @@ NTSTATUS NTAPI CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); static VOID STDCALL CmiHiveSyncDpcRoutine(PKDPC Dpc, @@ -508,6 +512,14 @@ { /* Bugcheck */ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); + } + + /* Initialize machine-dependent information into the registry */ + Status = CmpInitializeMachineDependentConfiguration(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 14, Status, 0); } /* Initialize volatile registry settings */ Added: 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 (added) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Thu May 10 20:42:24 2007 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/i386/cmhardwr.c + * PURPOSE: Configuration Manager - Hardware-Specific Code + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "../cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNICODE_STRING KeyName, ValueName; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG HavePae; + NTSTATUS Status; + HANDLE KeyHandle; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" + L"Control\\Session Manager\\Memory Management"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Detect if PAE is enabled */ + HavePae = SharedUserData->ProcessorFeatures[PF_PAE_ENABLED]; + + /* Set the value */ + RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); + NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_DWORD, + &HavePae, + sizeof(HavePae)); + + /* Close the key */ + NtClose(KeyHandle); + } + + /* All done*/ + return STATUS_SUCCESS; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu May 10 20:42:24 2007 @@ -84,6 +84,11 @@ <file>view.c</file> </directory> <directory name="config"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cmhardwr.c</file> + </directory> + </if> <file>cmboot.c</file> <file>cmcontrl.c</file> <file>cmdata.c</file>

1 0

[mbosma] 26674: Renamed RosBE to RosBE-Windows on request of Colin_Finck who is working on a linux version.
by mbosma＠svn.reactos.org 10 May '07

10 May '07

Author: mbosma Date: Thu May 10 20:41:58 2007 New Revision: 26674 URL: http://svn.reactos.org/svn/reactos?rev=26674&view=rev Log: Renamed RosBE to RosBE-Windows on request of Colin_Finck who is working on a linux version. Added: trunk/tools/RosBE-Windows/ - copied from r26673, trunk/tools/RosBE/ Removed: trunk/tools/RosBE/

1 0

[mbosma] 26673: Config dialog for RosBE.
by mbosma＠svn.reactos.org 10 May '07

10 May '07

Author: mbosma Date: Thu May 10 20:38:32 2007 New Revision: 26673 URL: http://svn.reactos.org/svn/reactos?rev=26673&view=rev Log: Config dialog for RosBE. Added: trunk/tools/RosBE/Tools/config/ trunk/tools/RosBE/Tools/config/en.rc trunk/tools/RosBE/Tools/config/makefile trunk/tools/RosBE/Tools/config/options.c (with props) trunk/tools/RosBE/Tools/config/options.rc trunk/tools/RosBE/Tools/config/resources.h (with props) trunk/tools/RosBE/Tools/config/todo.txt (with props) Added: trunk/tools/RosBE/Tools/config/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/en.rc?rev… ============================================================================== --- trunk/tools/RosBE/Tools/config/en.rc (added) +++ trunk/tools/RosBE/Tools/config/en.rc Thu May 10 20:38:32 2007 @@ -1,0 +1,20 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +ID_DIALOG DIALOG DISCARDABLE 0, 0, 304, 220 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RosBE Settings" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Reactos Build Envirement Settings", 0x0, 15, 12, 114, 13 + LTEXT "Font Color", 0x0, 12, 45, 114, 13 + COMBOBOX IDC_FONT, 100, 45, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Background Color", 0x0, 12, 81, 114, 13 + COMBOBOX IDC_BACK, 100, 81, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 123, 110, 21 + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 123, 60, 21 + EDITTEXT ID_LOGDIR, 34, 140, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 250, 140, 32, 13, WS_TABSTOP + PUSHBUTTON "Save", ID_OK, 92, 191, 59, 26, WS_TABSTOP + PUSHBUTTON "Cancel", ID_CANCEL, 162, 191, 59, 26, WS_TABSTOP +} Added: trunk/tools/RosBE/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/makefile?… ============================================================================== --- trunk/tools/RosBE/Tools/config/makefile (added) +++ trunk/tools/RosBE/Tools/config/makefile Thu May 10 20:38:32 2007 @@ -1,0 +1,29 @@ +TARGET := options.exe + +.PHONY: all + +all: $(TARGET) + +CPP=mingw32-gcc +CFLAGS := -DWIN32 -DUNICODE -O3 +LFLAGS := -mwindows +LIBS := + +SRCS := options.c +RC := options.rc + +OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff) + +$(TARGET): $(OBJS) + $(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS) + +.c.o: $< + $(CPP) $(CFLAGS) -c $< -o $@ + +$(RC:.rc=.coff): + windres $(RCFLAGS) -o $@ $(RC) + +.PHONY: clean +clean: + -@del $(TARGET) + -@del $(OBJS) Added: trunk/tools/RosBE/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/options.c… ============================================================================== --- trunk/tools/RosBE/Tools/config/options.c (added) +++ trunk/tools/RosBE/Tools/config/options.c Thu May 10 20:38:32 2007 @@ -1,0 +1,116 @@ +/* + * RosBE Options Dialog (options.c) + * + * Copyright 2007 by Maarten Bosma + * + * 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 + */ + +#include <windows.h> +#include <stdio.h> +#include <shlobj.h> +#include "resources.h" + +// note: do not change the order - theses are the color under winxp they might differ in another OSes +WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"violett", + L"olive", L"light grey", L"dark grey", L"light blue", L"light green", + L"don't know what this color is called", L"light red", L"pink", L"yellow", L"white" }; + +int WriteSettings (HWND hwnd) +{ + int foreground, background; + BOOL showtime, writelog; + WCHAR logpath [MAX_PATH]; + + showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; + writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; + foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); + background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); + GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + + FILE * pFile = fopen ("options.cmd","w"); + + fprintf (pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); + fprintf (pFile, "color %X%X\n",background,foreground); + fprintf (pFile, "set ROSBE_SHOWTIME=%d\n",showtime); + fprintf (pFile, "set ROSBE_WRITELOG=%d\n",writelog); + fprintf (pFile, "set ROSBE_LOGPATH=%S\n",logpath); + + fclose (pFile); +} + +INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + int i = 0; + switch (Msg) + { + case WM_INITDIALOG: + { + for(i = 0; i < sizeof(Colors)/sizeof(char*); i++) + { + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); + } + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); + EnableWindow (GetDlgItem(Dlg, ID_BROWSE), FALSE); + EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), FALSE); + return TRUE; + } + + case WM_COMMAND: + { + if (wParam == ID_CANCEL) + { + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_OK) + { + WriteSettings(Dlg); + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_BROWSE) + { + WCHAR Path [MAX_PATH]; + BROWSEINFO PathInfo = {0}; + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; + LPITEMIDLIST pidl = SHBrowseForFolder ( &PathInfo ); + if(pidl && SHGetPathFromIDList ( pidl, Path )) + SetDlgItemText(Dlg, ID_LOGDIR, Path); + } + else if (wParam == ID_SAVELOGS) + { + BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; + EnableWindow (GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); + EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); + } + return FALSE; + } + + case WM_CLOSE: + { + EndDialog(Dlg, 0); + return TRUE; + } + } + return FALSE; +} + +int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +{ + DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); + return 0; +} Propchange: trunk/tools/RosBE/Tools/config/options.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE/Tools/config/options.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/tools/RosBE/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/options.r… ============================================================================== --- trunk/tools/RosBE/Tools/config/options.rc (added) +++ trunk/tools/RosBE/Tools/config/options.rc Thu May 10 20:38:32 2007 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resources.h" + +#include "en.rc" Added: trunk/tools/RosBE/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/resources… ============================================================================== --- trunk/tools/RosBE/Tools/config/resources.h (added) +++ trunk/tools/RosBE/Tools/config/resources.h Thu May 10 20:38:32 2007 @@ -1,0 +1,9 @@ +#define ID_DIALOG 0x10 +#define ID_OK 0x1 +#define ID_CANCEL 0x2 +#define IDC_FONT 0x1 +#define IDC_BACK 0x2 +#define ID_SAVELOGS 0x5 +#define ID_SHOWBUILDTIME 0x6 +#define ID_LOGDIR 0x7 +#define ID_BROWSE 0x7 Propchange: trunk/tools/RosBE/Tools/config/resources.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE/Tools/config/resources.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/tools/RosBE/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/todo.txt?… ============================================================================== --- trunk/tools/RosBE/Tools/config/todo.txt (added) +++ trunk/tools/RosBE/Tools/config/todo.txt Thu May 10 20:38:32 2007 @@ -1,0 +1,11 @@ +ToDo: +- Load old settings +- Disable Save button if there are no changes +- Check Log path before saving +- Exe and dialog icon +- Fix control size / positions +- Use styled controls (uxtheme) for dialog +- Find out how to disable +- Font preview +- ;abye cool logo as Bitmap +- find out the name of color 0xB Propchange: trunk/tools/RosBE/Tools/config/todo.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgorbachev] 26672: Fix a bug in ScServiceMainStub(), add more checks.
by dgorbachev＠svn.reactos.org 10 May '07

10 May '07

Author: dgorbachev Date: Thu May 10 14:13:01 2007 New Revision: 26672 URL: http://svn.reactos.org/svn/reactos?rev=26672&view=rev Log: Fix a bug in ScServiceMainStub(), add more checks. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Thu May 10 14:13:01 2007 @@ -101,7 +101,7 @@ lpPtr = lpService->Arguments; while (*lpPtr) { - DPRINT("arg: %S\n", *lpPtr); + DPRINT("arg: %S\n", lpPtr); dwLen = wcslen(lpPtr) + 1; dwArgCount++; dwLength += dwLen; @@ -153,9 +153,15 @@ 0, NULL, NULL); + if (AnsiLength == 0) + return ERROR_INVALID_PARAMETER; /* ? */ + AnsiString = HeapAlloc(GetProcessHeap(), 0, - AnsiLength); + AnsiLength + 1); + if (AnsiString == NULL) + return ERROR_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, lpService->Arguments, @@ -165,9 +171,13 @@ NULL, NULL); + AnsiString[AnsiLength] = ANSI_NULL; + lpArgVector = HeapAlloc(GetProcessHeap(), 0, (dwArgCount + 1) * sizeof(LPSTR)); + if (lpArgVector == NULL) + return ERROR_OUTOFMEMORY; dwArgCount = 0; Ptr = AnsiString;

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