Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70612: [0.4.0] * Merge floppy driver fix by Sylvain in r70606. CORE-10761
by akhaldi＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: akhaldi Date: Mon Jan 18 09:28:44 2016 New Revision: 70612 URL: http://svn.reactos.org/svn/reactos?rev=70612&view=rev Log: [0.4.0] * Merge floppy driver fix by Sylvain in r70606. CORE-10761 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/drivers/storage/floppy/floppy.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 09:28:44 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 18 09:28:44 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606 Modified: branches/ros-branch-0_4_0/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_0/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Mon Jan 18 09:28:44 2016 @@ -680,7 +680,11 @@ TRACE_(FLOPPY, "InitController called with Controller 0x%p\n", ControllerInfo); /* Get controller in a known state */ - HwConfigure(ControllerInfo, FALSE, TRUE, TRUE, 0, 0); + if(HwConfigure(ControllerInfo, FALSE, TRUE, TRUE, 0, 0) != STATUS_SUCCESS) + { + WARN_(FLOPPY, "InitController: unable to configure controller\n"); + return STATUS_IO_DEVICE_ERROR; + } /* Get the controller version */ ControllerVersion = HwGetVersion(ControllerInfo);

1 0

[ion] 70611: [BOOTMGFW]: Implement BmEnumerateBootEntries. [BOOTLIB]: Implement BlGetOptionGuid. All BCD option APIs should now be implemented. [BOOTLIB]: Fix memory corruption + out-of-bounds bugs...
by ion＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: ion Date: Mon Jan 18 05:26:10 2016 New Revision: 70611 URL: http://svn.reactos.org/svn/reactos?rev=70611&view=rev Log: [BOOTMGFW]: Implement BmEnumerateBootEntries. [BOOTLIB]: Implement BlGetOptionGuid. All BCD option APIs should now be implemented. [BOOTLIB]: Fix memory corruption + out-of-bounds bugs in BlAppendBootOptions, which made the BCD options remain empty. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/misc/bcdopt.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Jan 18 05:26:10 2016 @@ -696,7 +696,7 @@ /* Check if boot.ini data needs to be freed */ if (BmBootIniUsed) { - EfiPrintf(L"Not handled\r\n"); + EfiPrintf(L"Boot.ini not handled\r\n"); } /* Dereference the hive and close the key */ @@ -756,7 +756,7 @@ if (NT_SUCCESS(Status)) { /* We don't handle custom BCDs yet */ - EfiPrintf(L"Not handled: %s\r\n", BcdPath); + EfiPrintf(L"Custom BCD Not handled: %s\r\n", BcdPath); Status = STATUS_NOT_IMPLEMENTED; goto Quickie; } @@ -765,7 +765,7 @@ if (BcdDevice->DeviceType == UdpDevice) { /* Nope. Nope. Nope */ - EfiPrintf(L"Not handled\r\n"); + EfiPrintf(L"UDP device Not handled\r\n"); Status = STATUS_NOT_IMPLEMENTED; goto Quickie; } @@ -920,7 +920,7 @@ /* The BSD is open. Start doing stuff to it */ EfiPrintf(L"Unimplemented BSD path\r\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; FailurePath: /* Close the BSD if we had it open */ @@ -1239,7 +1239,7 @@ _Out_ PULONG SequenceCount ) { - EfiPrintf(L"Fixed sequences not yet supported\r\n"); + EfiPrintf(L"Boot population not yet supported\r\n"); *SequenceCount = 0; *BootSequence = NULL; return STATUS_NOT_IMPLEMENTED; @@ -1292,14 +1292,130 @@ NTSTATUS BmEnumerateBootEntries ( _In_ HANDLE BcdHandle, - _Out_ PBL_LOADED_APPLICATION_ENTRY **Sequence, + _Out_ PBL_LOADED_APPLICATION_ENTRY **BootSequence, _Out_ PULONG SequenceCount ) { - EfiPrintf(L"Boot enumeration not yet implemented\r\n"); - *Sequence = NULL; - *SequenceCount = 0; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + ULONG BootIndex, BootIniCount, BootEntryCount, BcdCount; + PBL_LOADED_APPLICATION_ENTRY* Sequence; + PGUID DisplayOrder; + GUID DefaultObject; + BOOLEAN UseDisplayList; + + /* Initialize locals */ + BootIndex = 0; + + /* First try to get the display list, if any */ + UseDisplayList = TRUE; + Status = BlGetBootOptionGuidList(BlpApplicationEntry.BcdData, + BcdBootMgrObjectList_DisplayOrder, + &DisplayOrder, + &BcdCount); + if (!NT_SUCCESS(Status)) + { + /* No list, get the default entry instead */ + Status = BlGetBootOptionGuid(BlpApplicationEntry.BcdData, + BcdBootMgrObject_DefaultObject, + &DefaultObject); + if (NT_SUCCESS(Status)) + { + /* Set the array to just our entry */ + UseDisplayList = FALSE; + BcdCount = 1; + DisplayOrder = &DefaultObject; + } + else + { + /* No default list either, return success but no entries */ + *BootSequence = NULL; + *SequenceCount = 0; + Status = STATUS_SUCCESS; + DisplayOrder = NULL; + goto Quickie; + } + } + + /* Check if boot.ini was used */ + BootIniCount = 0; + if (BmBootIniUsed) + { + /* Get the entries from it */ + EfiPrintf(L"Boot.ini not supported\r\n"); + BootIniCount = 0;//BmBootIniGetEntryCount(); + } + + /* Allocate an array large enough for the combined boot entries */ + BootEntryCount = BootIniCount + BcdCount; + Sequence = BlMmAllocateHeap(BootEntryCount * sizeof(*Sequence)); + if (!Sequence) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Zero it out */ + RtlZeroMemory(Sequence, BootEntryCount * sizeof(*Sequence)); + + /* Check if we had BCD entries */ + if (BcdCount) + { + /* Populate the list of bootable entries */ + Status = BmpPopulateBootEntryList(BcdHandle, + DisplayOrder, + 0x800000, + Sequence, + &BcdCount); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + goto Quickie; + } + } + + /* Check if we had boot.ini entries */ + if (BootIniCount) + { + /* TODO */ + EfiPrintf(L"Boot.ini not supported\r\n"); + } + + /* Return success and the sequence + count populated */ + Status = STATUS_SUCCESS; + *BootSequence = Sequence; + *SequenceCount = BootIniCount + BcdCount; + +Quickie: + /* Check if we had allocated a GUID list */ + if ((UseDisplayList) && (DisplayOrder)) + { + /* Free it */ + BlMmFreeHeap(DisplayOrder); + } + + /* Check if this is the failure path */ + if (!(NT_SUCCESS(Status)) && (Sequence)) + { + /* Loop the remaining boot entries */ + while (BootIndex < BootEntryCount) + { + /* Check if it had been allocated */ + if (Sequence[BootIndex]) + { + /* Free it */ + BlMmFreeHeap(Sequence[BootIndex]); + } + + /* Next*/ + BootIndex++; + } + + /* Free the whole sequence now */ + BlMmFreeHeap(Sequence); + } + + /* All done, return the result */ + return Status; } NTSTATUS Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Jan 18 05:26:10 2016 @@ -1719,6 +1719,13 @@ _In_ ULONG Type, _Out_ PBL_DEVICE_DESCRIPTOR* Value, _In_opt_ PBL_BCD_OPTION* ExtraOptions + ); + +NTSTATUS +BlGetBootOptionGuid ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PGUID Value ); NTSTATUS Modified: trunk/reactos/boot/environ/lib/misc/bcdopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcdo… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] Mon Jan 18 05:26:10 2016 @@ -225,6 +225,44 @@ } NTSTATUS +BlGetBootOptionGuid ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type, + _Out_ PGUID Value + ) +{ + NTSTATUS Status; + PBL_BCD_OPTION Option; + PGUID Guid; + BcdElementType ElementType; + + /* Make sure this is a BCD_TYPE_OBJECT */ + ElementType.PackedValue = Type; + if (ElementType.Format != BCD_TYPE_OBJECT) + { + return STATUS_INVALID_PARAMETER; + } + + /* Return the data */ + Option = MiscGetBootOption(List, Type); + if (!Option) + { + /* Set failure if no data exists */ + Status = STATUS_NOT_FOUND; + } + else + { + /* Copy the GUID */ + Guid = (PGUID)((ULONG_PTR)Option + Option->DataOffset); + RtlCopyMemory(Value, Guid, Option->DataSize); + Status = STATUS_SUCCESS; + } + + /* All good */ + return Status; +} + +NTSTATUS BlGetBootOptionGuidList ( _In_ PBL_BCD_OPTION List, _In_ ULONG Type, @@ -610,7 +648,9 @@ /* Copy the old options, and the ones to be added */ RtlCopyMemory(NewOptions, CurrentOptions, CurrentSize); - RtlCopyMemory(&NewOptions[OptionsSize], Options, OptionsSize); + RtlCopyMemory((PVOID)((ULONG_PTR)NewOptions + CurrentSize), + Options, + OptionsSize); /* We made it! */ Status = STATUS_SUCCESS; @@ -626,7 +666,7 @@ /* Every other option now has to have its offset adjusted */ do { - NextOption->NextEntryOffset += OptionsSize; + NextOption->NextEntryOffset += CurrentSize; NextOption = (PBL_BCD_OPTION)((ULONG_PTR)NewOptions + NextOption->NextEntryOffset); } while (NextOption->NextEntryOffset);

1 0

