Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/03: Fixed typo
by Peter Wathall 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a3a4f797067fc145eb7e… commit 3a3a4f797067fc145eb7e9f7603d06f2ae54d50e Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Mon Apr 30 00:16:45 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:15:25 2018 +0100 Fixed typo --- drivers/usb/usbhub/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbhub/misc.c b/drivers/usb/usbhub/misc.c index 405fde8eba..33eacbe8b1 100644 --- a/drivers/usb/usbhub/misc.c +++ b/drivers/usb/usbhub/misc.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbhub/fdo.c + * FILE: drivers/usb/usbhub/misc.c * PURPOSE: Misc helper functions * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org)

1 0

01/01: [FASTFAT] Deny dismounting system volume or a volume with a pagefile
by Pierre Schweitzer 16 May '18

16 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d37280efaab68188e55f4… commit d37280efaab68188e55f4db3ef2882e54fff3163 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed May 16 21:44:47 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed May 16 21:45:35 2018 +0200 [FASTFAT] Deny dismounting system volume or a volume with a pagefile --- drivers/filesystems/fastfat/create.c | 2 ++ drivers/filesystems/fastfat/fsctl.c | 10 ++++++++++ drivers/filesystems/fastfat/vfat.h | 1 + 3 files changed, 13 insertions(+) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 7ecc0ffae1..d9efa96828 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -778,6 +778,7 @@ VfatCreateFile( if (PagingFileCreate) { pFcb->Flags |= FCB_IS_PAGE_FILE; + SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); } } else @@ -897,6 +898,7 @@ VfatCreateFile( else { pFcb->Flags |= FCB_IS_PAGE_FILE; + SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); } } else diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index abd772648a..778a2bce8b 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -777,6 +777,10 @@ VfatMount( } VolumeFcb->Flags |= VCB_IS_DIRTY; + if (BooleanFlagOn(Vpb->RealDevice->Flags, DO_SYSTEM_BOOT_PARTITION)) + { + SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); + } FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); FsRtlNotifyInitializeSync(&DeviceExt->NotifySync); @@ -1174,6 +1178,12 @@ VfatDismountVolume( return STATUS_ACCESS_DENIED; } + /* Deny dismount of boot volume */ + if (BooleanFlagOn(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE)) + { + return STATUS_ACCESS_DENIED; + } + /* Race condition? */ if (BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) { diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index cb38b16699..e58b61bb57 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -239,6 +239,7 @@ typedef union _DIR_ENTRY DIR_ENTRY, *PDIR_ENTRY; #define VCB_VOLUME_LOCKED 0x0001 #define VCB_DISMOUNT_PENDING 0x0002 #define VCB_IS_FATX 0x0004 +#define VCB_IS_SYS_OR_HAS_PAGE 0x0008 #define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ #define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */

1 0

01/01: [USETUP] Remove the WIN32 support because usetup is a native-only application
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3cff3a6859cabadb7df… commit 7c3cff3a6859cabadb7df300bbf5a86cd53c04a2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 23:35:17 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 23:35:17 2018 +0200 [USETUP] Remove the WIN32 support because usetup is a native-only application --- base/setup/usetup/CMakeLists.txt | 6 +- base/setup/usetup/bootsup.c | 12 ---- base/setup/usetup/{native/utils => }/console.c | 2 +- base/setup/usetup/{native/utils => }/console.h | 5 +- base/setup/usetup/consup.c | 2 +- base/setup/usetup/filesup.c | 19 +----- base/setup/usetup/fslist.c | 10 ++- base/setup/usetup/inffile.c | 85 ------------------------- base/setup/usetup/inffile.h | 8 --- base/setup/usetup/{native/utils => }/keytrans.c | 2 +- base/setup/usetup/{native/utils => }/keytrans.h | 2 +- base/setup/usetup/native/console.c | 7 -- base/setup/usetup/native/fslist.c | 31 --------- base/setup/usetup/native/host_native.h | 5 -- base/setup/usetup/registry.c | 43 ------------- base/setup/usetup/usetup.c | 5 -- base/setup/usetup/usetup.h | 7 -- base/setup/usetup/usetup.rc | 4 +- 18 files changed, 18 insertions(+), 237 deletions(-) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 8ca8471f5e..8dff7a5ab1 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -8,14 +8,11 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE - native/utils/keytrans.c - native/utils/console.c - native/fslist.c - native/console.c bootsup.c cabinet.c chkdsk.c cmdcons.c + console.c consup.c devinst.c drivesup.c @@ -26,6 +23,7 @@ list(APPEND SOURCE genlist.c inffile.c inicache.c + keytrans.c mui.c partlist.c progress.c diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index f6818293e7..75319fba95 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -2249,7 +2249,6 @@ InstallFatBootcodeToPartition( PUNICODE_STRING DestinationArcPath, UCHAR PartitionType) { -#ifdef __REACTOS__ NTSTATUS Status; BOOLEAN DoesFreeLdrExist; WCHAR SrcPath[MAX_PATH]; @@ -2494,9 +2493,6 @@ InstallFatBootcodeToPartition( } return STATUS_SUCCESS; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } static @@ -2507,7 +2503,6 @@ InstallExt2BootcodeToPartition( PUNICODE_STRING DestinationArcPath, UCHAR PartitionType) { -#ifdef __REACTOS__ NTSTATUS Status; BOOLEAN DoesFreeLdrExist; WCHAR SrcPath[MAX_PATH]; @@ -2613,9 +2608,6 @@ InstallExt2BootcodeToPartition( } return STATUS_SUCCESS; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } @@ -2666,7 +2658,6 @@ InstallFatBootcodeToFloppy( PUNICODE_STRING SourceRootPath, PUNICODE_STRING DestinationArcPath) { -#ifdef __REACTOS__ NTSTATUS Status; UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0"); WCHAR SrcPath[MAX_PATH]; @@ -2725,9 +2716,6 @@ InstallFatBootcodeToFloppy( } return STATUS_SUCCESS; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } /* EOF */ diff --git a/base/setup/usetup/native/utils/console.c b/base/setup/usetup/console.c similarity index 99% rename from base/setup/usetup/native/utils/console.c rename to base/setup/usetup/console.c index 2ab380a0bc..858e83433e 100644 --- a/base/setup/usetup/native/utils/console.c +++ b/base/setup/usetup/console.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/console.c + * FILE: base/setup/usetup/console.c * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ diff --git a/base/setup/usetup/native/utils/console.h b/base/setup/usetup/console.h similarity index 96% rename from base/setup/usetup/native/utils/console.h rename to base/setup/usetup/console.h index 567d657b88..8578afc11d 100644 --- a/base/setup/usetup/native/utils/console.h +++ b/base/setup/usetup/console.h @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/console.h + * FILE: base/setup/usetup/console.h * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ @@ -124,7 +124,6 @@ WriteConsoleOutputCharacterW( BOOL WINAPI SetConsoleOutputCP( - IN UINT wCodePageID -); + IN UINT wCodePageID); /* EOF */ diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 0fbf4daf9f..cec8c5ab5e 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -46,7 +46,7 @@ CONSOLE_Init( VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; - if (!HOST_InitConsole()) + if (!AllocConsole()) return FALSE; StdInput = GetStdHandle(STD_INPUT_HANDLE); diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 8007756191..568525d095 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -264,7 +264,6 @@ SetupCopyFile( SIZE_T SourceSectionSize = 0; LARGE_INTEGER ByteOffset; -#ifdef __REACTOS__ RtlInitUnicodeString(&FileName, SourceFileName); @@ -285,20 +284,6 @@ SetupCopyFile( DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); goto done; } -#else - FileHandleSource = CreateFileW(SourceFileName, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (FileHandleSource == INVALID_HANDLE_VALUE) - { - Status = STATUS_UNSUCCESSFUL; - goto done; - } -#endif Status = NtQueryInformationFile(FileHandleSource, &IoStatusBlock, @@ -496,7 +481,7 @@ done: return Status; } -#ifdef __REACTOS__ + NTSTATUS SetupExtractFile( PWCHAR CabinetFileName, @@ -574,7 +559,7 @@ SetupExtractFile( return STATUS_SUCCESS; } -#endif + BOOLEAN DoesFileExist( diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index 99fe2f8460..0b190d4a8b 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -33,7 +33,7 @@ /* FUNCTIONS ****************************************************************/ VOID -FS_AddProvider( +AddProvider( IN OUT PFILE_SYSTEM_LIST List, IN LPCWSTR FileSystemName, IN FORMATEX FormatFunc, @@ -175,12 +175,16 @@ CreateFileSystemList( List->Selected = NULL; InitializeListHead(&List->ListHead); - HOST_CreateFileSystemList(List); + AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); +#if 0 + AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); + AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); +#endif if (!ForceFormat) { /* Add 'Keep' provider */ - FS_AddProvider(List, NULL, NULL, NULL); + AddProvider(List, NULL, NULL, NULL); } /* Search for ForceFileSystem in list */ diff --git a/base/setup/usetup/inffile.c b/base/setup/usetup/inffile.c index 73ab536a4b..10adbcf5c2 100644 --- a/base/setup/usetup/inffile.c +++ b/base/setup/usetup/inffile.c @@ -33,8 +33,6 @@ /* FUNCTIONS *****************************************************************/ -#ifdef __REACTOS__ - BOOL WINAPI InfpFindFirstLineW( @@ -81,7 +79,6 @@ InfpOpenInfFileW( return hInf; } -#endif /* __REACTOS__ */ BOOLEAN @@ -90,54 +87,7 @@ INF_GetData( OUT PWCHAR *Key, OUT PWCHAR *Data) { -#ifdef __REACTOS__ return InfGetData(Context, Key, Data); -#else - static PWCHAR pLastCallData[4] = { NULL, NULL, NULL, NULL }; - static DWORD currentIndex = 0; - DWORD dwSize, i; - BOOL ret; - - currentIndex ^= 2; - - if (Key) - *Key = NULL; - - if (Data) - *Data = NULL; - - if (SetupGetFieldCount(Context) != 1) - return FALSE; - - for (i = 0; i <= 1; i++) - { - ret = SetupGetStringFieldW(Context, - i, - NULL, - 0, - &dwSize); - if (!ret) - return FALSE; - - HeapFree(GetProcessHeap(), 0, pLastCallData[i + currentIndex]); - pLastCallData[i + currentIndex] = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - ret = SetupGetStringFieldW(Context, - i, - pLastCallData[i + currentIndex], - dwSize, - NULL); - if (!ret) - return FALSE; - } - - if (Key) - *Key = pLastCallData[0 + currentIndex]; - - if (Data) - *Data = pLastCallData[1 + currentIndex]; - - return TRUE; -#endif /* !__REACTOS__ */ } @@ -147,38 +97,7 @@ INF_GetDataField( IN ULONG FieldIndex, OUT PWCHAR *Data) { -#ifdef __REACTOS__ return InfGetDataField(Context, FieldIndex, Data); -#else - static PWCHAR pLastCallsData[] = { NULL, NULL, NULL }; - static DWORD NextIndex = 0; - DWORD dwSize; - BOOL ret; - - *Data = NULL; - - ret = SetupGetStringFieldW(Context, - FieldIndex, - NULL, - 0, - &dwSize); - if (!ret) - return FALSE; - - HeapFree(GetProcessHeap(), 0, pLastCallsData[NextIndex]); - pLastCallsData[NextIndex] = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - ret = SetupGetStringFieldW(Context, - FieldIndex, - pLastCallsData[NextIndex], - dwSize, - NULL); - if (!ret) - return FALSE; - - *Data = pLastCallsData[NextIndex]; - NextIndex = (NextIndex + 1) % (sizeof(pLastCallsData) / sizeof(pLastCallsData[0])); - return TRUE; -#endif /* !__REACTOS__ */ } @@ -191,7 +110,6 @@ INF_OpenBufferedFileA( IN LCID LocaleId, OUT PUINT ErrorLine) { -#ifdef __REACTOS__ HINF hInf = NULL; ULONG ErrorLineUL; NTSTATUS Status; @@ -206,9 +124,6 @@ INF_OpenBufferedFileA( return INVALID_HANDLE_VALUE; return hInf; -#else - return INVALID_HANDLE_VALUE; -#endif /* !__REACTOS__ */ } /* EOF */ diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h index 039fbef353..9ce8ce0b2c 100644 --- a/base/setup/usetup/inffile.h +++ b/base/setup/usetup/inffile.h @@ -26,12 +26,6 @@ #pragma once -#ifndef __REACTOS__ - -#include <setupapi.h> - -#else /* __REACTOS__ */ - #include <infcommon.h> #define SetupFindFirstLineW InfpFindFirstLineW @@ -69,8 +63,6 @@ InfpOpenInfFileW( IN LCID LocaleId, OUT PUINT ErrorLine); -#endif /* __REACTOS__ */ - BOOLEAN INF_GetData( IN PINFCONTEXT Context, diff --git a/base/setup/usetup/native/utils/keytrans.c b/base/setup/usetup/keytrans.c similarity index 99% rename from base/setup/usetup/native/utils/keytrans.c rename to base/setup/usetup/keytrans.c index 61279634b3..0c85cb7e83 100644 --- a/base/setup/usetup/native/utils/keytrans.c +++ b/base/setup/usetup/keytrans.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/keytrans.c + * FILE: base/setup/usetup/keytrans.c * PURPOSE: Console support functions: keyboard translation * PROGRAMMER: Tinus * diff --git a/base/setup/usetup/native/utils/keytrans.h b/base/setup/usetup/keytrans.h similarity index 94% rename from base/setup/usetup/native/utils/keytrans.h rename to base/setup/usetup/keytrans.h index 893a6995e5..788d7ed151 100644 --- a/base/setup/usetup/native/utils/keytrans.h +++ b/base/setup/usetup/keytrans.h @@ -18,7 +18,7 @@ */ /* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/keytrans.h + * FILE: base/setup/usetup/keytrans.h * PURPOSE: Keyboard translation functionality * PROGRAMMER: Tinus */ diff --git a/base/setup/usetup/native/console.c b/base/setup/usetup/native/console.c deleted file mode 100644 index 963caa72f0..0000000000 --- a/base/setup/usetup/native/console.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <usetup.h> - -BOOLEAN -NATIVE_InitConsole(VOID) -{ - return (BOOLEAN)AllocConsole(); -} diff --git a/base/setup/usetup/native/fslist.c b/base/setup/usetup/native/fslist.c deleted file mode 100644 index 4d9b655936..0000000000 --- a/base/setup/usetup/native/fslist.c +++ /dev/null @@ -1,31 +0,0 @@ -#include <usetup.h> - -BOOLEAN -NATIVE_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List) -{ - FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); -#if 0 - FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); - FS_AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); -#endif - return TRUE; -} - - -BOOLEAN -NATIVE_FormatPartition( - IN PFILE_SYSTEM_ITEM FileSystem, - IN PCUNICODE_STRING DriveRoot, - IN PFMIFSCALLBACK Callback) -{ - NTSTATUS Status; - - Status = FileSystem->FormatFunc((PUNICODE_STRING)DriveRoot, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - FileSystem->QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - Callback); /* Callback */ - return NT_SUCCESS(Status); -} diff --git a/base/setup/usetup/native/host_native.h b/base/setup/usetup/native/host_native.h deleted file mode 100644 index df3ad98ddc..0000000000 --- a/base/setup/usetup/native/host_native.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define SetupInitDefaultQueueCallback(a) NULL -#define SetupDefaultQueueCallbackW(a, b, c, d) TRUE -#define SetupTermDefaultQueueCallback(a) diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index 4bbc4f8aa1..2c7ada697d 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -31,7 +31,6 @@ #define NDEBUG #include <debug.h> -#ifdef __REACTOS__ #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002 #define FLG_ADDREG_DELVAL 0x00000004 @@ -45,7 +44,6 @@ #define FLG_ADDREG_TYPE_DWORD (0x00010000 | FLG_ADDREG_BINVALUETYPE) #define FLG_ADDREG_TYPE_NONE (0x00020000 | FLG_ADDREG_BINVALUETYPE) #define FLG_ADDREG_TYPE_MASK (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE) -#endif #ifdef _M_IX86 #define Architecture L"x86" @@ -324,16 +322,12 @@ do_reg_operation(HANDLE KeyHandle, DPRINT("setting dword %wZ to %lx\n", ValueName, dw); -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)&dw, sizeof(ULONG)); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)&dw, sizeof(ULONG)); -#endif } else { @@ -341,29 +335,21 @@ do_reg_operation(HANDLE KeyHandle, if (Str) { -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)Str, Size * sizeof(WCHAR)); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)Str, Size * sizeof(WCHAR)); -#endif } else { -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)&EmptyStr, sizeof(WCHAR)); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)&EmptyStr, sizeof(WCHAR)); -#endif } } RtlFreeHeap (ProcessHeap, 0, Str); @@ -385,16 +371,12 @@ do_reg_operation(HANDLE KeyHandle, SetupGetBinaryField (Context, 5, Data, Size, NULL); } -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)Data, Size); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)Data, Size); -#endif RtlFreeHeap (ProcessHeap, 0, Data); } @@ -402,7 +384,6 @@ do_reg_operation(HANDLE KeyHandle, return TRUE; } -#ifdef __REACTOS__ NTSTATUS CreateNestedKey (PHANDLE KeyHandle, ACCESS_MASK DesiredAccess, @@ -494,7 +475,6 @@ CreateNestedKey (PHANDLE KeyHandle, return Status; } -#endif /*********************************************************************** * registry_callback @@ -543,7 +523,6 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) DPRINT("Flags: %lx\n", Flags); -#ifdef __REACTOS__ RtlInitUnicodeString (&Name, Buffer); @@ -575,26 +554,6 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) continue; } } -#else - if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) - { - LONG rc = RegOpenKeyW(NULL, Buffer, &KeyHandle); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegOpenKeyW(%S) failed (error %lu)\n", Buffer, rc); - continue; /* ignore if it doesn't exist */ - } - } - else - { - LONG rc = RegCreateKeyW(NULL, Buffer, &KeyHandle); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyW(%S) failed (error %lu)\n", Buffer, rc); - continue; - } - } -#endif /* get value name */ if (SetupGetStringFieldW (&Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL)) @@ -615,9 +574,7 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) return FALSE; } -#ifdef __REACTOS__ NtClose (KeyHandle); -#endif } } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 5b5ac583d3..71dc354ae0 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3886,7 +3886,6 @@ PrepareCopyPage(PINPUT_RECORD Ir) wcscat(PathBuffer, L"\\"); wcscat(PathBuffer, KeyValue); -#ifdef __REACTOS__ CabinetInitialize(); CabinetSetEventHandlers(NULL, NULL, NULL); CabinetSetCabinetName(PathBuffer); @@ -3929,7 +3928,6 @@ PrepareCopyPage(PINPUT_RECORD Ir) /* FIXME: show an error dialog */ return QUIT_PAGE; } -#endif } while (SetupFindNextLine(&CabinetsContext, &CabinetsContext)); return FILE_COPY_PAGE; @@ -4960,8 +4958,6 @@ RunUSetup(VOID) } -#ifdef __REACTOS__ - VOID NTAPI NtProcessStartup(PPEB Peb) { @@ -4971,6 +4967,5 @@ NtProcessStartup(PPEB Peb) InfSetHeap(ProcessHeap); RunUSetup(); } -#endif /* __REACTOS__ */ /* EOF */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 181c1b40a3..37cae20f7f 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -63,17 +63,14 @@ #include "inffile.h" #include "inicache.h" #include "progress.h" -#ifdef __REACTOS__ #include "infros.h" #include "filequeue.h" -#endif #include "registry.h" #include "fslist.h" #include "partlist.h" #include "cabinet.h" #include "filesup.h" #include "genlist.h" -#include "host.h" #include "mui.h" #include "errorcode.h" @@ -84,8 +81,6 @@ extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; extern PWCHAR SelectedLanguageId; -#ifdef __REACTOS__ - extern VOID InfSetHeap(PVOID Heap); extern VOID InfCloseFile(HINF InfHandle); extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, @@ -112,8 +107,6 @@ extern BOOLEAN InfGetStringField(PINFCONTEXT Context, #define SetupGetMultiSzFieldW InfGetMultiSzField #define SetupGetStringFieldW InfGetStringField -#endif /* __REACTOS__ */ - #ifndef _PAGE_NUMBER_DEFINED #define _PAGE_NUMBER_DEFINED typedef enum _PAGE_NUMBER diff --git a/base/setup/usetup/usetup.rc b/base/setup/usetup/usetup.rc index 3eb82aea53..d7347f31b9 100644 --- a/base/setup/usetup/usetup.rc +++ b/base/setup/usetup/usetup.rc @@ -1,6 +1,4 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" #define REACTOS_STR_INTERNAL_NAME "usetup" -#define REACTOS_STR_ORIGINAL_FILENAME "usetup.dll" -#ifdef __REACTOS__ +#define REACTOS_STR_ORIGINAL_FILENAME "usetup.exe" #include <reactos/version.rc> -#endif

1 0

01/01: [USETUP] Disable install path test that may tests
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4038773f45d2c0747b7e2… commit 4038773f45d2c0747b7e213cd4fd249162c84dd2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 22:58:34 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 22:58:34 2018 +0200 [USETUP] Disable install path test that may tests --- base/setup/usetup/filesup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index a325df8e2a..8007756191 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -142,12 +142,12 @@ IsValidPath( // TODO: Add check for 8.3 too. /* Path must be at least 2 characters long */ - if (Length < 2) - return FALSE; +// if (Length < 2) +// return FALSE; /* Path must start with a backslash */ - if (InstallDir[0] != L'\\') - return FALSE; +// if (InstallDir[0] != L'\\') +// return FALSE; /* Path must not end with a backslash */ if (InstallDir[Length - 1] == L'\\')

1 0

01/01: [USETUP] Remove unused VolumeLabel and FileSystemName from the PARTENTRY type
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b323ff2f4ad43a1d2f92… commit 1b323ff2f4ad43a1d2f9216fa9db8a2ff468a688 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 20:02:04 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 20:02:04 2018 +0200 [USETUP] Remove unused VolumeLabel and FileSystemName from the PARTENTRY type --- base/setup/usetup/partlist.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index bf2bca235e..c42335a70a 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -63,8 +63,6 @@ typedef struct _PARTENTRY ULONG PartitionIndex; CHAR DriveLetter; - CHAR VolumeLabel[17]; - CHAR FileSystemName[9]; BOOLEAN LogicalPartition;

1 0

01/01: [USETUP] Get rid of the interface directory because we support text-mode only
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ce0c5d48b6f149a15e7e… commit 3ce0c5d48b6f149a15e7eb9694e31a221546da5c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 19:47:52 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 19:47:52 2018 +0200 [USETUP] Get rid of the interface directory because we support text-mode only --- base/setup/usetup/CMakeLists.txt | 6 +++--- base/setup/usetup/{interface => }/consup.c | 2 +- base/setup/usetup/{interface => }/consup.h | 2 +- base/setup/usetup/{interface => }/devinst.c | 2 +- base/setup/usetup/{interface => }/usetup.c | 2 +- base/setup/usetup/usetup.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 46034af752..8ca8471f5e 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -8,9 +8,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE - interface/usetup.c - interface/devinst.c - interface/consup.c native/utils/keytrans.c native/utils/console.c native/fslist.c @@ -19,6 +16,8 @@ list(APPEND SOURCE cabinet.c chkdsk.c cmdcons.c + consup.c + devinst.c drivesup.c filesup.c filequeue.c @@ -32,6 +31,7 @@ list(APPEND SOURCE progress.c registry.c settings.c + usetup.c usetup.h) add_executable(usetup ${SOURCE} usetup.rc) diff --git a/base/setup/usetup/interface/consup.c b/base/setup/usetup/consup.c similarity index 99% rename from base/setup/usetup/interface/consup.c rename to base/setup/usetup/consup.c index d682a73959..0fbf4daf9f 100644 --- a/base/setup/usetup/interface/consup.c +++ b/base/setup/usetup/consup.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/consup.c + * FILE: base/setup/usetup/consup.c * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ diff --git a/base/setup/usetup/interface/consup.h b/base/setup/usetup/consup.h similarity index 98% rename from base/setup/usetup/interface/consup.h rename to base/setup/usetup/consup.h index 44d3eab80b..546e78864a 100644 --- a/base/setup/usetup/interface/consup.h +++ b/base/setup/usetup/consup.h @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/consup.h + * FILE: base/setup/usetup/consup.h * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ diff --git a/base/setup/usetup/interface/devinst.c b/base/setup/usetup/devinst.c similarity index 99% rename from base/setup/usetup/interface/devinst.c rename to base/setup/usetup/devinst.c index 354be13075..ef4c6840a8 100644 --- a/base/setup/usetup/interface/devinst.c +++ b/base/setup/usetup/devinst.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/devinst.c + * FILE: base/setup/usetup/devinst.c * PURPOSE: Device installation * PROGRAMMER: Herv� Poussineau (hpoussin(a)reactos.org) */ diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/usetup.c similarity index 99% rename from base/setup/usetup/interface/usetup.c rename to base/setup/usetup/usetup.c index 2cbab22f0e..5b5ac583d3 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/usetup.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/interface/usetup.c + * FILE: base/setup/usetup/usetup.c * PURPOSE: Text-mode setup * PROGRAMMER: Eric Kohl * Casper S. Hornstrup (chorns(a)users.sourceforge.net) diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index a640728b05..181c1b40a3 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -59,7 +59,7 @@ // #include <fslib/ntfslib.h> /* Internal Headers */ -#include "interface/consup.h" +#include "consup.h" #include "inffile.h" #include "inicache.h" #include "progress.h"

1 0

01/01: [USETUP] Simplify the unattended code path in the install directory page and verify the unattended install path.
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=849fe9f4eb11707d2f205… commit 849fe9f4eb11707d2f205271aaa77f0d80cb8064 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 18:11:12 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 18:11:12 2018 +0200 [USETUP] Simplify the unattended code path in the install directory page and verify the unattended install path. --- base/setup/usetup/filesup.c | 7 ++-- base/setup/usetup/filesup.h | 3 +- base/setup/usetup/interface/usetup.c | 65 +++++++++++++++--------------------- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 4dfd7d40b6..a325df8e2a 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -133,10 +133,11 @@ DoesPathExist( BOOLEAN IsValidPath( - PWCHAR InstallDir, - ULONG Length) + PWCHAR InstallDir) { - UINT i; + UINT i, Length; + + Length = wcslen(InstallDir); // TODO: Add check for 8.3 too. diff --git a/base/setup/usetup/filesup.h b/base/setup/usetup/filesup.h index 85790e4c66..e09a08c673 100644 --- a/base/setup/usetup/filesup.h +++ b/base/setup/usetup/filesup.h @@ -48,7 +48,6 @@ DoesFileExist( BOOLEAN IsValidPath( - PWCHAR InstallDir, - ULONG Length); + PWCHAR InstallDir); /* EOF */ diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/interface/usetup.c index dbd024d076..2cbab22f0e 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/interface/usetup.c @@ -3257,24 +3257,11 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } -/* - * Displays the InstallDirectoryPage1. - * - * Next pages: - * PrepareCopyPage (At once) - * - * SIDEEFFECTS - * Inits DestinationRootPath - * Inits DestinationPath - * Inits DestinationArcPath - * - * RETURNS - * Number of the next page. - */ -static PAGE_NUMBER -InstallDirectoryPage1(PWCHAR InstallDir, - PDISKENTRY DiskEntry, - PPARTENTRY PartEntry) +static +VOID +BuildInstallPaths(PWCHAR InstallDir, + PDISKENTRY DiskEntry, + PPARTENTRY PartEntry) { WCHAR PathBuffer[MAX_PATH]; @@ -3313,8 +3300,6 @@ InstallDirectoryPage1(PWCHAR InstallDir, wcscat(PathBuffer, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); - - return PREPARE_COPY_PAGE; } @@ -3356,9 +3341,21 @@ InstallDirectoryPage(PINPUT_RECORD Ir) PartEntry = PartitionList->CurrentPartition; if (IsUnattendedSetup) - wcscpy(InstallDir, UnattendInstallationDirectory); - else - wcscpy(InstallDir, L"\\ReactOS"); + { + if (!IsValidPath(UnattendInstallationDirectory)) + { + /* FIXME: Log the error? */ + return QUIT_PAGE; + } + + BuildInstallPaths(UnattendInstallationDirectory, + DiskEntry, + PartEntry); + + return PREPARE_COPY_PAGE; + } + + wcscpy(InstallDir, L"\\ReactOS"); Length = wcslen(InstallDir); Pos = Length; @@ -3367,17 +3364,6 @@ InstallDirectoryPage(PINPUT_RECORD Ir) CONSOLE_SetCursorType(TRUE, TRUE); MUIDisplayPage(INSTALL_DIRECTORY_PAGE); - // FIXME: Check the validity of the InstallDir; however what to do - // if it is invalid but we are in unattended setup? (case of somebody - // specified an invalid installation directory in the unattended file). - - if (IsUnattendedSetup) - { - return InstallDirectoryPage1(InstallDir, - DiskEntry, - PartEntry); - } - while (TRUE) { CONSOLE_ConInKey(Ir); @@ -3446,14 +3432,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir) * Check for the validity of the installation directory and pop up * an error if it is not the case. Then the user can fix its input. */ - if (!IsValidPath(InstallDir, Length)) + if (!IsValidPath(InstallDir)) { MUIDisplayError(ERROR_DIRECTORY_NAME, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; } - return InstallDirectoryPage1(InstallDir, - DiskEntry, - PartEntry); + + BuildInstallPaths(InstallDir, + DiskEntry, + PartEntry); + + return PREPARE_COPY_PAGE; } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */ {

1 0

01/01: [USETUP] Improve the install path checks
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16daf6700a30401699005… commit 16daf6700a30401699005b6f798c73689b6223d9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 15:45:31 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 15:45:31 2018 +0200 [USETUP] Improve the install path checks - Path must not contain whitespace characters. - Path must be at least 2 characters long. - Path must start with a backslash. - Path must not end with a backslash. - Path components must not end with a dot. CORE-9529 --- base/setup/usetup/filesup.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 4238557bbe..4dfd7d40b6 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -140,13 +140,38 @@ IsValidPath( // TODO: Add check for 8.3 too. - /* Check for whitespaces */ + /* Path must be at least 2 characters long */ + if (Length < 2) + return FALSE; + + /* Path must start with a backslash */ + if (InstallDir[0] != L'\\') + return FALSE; + + /* Path must not end with a backslash */ + if (InstallDir[Length - 1] == L'\\') + return FALSE; + + /* Path must not contain whitespace characters */ for (i = 0; i < Length; i++) { if (isspace(InstallDir[i])) return FALSE; } + /* Path component must not end with a dot */ + for (i = 0; i < Length; i++) + { + if (InstallDir[i] == L'\\' && i > 0) + { + if (InstallDir[i - 1] == L'.') + return FALSE; + } + } + + if (InstallDir[Length - 1] == L'.') + return FALSE; + return TRUE; }

1 0

01/01: [USETUP] Add support for HOME, END, DEL, LEFT and RIGHT keys to partition size and install path edit fields.
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bf2f30cf27ce5b6cd923… commit 3bf2f30cf27ce5b6cd92382d2698d49bea758266 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 11:28:33 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 11:28:33 2018 +0200 [USETUP] Add support for HOME, END, DEL, LEFT and RIGHT keys to partition size and install path edit fields. CORE-13975 --- base/setup/usetup/interface/consup.c | 12 +-- base/setup/usetup/interface/usetup.c | 187 ++++++++++++++++++++++++++++++----- 2 files changed, 164 insertions(+), 35 deletions(-) diff --git a/base/setup/usetup/interface/consup.c b/base/setup/usetup/interface/consup.c index 004f9dabf8..d682a73959 100644 --- a/base/setup/usetup/interface/consup.c +++ b/base/setup/usetup/interface/consup.c @@ -334,20 +334,12 @@ CONSOLE_SetInputTextXY( &Written); coPos.X += Length; - FillConsoleOutputCharacterA( - StdOutput, - '_', - 1, - coPos, - &Written); - - if (len > Length + 1) + if (len > Length) { - coPos.X++; FillConsoleOutputCharacterA( StdOutput, ' ', - len - Length - 1, + len - Length, coPos, &Written); } diff --git a/base/setup/usetup/interface/usetup.c b/base/setup/usetup/interface/usetup.c index 38085569d7..dbd024d076 100644 --- a/base/setup/usetup/interface/usetup.c +++ b/base/setup/usetup/interface/usetup.c @@ -1774,7 +1774,7 @@ ShowPartitionSizeInputBox(SHORT Left, DWORD Written; CHAR Buffer[128]; WCHAR PartitionSizeBuffer[100]; - ULONG Index; + ULONG Length, Pos; WCHAR ch; SHORT iLeft; SHORT iTop; @@ -1810,11 +1810,14 @@ ShowPartitionSizeInputBox(SHORT Left, &Written); swprintf(PartitionSizeBuffer, L"%lu", MaxSize); - Index = wcslen(PartitionSizeBuffer); + Length = wcslen(PartitionSizeBuffer); + Pos = Length; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Length, iTop); + CONSOLE_SetCursorType(TRUE, TRUE); while (TRUE) { @@ -1826,11 +1829,13 @@ ShowPartitionSizeInputBox(SHORT Left, if (Quit != NULL) *Quit = TRUE; - PartitionSizeBuffer[0] = 0; + PartitionSizeBuffer[0] = UNICODE_NULL; + CONSOLE_SetCursorType(TRUE, FALSE); break; } else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { + CONSOLE_SetCursorType(TRUE, FALSE); break; } else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESCAPE */ @@ -1838,35 +1843,100 @@ ShowPartitionSizeInputBox(SHORT Left, if (Cancel != NULL) *Cancel = TRUE; - PartitionSizeBuffer[0] = 0; + PartitionSizeBuffer[0] = UNICODE_NULL; + CONSOLE_SetCursorType(TRUE, FALSE); break; } - else if ((Ir.Event.KeyEvent.wVirtualKeyCode == VK_BACK) && /* BACKSPACE */ - (Index > 0)) + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_HOME)) /* HOME */ { - Index--; - PartitionSizeBuffer[Index] = 0; - - CONSOLE_SetInputTextXY(iLeft, - iTop, - PARTITION_SIZE_INPUT_FIELD_LENGTH, - PartitionSizeBuffer); + Pos = 0; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_END)) /* END */ + { + Pos = Length; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_LEFT)) /* LEFT */ + { + if (Pos > 0) + { + Pos--; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } } - else if ((Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) && - (Index < PARTITION_SIZE_INPUT_FIELD_LENGTH)) + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RIGHT)) /* RIGHT */ { - ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar; + if (Pos < Length) + { + Pos++; + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + } + else if ((Ir.Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir.Event.KeyEvent.wVirtualKeyCode == VK_DELETE)) /* DEL */ + { + if (Pos < Length) + { + memmove(&PartitionSizeBuffer[Pos], + &PartitionSizeBuffer[Pos + 1], + (Length - Pos - 1) * sizeof(WCHAR)); + PartitionSizeBuffer[Length - 1] = UNICODE_NULL; - if ((ch >= L'0') && (ch <= L'9')) + Length--; + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + } + else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_BACK) /* BACKSPACE */ + { + if (Pos > 0) { - PartitionSizeBuffer[Index] = ch; - Index++; - PartitionSizeBuffer[Index] = 0; + if (Pos < Length) + memmove(&PartitionSizeBuffer[Pos - 1], + &PartitionSizeBuffer[Pos], + (Length - Pos) * sizeof(WCHAR)); + PartitionSizeBuffer[Length - 1] = UNICODE_NULL; + Pos--; + Length--; CONSOLE_SetInputTextXY(iLeft, iTop, PARTITION_SIZE_INPUT_FIELD_LENGTH, PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } + } + else if (Ir.Event.KeyEvent.uChar.AsciiChar != 0x00) + { + if (Length < PARTITION_SIZE_INPUT_FIELD_LENGTH) + { + ch = (WCHAR)Ir.Event.KeyEvent.uChar.AsciiChar; + + if ((ch >= L'0') && (ch <= L'9')) + { + if (Pos < Length) + memmove(&PartitionSizeBuffer[Pos + 1], + &PartitionSizeBuffer[Pos], + (Length - Pos) * sizeof(WCHAR)); + PartitionSizeBuffer[Length + 1] = UNICODE_NULL; + PartitionSizeBuffer[Pos] = ch; + + Pos++; + Length++; + CONSOLE_SetInputTextXY(iLeft, + iTop, + PARTITION_SIZE_INPUT_FIELD_LENGTH, + PartitionSizeBuffer); + CONSOLE_SetCursorXY(iLeft + Pos, iTop); + } } } } @@ -3265,7 +3335,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; WCHAR InstallDir[51]; WCHAR c; - ULONG Length; + ULONG Length, Pos; /* We do not need the filesystem list any more */ if (FileSystemList != NULL) @@ -3291,7 +3361,10 @@ InstallDirectoryPage(PINPUT_RECORD Ir) wcscpy(InstallDir, L"\\ReactOS"); Length = wcslen(InstallDir); + Pos = Length; CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); + CONSOLE_SetCursorType(TRUE, TRUE); MUIDisplayPage(INSTALL_DIRECTORY_PAGE); // FIXME: Check the validity of the InstallDir; however what to do @@ -3312,13 +3385,63 @@ InstallDirectoryPage(PINPUT_RECORD Ir) if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ { + CONSOLE_SetCursorType(TRUE, FALSE); + if (ConfirmQuit(Ir) != FALSE) return QUIT_PAGE; + CONSOLE_SetCursorType(TRUE, TRUE); break; } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DELETE)) /* DEL */ + { + if (Pos < Length) + { + memmove(&InstallDir[Pos], + &InstallDir[Pos + 1], + (Length - Pos - 1) * sizeof(WCHAR)); + InstallDir[Length - 1] = UNICODE_NULL; + + Length--; + CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); + } + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_HOME)) /* HOME */ + { + Pos = 0; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_END)) /* END */ + { + Pos = Length; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_LEFT)) /* LEFT */ + { + if (Pos > 0) + { + Pos--; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + } + else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && + (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RIGHT)) /* RIGHT */ + { + if (Pos < Length) + { + Pos++; + CONSOLE_SetCursorXY(8 + Pos, 11); + } + } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { + CONSOLE_SetCursorType(TRUE, FALSE); + /* * Check for the validity of the installation directory and pop up * an error if it is not the case. Then the user can fix its input. @@ -3334,11 +3457,18 @@ InstallDirectoryPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */ { - if (Length > 0) + if (Pos > 0) { + if (Pos < Length) + memmove(&InstallDir[Pos - 1], + &InstallDir[Pos], + (Length - Pos) * sizeof(WCHAR)); + InstallDir[Length - 1] = UNICODE_NULL; + + Pos--; Length--; - InstallDir[Length] = 0; CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); } } else if (isprint(Ir->Event.KeyEvent.uChar.AsciiChar)) @@ -3348,10 +3478,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir) c = (WCHAR)Ir->Event.KeyEvent.uChar.AsciiChar; if (iswalpha(c) || iswdigit(c) || c == '.' || c == '\\' || c == '-' || c == '_') { - InstallDir[Length] = c; + if (Pos < Length) + memmove(&InstallDir[Pos + 1], + &InstallDir[Pos], + (Length - Pos) * sizeof(WCHAR)); + InstallDir[Length + 1] = UNICODE_NULL; + InstallDir[Pos] = c; + + Pos++; Length++; - InstallDir[Length] = 0; CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + CONSOLE_SetCursorXY(8 + Pos, 11); } } }

1 0

01/01: [USETUP] Fix the name of the backspace key in the german translation
by Eric Kohl 14 May '18

14 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9b628bb8016aa756b7f… commit 7e9b628bb8016aa756b7fd7e97f5822e9ede0e3a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 14 23:35:48 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 14 23:35:48 2018 +0200 [USETUP] Fix the name of the backspace key in the german translation CORE-14006 --- base/setup/usetup/lang/de-DE.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index 2184ebeaf6..6372cee3f1 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -983,7 +983,7 @@ static MUI_ENTRY deDEInstallDirectoryEntries[] = { 6, 15, - "Benutzen Sie die Entf-TASTE, um Zeichen zu l�schen.", + "Benutzen Sie die R�ck-TASTE, um Zeichen zu l�schen.", TEXT_STYLE_NORMAL }, {

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