[ion] 70610: [HIVEBCD]: Implement an entire wholeseome BCD boot hive, including multiple levels of inheritance (globalsettings, dbgsettings, emssettings, bootloadersettings), plus entries for {memd...
by ion＠svn.reactos.org 18 Jan '16

18 Jan '16

Author: ion Date: Mon Jan 18 04:18:12 2016 New Revision: 70610 URL: http://svn.reactos.org/svn/reactos?rev=70610&view=rev Log: [HIVEBCD]: Implement an entire wholeseome BCD boot hive, including multiple levels of inheritance (globalsettings, dbgsettings, emssettings, bootloadersettings), plus entries for {memdiag}, {bootmgr} and {winload}. [BOOTLIB]: Fix a bug in BCD parsing which was causing massive heap corruption. Became evident with the increased complexity of the new BCD hive. Modified: trunk/reactos/boot/bootdata/hivebcd.inf trunk/reactos/boot/environ/lib/misc/bcd.c Modified: trunk/reactos/boot/bootdata/hivebcd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivebcd.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivebcd.inf [iso-8859-1] Mon Jan 18 04:18:12 2016 @@ -2,15 +2,89 @@ Signature = "$ReactOS$" [AddReg] +BCD,"BCD00000000\Description\Control","System",0x00010001,1 +BCD,"BCD00000000\Description\Control","TreatAtSystem",0x00010001,1 +BCD,"BCD00000000\Description\Control","KeyName",,"BCD00000000" -BCD,"BCD00000000\Description\Control","System",0x00010003,1 -BCD,"BCD00000000\Description\Control","TreatAtSystem",0x00010003,1 -BCD,"BCD00000000\Description\Control","KeyName",2,"BCD00000000" +; +; ReactOS Boot Manager +; +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Description","Type",0x00010001,0x10100002 ; identifier={bootmgr} +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000004","Element",,"ReactOS Boot Manager" ; description +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000005","Element",,"en-US" ; locale="en-US" +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\14000006","Element",0x10000,"{7ea2e1ac-2e61-4728-aaa3-896d9d0a9f0e}" ; inherit={globalsettings} +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\23000003","Element",,"{7619dcc9-fafe-11d9-b411-000476eba25f}" ; default={winload} +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\24000001","Element",0x10000,"{7619dcc9-fafe-11d9-b411-000476eba25f}" ; displayorder={winload} +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\24000010","Element",0x10000,"{b2721d73-1db4-4c62-bf78-c548a880142d}" ; toolsdisplayorder={memdiag} +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\25000004","Element",0x1,0x1e ; timeout=30 -BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Description","Type",0x00010003,0x10100002 +; +; ReactOS Boot Loader +; +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Description","Type",0x00010001,0x10200003 ; identifier={winload} +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\11000011","Element",0x1,\ ; device=boot + 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ + 05,00,00,00,\ + 00,00,00,00,\ + 48,00,00,00,\ + 00,00,00,00,\ + 00,00,00,00,\ + 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ + 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000002","Element",,"\windows\system32\boot\winload.efi" ; path +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000004","Element",,"ReactOS Setup" ; description +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\12000005","Element",,"en-US" ; locale="en-US" +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\14000006","Element",0x10000,"{6efb52bf-1766-41db-a6b3-0ee5eff72bd7}" ; inherit={bootloadersettings} +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\16000060","Element",0x1,0x01 ; isolatedcontext=Yes +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\22000002","Element",,"\windows" ; systemroot=\Windows +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\26000010","Element",0x1,0x01 ; detecthal=Yes +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\26000022","Element",0x1,0x01 ; winpe=Yes +BCD,"BCD00000000\Objects\{7619dcc9-fafe-11d9-b411-000476eba25f}\Elements\260000b0","Element",0x1,0x01 ; ems=Yes -BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000002","Element",2,"\EFI\BOOT\BOOTIA32.EFI" -BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000004","Element",2,"ReactOS Boot Manager" -BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000005","Element",2,"en-US" +; +; ReactOS Memory Tester +; +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Description","Type",0x00010001,0x10200005 ; identifier={memdiag} +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\11000011","Element",0x1,\ ; device=boot + 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ + 05,00,00,00,\ + 00,00,00,00,\ + 48,00,00,00,\ + 00,00,00,00,\ + 00,00,00,00,\ + 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ + 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\12000002","Element",,"\EFI\BOOT\MEMTEST.EFI" ; path +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\12000004","Element",,"ReactOS Memory Diagnostics" ; description +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\12000005","Element",,"en-US" ; locale="en-US" +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\14000006","Element",0x10000,"{7ea2e1ac-2e61-4728-aaa3-896d9d0a9f0e}" ; inherit={globalsettings} +BCD,"BCD00000000\Objects\{b2721d73-1db4-4c62-bf78-c548a880142d}\Elements\1600000b","Element",0x1,0x01 ; allowbadmemoryaccess=Yes + +; +; Global Settings +; +BCD,"BCD00000000\Objects\{7ea2e1ac-2e61-4728-aaa3-896d9d0a9f0e}\Description","Type",0x00010001,0x20100000 ; identifier={globalsettings} +BCD,"BCD00000000\Objects\{7ea2e1ac-2e61-4728-aaa3-896d9d0a9f0e}\Elements\14000006","Element",0x10000,"{4636856e-540f-4170-a130-a84776f4c654}", \ + "{0ce4991b-e6b3-4b16-b23c-5e0d9250e5d9}" ; inherit={dbgsettings,emssettings} + +; +; Boot Loader Settings +; +BCD,"BCD00000000\Objects\{6efb52bf-1766-41db-a6b3-0ee5eff72bd7}\Description","Type",0x00010001,0x20200003 ; identifier={bootloadersettings} +BCD,"BCD00000000\Objects\{6efb52bf-1766-41db-a6b3-0ee5eff72bd7}\Elements\14000006","Element",0x10000,"{7ea2e1ac-2e61-4728-aaa3-896d9d0a9f0e}" ; inherit={globalsettings} + +; +; EMS Settings +; +BCD,"BCD00000000\Objects\{0ce4991b-e6b3-4b16-b23c-5e0d9250e5d9}\Description","Type",0x00010001,0x20100000 ; identifier={dbgsettings} +BCD,"BCD00000000\Objects\{0ce4991b-e6b3-4b16-b23c-5e0d9250e5d9}\Elements\16000020","Element",0x1,0x01 ; bootems=Yes + +; +; Debugger Settings +; +BCD,"BCD00000000\Objects\{4636856e-540f-4170-a130-a84776f4c654}\Description","Type",0x00010001,0x20100000 ; identifier={dbgsettings} +BCD,"BCD00000000\Objects\{4636856e-540f-4170-a130-a84776f4c654}\Elements\15000011","Element",0x1,0x00 ; debugtype=Serial +BCD,"BCD00000000\Objects\{4636856e-540f-4170-a130-a84776f4c654}\Elements\15000013","Element",0x1,0x01 ; debugport=1 +BCD,"BCD00000000\Objects\{4636856e-540f-4170-a130-a84776f4c654}\Elements\15000014","Element",0x1,0x00,0xc2,0x01 ; baudrate=115200 ; EOF Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Mon Jan 18 04:18:12 2016 @@ -24,7 +24,7 @@ UNREFERENCED_PARAMETER(ObjectHandle); UNREFERENCED_PARAMETER(ElementName); UNREFERENCED_PARAMETER(Status); - EfiPrintf(L"Error in BiNotify\r\n"); + EfiPrintf(L"Error in BiNotify: %lx for element %s\r\n", Status, ElementName); } ULONG @@ -818,7 +818,7 @@ ULONG i; PVOID ElementData, SubObjectList, RegistryElementData; BcdElementType ElementType; - PBCD_PACKED_ELEMENT PreviousElement; + PBCD_PACKED_ELEMENT PreviousElement, ElementsStart; ULONG SubElementCount, SubKeyCount, SubObjectCount, ElementDataLength; PWCHAR ElementName; PWCHAR* SubKeys; @@ -839,6 +839,7 @@ ElementDataLength = 0; SubObjectCount = 0; RemainingLength = 0; + ElementsStart = Elements; /* Open the root object key's elements */ Status = BiOpenKey(ObjectHandle, L"Elements", &ElementsHandle); @@ -862,6 +863,8 @@ Status = BiOpenKey(ElementsHandle, ElementName, &ElementHandle); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"ELEMENT ERROR: %lx\r\n", Status); + EfiStall(100000); break; } @@ -869,7 +872,7 @@ ElementType.PackedValue = wcstoul(SubKeys[i], NULL, 16); if (!(ElementType.PackedValue) || (ElementType.PackedValue == -1)) { - EfiPrintf(L"Value invald\r\n"); + EfiPrintf(L"Value invalid\r\n"); BiCloseKey(ElementHandle); ElementHandle = 0; continue; @@ -885,6 +888,7 @@ &RegistryElementDataLength); if (!NT_SUCCESS(Status)) { + EfiPrintf(L"Element invalid\r\n"); break; } @@ -945,7 +949,7 @@ if (RemainingLength >= TotalLength) { /* Set the next pointer */ - Elements->NextEntry = (PBCD_PACKED_ELEMENT)((ULONG_PTR)Elements + TotalLength); + Elements->NextEntry = (PBCD_PACKED_ELEMENT)((ULONG_PTR)ElementsStart + TotalLength); /* Fill this one out */ Elements->RootType.PackedValue = RootElementType; @@ -1005,7 +1009,7 @@ /* Link the subelements into the chain */ PreviousElement = Elements; PreviousElement->NextEntry = - (PBCD_PACKED_ELEMENT)((ULONG_PTR)Elements + + (PBCD_PACKED_ELEMENT)((ULONG_PTR)ElementsStart + TotalLength); Elements = PreviousElement->NextEntry; }

1 0

[ion] 70609: [CMLIB/NTOSKRNL]: Move key deletion functions to cmlib, so that UEFI boot library can use them. [BOOTLIB]: Implement BCD element deletion (bootreg: implement key deletion) [BOOTMGR]: I...
by ion＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: ion Date: Sun Jan 17 21:48:00 2016 New Revision: 70609 URL: http://svn.reactos.org/svn/reactos?rev=70609&view=rev Log: [CMLIB/NTOSKRNL]: Move key deletion functions to cmlib, so that UEFI boot library can use them. [BOOTLIB]: Implement BCD element deletion (bootreg: implement key deletion) [BOOTMGR]: Implement BL_FATAL_ERROR_BCD_ENTRIES fatal error. [BOOTMGR]: Stubplement support for memory list data parsing (when memtest.efi will run), and stubplement support for boot persistent data blobs. [BOOTMGR]: Stubplement boot sequence support, create stub for boot entry population. [BOOTMGR]: Stubplement boot entry selection, create stub for boot entry enumeration. Mostly factoring-level changes to get us closer to the needed code paths. Added: trunk/reactos/lib/cmlib/cmkeydel.c - copied, changed from r70605, trunk/reactos/ntoskrnl/config/cmkeydel.c Removed: trunk/reactos/ntoskrnl/config/cmkeydel.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/bootmgr.h trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/misc/bcd.c trunk/reactos/boot/environ/lib/misc/bootreg.c trunk/reactos/lib/cmlib/CMakeLists.txt trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/ntos.cmake Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -550,6 +550,23 @@ ErrorResourceId = 9002; break; + case BL_FATAL_ERROR_BCD_ENTRIES: + + /* File name is in parameter 1 */ + FileName = (PWCHAR)Parameter1; + + /* The NTSTATUS code is in parameter 2*/ + ErrorStatus = (NTSTATUS)Parameter2; + + /* Build the error string */ + swprintf(FormatString, + L"\nNo valid entries found in the boot configuration data file %s\n", + FileName); + + /* Select the resource ID message */ + ErrorResourceId = 9007; + break; + case BL_FATAL_ERROR_BCD_PARSE: /* File name isin parameter 1 */ @@ -1168,7 +1185,22 @@ VOID ) { - EfiPrintf(L"Bad page list persistence \r\n"); + BL_PD_DATA_BLOB BadMemoryData; + NTSTATUS Status; + + /* Try to get the memory data from the memtest application */ + BadMemoryData.BlobSize = 0; + BadMemoryData.Data = NULL; + BadMemoryData.DataSize = 0; + Status = BlPdQueryData(&BadMemoryGuid, NULL, &BadMemoryData); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* No results, or some other error */ + return Status; + } + + /* Not yet implemented */ + EfiPrintf(L"Bad page list persistence not implemented\r\n"); return STATUS_NOT_IMPLEMENTED; } @@ -1179,7 +1211,37 @@ _In_ ULONG Type ) { - EfiPrintf(L"Key BCD delete not yet implemented\r\n"); + HANDLE ObjectHandle; + NTSTATUS Status; + + /* Open the object */ + Status = BcdOpenObject(BcdHandle, ObjectId, &ObjectHandle); + if (NT_SUCCESS(Status)) + { + /* Delete the element */ + BcdDeleteElement(ObjectHandle, Type); + + /* Close the object and set success */ + BiCloseKey(ObjectHandle); + Status = STATUS_SUCCESS; + } + + /* Return the result */ + return Status; +} + +NTSTATUS +BmpPopulateBootEntryList ( + _In_ HANDLE BcdHandle, + _In_ PGUID SequenceList, + _In_ ULONG Flags, + _Out_ PBL_LOADED_APPLICATION_ENTRY* BootSequence, + _Out_ PULONG SequenceCount + ) +{ + EfiPrintf(L"Fixed sequences not yet supported\r\n"); + *SequenceCount = 0; + *BootSequence = NULL; return STATUS_NOT_IMPLEMENTED; } @@ -1193,9 +1255,50 @@ _Out_ PULONG SequenceCount ) { - EfiPrintf(L"Fixed sequences not yet supported\r\n"); + PBL_LOADED_APPLICATION_ENTRY* Sequence; + ULONG Count; + NTSTATUS Status; + + /* Allocate the sequence list */ + Sequence = BlMmAllocateHeap(SequenceListCount * sizeof(*Sequence)); + if (!Sequence) + { + return STATUS_NO_MEMORY; + } + + /* Populate the sequence list */ + Status = BmpPopulateBootEntryList(BcdHandle, + SequenceList, + Flags, + Sequence, + &Count); + if (!NT_SUCCESS(Status)) + { + /* Free the list on failure */ + BlMmFreeHeap(Sequence); + } + else + { + /* Otherwise, set success and return the list and count */ + Status = STATUS_SUCCESS; + *BootSequence = Sequence; + *SequenceCount = Count; + } + + /* All done */ + return Status; +} + +NTSTATUS +BmEnumerateBootEntries ( + _In_ HANDLE BcdHandle, + _Out_ PBL_LOADED_APPLICATION_ENTRY **Sequence, + _Out_ PULONG SequenceCount + ) +{ + EfiPrintf(L"Boot enumeration not yet implemented\r\n"); + *Sequence = NULL; *SequenceCount = 0; - *BootSequence = NULL; return STATUS_NOT_IMPLEMENTED; } @@ -1207,8 +1310,69 @@ _Out_ PBOOLEAN ExitBootManager ) { + NTSTATUS Status; + PBL_LOADED_APPLICATION_ENTRY* Sequence; + PBL_LOADED_APPLICATION_ENTRY Entry, SelectedEntry; + ULONG Count, BootIndex; + + /* Initialize locals */ + BootIndex = 0; + Count = 0; + Sequence = NULL; + SelectedEntry = NULL; + + /* Enumerate all the boot entries */ + Status = BmEnumerateBootEntries(BcdHandle, &Sequence, &Count); + if (!NT_SUCCESS(Status)) + { + /* Bail out if we failed */ + goto Quickie; + } + + /* Check if there are no entries */ + if (!Count) + { + /* This is fatal -- kill the system */ + Status = STATUS_FILE_INVALID; + BmFatalErrorEx(BL_FATAL_ERROR_BCD_ENTRIES, (ULONG_PTR)L"\\BCD", Status, 0, 0); + goto Quickie; + } + EfiPrintf(L"Boot selection not yet implemented\r\n"); - return STATUS_NOT_IMPLEMENTED; + *SelectedBootEntry = NULL; + +Quickie: + /* We are done -- did we have a sequence? */ + if (Sequence) + { + /* Do we have any boot entries we parsed? */ + while (BootIndex < Count) + { + /* Get the current boot entry */ + Entry = Sequence[BootIndex]; + + /* Did we fail, or is is not the selected one? */ + if ((Entry) && ((Entry != SelectedEntry) || !(NT_SUCCESS(Status)))) + { + /* Destroy it, as it won't be needed */ + BlDestroyBootEntry(Entry); + } + else if (Entry == SelectedEntry) + { + /* It's the selected one, return its index */ + *EntryIndex = BootIndex; + } + + /* Move to the next entry */ + BootIndex++; + } + + /* Free the sequence of entries */ + BlMmFreeHeap(Sequence); + } + + /* Return the selection result */ + return Status; } NTSTATUS Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -53,6 +53,7 @@ } BL_PACKED_BOOT_ERROR, *PBL_PACKED_BOOT_ERROR; #define BL_FATAL_ERROR_BCD_READ 0x01 +#define BL_FATAL_ERROR_BCD_ENTRIES 0x03 #define BL_FATAL_ERROR_GENERIC 0x04 #define BL_FATAL_ERROR_BCD_PARSE 0x07 Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -246,6 +246,12 @@ ); NTSTATUS +BcdDeleteElement ( + _In_ HANDLE ObjectHandle, + _In_ ULONG Type + ); + +NTSTATUS BcdEnumerateAndUnpackElements ( _In_ HANDLE BcdHandle, _In_ HANDLE ObjectHandle, Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -46,6 +46,8 @@ #include <cmlib.h> /* DEFINES *******************************************************************/ + +DEFINE_GUID(BadMemoryGuid, 0x54B8275B, 0xD431, 0x473F, 0xAC, 0xFB, 0xE5, 0x36, 0xA0, 0x84, 0x94, 0xA3); #define BL_APPLICATION_FLAG_CONVERTED_FROM_EFI 0x01 @@ -1142,6 +1144,13 @@ ULONG Y; } COORD, *PCOORD; +typedef struct _BL_PD_DATA_BLOB +{ + PVOID Data; + ULONG DataSize; + ULONG BlobSize; +} BL_PD_DATA_BLOB, *PBL_PD_DATA_BLOB; + /* INLINE ROUTINES ***********************************************************/ FORCEINLINE @@ -1535,6 +1544,13 @@ _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry ); +NTSTATUS +BlPdQueryData ( + _In_ const GUID* DataGuid, + _In_ PVOID Unknown, + _Inout_ PBL_PD_DATA_BLOB DataBlob + ); + /* FIRMWARE UTILITY ROUTINES *************************************************/ EFI_STATUS @@ -1772,6 +1788,11 @@ _In_ HANDLE KeyHandle, _Out_ PWCHAR** SubKeyList, _Out_ PULONG SubKeyCount + ); + +NTSTATUS +BiDeleteKey ( + _In_ HANDLE KeyHandle ); VOID Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -20,7 +20,7 @@ BOOLEAN BlpLibraryParametersInitialized; ULONG PdPersistAllocations; -LIST_ENTRY BlBadpListHead; +LIST_ENTRY BlpPdListHead; /* FUNCTIONS *****************************************************************/ @@ -283,7 +283,7 @@ /* Initialize the boot application persistent data */ PdPersistAllocations = 0; - InitializeListHead(&BlBadpListHead); + InitializeListHead(&BlpPdListHead); #ifdef BL_TPM_SUPPORT /* Now setup the security subsystem in phase 1 */ @@ -451,3 +451,29 @@ /* Free the entry itself */ BlMmFreeHeap(AppEntry); } + +NTSTATUS +BlPdQueryData ( + _In_ const GUID* DataGuid, + _In_ PVOID Unknown, + _Inout_ PBL_PD_DATA_BLOB DataBlob + ) +{ + /* Check for invalid or missing parameters */ + if (!(DataBlob) || + !(DataGuid) || + ((DataBlob->BlobSize) && !(DataBlob->Data))) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if there's no persistent data blobs */ + if (IsListEmpty(&BlpPdListHead)) + { + return STATUS_NOT_FOUND; + } + + /* Not yet handled, TODO */ + EfiPrintf(L"Boot persistent data not yet implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/boot/environ/lib/misc/bcd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcd.… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcd.c [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -553,6 +553,66 @@ } /* Return the final status */ + return Status; +} + +NTSTATUS +BcdDeleteElement ( + _In_ HANDLE ObjectHandle, + _In_ ULONG Type + ) +{ + NTSTATUS Status; + HANDLE ElementsHandle, ElementHandle; + WCHAR TypeString[22]; + + /* Open the elements key */ + Status = BiOpenKey(ObjectHandle, L"Elements", &ElementsHandle); + if (NT_SUCCESS(Status)) + { + /* Convert the element ID into a string */ + if (!_ultow(Type, TypeString, 16)) + { + /* Failed to do so */ + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Open the element specifically */ + Status = BiOpenKey(ElementHandle, TypeString, &ElementHandle); + if (NT_SUCCESS(Status)) + { + /* Delete it */ + Status = BiDeleteKey(ElementHandle); + if (NT_SUCCESS(Status)) + { + /* No point in closing the handle anymore */ + ElementHandle = NULL; + } + } + else + { + /* The element doesn't exist */ + Status = STATUS_NOT_FOUND; + } + + /* Check if we should close the key */ + if (ElementHandle) + { + /* Do it */ + BiCloseKey(ElementHandle); + } + } + } + + /* Check if we should close the elements handle */ + if (ElementsHandle) + { + /* Do it */ + BiCloseKey(ElementsHandle); + } + + /* Return whatever the result was */ return Status; } Modified: trunk/reactos/boot/environ/lib/misc/bootreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/boot… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bootreg.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bootreg.c [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -887,3 +887,66 @@ return Status; } +NTSTATUS +BiDeleteKey ( + _In_ HANDLE KeyHandle + ) +{ + NTSTATUS Status; + PBI_KEY_OBJECT KeyObject; + PHHIVE Hive; + ULONG SubKeyCount, i; + PWCHAR* SubKeyList; + HANDLE SubKeyHandle; + + /* Get the key object and hive */ + KeyObject = (PBI_KEY_OBJECT)KeyHandle; + Hive = &KeyObject->KeyHive->Hive.Hive; + + /* Make sure the hive is writeable */ + if (!(KeyObject->KeyHive->Flags & BI_HIVE_WRITEABLE)) + { + return STATUS_MEDIA_WRITE_PROTECTED; + } + + /* Enumerate all of the subkeys */ + Status = BiEnumerateSubKeys(KeyHandle, &SubKeyList, &SubKeyCount); + if ((NT_SUCCESS(Status)) && (SubKeyCount > 0)) + { + /* Loop through each one */ + for (i = 0; i < SubKeyCount; i++) + { + /* Open a handle to it */ + Status = BiOpenKey(KeyHandle, SubKeyList[i], &SubKeyHandle); + if (NT_SUCCESS(Status)) + { + /* Recursively call us to delete it */ + Status = BiDeleteKey(SubKeyHandle); + if (Status != STATUS_SUCCESS) + { + /* Close the key on failure */ + BiCloseKey(SubKeyHandle); + } + } + } + } + + /* Check if we had a list of subkeys */ + if (SubKeyList) + { + /* Free it */ + BlMmFreeHeap(SubKeyList); + } + + /* Delete this key cell */ + Status = CmpFreeKeyByCell(Hive, KeyObject->KeyCell, TRUE); + if (NT_SUCCESS(Status)) + { + /* Mark the hive as requiring a flush */ + KeyObject->KeyHive->Flags |= BI_FLUSH_HIVE; + BiCloseKey(KeyHandle); + } + + /* All done */ + return Status; +} Modified: trunk/reactos/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -6,6 +6,7 @@ list(APPEND SOURCE cminit.c cmindex.c + cmkeydel.c cmname.c cmvalue.c hivebin.c Copied: trunk/reactos/lib/cmlib/cmkeydel.c (from r70605, trunk/reactos/ntoskrnl/config/cmkeydel.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmkeydel.c?p2=tr… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkeydel.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -1,14 +1,14 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmkeydel.c - * PURPOSE: Configuration Manager - Key Body Deletion + * FILE: lib/cmlib/cmkeydel.c + * PURPOSE: Configuration Manager Library - Key Body Deletion * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ -#include "ntoskrnl.h" +#include "cmlib.h" #define NDEBUG #include "debug.h" @@ -214,6 +214,9 @@ HvFreeCell(Hive, CellData->u.KeyNode.ValueList.List); } + /* FIXME: This leaks the security desriptor! */ + DPRINT1("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor"); + /* Free the key body itself, and then return our status */ if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES; return STATUS_SUCCESS; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7060… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -671,6 +671,13 @@ IN HSTORAGE_TYPE StorageType ); +NTSTATUS +NTAPI +CmpFreeKeyByCell( + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN BOOLEAN Unlink +); /******************************************************************************/ Removed: trunk/reactos/ntoskrnl/config/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkeydel.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkeydel.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkeydel.c (removed) @@ -1,220 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmkeydel.c - * PURPOSE: Configuration Manager - Key Body Deletion - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include "ntoskrnl.h" -#define NDEBUG -#include "debug.h" - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN -NTAPI -CmpMarkKeyDirty(IN PHHIVE Hive, - IN HCELL_INDEX Cell, - IN BOOLEAN CheckNoSubkeys) -{ - PCELL_DATA CellData, ListData, SecurityData, ValueData; - ULONG i; - - /* Get the cell data for our target */ - CellData = HvGetCell(Hive, Cell); - if (!CellData) return FALSE; - - /* Check if sanity checks requested */ - if (CheckNoSubkeys) - { - /* Do them */ - ASSERT(CellData->u.KeyNode.SubKeyCounts[Stable] == 0); - ASSERT(CellData->u.KeyNode.SubKeyCounts[Volatile] == 0); - } - - /* If this is an exit hive, there's nothing to do */ - if (CellData->u.KeyNode.Flags & KEY_HIVE_EXIT) - { - /* Release the cell and get out */ - HvReleaseCell(Hive, Cell); - return TRUE; - } - - /* Otherwise, mark it dirty and release it */ - HvMarkCellDirty(Hive, Cell, FALSE); - HvReleaseCell(Hive, Cell); - - /* Check if we have a class */ - if (CellData->u.KeyNode.Class != HCELL_NIL) - { - /* Mark it dirty */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.Class, FALSE); - } - - /* Check if we have security */ - if (CellData->u.KeyNode.Security != HCELL_NIL) - { - /* Mark it dirty */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.Security, FALSE); - - /* Get the security data and release it */ - SecurityData = HvGetCell(Hive, CellData->u.KeyNode.Security); - if (!SecurityData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.Security); - - /* Mark the security links dirty too */ - HvMarkCellDirty(Hive, SecurityData->u.KeySecurity.Flink, FALSE); - HvMarkCellDirty(Hive, SecurityData->u.KeySecurity.Blink, FALSE); - } - - /* Check if we have any values */ - if (CellData->u.KeyNode.ValueList.Count > 0) - { - /* Dirty the value list */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.ValueList.List, FALSE); - - /* Get the list data itself, and release it */ - ListData = HvGetCell(Hive, CellData->u.KeyNode.ValueList.List); - if (!ListData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.ValueList.List); - - /* Loop all values */ - for (i = 0; i < CellData->u.KeyNode.ValueList.Count; i++) - { - /* Dirty each value */ - HvMarkCellDirty(Hive, ListData->u.KeyList[i], FALSE); - - /* Get the value data and release it */ - ValueData = HvGetCell(Hive, ListData->u.KeyList[i]); - ASSERT(ValueData); - HvReleaseCell(Hive,ListData->u.KeyList[i]); - - /* Mark the value data dirty too */ - if (!CmpMarkValueDataDirty(Hive, &ValueData->u.KeyValue)) - { - /* Failure */ - return FALSE; - } - } - } - - /* If this is an entry hive, we're done */ - if (CellData->u.KeyNode.Flags & KEY_HIVE_ENTRY) return TRUE; - - /* Otherwise mark the index dirty too */ - if (!CmpMarkIndexDirty(Hive, CellData->u.KeyNode.Parent, Cell)) - { - /* Failure */ - return FALSE; - } - - /* Finally, mark the parent dirty */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.Parent, FALSE); - return TRUE; -} - -BOOLEAN -NTAPI -CmpFreeKeyBody(IN PHHIVE Hive, - IN HCELL_INDEX Cell) -{ - PCELL_DATA CellData; - - /* Get the key node */ - CellData = HvGetCell(Hive, Cell); - if (!CellData) ASSERT(FALSE); - - /* Check if we can delete the child cells */ - if (!(CellData->u.KeyNode.Flags & KEY_HIVE_EXIT)) - { - /* Check if we have a security cell */ - if (CellData->u.KeyNode.Security != HCELL_NIL) - { - /* Free the security cell */ - HvFreeCell(Hive, CellData->u.KeyNode.Security); - } - - /* Check if we have a class */ - if (CellData->u.KeyNode.ClassLength > 0) - { - /* Free it */ - HvFreeCell(Hive, CellData->u.KeyNode.Class); - } - } - - /* Release and free the cell */ - HvReleaseCell(Hive, Cell); - HvFreeCell(Hive, Cell); - return TRUE; -} - -NTSTATUS -NTAPI -CmpFreeKeyByCell(IN PHHIVE Hive, - IN HCELL_INDEX Cell, - IN BOOLEAN Unlink) -{ - PCELL_DATA CellData, ParentData, ListData; - ULONG i; - BOOLEAN Result; - - /* Mark the entire key dirty */ - CmpMarkKeyDirty(Hive, Cell ,TRUE); - - /* Get the target node and release it */ - CellData = HvGetCell(Hive, Cell); - if (!CellData) ASSERT(FALSE); - HvReleaseCell(Hive, Cell); - - /* Make sure we don't have subkeys */ - ASSERT((CellData->u.KeyNode.SubKeyCounts[Stable] + - CellData->u.KeyNode.SubKeyCounts[Volatile]) == 0); - - /* Check if we have to unlink */ - if (Unlink) - { - /* Remove the subkey */ - Result = CmpRemoveSubKey(Hive, CellData->u.KeyNode.Parent, Cell); - if (!Result) return STATUS_INSUFFICIENT_RESOURCES; - - /* Get the parent node and release it */ - ParentData = HvGetCell(Hive, CellData->u.KeyNode.Parent); - if (!ParentData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.Parent); - - /* Check if the parent node has no more subkeys */ - if (!(ParentData->u.KeyNode.SubKeyCounts[Stable] + - ParentData->u.KeyNode.SubKeyCounts[Volatile])) - { - /* Then free the cached name/class lengths */ - ParentData->u.KeyNode.MaxNameLen = 0; - ParentData->u.KeyNode.MaxClassLen = 0; - } - } - - /* Check if we have any values */ - if (CellData->u.KeyNode.ValueList.Count > 0) - { - /* Get the value list and release it */ - ListData = HvGetCell(Hive, CellData->u.KeyNode.ValueList.List); - if (!ListData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.ValueList.List); - - /* Loop every value */ - for (i = 0; i < CellData->u.KeyNode.ValueList.Count; i++) - { - /* Free it */ - if (!CmpFreeValue(Hive, ListData->u.KeyList[i])) ASSERT(FALSE); - } - - /* Free the value list */ - HvFreeCell(Hive, CellData->u.KeyNode.ValueList.List); - } - - /* Free the key body itself, and then return our status */ - if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES; - return STATUS_SUCCESS; -} Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -1059,14 +1059,6 @@ IN BOOLEAN LockHeld ); -NTSTATUS -NTAPI -CmpFreeKeyByCell( - IN PHHIVE Hive, - IN HCELL_INDEX Cell, - IN BOOLEAN Unlink -); - VOID NTAPI CmpAcquireTwoKcbLocksExclusiveByKey( Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=70… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Sun Jan 17 21:48:00 2016 @@ -58,7 +58,6 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmhvlist.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cminit.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmkcbncb.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmkeydel.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmlazy.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmmapvw.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmnotify.c

1 0

[ekohl] 70608: [USERINIT] Add missing newline for MSVC.
by ekohl＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: ekohl Date: Sun Jan 17 19:37:18 2016 New Revision: 70608 URL: http://svn.reactos.org/svn/reactos?rev=70608&view=rev Log: [USERINIT] Add missing newline for MSVC. Modified: trunk/reactos/base/system/userinit/resource.h Modified: trunk/reactos/base/system/userinit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/resou… ============================================================================== --- trunk/reactos/base/system/userinit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/resource.h [iso-8859-1] Sun Jan 17 19:37:18 2016 @@ -30,4 +30,4 @@ -#define IDS_SPAIN 3900 +#define IDS_SPAIN 3900

1 0

[ekohl] 70607: [USERINIT] Add two dialogs that are shown when the LiveCD is booted. The first dialog is used to select the language and keyboard layout. The second dialog is used to either start th...
by ekohl＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: ekohl Date: Sun Jan 17 19:20:47 2016 New Revision: 70607 URL: http://svn.reactos.org/svn/reactos?rev=70607&view=rev Log: [USERINIT] Add two dialogs that are shown when the LiveCD is booted. The first dialog is used to select the language and keyboard layout. The second dialog is used to either start the shell or the GUI installer. Language and keyboard layout selection are still work in progress. Added: trunk/reactos/base/system/userinit/livecd.c (with props) trunk/reactos/base/system/userinit/res/ (with props) trunk/reactos/base/system/userinit/res/rosbitmap.bmp (with props) trunk/reactos/base/system/userinit/userinit.h (with props) Modified: trunk/reactos/base/system/userinit/CMakeLists.txt trunk/reactos/base/system/userinit/lang/bg-BG.rc trunk/reactos/base/system/userinit/lang/cs-CZ.rc trunk/reactos/base/system/userinit/lang/de-DE.rc trunk/reactos/base/system/userinit/lang/el-GR.rc trunk/reactos/base/system/userinit/lang/en-US.rc trunk/reactos/base/system/userinit/lang/es-ES.rc trunk/reactos/base/system/userinit/lang/fr-FR.rc trunk/reactos/base/system/userinit/lang/he-IL.rc trunk/reactos/base/system/userinit/lang/hu-HU.rc trunk/reactos/base/system/userinit/lang/id-ID.rc trunk/reactos/base/system/userinit/lang/it-IT.rc trunk/reactos/base/system/userinit/lang/ja-JP.rc trunk/reactos/base/system/userinit/lang/lt-LT.rc trunk/reactos/base/system/userinit/lang/nl-NL.rc trunk/reactos/base/system/userinit/lang/no-NO.rc trunk/reactos/base/system/userinit/lang/pl-PL.rc trunk/reactos/base/system/userinit/lang/pt-BR.rc trunk/reactos/base/system/userinit/lang/ro-RO.rc trunk/reactos/base/system/userinit/lang/ru-RU.rc trunk/reactos/base/system/userinit/lang/sk-SK.rc trunk/reactos/base/system/userinit/lang/sq-AL.rc trunk/reactos/base/system/userinit/lang/sv-SE.rc trunk/reactos/base/system/userinit/lang/th-TH.rc trunk/reactos/base/system/userinit/lang/tr-TR.rc trunk/reactos/base/system/userinit/lang/uk-UA.rc trunk/reactos/base/system/userinit/lang/zh-CN.rc trunk/reactos/base/system/userinit/lang/zh-TW.rc trunk/reactos/base/system/userinit/resource.h trunk/reactos/base/system/userinit/userinit.c trunk/reactos/base/system/userinit/userinit.rc Modified: trunk/reactos/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/CMake… ============================================================================== --- trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,12 @@ -add_executable(userinit userinit.c userinit.rc) +list(APPEND SOURCE + livecd.c + userinit.c + userinit.h) + +add_executable(userinit ${SOURCE} userinit.rc) target_link_libraries(userinit wine) set_module_type(userinit win32gui UNICODE) -add_importlibs(userinit user32 advapi32 shell32 msvcrt kernel32 ntdll) +add_importlibs(userinit user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll) +add_pch(userinit userinit.h SOURCE) add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/userinit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/bg-BG.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ userinit Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ð¿ÑÑÐ½Ðµ Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°ÑÐ°!\n" + IDS_SHELL_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ userinit Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ð¿ÑÑÐ½Ðµ Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°ÑÐ°!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -5,7 +5,46 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho rozhranÃ!\n" + IDS_SHELL_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho rozhranÃ!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/de-DE.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit konnte die Shell nicht starten!\n" + IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/el-GR.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "H Userinit Î´Îµ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏÎµÎ¹ ÏÎ¿ ÎºÎÎ»ÏÏÎ¿Ï!\n" + IDS_SHELL_FAIL "H Userinit Î´Îµ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏÎµÎ¹ ÏÎ¿ ÎºÎÎ»ÏÏÎ¿Ï!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/en-US.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit failed to start the shell!\n" + IDS_SHELL_FAIL "Userinit failed to start the shell!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/es-ES.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit no pudo iniciar el shell con Ã©xito!\n" + IDS_SHELL_FAIL "Userinit no pudo iniciar el shell con Ã©xito!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/fr-FR.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit a Ã©chouÃ© lors du chargement de l'interface (shell) !\n" + IDS_SHELL_FAIL "Userinit a Ã©chouÃ© lors du chargement de l'interface (shell) !\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/he-IL.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit × ××©× ×××¤×¢×× ××ª ××××©×§!\n" + IDS_SHELL_FAIL "Userinit × ××©× ×××¤×¢×× ××ª ××××©×§!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/hu-HU.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Az Userinit nem tudja elindÃtani a rendszert!\n" + IDS_SHELL_FAIL "Az Userinit nem tudja elindÃtani a rendszert!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/id-ID.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit gagal untuk memulai shell!\n" + IDS_SHELL_FAIL "Userinit gagal untuk memulai shell!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/it-IT.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit non ha potuto avviare l'ambiente(shell)!\n" + IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente(shell)!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ja-JP.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!\n" + IDS_SHELL_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/lt-LT.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit nepavyko paleisti aplinkos!\n" + IDS_SHELL_FAIL "Userinit nepavyko paleisti aplinkos!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/nl-NL.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit kon de shell niet starten!\n" + IDS_SHELL_FAIL "Userinit kon de shell niet starten!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/no-NO.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit mislykket Ã¥ starte skall!\n" + IDS_SHELL_FAIL "Userinit mislykket Ã¥ starte skall!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -7,7 +7,46 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!\n" + IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/pt-BR.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit falhou ao tentar iniciar o shell!\n" + IDS_SHELL_FAIL "Userinit falhou ao tentar iniciar o shell!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ro-RO.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!\n" + IDS_SHELL_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!\n" + IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/sk-SK.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL, "Userinit zlyhal pri spÃºÅ¡Å¥anÃ shellu!\n" + IDS_SHELL_FAIL "Userinit zlyhal pri spÃºÅ¡Å¥anÃ shellu!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/sq-AL.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -4,7 +4,46 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!\n" + IDS_SHELL_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/sv-SE.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,7 +1,47 @@ /* Translated by David Nordenberg */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit misslyckades att starta anvÃ¤ndargrÃ¤nssnittet!\n" + IDS_SHELL_FAIL "Userinit misslyckades att starta anvÃ¤ndargrÃ¤nssnittet!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/th-TH.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,6 +1,45 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END STRINGTABLE BEGIN - STRING_USERINIT_FAIL "à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!\n" + IDS_SHELL_FAIL "à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/tr-TR.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!\n" + IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/uk-UA.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -8,7 +8,46 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ!\n" + IDS_SHELL_FAIL "Userinit Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ!\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/zh-CN.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n" + IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Modified: trunk/reactos/base/system/userinit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/zh-TW.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -2,7 +2,46 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + +IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "ReactOS LiveCD" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + + LTEXT "", IDC_STATIC, 7, 152, 300, 8 + + GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 + PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 +END + STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n" + IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n" + IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" END + +STRINGTABLE +BEGIN + IDS_SPAIN "Spanish (Spain)" +END Added: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c (added) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -0,0 +1,530 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Userinit Logon Application + * FILE: base/system/userinit/livecd.c + * PROGRAMMERS: Eric Kohl + */ + +#include "userinit.h" + +HWND hList; +HWND hLocaleList; +BOOL bSpain = FALSE; + +static VOID +InitImageInfo(PIMGINFO ImgInfo) +{ + BITMAP bitmap; + + ZeroMemory(ImgInfo, sizeof(*ImgInfo)); + + ImgInfo->hBitmap = LoadImage(hInstance, + MAKEINTRESOURCE(IDB_ROSLOGO), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + + if (ImgInfo->hBitmap != NULL) + { + GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + + ImgInfo->cxSource = bitmap.bmWidth; + ImgInfo->cySource = bitmap.bmHeight; + } +} + + +BOOL +IsLiveCD(VOID) +{ + HKEY ControlKey = NULL; + LPWSTR SystemStartOptions = NULL; + LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ + LONG rc; + BOOL ret = FALSE; + + TRACE("IsLiveCD()\n"); + + rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + REGSTR_PATH_CURRENT_CONTROL_SET, + 0, + KEY_QUERY_VALUE, + &ControlKey); + if (rc != ERROR_SUCCESS) + { + WARN("RegOpenKeyEx() failed with error %lu\n", rc); + goto cleanup; + } + + rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); + if (rc != ERROR_SUCCESS) + { + WARN("ReadRegSzKey() failed with error %lu\n", rc); + goto cleanup; + } + + /* Check for CONSOLE switch in SystemStartOptions */ + CurrentOption = SystemStartOptions; + while (CurrentOption) + { + NextOption = wcschr(CurrentOption, L' '); + if (NextOption) + *NextOption = L'\0'; + if (_wcsicmp(CurrentOption, L"MININT") == 0) + { + TRACE("Found 'MININT' boot option\n"); + ret = TRUE; + goto cleanup; + } + CurrentOption = NextOption ? NextOption + 1 : NULL; + } + +cleanup: + if (ControlKey != NULL) + RegCloseKey(ControlKey); + HeapFree(GetProcessHeap(), 0, SystemStartOptions); + + TRACE("IsLiveCD() returning %d\n", ret); + + return ret; +} + + +static BOOL CALLBACK +LocalesEnumProc(LPTSTR lpLocale) +{ + LCID lcid; + WCHAR lang[255]; + INT index; + BOOL bNoShow = FALSE; + + lcid = wcstoul(lpLocale, NULL, 16); + + /* Display only languages with installed support */ + if (!IsValidLocale(lcid, LCID_INSTALLED)) + return TRUE; + + if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) || + lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT)) + { + if (bSpain == FALSE) + { + LoadStringW(hInstance, IDS_SPAIN, lang, 255); + bSpain = TRUE; + } + else + { + bNoShow = TRUE; + } + } + else + { + GetLocaleInfoW(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)/sizeof(WCHAR)); + } + + if (bNoShow == FALSE) + { + index = SendMessageW(hList, + CB_ADDSTRING, + 0, + (LPARAM)lang); + + SendMessageW(hList, + CB_SETITEMDATA, + index, + (LPARAM)lcid); + } + + return TRUE; +} + + +static VOID +CreateLanguagesList(HWND hwnd) +{ + WCHAR langSel[255]; + + hList = hwnd; + bSpain = FALSE; + EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); + + /* Select current locale */ + /* or should it be System and not user? */ + GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(WCHAR)); + + SendMessageW(hList, + CB_SELECTSTRING, + -1, + (LPARAM)langSel); +} + + +static +VOID +InitializeDefaultUserLocale( + PLCID pNewLcid) +{ + WCHAR szBuffer[80]; + PWSTR ptr; + HKEY hLocaleKey; + DWORD ret; + DWORD dwSize; + LCID lcid; + INT i; + + struct {LCTYPE LCType; PWSTR pValue;} LocaleData[] = { + /* Number */ + {LOCALE_SDECIMAL, L"sDecimal"}, + {LOCALE_STHOUSAND, L"sThousand"}, + {LOCALE_SNEGATIVESIGN, L"sNegativeSign"}, + {LOCALE_SPOSITIVESIGN, L"sPositiveSign"}, + {LOCALE_SGROUPING, L"sGrouping"}, + {LOCALE_SLIST, L"sList"}, + {LOCALE_SNATIVEDIGITS, L"sNativeDigits"}, + {LOCALE_INEGNUMBER, L"iNegNumber"}, + {LOCALE_IDIGITS, L"iDigits"}, + {LOCALE_ILZERO, L"iLZero"}, + {LOCALE_IMEASURE, L"iMeasure"}, + {LOCALE_IDIGITSUBSTITUTION, L"NumShape"}, + + /* Currency */ + {LOCALE_SCURRENCY, L"sCurrency"}, + {LOCALE_SMONDECIMALSEP, L"sMonDecimalSep"}, + {LOCALE_SMONTHOUSANDSEP, L"sMonThousandSep"}, + {LOCALE_SMONGROUPING, L"sMonGrouping"}, + {LOCALE_ICURRENCY, L"iCurrency"}, + {LOCALE_INEGCURR, L"iNegCurr"}, + {LOCALE_ICURRDIGITS, L"iCurrDigits"}, + + /* Time */ + {LOCALE_STIMEFORMAT, L"sTimeFormat"}, + {LOCALE_STIME, L"sTime"}, + {LOCALE_S1159, L"s1159"}, + {LOCALE_S2359, L"s2359"}, + {LOCALE_ITIME, L"iTime"}, + {LOCALE_ITIMEMARKPOSN, L"iTimePrefix"}, + {LOCALE_ITLZERO, L"iTLZero"}, + + /* Date */ + {LOCALE_SLONGDATE, L"sLongDate"}, + {LOCALE_SSHORTDATE, L"sShortDate"}, + {LOCALE_SDATE, L"sDate"}, + {LOCALE_IFIRSTDAYOFWEEK, L"iFirstDayOfWeek"}, + {LOCALE_IFIRSTWEEKOFYEAR, L"iFirstWeekOfYear"}, + {LOCALE_IDATE, L"iDate"}, + {LOCALE_ICALENDARTYPE, L"iCalendarType"}, + + /* Misc */ + {LOCALE_SCOUNTRY, L"sCountry"}, + {LOCALE_SLANGUAGE, L"sLanguage"}, + {LOCALE_ICOUNTRY, L"iCountry"}, + {0, NULL}}; + + ret = RegOpenKeyExW(HKEY_USERS, + L".DEFAULT\\Control Panel\\International", + 0, + KEY_READ | KEY_WRITE, + &hLocaleKey); + if (ret != ERROR_SUCCESS) + { + return; + } + + if (pNewLcid == NULL) + { + dwSize = 9 * sizeof(WCHAR); + ret = RegQueryValueExW(hLocaleKey, + L"Locale", + NULL, + NULL, + (PBYTE)szBuffer, + &dwSize); + if (ret != ERROR_SUCCESS) + goto done; + + lcid = (LCID)wcstoul(szBuffer, &ptr, 16); + if (lcid == 0) + goto done; + } + else + { + lcid = *pNewLcid; + + swprintf(szBuffer, L"%08lx", lcid); + RegSetValueExW(hLocaleKey, + L"Locale", + 0, + REG_SZ, + (PBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + } + + i = 0; + while (LocaleData[i].pValue != NULL) + { + if (GetLocaleInfo(lcid, + LocaleData[i].LCType | LOCALE_NOUSEROVERRIDE, + szBuffer, + sizeof(szBuffer) / sizeof(WCHAR))) + { + RegSetValueExW(hLocaleKey, + LocaleData[i].pValue, + 0, + REG_SZ, + (PBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + } + + i++; + } + +done: + RegCloseKey(hLocaleKey); +} + + +VOID +CenterWindow(HWND hWnd) +{ + HWND hWndParent; + RECT rcParent; + RECT rcWindow; + + hWndParent = GetParent(hWnd); + if (hWndParent == NULL) + hWndParent = GetDesktopWindow(); + + GetWindowRect(hWndParent, &rcParent); + GetWindowRect(hWnd, &rcWindow); + + SetWindowPos(hWnd, + HWND_TOP, + ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, + ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, + 0, + 0, + SWP_NOSIZE); +} + + +static +VOID +OnDrawItem( + LPDRAWITEMSTRUCT lpDrawItem, + PSTATE pState, + UINT uCtlID) +{ + HDC hdcMem; + LONG left; + + if (lpDrawItem->CtlID == uCtlID) + { + /* position image in centre of dialog */ + left = (lpDrawItem->rcItem.right - pState->ImageInfo.cxSource) / 2; + + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + if (hdcMem != NULL) + { + SelectObject(hdcMem, pState->ImageInfo.hBitmap); + BitBlt(lpDrawItem->hDC, + left, + lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, + 0, + 0, + SRCCOPY); + DeleteDC(hdcMem); + } + } +} + + +static +INT_PTR +CALLBACK +LocaleDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PSTATE pState; + + /* Retrieve pointer to the state */ + pState = (PSTATE)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + /* Save pointer to the global state */ + pState = (PSTATE)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pState); + + /* Center the dialog window */ + CenterWindow (hwndDlg); + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + + EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); + return FALSE; + + case WM_DRAWITEM: + OnDrawItem((LPDRAWITEMSTRUCT)lParam, + pState, + IDC_LOCALELOGO); + return TRUE; + + case WM_COMMAND: + if (HIWORD(wParam) == BN_CLICKED) + { + switch (LOWORD(wParam)) + { + case IDOK: + { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + SetThreadLocale(NewLcid); + InitializeDefaultUserLocale(&NewLcid); + } + + pState->NextPage = STARTPAGE; + EndDialog(hwndDlg, 0); + break; + + default: + break; + } + } + break; + + default: + break; + } + + return FALSE; +} + + +static +INT_PTR +CALLBACK +StartDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PSTATE pState; + + /* Retrieve pointer to the state */ + pState = (PSTATE)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + /* Save pointer to the state */ + pState = (PSTATE)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pState); + + /* Center the dialog window */ + CenterWindow(hwndDlg); + + EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); + return FALSE; + + case WM_DRAWITEM: + OnDrawItem((LPDRAWITEMSTRUCT)lParam, + pState, + IDC_STARTLOGO); + return TRUE; + + case WM_COMMAND: + if (HIWORD(wParam) == BN_CLICKED) + { + switch (LOWORD(wParam)) + { + case IDC_RUN: + pState->NextPage = DONE; + pState->Run = SHELL; + EndDialog(hwndDlg, 0); + break; + + case IDC_INSTALL: + pState->NextPage = DONE; + pState->Run = INSTALLER; + EndDialog(hwndDlg, 0); + break; + + case IDOK: + pState->NextPage = LOCALEPAGE; + EndDialog(hwndDlg, 0); + break; + + default: + break; + } + } + break; + + default: + break; + } + + return FALSE; +} + + +VOID +RunLiveCD( + PSTATE pState) +{ + InitImageInfo(&pState->ImageInfo); + + while (pState->NextPage != DONE) + { + switch (pState->NextPage) + { + case LOCALEPAGE: + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_LOCALEPAGE), + NULL, + LocaleDlgProc, + (LPARAM)pState); + break; + + case STARTPAGE: + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_STARTPAGE), + NULL, + StartDlgProc, + (LPARAM)pState); + break; + + default: + break; + } + } + + DeleteObject(pState->ImageInfo.hBitmap); +} + +/* EOF */ Propchange: trunk/reactos/base/system/userinit/livecd.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/userinit/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jan 17 19:20:47 2016 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/system/userinit/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/system/userinit/res/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/system/userinit/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/userinit/res/rosbitmap.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/res/r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/userinit/res/rosbitmap.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/system/userinit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/resou… ============================================================================== --- trunk/reactos/base/system/userinit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/resource.h [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,4 +1,33 @@ #pragma once #define RC_STRING_MAX_SIZE 2048 -#define STRING_USERINIT_FAIL 100 + +/* Bitmaps */ +#define IDB_ROSLOGO 100 + +#define IDC_STATIC -1 + + +/* Dialogs */ +#define IDD_LOCALEPAGE 200 +#define IDC_LOCALELOGO 201 +#define IDC_LANGUAGELIST 202 +#define IDC_FORMATLIST 203 +#define IDC_LAYOUTLIST 204 + +#define IDD_STARTPAGE 300 +#define IDC_STARTLOGO 301 +#define IDC_RUN 302 +#define IDC_INSTALL 303 +#define IDC_UPDATE 304 +#define IDC_REPAIR 305 + + +/* Strings */ +#define IDS_SHELL_FAIL 600 +#define IDS_INSTALLER_FAIL 601 + + + + +#define IDS_SPAIN 3900 Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -24,37 +24,22 @@ * Hervé Poussineau (hpoussin(a)reactos.org) */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <wingdi.h> -#include <wincon.h> -#include <shellapi.h> -#include <regstr.h> -#include <shlobj.h> -#include <shlwapi.h> -#include <undocuser.h> -#include <wine/debug.h> - -#include "resource.h" - -WINE_DEFAULT_DEBUG_CHANNEL(userinit); +#include "userinit.h" #define CMP_MAGIC 0x01234567 /* GLOBALS ******************************************************************/ +HINSTANCE hInstance; + + /* FUNCTIONS ****************************************************************/ -static LONG +LONG ReadRegSzKey( IN HKEY hKey, IN LPCWSTR pszKey, - OUT LPWSTR* pValue) + OUT LPWSTR *pValue) { LONG rc; DWORD dwType; @@ -382,7 +367,7 @@ if (!TryToStartShell(Shell)) { WARN("Failed to start default shell %s\n", debugstr_w(Shell)); - LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + LoadString( GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); MessageBox(0, szMsg, NULL, 0); } } @@ -548,6 +533,27 @@ WARN("LoadLibrary() failed with error %lu\n", GetLastError()); } +static +VOID +StartInstaller(VOID) +{ + WCHAR Shell[MAX_PATH]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + + if (GetWindowsDirectory(Shell, MAX_PATH - 12)) + wcscat(Shell, L"\\reactos.exe"); + else + wcscpy(Shell, L"reactos.exe"); + + if (!TryToStartShell(Shell)) + { + ERR("Failed to start the installer: %s\n", debugstr_w(Shell)); + LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + MessageBoxW(0, szMsg, NULL, 0); + } +} + + #ifdef _MSC_VER #pragma warning(disable : 4100) #endif /* _MSC_VER */ @@ -558,9 +564,38 @@ IN LPWSTR lpszCmdLine, IN int nCmdShow) { + STATE State; + + hInstance = hInst; + SetUserSettings(); - StartShell(); - NotifyLogon(); + + if (IsLiveCD()) + { + State.NextPage = LOCALEPAGE; + State.Run = SHELL; + } + else + { + State.NextPage = DONE; + State.Run = SHELL; + } + + if (State.NextPage != DONE) + { + RunLiveCD(&State); + } + + if (State.Run == SHELL) + { + StartShell(); + NotifyLogon(); + } + else if (State.Run == INSTALLER) + { + StartInstaller(); + } + return 0; } Added: trunk/reactos/base/system/userinit/userinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.h (added) +++ trunk/reactos/base/system/userinit/userinit.h [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -0,0 +1,74 @@ +/* + */ + +#ifndef __USERINIT_H__ +#define __USERINIT_H__ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#include <wincon.h> +#include <shellapi.h> +#include <regstr.h> +#include <shlobj.h> +#include <shlwapi.h> +#include <undocuser.h> +#include <winnls.h> +#include <stdio.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(userinit); + +#include "resource.h" + + +typedef enum +{ + LOCALEPAGE, + STARTPAGE, + DONE +} PAGESTATE; + +typedef enum +{ + SHELL, + INSTALLER +} RUN; + +typedef struct _IMGINFO +{ + HBITMAP hBitmap; + INT cxSource; + INT cySource; +} IMGINFO, *PIMGINFO; + +typedef struct +{ + PAGESTATE NextPage; + RUN Run; + IMGINFO ImageInfo; +} STATE, *PSTATE; + + +extern HINSTANCE hInstance; + +LONG +ReadRegSzKey( + IN HKEY hKey, + IN LPCWSTR pszKey, + OUT LPWSTR *pValue); + +BOOL +IsLiveCD(VOID); + + +VOID +RunLiveCD( + PSTATE State); + +#endif /* __USERINIT_H__ */ Propchange: trunk/reactos/base/system/userinit/userinit.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.rc [iso-8859-1] Sun Jan 17 19:20:47 2016 @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include "resource.h" @@ -6,6 +7,10 @@ #define REACTOS_STR_INTERNAL_NAME "userinit" #define REACTOS_STR_ORIGINAL_FILENAME "userinit.dll" #include <reactos/version.rc> + +/* Bitmaps */ +IDB_ROSLOGO BITMAP "res/rosbitmap.bmp" + /* UTF-8 */ #pragma code_page(65001)

1 0

[spetreolle] 70606: [FLOPPY] Check for controller configuration status. CORE-10761 #comment Please retest.
by spetreolle＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: spetreolle Date: Sun Jan 17 16:59:55 2016 New Revision: 70606 URL: http://svn.reactos.org/svn/reactos?rev=70606&view=rev Log: [FLOPPY] Check for controller configuration status. CORE-10761 #comment Please retest. Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sun Jan 17 16:59:55 2016 @@ -680,7 +680,11 @@ TRACE_(FLOPPY, "InitController called with Controller 0x%p\n", ControllerInfo); /* Get controller in a known state */ - HwConfigure(ControllerInfo, FALSE, TRUE, TRUE, 0, 0); + if(HwConfigure(ControllerInfo, FALSE, TRUE, TRUE, 0, 0) != STATUS_SUCCESS) + { + WARN_(FLOPPY, "InitController: unable to configure controller\n"); + return STATUS_IO_DEVICE_ERROR; + } /* Get the controller version */ ControllerVersion = HwGetVersion(ControllerInfo);

1 0

[hbelusca] 70605: [CMLIB] - Now that both FreeLdr and MKHIVE use the regular (aka. the "NT-style public") CMLIB functions, get rid of the "old-style public" cmlib functions, with the exception of C...
by hbelusca＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: hbelusca Date: Sun Jan 17 02:12:37 2016 New Revision: 70605 URL: http://svn.reactos.org/svn/reactos?rev=70605&view=rev Log: [CMLIB] - Now that both FreeLdr and MKHIVE use the regular (aka. the "NT-style public") CMLIB functions, get rid of the "old-style public" cmlib functions, with the exception of CmCreateRootNode and CmPrepareHive which remain for now due to a slight different implementation difference between NT and ours. Remove the cmtools.c file containing those old functions. - Remove the now-deprecated VALUE_LIST_CELL structure (which was an old version of CELL_DATA:KeyList). - When freeing hive bins (in HvpFreeHiveBins), use the storage number count stored in the hive instead of a constant value. - Flat hives have only one storage type (they are read-only and reside only in memory). CORE-10802 CORE-10793 Removed: trunk/reactos/lib/cmlib/cmtools.c Modified: trunk/reactos/lib/cmlib/CMakeLists.txt trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] Sun Jan 17 02:12:37 2016 @@ -7,7 +7,6 @@ cminit.c cmindex.c cmname.c - cmtools.c cmvalue.c hivebin.c hivecell.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=706… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sun Jan 17 02:12:37 2016 @@ -27,16 +27,16 @@ // // CM_KEY_NODE Flags // -#define KEY_IS_VOLATILE 0x01 -#define KEY_HIVE_EXIT 0x02 -#define KEY_HIVE_ENTRY 0x04 -#define KEY_NO_DELETE 0x08 -#define KEY_SYM_LINK 0x10 -#define KEY_COMP_NAME 0x20 -#define KEY_PREFEF_HANDLE 0x40 -#define KEY_VIRT_MIRRORED 0x80 -#define KEY_VIRT_TARGET 0x100 -#define KEY_VIRTUAL_STORE 0x200 +#define KEY_IS_VOLATILE 0x0001 +#define KEY_HIVE_EXIT 0x0002 +#define KEY_HIVE_ENTRY 0x0004 +#define KEY_NO_DELETE 0x0008 +#define KEY_SYM_LINK 0x0010 +#define KEY_COMP_NAME 0x0020 +#define KEY_PREFEF_HANDLE 0x0040 +#define KEY_VIRT_MIRRORED 0x0080 +#define KEY_VIRT_TARGET 0x0100 +#define KEY_VIRTUAL_STORE 0x0200 // // CM_KEY_VALUE Flags @@ -67,7 +67,7 @@ } CM_VIEW_OF_FILE, *PCM_VIEW_OF_FILE; // -// Children of Key Notes +// Children of Key Nodes // typedef struct _CHILD_LIST { @@ -117,14 +117,6 @@ } CM_KEY_NODE, *PCM_KEY_NODE; // -// Value List -// -typedef struct _VALUE_LIST_CELL -{ - HCELL_INDEX ValueOffset[ANYSIZE_ARRAY]; -} VALUE_LIST_CELL, *PVALUE_LIST_CELL; - -// // Value Key // typedef struct _CM_KEY_VALUE Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=706… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Sun Jan 17 02:12:37 2016 @@ -37,7 +37,11 @@ /* Get the key cell */ KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, RootCellIndex); - if (!KeyCell) return FALSE; + if (!KeyCell) + { + HvFreeCell(Hive, RootCellIndex); + return FALSE; + } /* Setup the cell */ KeyCell->Signature = CM_KEY_NODE_SIGNATURE; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7060… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jan 17 02:12:37 2016 @@ -33,7 +33,7 @@ #ifdef _WIN32 #define strncasecmp _strnicmp #define strcasecmp _stricmp - #endif//_WIN32 + #endif // _WIN32 #if (!defined(_MSC_VER) || (_MSC_VER < 1500)) #define _In_ @@ -68,6 +68,7 @@ #define USHORT_MAX USHRT_MAX #define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') + #define UNICODE_NULL ((WCHAR)0) VOID NTAPI KeQuerySystemTime( @@ -161,7 +162,7 @@ // // These define the Debug Masks Supported // -#define CMLIB_HCELL_DEBUG 0x01 +#define CMLIB_HCELL_DEBUG 0x01 #ifndef ROUND_UP #define ROUND_UP(a,b) ((((a)+(b)-1)/(b))*(b)) @@ -191,12 +192,17 @@ #include "hivedata.h" #include "cmdata.h" -#if defined(_TYPEDEFS_HOST_H) || defined(__FREELDR_H) - -#define PCM_KEY_SECURITY_CACHE_ENTRY PVOID -#define PCM_KEY_CONTROL_BLOCK PVOID -#define CMP_SECURITY_HASH_LISTS 64 -#define PCM_CELL_REMAP_BLOCK PVOID +#if defined(_TYPEDEFS_HOST_H) || defined(__FREELDR_H) // || defined(_BLDR_) + +#define PCM_KEY_SECURITY_CACHE_ENTRY PVOID +#define PCM_KEY_CONTROL_BLOCK PVOID +#define PCM_CELL_REMAP_BLOCK PVOID + +// See also ntoskrnl/include/internal/cm.h +#define CMP_SECURITY_HASH_LISTS 64 + +// #endif // Commented out until one finds a way to properly include + // this header in freeldr and in ntoskrnl. // // Use Count Log and Entry @@ -263,7 +269,7 @@ PKTHREAD CreatorOwner; } CMHIVE, *PCMHIVE; -#endif +#endif // See comment above typedef struct _HV_HIVE_CELL_PAIR { @@ -466,54 +472,8 @@ CmPrepareHive( PHHIVE RegistryHive); -BOOLEAN -NTAPI -CmCompareHash( - IN PCUNICODE_STRING KeyName, - IN PCHAR HashString, - IN BOOLEAN CaseInsensitive); - -BOOLEAN -NTAPI -CmComparePackedNames( - IN PCUNICODE_STRING Name, - IN PVOID NameBuffer, - IN USHORT NameBufferSize, - IN BOOLEAN NamePacked, - IN BOOLEAN CaseInsensitive); - -BOOLEAN -NTAPI -CmCompareKeyName( - IN PCM_KEY_NODE KeyCell, - IN PCUNICODE_STRING KeyName, - IN BOOLEAN CaseInsensitive); - -BOOLEAN -NTAPI -CmCompareKeyValueName( - IN PCM_KEY_VALUE ValueCell, - IN PCUNICODE_STRING KeyName, - IN BOOLEAN CaseInsensitive); - -ULONG -NTAPI -CmCopyKeyName( - _In_ PCM_KEY_NODE KeyNode, - _Out_ PWCHAR KeyNameBuffer, - _Inout_ ULONG BufferLength); - -ULONG -NTAPI -CmCopyKeyValueName( - _In_ PCM_KEY_VALUE ValueCell, - _Out_ PWCHAR ValueNameBuffer, - _Inout_ ULONG BufferLength); - - /* NT-style Public Cm functions */ - // // Cell Index Routines @@ -615,8 +575,8 @@ IN PHHIVE Hive, IN PCHILD_LIST ChildList, IN PUNICODE_STRING Name, - IN PULONG ChildIndex, - IN PHCELL_INDEX CellIndex + OUT PULONG ChildIndex, + OUT PHCELL_INDEX CellIndex ); @@ -695,7 +655,7 @@ CmpGetValueData( IN PHHIVE Hive, IN PCM_KEY_VALUE Value, - IN PULONG Length, + OUT PULONG Length, OUT PVOID *Buffer, OUT PBOOLEAN BufferAllocated, OUT PHCELL_INDEX CellToRelease Removed: trunk/reactos/lib/cmlib/cmtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmtools.c (removed) @@ -1,222 +0,0 @@ -/* - * PROJECT: Registry manipulation library - * LICENSE: GPL - See COPYING in the top level directory - * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> - * Copyright 2001 - 2005 Eric Kohl - */ - -#include "cmlib.h" -#define NDEBUG -#include <debug.h> - -BOOLEAN -NTAPI -CmCompareHash( - IN PCUNICODE_STRING KeyName, - IN PCHAR HashString, - IN BOOLEAN CaseInsensitive) -{ - CHAR Buffer[4]; - - Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; - Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; - Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; - Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; - - if (CaseInsensitive) - { - return (strncasecmp(Buffer, HashString, 4) == 0); - } - else - { - return (strncmp(Buffer, HashString, 4) == 0); - } -} - -BOOLEAN -NTAPI -CmComparePackedNames( - IN PCUNICODE_STRING CompareName, - IN PVOID Name, - IN USHORT NameLength, - IN BOOLEAN NamePacked, - IN BOOLEAN CaseInsensitive) -{ - ULONG i; - - if (NamePacked) - { - PUCHAR PackedName = (PUCHAR)Name; - - if (CompareName->Length != NameLength * sizeof(WCHAR)) - { - //DPRINT1("Length doesn'T match %lu / %lu\n", CompareName->Length, NameLength); - return FALSE; - } - - if (CaseInsensitive) - { - for (i = 0; i < CompareName->Length / sizeof(WCHAR); i++) - { - //DbgPrint("%c/%c,", - // RtlUpcaseUnicodeChar(CompareName->Buffer[i]), - // RtlUpcaseUnicodeChar(PackedName[i])); - if (RtlUpcaseUnicodeChar(CompareName->Buffer[i]) != - RtlUpcaseUnicodeChar(PackedName[i])) - { - //DbgPrint("\nFailed!\n"); - return FALSE; - } - } - //DbgPrint("\nSuccess!\n"); - } - else - { - for (i = 0; i < CompareName->Length / sizeof(WCHAR); i++) - { - if (CompareName->Buffer[i] != PackedName[i]) - return FALSE; - } - } - - } - else - { - PWCHAR UnicodeName = (PWCHAR)Name; - - if (CompareName->Length != NameLength) - return FALSE; - - if (CaseInsensitive) - { - for (i = 0; i < CompareName->Length / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(CompareName->Buffer[i]) != - RtlUpcaseUnicodeChar(UnicodeName[i])) - return FALSE; - } - } - else - { - for (i = 0; i < CompareName->Length / sizeof(WCHAR); i++) - { - if (CompareName->Buffer[i] != UnicodeName[i]) - return FALSE; - } - } - } - - return TRUE; -} - - -BOOLEAN -NTAPI -CmCompareKeyName( - IN PCM_KEY_NODE KeyNode, - IN PCUNICODE_STRING KeyName, - IN BOOLEAN CaseInsensitive) -{ - ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); - return CmComparePackedNames(KeyName, - KeyNode->Name, - KeyNode->NameLength, - (KeyNode->Flags & KEY_COMP_NAME) ? TRUE : FALSE, - CaseInsensitive); -} - -BOOLEAN -NTAPI -CmCompareKeyValueName( - IN PCM_KEY_VALUE ValueCell, - IN PCUNICODE_STRING ValueName, - IN BOOLEAN CaseInsensitive) -{ - ASSERT(ValueCell->Signature == CM_KEY_VALUE_SIGNATURE); - return CmComparePackedNames(ValueName, - ValueCell->Name, - ValueCell->NameLength, - (ValueCell->Flags & VALUE_COMP_NAME) ? TRUE : FALSE, - CaseInsensitive); -} - -ULONG -NTAPI -CmCopyPackedName( - _Out_ PWCHAR Buffer, - _In_ ULONG BufferLength, - _In_ PVOID Name, - _In_ USHORT NameLength, - _In_ BOOLEAN NamePacked) -{ - ULONG CharCount, i; - ASSERT(Name != 0); - ASSERT(NameLength != 0); - - if (NamePacked) - { - NameLength *= sizeof(WCHAR); - CharCount = min(BufferLength, NameLength) / sizeof(WCHAR); - - if (Buffer != NULL) - { - PUCHAR PackedName = (PUCHAR)Name; - - for (i = 0; i < CharCount; i++) - { - Buffer[i] = PackedName[i]; - } - } - } - else - { - CharCount = min(BufferLength, NameLength) / sizeof(WCHAR); - - if (Buffer != NULL) - { - PWCHAR UnicodeName = (PWCHAR)Name; - - for (i = 0; i < CharCount; i++) - { - Buffer[i] = UnicodeName[i]; - } - } - } - - if (BufferLength >= NameLength + sizeof(WCHAR)) - { - Buffer[NameLength / sizeof(WCHAR)] = '\0'; - } - - return NameLength + sizeof(WCHAR); -} - -ULONG -NTAPI -CmCopyKeyName( - _In_ PCM_KEY_NODE KeyNode, - _Out_ PWCHAR KeyNameBuffer, - _Inout_ ULONG BufferLength) -{ - ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); - return CmCopyPackedName(KeyNameBuffer, - BufferLength, - KeyNode->Name, - KeyNode->NameLength, - (KeyNode->Flags & KEY_COMP_NAME) ? TRUE : FALSE); -} - -ULONG -NTAPI -CmCopyKeyValueName( - _In_ PCM_KEY_VALUE ValueCell, - _Out_ PWCHAR ValueNameBuffer, - _Inout_ ULONG BufferLength) -{ - ASSERT(ValueCell->Signature == CM_KEY_VALUE_SIGNATURE); - return CmCopyPackedName(ValueNameBuffer, - BufferLength, - ValueCell->Name, - ValueCell->NameLength, - (ValueCell->Flags & VALUE_COMP_NAME) ? TRUE : FALSE); -} Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sun Jan 17 02:12:37 2016 @@ -57,7 +57,7 @@ PHBIN Bin; ULONG Storage; - for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) + for (Storage = 0; Storage < Hive->StorageTypeCount; Storage++) { Bin = NULL; for (i = 0; i < Hive->Storage[Storage].Length; i++) @@ -353,6 +353,8 @@ Hive->Version = ChunkBase->Minor; Hive->Flat = TRUE; Hive->ReadOnly = TRUE; + + Hive->StorageTypeCount = 1; /* Set default boot type */ ChunkBase->BootType = 0;

1 0

[hbelusca] 70604: [FREELDR] Make FreeLdr fully using the CMLIB library. CORE-10802 #resolve CORE-10793
by hbelusca＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: hbelusca Date: Sun Jan 17 01:42:11 2016 New Revision: 70604 URL: http://svn.reactos.org/svn/reactos?rev=70604&view=rev Log: [FREELDR] Make FreeLdr fully using the CMLIB library. CORE-10802 #resolve CORE-10793 Modified: trunk/reactos/boot/freeldr/freeldr/windows/registry.c trunk/reactos/boot/freeldr/freeldr/windows/registry.h trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/registry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/registry.c [iso-8859-1] Sun Jan 17 01:42:11 2016 @@ -29,23 +29,46 @@ static PCM_KEY_NODE RootKeyNode; static HKEY CurrentControlSetKey; +PVOID +NTAPI +CmpAllocate( + IN SIZE_T Size, + IN BOOLEAN Paged, + IN ULONG Tag) +{ + UNREFERENCED_PARAMETER(Paged); + UNREFERENCED_PARAMETER(Tag); + + return FrLdrTempAlloc(Size, Tag); +} + +VOID +NTAPI +CmpFree( + IN PVOID Ptr, + IN ULONG Quota) +{ + UNREFERENCED_PARAMETER(Quota); + FrLdrTempFree(Ptr, 0); +} + BOOLEAN RegImportBinaryHive( - _In_ PCHAR ChunkBase, + _In_ PVOID ChunkBase, _In_ ULONG ChunkSize) { NTSTATUS Status; TRACE("RegImportBinaryHive(%p, 0x%lx)\n", ChunkBase, ChunkSize); /* Allocate and initialize the hive */ - CmHive = FrLdrTempAlloc(sizeof(CMHIVE), 'eviH'); + CmHive = CmpAllocate(sizeof(CMHIVE), FALSE, 'eviH'); Status = HvInitialize(&CmHive->Hive, - HINIT_FLAT, + HINIT_FLAT, // HINIT_MEMORY_INPLACE 0, 0, ChunkBase, - NULL, - NULL, + CmpAllocate, + CmpFree, NULL, NULL, NULL, @@ -54,22 +77,16 @@ NULL); if (!NT_SUCCESS(Status)) { - FrLdrTempFree(CmHive, 'eviH'); - ERR("Invalid hive Signature!\n"); + CmpFree(CmHive, 0); + ERR("Corrupted hive %p!\n", ChunkBase); return FALSE; } /* Save the root key node */ - RootKeyNode = HvGetCell(&CmHive->Hive, CmHive->Hive.BaseBlock->RootCell); + RootKeyNode = (PCM_KEY_NODE)HvGetCell(&CmHive->Hive, CmHive->Hive.BaseBlock->RootCell); TRACE("RegImportBinaryHive done\n"); return TRUE; -} - -VOID -RegInitializeRegistry(VOID) -{ - /* Nothing to do */ } LONG @@ -203,62 +220,6 @@ return TRUE; } -static -PCM_KEY_NODE -RegpFindSubkeyInIndex( - _In_ PHHIVE Hive, - _In_ PCM_KEY_INDEX IndexCell, - _In_ PUNICODE_STRING SubKeyName) -{ - PCM_KEY_NODE SubKeyNode; - ULONG i; - TRACE("RegpFindSubkeyInIndex('%wZ')\n", SubKeyName); - - /* Check the cell type */ - if ((IndexCell->Signature == CM_KEY_INDEX_ROOT) || - (IndexCell->Signature == CM_KEY_INDEX_LEAF)) - { - ASSERT(FALSE); - - /* Enumerate subindex cells */ - for (i = 0; i < IndexCell->Count; i++) - { - /* Get the subindex cell and call the function recursively */ - PCM_KEY_INDEX SubIndexCell = HvGetCell(Hive, IndexCell->List[i]); - - SubKeyNode = RegpFindSubkeyInIndex(Hive, SubIndexCell, SubKeyName); - if (SubKeyNode != NULL) - { - return SubKeyNode; - } - } - } - else if ((IndexCell->Signature == CM_KEY_FAST_LEAF) || - (IndexCell->Signature == CM_KEY_HASH_LEAF)) - { - /* Directly enumerate subkey nodes */ - PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; - for (i = 0; i < HashCell->Count; i++) - { - SubKeyNode = HvGetCell(Hive, HashCell->List[i].Cell); - ASSERT(SubKeyNode->Signature == CM_KEY_NODE_SIGNATURE); - - TRACE(" RegpFindSubkeyInIndex: checking '%.*s'\n", - SubKeyNode->NameLength, SubKeyNode->Name); - if (CmCompareKeyName(SubKeyNode, SubKeyName, TRUE)) - { - return SubKeyNode; - } - } - } - else - { - ASSERT(FALSE); - } - - return NULL; -} - LONG RegEnumKey( _In_ HKEY Key, @@ -269,8 +230,9 @@ { PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode, SubKeyNode; - PCM_KEY_INDEX IndexCell; - PCM_KEY_FAST_INDEX HashCell; + HCELL_INDEX CellIndex; + USHORT NameLength; + TRACE("RegEnumKey(%p, %lu, %p, %p->%u)\n", Key, Index, Name, NameSize, NameSize ? *NameSize : 0); @@ -278,40 +240,52 @@ KeyNode = (PCM_KEY_NODE)Key; ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); - /* Check if the index is valid */ - if ((KeyNode->SubKeyCounts[Stable] == 0) || - (Index >= KeyNode->SubKeyCounts[Stable])) - { - TRACE("RegEnumKey index out of bounds\n"); + CellIndex = CmpFindSubKeyByNumber(Hive, KeyNode, Index); + if (CellIndex == HCELL_NIL) + { + TRACE("RegEnumKey index out of bounds (%d) in key (%.*s)\n", + Index, KeyNode->NameLength, KeyNode->Name); return ERROR_NO_MORE_ITEMS; } - /* Get the index cell */ - IndexCell = HvGetCell(Hive, KeyNode->SubKeyLists[Stable]); - TRACE("IndexCell: %x, SubKeyCounts: %x\n", IndexCell, KeyNode->SubKeyCounts[Stable]); - - /* Check the cell type */ - if ((IndexCell->Signature == CM_KEY_FAST_LEAF) || - (IndexCell->Signature == CM_KEY_HASH_LEAF)) - { - /* Get the value cell */ - HashCell = (PCM_KEY_FAST_INDEX)IndexCell; - SubKeyNode = HvGetCell(Hive, HashCell->List[Index].Cell); + /* Get the value cell */ + SubKeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); + ASSERT(SubKeyNode != NULL); + ASSERT(SubKeyNode->Signature == CM_KEY_NODE_SIGNATURE); + + if (SubKeyNode->Flags & KEY_COMP_NAME) + { + NameLength = CmpCompressedNameSize(SubKeyNode->Name, SubKeyNode->NameLength); + + /* Compressed name */ + CmpCopyCompressedName(Name, + *NameSize, + SubKeyNode->Name, + SubKeyNode->NameLength); } else { - ASSERT(FALSE); - } - - *NameSize = CmCopyKeyName(SubKeyNode, Name, *NameSize); + NameLength = SubKeyNode->NameLength; + + /* Normal name */ + RtlCopyMemory(Name, SubKeyNode->Name, + min(*NameSize, SubKeyNode->NameLength)); + } + + if (*NameSize >= NameLength + sizeof(WCHAR)) + { + Name[NameLength / sizeof(WCHAR)] = UNICODE_NULL; + } + + *NameSize = NameLength + sizeof(WCHAR); + + /**/HvReleaseCell(Hive, CellIndex);/**/ if (SubKey != NULL) - { *SubKey = (HKEY)SubKeyNode; - } - - TRACE("RegEnumKey done -> %u, '%.*s'\n", *NameSize, *NameSize, Name); - return STATUS_SUCCESS; + + TRACE("RegEnumKey done -> %u, '%.*S'\n", *NameSize, *NameSize, Name); + return ERROR_SUCCESS; } LONG @@ -324,7 +298,7 @@ UNICODE_STRING CurrentControlSet = RTL_CONSTANT_STRING(L"CurrentControlSet"); PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; - PCM_KEY_INDEX IndexCell; + HCELL_INDEX CellIndex; TRACE("RegOpenKey(%p, '%S', %p)\n", ParentKey, KeyName, Key); /* Initialize the remaining path name */ @@ -400,27 +374,22 @@ { TRACE("RegOpenKey: next element '%wZ'\n", &SubKeyName); - /* Check if there is any subkey */ - if (KeyNode->SubKeyCounts[Stable] == 0) + /* Get the next sub key */ + CellIndex = CmpFindSubKeyByName(Hive, KeyNode, &SubKeyName); + if (CellIndex == HCELL_NIL) { + ERR("Did not find sub key '%wZ' (full %S)\n", &SubKeyName, KeyName); return ERROR_PATH_NOT_FOUND; } - /* Get the top level index cell */ - IndexCell = HvGetCell(Hive, KeyNode->SubKeyLists[Stable]); - - /* Get the next sub key */ - KeyNode = RegpFindSubkeyInIndex(Hive, IndexCell, &SubKeyName); - if (KeyNode == NULL) - { - - ERR("Did not find sub key '%wZ' (full %S)\n", &RemainingPath, KeyName); - return ERROR_PATH_NOT_FOUND; - } - } + /* Get the found key */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, CellIndex); + ASSERT(KeyNode); + } + + *Key = (HKEY)KeyNode; TRACE("RegOpenKey done\n"); - *Key = (HKEY)KeyNode; return ERROR_SUCCESS; } @@ -434,40 +403,27 @@ _Inout_opt_ ULONG* DataSize) { ULONG DataLength; + PVOID DataCell; /* Does the caller want the type? */ if (Type != NULL) - { *Type = ValueCell->Type; - } /* Does the caller provide DataSize? */ if (DataSize != NULL) { - /* Get the data length */ - DataLength = ValueCell->DataLength & ~CM_KEY_VALUE_SPECIAL_SIZE; + // NOTE: CmpValueToData doesn't support big data (the function will + // bugcheck if so), FreeLdr is not supposed to read such data. + // If big data is needed, use instead CmpGetValueData. + // CmpGetValueData(Hive, ValueCell, DataSize, &DataCell, ...); + DataCell = CmpValueToData(Hive, ValueCell, &DataLength); /* Does the caller want the data? */ if ((Data != NULL) && (*DataSize != 0)) { - /* Check where the data is stored */ - if ((DataLength <= sizeof(HCELL_INDEX)) && - (ValueCell->DataLength & CM_KEY_VALUE_SPECIAL_SIZE)) - { - /* The data member contains the data */ - RtlCopyMemory(Data, - &ValueCell->Data, - min(*DataSize, DataLength)); - } - else - { - /* The data member contains the data cell index */ - PVOID DataCell = HvGetCell(Hive, ValueCell->Data); - RtlCopyMemory(Data, - DataCell, - min(*DataSize, ValueCell->DataLength)); - } - + RtlCopyMemory(Data, + DataCell, + min(*DataSize, DataLength)); } /* Return the actual data length */ @@ -486,9 +442,9 @@ PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; PCM_KEY_VALUE ValueCell; - PVALUE_LIST_CELL ValueListCell; + HCELL_INDEX CellIndex; UNICODE_STRING ValueNameString; - ULONG i; + TRACE("RegQueryValue(%p, '%S', %p, %p, %p)\n", Key, ValueName, Type, Data, DataSize); @@ -496,54 +452,50 @@ KeyNode = (PCM_KEY_NODE)Key; ASSERT(KeyNode->Signature == CM_KEY_NODE_SIGNATURE); - /* Check if there are any values */ - if (KeyNode->ValueList.Count == 0) - { - TRACE("RegQueryValue no values in key (%.*s)\n", - KeyNode->NameLength, KeyNode->Name); - return ERROR_INVALID_PARAMETER; - } - /* Initialize value name string */ RtlInitUnicodeString(&ValueNameString, ValueName); - - ValueListCell = (PVALUE_LIST_CELL)HvGetCell(Hive, KeyNode->ValueList.List); - TRACE("ValueListCell: %x\n", ValueListCell); - - /* Loop all values */ - for (i = 0; i < KeyNode->ValueList.Count; i++) - { - /* Get the subkey node and check the name */ - ValueCell = HvGetCell(Hive, ValueListCell->ValueOffset[i]); - - /* Compare the value name */ - TRACE("checking %.*s\n", ValueCell->NameLength, ValueCell->Name); - if (CmCompareKeyValueName(ValueCell, &ValueNameString, TRUE)) - { - RepGetValueData(Hive, ValueCell, Type, Data, DataSize); - TRACE("RegQueryValue success\n"); - return STATUS_SUCCESS; - } - } - - TRACE("RegQueryValue value not found\n"); - return ERROR_INVALID_PARAMETER; -} - + CellIndex = CmpFindValueByName(Hive, KeyNode, &ValueNameString); + if (CellIndex == HCELL_NIL) + { + TRACE("RegQueryValue value not found in key (%.*s)\n", + KeyNode->NameLength, KeyNode->Name); + return ERROR_FILE_NOT_FOUND; + } + + /* Get the value cell */ + ValueCell = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex); + ASSERT(ValueCell != NULL); + + RepGetValueData(Hive, ValueCell, Type, Data, DataSize); + + HvReleaseCell(Hive, CellIndex); + + TRACE("RegQueryValue success\n"); + return ERROR_SUCCESS; +} + +/* + * NOTE: This function is currently unused in FreeLdr; however it is kept here + * as an implementation reference of RegEnumValue using CMLIB that may be used + * elsewhere in ReactOS. + */ +#if 0 LONG RegEnumValue( _In_ HKEY Key, _In_ ULONG Index, _Out_ PWCHAR ValueName, _Inout_ ULONG* NameSize, - _Out_ ULONG* Type, - _Out_ PUCHAR Data, - _Inout_ ULONG* DataSize) + _Out_opt_ ULONG* Type, + _Out_opt_ PUCHAR Data, + _Inout_opt_ ULONG* DataSize) { PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; + PCELL_DATA ValueListCell; PCM_KEY_VALUE ValueCell; - PVALUE_LIST_CELL ValueListCell; + USHORT NameLength; + TRACE("RegEnumValue(%p, %lu, %S, %p, %p, %p, %p (%lu))\n", Key, Index, ValueName, NameSize, Type, Data, DataSize, *DataSize); @@ -553,40 +505,55 @@ /* Check if the index is valid */ if ((KeyNode->ValueList.Count == 0) || + (KeyNode->ValueList.List == HCELL_NIL) || (Index >= KeyNode->ValueList.Count)) { ERR("RegEnumValue: index invalid\n"); return ERROR_NO_MORE_ITEMS; } - ValueListCell = (PVALUE_LIST_CELL)HvGetCell(Hive, KeyNode->ValueList.List); - TRACE("ValueListCell: %x\n", ValueListCell); + ValueListCell = (PCELL_DATA)HvGetCell(Hive, KeyNode->ValueList.List); + ASSERT(ValueListCell != NULL); /* Get the value cell */ - ValueCell = HvGetCell(Hive, ValueListCell->ValueOffset[Index]); + ValueCell = (PCM_KEY_VALUE)HvGetCell(Hive, ValueListCell->KeyList[Index]); ASSERT(ValueCell != NULL); - - if (NameSize != NULL) - { - *NameSize = CmCopyKeyValueName(ValueCell, ValueName, *NameSize); - } + ASSERT(ValueCell->Signature == CM_KEY_VALUE_SIGNATURE); + + if (ValueCell->Flags & VALUE_COMP_NAME) + { + NameLength = CmpCompressedNameSize(ValueCell->Name, ValueCell->NameLength); + + /* Compressed name */ + CmpCopyCompressedName(ValueName, + *NameSize, + ValueCell->Name, + ValueCell->NameLength); + } + else + { + NameLength = ValueCell->NameLength; + + /* Normal name */ + RtlCopyMemory(ValueName, ValueCell->Name, + min(*NameSize, ValueCell->NameLength)); + } + + if (*NameSize >= NameLength + sizeof(WCHAR)) + { + ValueName[NameLength / sizeof(WCHAR)] = UNICODE_NULL; + } + + *NameSize = NameLength + sizeof(WCHAR); RepGetValueData(Hive, ValueCell, Type, Data, DataSize); - if (DataSize != NULL) - { - if ((Data != NULL) && (*DataSize != 0)) - { - RtlCopyMemory(Data, - &ValueCell->Data, - min(*DataSize, ValueCell->DataLength)); - } - - *DataSize = ValueCell->DataLength; - } - - TRACE("RegEnumValue done\n"); - return STATUS_SUCCESS; -} + HvReleaseCell(Hive, ValueListCell->KeyList[Index]); + HvReleaseCell(Hive, KeyNode->ValueList.List); + + TRACE("RegEnumValue done -> %u, '%.*S'\n", *NameSize, *NameSize, ValueName); + return ERROR_SUCCESS; +} +#endif /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/registry.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/registry.h [iso-8859-1] Sun Jan 17 01:42:11 2016 @@ -23,9 +23,6 @@ typedef HANDLE HKEY, *PHKEY; -VOID -RegInitializeRegistry(VOID); - LONG RegInitCurrentControlSet(BOOLEAN LastKnownGood); @@ -41,13 +38,6 @@ RegOpenKey(HKEY ParentKey, PCWSTR KeyName, PHKEY Key); - -LONG -RegSetValue(HKEY Key, - PCWSTR ValueName, - ULONG Type, - PCSTR Data, - ULONG DataSize); LONG RegQueryValue(HKEY Key, @@ -66,7 +56,7 @@ ULONG* DataSize); BOOLEAN -RegImportBinaryHive(PCHAR ChunkBase, +RegImportBinaryHive(PVOID ChunkBase, ULONG ChunkSize); #endif /* __REGISTRY_H */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Sun Jan 17 01:42:11 2016 @@ -133,11 +133,8 @@ if (!Success) return FALSE; - // Initialize in-memory registry - RegInitializeRegistry(); - // Import what was loaded - Success = RegImportBinaryHive((PCHAR)VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); + Success = RegImportBinaryHive(VaToPa(LoaderBlock->RegistryBase), LoaderBlock->RegistryLength); if (!Success) { UiMessageBox("Importing binary hive failed!");

1 0

[hbelusca] 70603: [MKHIVE] - Fix two warnings in GCC Linux build (in KeBugCheckEx and in a call to the helper function RepGetValueData). - Remove two unused RTL ANSI functions. - Fix USHORT vs. ULO...
by hbelusca＠svn.reactos.org 17 Jan '16

17 Jan '16

Author: hbelusca Date: Sun Jan 17 01:29:43 2016 New Revision: 70603 URL: http://svn.reactos.org/svn/reactos?rev=70603&view=rev Log: [MKHIVE] - Fix two warnings in GCC Linux build (in KeBugCheckEx and in a call to the helper function RepGetValueData). - Remove two unused RTL ANSI functions. - Fix USHORT vs. ULONG type misuage. - Fix SIZE_T vs. ULONG usage. Modified: trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c trunk/reactos/tools/mkhive/rtl.c Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sun Jan 17 01:29:43 2016 @@ -57,15 +57,6 @@ typedef LPVOID LPSECURITY_ATTRIBUTES; typedef HANDLE HKEY, *PHKEY; -NTSTATUS NTAPI -RtlAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PANSI_STRING AnsiSource, - IN BOOLEAN AllocateDestinationString); -VOID NTAPI -RtlInitAnsiString( - IN OUT PANSI_STRING DestinationString, - IN PCSTR SourceString); VOID NTAPI RtlInitUnicodeString( IN OUT PUNICODE_STRING DestinationString, @@ -79,9 +70,9 @@ IN HKEY hKey, IN LPCWSTR lpValueName, IN PULONG lpReserved, - OUT PULONG lpType, - OUT PUCHAR lpData, - OUT PSIZE_T lpcbData); + OUT PULONG lpType OPTIONAL, + OUT PUCHAR lpData OPTIONAL, + IN OUT PULONG lpcbData OPTIONAL); LONG WINAPI RegSetValueExW( @@ -90,7 +81,7 @@ IN ULONG Reserved, IN ULONG dwType, IN const UCHAR* lpData, - IN USHORT cbData); + IN ULONG cbData); LONG WINAPI RegDeleteKeyW( Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sun Jan 17 01:29:43 2016 @@ -119,11 +119,11 @@ IN HKEY KeyHandle, IN PWCHAR ValueName, IN PWCHAR Strings, - IN SIZE_T StringSize) + IN ULONG StringSize) { - SIZE_T Size; + ULONG Size; ULONG Type; - size_t Total; + ULONG Total; PWCHAR Buffer; PWCHAR p; size_t len; @@ -182,7 +182,7 @@ 0, REG_MULTI_SZ, (PUCHAR)Buffer, - (ULONG)Total * sizeof(WCHAR)); + Total * sizeof(WCHAR)); } done: @@ -289,7 +289,7 @@ if (Str == NULL) return FALSE; - InfHostGetMultiSzField (Context, 5, Str, (ULONG)Size, NULL); + InfHostGetMultiSzField (Context, 5, Str, Size, NULL); } if (Flags & FLG_ADDREG_APPEND) @@ -319,7 +319,7 @@ if (Str == NULL) return FALSE; - InfHostGetStringField (Context, 5, Str, (ULONG)Size, NULL); + InfHostGetStringField (Context, 5, Str, Size, NULL); } } @@ -349,7 +349,7 @@ 0, Type, (PVOID)Str, - (ULONG)Size * sizeof(WCHAR)); + Size * sizeof(WCHAR)); } else { @@ -359,7 +359,7 @@ 0, Type, (PVOID)&EmptyStr, - (ULONG)sizeof(WCHAR)); + sizeof(WCHAR)); } } free (Str); @@ -387,7 +387,7 @@ 0, Type, (PVOID)Data, - (ULONG)Size); + Size); free (Data); } Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Sun Jan 17 01:29:43 2016 @@ -518,7 +518,7 @@ IN ULONG Reserved, IN ULONG dwType, IN const UCHAR* lpData, - IN USHORT cbData) + IN ULONG cbData) { PMEMKEY Key = HKEY_TO_MEMKEY(hKey); // ParentKey PHHIVE Hive; @@ -528,7 +528,7 @@ UNICODE_STRING ValueNameString; PVOID DataCell; - LONG DataCellSize; + ULONG DataCellSize; NTSTATUS Status; if (dwType == REG_LINK) @@ -597,7 +597,7 @@ if (!DataCell) return ERROR_UNSUCCESSFUL; - DataCellSize = -HvGetCellSize(Hive, DataCell); + DataCellSize = (ULONG)(-HvGetCellSize(Hive, DataCell)); } else { @@ -613,12 +613,12 @@ HvFreeCell(Hive, ValueCell->Data); RtlCopyMemory(&ValueCell->Data, lpData, cbData); - ValueCell->DataLength = (ULONG)(cbData | CM_KEY_VALUE_SPECIAL_SIZE); + ValueCell->DataLength = (cbData | CM_KEY_VALUE_SPECIAL_SIZE); ValueCell->Type = dwType; } else { - if (cbData > (SIZE_T)DataCellSize) + if (cbData > DataCellSize) { /* New data size is larger than the current, destroy current * data block and allocate a new one. */ @@ -642,7 +642,7 @@ /* Copy new contents to cell */ RtlCopyMemory(DataCell, lpData, cbData); - ValueCell->DataLength = (ULONG)(cbData & ~CM_KEY_VALUE_SPECIAL_SIZE); + ValueCell->DataLength = (cbData & ~CM_KEY_VALUE_SPECIAL_SIZE); ValueCell->Type = dwType; HvMarkCellDirty(Hive, ValueCell->Data, FALSE); } @@ -712,7 +712,7 @@ IN PULONG lpReserved, OUT PULONG lpType OPTIONAL, OUT PUCHAR lpData OPTIONAL, - IN OUT PSIZE_T lpcbData OPTIONAL) + IN OUT PULONG lpcbData OPTIONAL) { PMEMKEY ParentKey = HKEY_TO_MEMKEY(hKey); PHHIVE Hive = &ParentKey->RegistryHive->Hive; Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=706… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] Sun Jan 17 01:29:43 2016 @@ -16,34 +16,6 @@ #include "mkhive.h" #include <bitmap.c> - -/* - * @implemented - * - * NOTES - * If source is NULL the length of source is assumed to be 0. - */ -VOID NTAPI -RtlInitAnsiString( - IN OUT PANSI_STRING DestinationString, - IN PCSTR SourceString) -{ - SIZE_T DestSize; - - if(SourceString) - { - DestSize = strlen(SourceString); - DestinationString->Length = (USHORT)DestSize; - DestinationString->MaximumLength = (USHORT)DestSize + sizeof(CHAR); - } - else - { - DestinationString->Length = 0; - DestinationString->MaximumLength = 0; - } - - DestinationString->Buffer = (PCHAR)SourceString; -} /* * @implemented @@ -71,41 +43,6 @@ } DestinationString->Buffer = (PWCHAR)SourceString; -} - -NTSTATUS NTAPI -RtlAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PANSI_STRING AnsiSource, - IN BOOLEAN AllocateDestinationString) -{ - ULONG Length; - PUCHAR WideString; - USHORT i; - - Length = AnsiSource->Length * sizeof(WCHAR); - if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; - UniDest->Length = (USHORT)Length; - - if (AllocateDestinationString) - { - UniDest->MaximumLength = (USHORT)Length + sizeof(WCHAR); - UniDest->Buffer = (PWSTR) malloc(UniDest->MaximumLength); - if (!UniDest->Buffer) - return STATUS_NO_MEMORY; - } - else if (UniDest->Length >= UniDest->MaximumLength) - { - return STATUS_BUFFER_OVERFLOW; - } - - WideString = (PUCHAR)UniDest->Buffer; - for (i = 0; i <= AnsiSource->Length; i++) - { - WideString[2 * i + 0] = AnsiSource->Buffer[i]; - WideString[2 * i + 1] = 0; - } - return STATUS_SUCCESS; } LONG NTAPI @@ -222,14 +159,14 @@ VOID NTAPI KeBugCheckEx( - IN ULONG BugCheckCode, + IN ULONG BugCheckCode, IN ULONG_PTR BugCheckParameter1, IN ULONG_PTR BugCheckParameter2, IN ULONG_PTR BugCheckParameter3, IN ULONG_PTR BugCheckParameter4) { char Buffer[70]; - printf("*** STOP: 0x%08lX (0x%08lX, 0x%08lX, 0x%08lX, 0x%08lX)", + printf("*** STOP: 0x%08X (0x%08lX, 0x%08lX, 0x%08lX, 0x%08lX)", BugCheckCode, BugCheckParameter1, BugCheckParameter2, BugCheckParameter3, BugCheckParameter4); ASSERT(FALSE);

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