Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[hbelusca] 74644: Code styling: [NDK]: Make a #define value look less "magical". [ARC]: Write "BaseDllName" using the regular case used in other parts of ReactOS' code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 24 23:52:56 2017 New Revision: 74644 URL: http://svn.reactos.org/svn/reactos?rev=74644&view=rev Log: Code styling: [NDK]: Make a #define value look less "magical". [ARC]: Write "BaseDllName" using the regular case used in other parts of ReactOS' code. Modified: trunk/reactos/sdk/include/ndk/cmtypes.h trunk/reactos/sdk/include/reactos/arc/setupblk.h Modified: trunk/reactos/sdk/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/cmtypes.h?… ============================================================================== --- trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/cmtypes.h [iso-8859-1] Wed May 24 23:52:56 2017 @@ -124,7 +124,7 @@ #define CM_BOOT_FLAG_SMSS 0x0000 #define CM_BOOT_FLAG_SETUP 0x0001 #define CM_BOOT_FLAG_ACCEPTED 0x0002 -#define CM_BOOT_FLAG_MAX 0x03E9 +#define CM_BOOT_FLAG_MAX (CM_BOOT_FLAG_ACCEPTED + 999) #ifdef NTOS_MODE_USER Modified: trunk/reactos/sdk/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/arc/se… ============================================================================== --- trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/arc/setupblk.h [iso-8859-1] Wed May 24 23:52:56 2017 @@ -73,7 +73,7 @@ BOOLEAN ThirdPartyOptionSelected; ULONG FileTypeBits; PDETECTED_DEVICE_FILE Files; - PCHAR BasedllName; + PCHAR BaseDllName; BOOLEAN MigratedDriver; PPNP_HARDWARE_ID HardwareIds; } DETECTED_DEVICE, *PDETECTED_DEVICE;

7 years, 3 months

[hbelusca] 74643: [FSLIB]: Minor fixes: - Stub and export VfatxChkdsk(); - Sync and fix the file code headers; - In the libs, use NTAPI instead of WINAPI; - Use 4-space indentation (instead of tabs).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 24 23:32:46 2017 New Revision: 74643 URL: http://svn.reactos.org/svn/reactos?rev=74643&view=rev Log: [FSLIB]: Minor fixes: - Stub and export VfatxChkdsk(); - Sync and fix the file code headers; - In the libs, use NTAPI instead of WINAPI; - Use 4-space indentation (instead of tabs). Added: trunk/reactos/dll/win32/ufatx/ufatx.c (with props) Modified: trunk/reactos/dll/win32/ubtrfs/ubtrfs.c trunk/reactos/dll/win32/uext2/uext2.c trunk/reactos/dll/win32/ufat/ufat.c trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/dll/win32/ufatx/ufatx.spec trunk/reactos/dll/win32/uffs/uffs.c trunk/reactos/dll/win32/untfs/untfs.c trunk/reactos/dll/win32/ureiserfs/ureiserfs.c trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c Modified: trunk/reactos/dll/win32/ubtrfs/ubtrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ubtrfs/ubtrfs.c?… ============================================================================== --- trunk/reactos/dll/win32/ubtrfs/ubtrfs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ubtrfs/ubtrfs.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -3,7 +3,6 @@ * PROJECT: BtrFS File System Management * FILE: dll/win32/ubtrfs/ubtrfs.c * PURPOSE: ubtrfs DLL initialisation - * * PROGRAMMERS: Pierre Schweitzer */ @@ -11,13 +10,13 @@ INT WINAPI DllMain( - IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(hinstDLL); - UNREFERENCED_PARAMETER(dwReason); - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.c?re… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -3,22 +3,20 @@ * PROJECT: Ext2 File System Management * FILE: dll/win32/uext2/uext2.c * PURPOSE: uext2 DLL initialisation - * * PROGRAMMERS: Pierre Schweitzer */ #include <windef.h> - INT WINAPI DllMain( - IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(hinstDLL); - UNREFERENCED_PARAMETER(dwReason); - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/ufat/ufat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -1,9 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: FAT File System Management - * FILE: reactos/dll/win32/fmifs/init.c - * PURPOSE: Initialisation - * + * FILE: dll/win32/ufat/ufat.c + * PURPOSE: ufat DLL initialisation * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ @@ -11,13 +10,13 @@ INT WINAPI DllMain( - IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(hinstDLL); - UNREFERENCED_PARAMETER(dwReason); - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Wed May 24 23:32:46 2017 @@ -2,12 +2,12 @@ spec2def(ufatx.dll ufatx.spec) list(APPEND SOURCE + ufatx.c ufatx.rc ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) add_library(ufatx SHARED ${SOURCE}) +set_module_type(ufatx nativedll) target_link_libraries(ufatx vfatxlib) -set_module_type(ufatx nativedll ENTRYPOINT 0 ) add_importlibs(ufatx ntdll) -add_dependencies(ufatx psdk) add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/ufatx/ufatx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.c?re… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.c (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -0,0 +1,22 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: FATX File System Management + * FILE: dll/win32/ufatx/ufatx.c + * PURPOSE: ufatx DLL initialisation + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#include <windef.h> + +INT WINAPI +DllMain( + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/ufatx/ufatx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ufatx/ufatx.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.spec… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/ufatx.spec [iso-8859-1] Wed May 24 23:32:46 2017 @@ -1 +1,2 @@ +@ stdcall ChkdskEx(ptr long long long long ptr) VfatxChkdsk @ stdcall FormatEx(ptr long ptr long long ptr) VfatxFormat Modified: trunk/reactos/dll/win32/uffs/uffs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uffs/uffs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/uffs/uffs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uffs/uffs.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -3,7 +3,6 @@ * PROJECT: FFS File System Management * FILE: dll/win32/uffs/uffs.c * PURPOSE: uffs DLL initialisation - * * PROGRAMMERS: Pierre Schweitzer */ @@ -11,13 +10,13 @@ INT WINAPI DllMain( - IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(hinstDLL); - UNREFERENCED_PARAMETER(dwReason); - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -3,7 +3,6 @@ * PROJECT: NTFS File System Management * FILE: dll/win32/untfs/untfs.c * PURPOSE: untfs DLL initialisation - * * PROGRAMMERS: Pierre Schweitzer */ @@ -11,13 +10,13 @@ INT WINAPI DllMain( - IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(hinstDLL); - UNREFERENCED_PARAMETER(dwReason); - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); - return TRUE; + return TRUE; } Modified: trunk/reactos/dll/win32/ureiserfs/ureiserfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ureiserfs/ureise… ============================================================================== --- trunk/reactos/dll/win32/ureiserfs/ureiserfs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ureiserfs/ureiserfs.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -1,9 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: BTRFS File System Management - * FILE: dll/win32/ubtrfs/ubtrfs.c - * PURPOSE: ubtrfs DLL initialisation - * + * PROJECT: ReiserFS File System Management + * FILE: dll/win32/ureiserfs/ureiserfs.c + * PURPOSE: ureiserfs DLL initialisation * PROGRAMMERS: Pierre Schweitzer */ @@ -11,13 +10,13 @@ INT WINAPI DllMain( - IN HINSTANCE hinstDLL, - IN DWORD dwReason, - IN LPVOID lpvReserved) + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(hinstDLL); - UNREFERENCED_PARAMETER(dwReason); - UNREFERENCED_PARAMETER(lpvReserved); + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); - return TRUE; + return TRUE; } Modified: trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/btrfslib/btr… ============================================================================== --- trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -82,13 +82,13 @@ #endif #if defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) -NTSTATUS WINAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, - ULONG *utf8_bytes_written, - const WCHAR *uni_src, ULONG uni_bytes); +NTSTATUS NTAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, + ULONG *utf8_bytes_written, + const WCHAR *uni_src, ULONG uni_bytes); #endif /* defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) */ #ifdef __REACTOS__ -ULONG WINAPI NtGetTickCount(VOID); +ULONG NTAPI NtGetTickCount(VOID); #endif typedef struct { @@ -237,7 +237,7 @@ #ifndef __REACTOS__ NTSTATUS WINAPI ChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty, #else -NTSTATUS WINAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty, +NTSTATUS NTAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty, #endif BOOLEAN ScanDrive, PFMIFSCALLBACK Callback) { // STUB Modified: trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ext2lib/Mke2… ============================================================================== --- trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -1004,7 +1004,7 @@ } NTSTATUS -WINAPI +NTAPI Ext2Chkdsk(IN PUNICODE_STRING DriveRoot, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, Modified: trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ffslib/ffsli… ============================================================================== --- trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -23,7 +23,7 @@ } -NTSTATUS WINAPI +NTSTATUS NTAPI FfsChkdsk(IN PUNICODE_STRING DriveRoot, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, Modified: trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ntfslib/ntfs… ============================================================================== --- trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -23,7 +23,7 @@ } -NTSTATUS WINAPI +NTSTATUS NTAPI NtfsChkdsk(IN PUNICODE_STRING DriveRoot, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, Modified: trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/reiserfslib/… ============================================================================== --- trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -23,7 +23,7 @@ } -NTSTATUS WINAPI +NTSTATUS NTAPI ReiserfsChkdsk(IN PUNICODE_STRING DriveRoot, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, Modified: trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/vfatlib/vfat… ============================================================================== --- trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -371,7 +371,7 @@ NTSTATUS -WINAPI +NTAPI VfatChkdsk(IN PUNICODE_STRING DriveRoot, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, Modified: trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/vfatxlib/vfa… ============================================================================== --- trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c [iso-8859-1] Wed May 24 23:32:46 2017 @@ -152,6 +152,17 @@ return Status; } +NTSTATUS NTAPI +VfatxChkdsk(IN PUNICODE_STRING DriveRoot, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} VOID VfatxUpdateProgress(IN PFORMAT_CONTEXT Context,

7 years, 3 months

[bfreisen] 74642: [MSPAINT] - Determine and adapt to actual status bar height instead of assuming a fixed height. This improves theme support.

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Wed May 24 19:31:43 2017 New Revision: 74642 URL: http://svn.reactos.org/svn/reactos?rev=74642&view=rev Log: [MSPAINT] - Determine and adapt to actual status bar height instead of assuming a fixed height. This improves theme support. Modified: trunk/reactos/base/applications/mspaint/winproc.cpp Modified: trunk/reactos/base/applications/mspaint/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.cpp [iso-8859-1] Wed May 24 19:31:43 2017 @@ -66,7 +66,13 @@ h = clientRect.bottom - 3; } - scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - 23 : h, TRUE); + RECT statusBarRect0; + SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); + int statusBarBorders[3]; + SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; + + scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); }

7 years, 3 months

[hbelusca] 74641: [USETUP]: Refactor the DoesFileExist() function so that it now looks closer to DoesPathExist() and use it almost everywhere. Adjust also its callers, adjust OpenAndMapFile() param...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 24 16:37:49 2017 New Revision: 74641 URL: http://svn.reactos.org/svn/reactos?rev=74641&view=rev Log: [USETUP]: Refactor the DoesFileExist() function so that it now looks closer to DoesPathExist() and use it almost everywhere. Adjust also its callers, adjust OpenAndMapFile() parameters. Related to that, simplify IsValidNTOSInstallation() parameters & introduce a IsValidNTOSInstallation_UStr that does the same but takes a UNICODE_STRING instead. Simplify CheckForValidPEAndVendor(). Now only exactly 5 calls use the "old" 'DoesFileExist' syntax, using a temporarily auxiliary function "DoesFileExist_2"... Modified: branches/setup_improvements/base/setup/lib/filesup.c branches/setup_improvements/base/setup/lib/filesup.h branches/setup_improvements/base/setup/lib/osdetect.c branches/setup_improvements/base/setup/usetup/bootsup.c branches/setup_improvements/base/setup/usetup/interface/usetup.c Modified: branches/setup_improvements/base/setup/lib/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] Wed May 24 16:37:49 2017 @@ -176,7 +176,7 @@ if (NT_SUCCESS(Status)) NtClose(FileHandle); else - DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &Name, Status); return NT_SUCCESS(Status); } @@ -184,21 +184,18 @@ BOOLEAN DoesFileExist( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName) + IN PCWSTR PathNameToFile) { NTSTATUS Status; + UNICODE_STRING FileName; HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; - WCHAR FullName[MAX_PATH]; - - CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); - RtlInitUnicodeString(&Name, FullName); + + RtlInitUnicodeString(&FileName, PathNameToFile); InitializeObjectAttributes(&ObjectAttributes, - &Name, + &FileName, OBJ_CASE_INSENSITIVE, RootDirectory, NULL); @@ -212,9 +209,20 @@ if (NT_SUCCESS(Status)) NtClose(FileHandle); else - DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return NT_SUCCESS(Status); +} + +// FIXME: DEPRECATED! HACKish function that needs to be deprecated! +BOOLEAN +DoesFileExist_2( + IN PCWSTR PathName OPTIONAL, + IN PCWSTR FileName) +{ + WCHAR FullName[MAX_PATH]; + CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); + return DoesFileExist(NULL, FullName); } /* @@ -320,26 +328,23 @@ NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL + IN PCWSTR PathNameToFile, OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, OUT PVOID* BaseAddress, OUT PULONG FileSize OPTIONAL) { NTSTATUS Status; + UNICODE_STRING FileName; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; SIZE_T ViewSize; PVOID ViewBase; - UNICODE_STRING Name; - WCHAR FullName[MAX_PATH]; - - CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); - RtlInitUnicodeString(&Name, FullName); + + RtlInitUnicodeString(&FileName, PathNameToFile); InitializeObjectAttributes(&ObjectAttributes, - &Name, + &FileName, OBJ_CASE_INSENSITIVE, RootDirectory, NULL); @@ -355,7 +360,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return Status; } @@ -377,7 +382,7 @@ } if (FileInfo.EndOfFile.HighPart != 0) - DPRINT1("WARNING!! The file '%wZ' is too large!\n", &Name); + DPRINT1("WARNING!! The file '%wZ' is too large!\n", &FileName); *FileSize = FileInfo.EndOfFile.LowPart; @@ -396,7 +401,7 @@ *FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to create a memory section for file '%wZ', Status 0x%08lx\n", &FileName, Status); NtClose(*FileHandle); *FileHandle = NULL; return Status; @@ -416,7 +421,7 @@ PAGE_READONLY); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to map a view for file %wZ, Status 0x%08lx\n", &Name, Status); + DPRINT1("Failed to map a view for file '%wZ', Status 0x%08lx\n", &FileName, Status); NtClose(*SectionHandle); *SectionHandle = NULL; NtClose(*FileHandle); Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Wed May 24 16:37:49 2017 @@ -52,6 +52,11 @@ BOOLEAN DoesFileExist( IN HANDLE RootDirectory OPTIONAL, + IN PCWSTR PathNameToFile); + +// FIXME: DEPRECATED! HACKish function that needs to be deprecated! +BOOLEAN +DoesFileExist_2( IN PCWSTR PathName OPTIONAL, IN PCWSTR FileName); @@ -65,8 +70,7 @@ NTSTATUS OpenAndMapFile( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL + IN PCWSTR PathNameToFile, OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL OUT PHANDLE SectionHandle, OUT PVOID* BaseAddress, Modified: branches/setup_improvements/base/setup/lib/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] Wed May 24 16:37:49 2017 @@ -103,9 +103,12 @@ static BOOLEAN +IsValidNTOSInstallation_UStr( + IN PUNICODE_STRING SystemRootPath); + +/*static*/ BOOLEAN IsValidNTOSInstallation( - IN HANDLE SystemRootDirectory OPTIONAL, - IN PCWSTR SystemRoot OPTIONAL); + IN PCWSTR SystemRoot); static PNTOS_INSTALLATION FindExistingNTOSInstall( @@ -140,9 +143,6 @@ PWCHAR SectionName, KeyData; UNICODE_STRING InstallName; - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; PNTOS_INSTALLATION NtOsInstall; UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; @@ -262,25 +262,7 @@ /* Set SystemRootPath */ DPRINT1("FreeLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - /* Open SystemRootPath */ - InitializeObjectAttributes(&ObjectAttributes, - &SystemRootPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&SystemRootDirectory, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); - continue; - } - - if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) + if (IsValidNTOSInstallation_UStr(&SystemRootPath)) { ULONG DiskNumber = 0, PartitionNumber = 0; PCWSTR PathComponent = NULL; @@ -320,8 +302,6 @@ DiskNumber, PartitionNumber, PartEntry, InstallNameW); } - - NtClose(SystemRootDirectory); } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -347,9 +327,6 @@ PWCHAR SectionName, KeyData; UNICODE_STRING InstallName; - HANDLE SystemRootDirectory; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; PNTOS_INSTALLATION NtOsInstall; UNICODE_STRING SystemRootPath; WCHAR SystemRoot[MAX_PATH]; @@ -437,25 +414,7 @@ /* Set SystemRootPath */ DPRINT1("NtLdrEnumerateInstallations: SystemRootPath: '%wZ'\n", &SystemRootPath); - /* Open SystemRootPath */ - InitializeObjectAttributes(&ObjectAttributes, - &SystemRootPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&SystemRootDirectory, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", &SystemRootPath, Status); - continue; - } - - if (IsValidNTOSInstallation(SystemRootDirectory, NULL)) + if (IsValidNTOSInstallation_UStr(&SystemRootPath)) { ULONG DiskNumber = 0, PartitionNumber = 0; PCWSTR PathComponent = NULL; @@ -495,8 +454,6 @@ DiskNumber, PartitionNumber, PartEntry, InstallNameW); } - - NtClose(SystemRootDirectory); } while (IniCacheFindNextValue(Iterator, &SectionName, &KeyData)); @@ -540,8 +497,7 @@ static BOOLEAN CheckForValidPEAndVendor( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName OPTIONAL, - IN PCWSTR FileName, // OPTIONAL + IN PCWSTR PathNameToFile, OUT PUNICODE_STRING VendorName ) { @@ -560,18 +516,18 @@ *VendorName->Buffer = UNICODE_NULL; VendorName->Length = 0; - Status = OpenAndMapFile(RootDirectory, PathName, FileName, + Status = OpenAndMapFile(RootDirectory, PathNameToFile, &FileHandle, &SectionHandle, &ViewBase, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to open and map file '%S', Status 0x%08lx\n", PathNameToFile, Status); return FALSE; // Status; } /* Make sure it's a valid PE file */ if (!RtlImageNtHeader(ViewBase)) { - DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", FileName); + DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile); Status = STATUS_INVALID_IMAGE_FORMAT; goto UnmapFile; } @@ -583,7 +539,7 @@ Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", FileName, Status); + DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", PathNameToFile, Status); goto UnmapFile; } @@ -609,7 +565,7 @@ if (NT_SUCCESS(Status) /*&& pvData*/) { /* BufLen includes the NULL terminator count */ - DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, FileName); + DPRINT1("Found version vendor: \"%S\" for file '%S'\n", pvData, PathNameToFile); StringCbCopyNW(VendorName->Buffer, VendorName->MaximumLength, pvData, BufLen * sizeof(WCHAR)); @@ -620,7 +576,7 @@ } if (!NT_SUCCESS(Status)) - DPRINT1("No version vendor found for file '%S'\n", FileName); + DPRINT1("No version vendor found for file '%S'\n", PathNameToFile); UnmapFile: /* Finally, unmap and close the file */ @@ -637,48 +593,30 @@ // - if it's broken or not (aka. needs for repair, or just upgrading). // static BOOLEAN -IsValidNTOSInstallation( - IN HANDLE SystemRootDirectory OPTIONAL, - IN PCWSTR SystemRoot OPTIONAL) +IsValidNTOSInstallationByHandle( + IN HANDLE SystemRootDirectory) { BOOLEAN Success = FALSE; USHORT i; UNICODE_STRING VendorName; - WCHAR PathBuffer[MAX_PATH]; - - /* - * Use either the 'SystemRootDirectory' handle or the 'SystemRoot' string, - * depending on what the user gave to us in entry. - */ - if (SystemRootDirectory) - SystemRoot = NULL; - // else SystemRootDirectory == NULL and SystemRoot is what it is. - - /* If both the parameters are NULL we cannot do anything else more */ - if (!SystemRootDirectory && !SystemRoot) - return FALSE; - - // DoesPathExist(SystemRootDirectory, SystemRoot, L"System32\\"); etc... + WCHAR VendorNameBuffer[MAX_PATH]; /* Check for the existence of \SystemRoot\System32 */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\"); - if (!DoesPathExist(SystemRootDirectory, PathBuffer)) + if (!DoesPathExist(SystemRootDirectory, L"System32\\")) { // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\drivers */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\drivers\\"); - if (!DoesPathExist(SystemRootDirectory, PathBuffer)) + if (!DoesPathExist(SystemRootDirectory, L"System32\\drivers\\")) { // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } /* Check for the existence of \SystemRoot\System32\config */ - StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot ? SystemRoot : L"", L"System32\\config\\"); - if (!DoesPathExist(SystemRootDirectory, PathBuffer)) + if (!DoesPathExist(SystemRootDirectory, L"System32\\config\\")) { // DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; @@ -689,22 +627,22 @@ * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config * (but we don't check here whether they are actually valid). */ - if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SYSTEM")) + if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SYSTEM")) { // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } - if (!DoesFileExist(SystemRootDirectory, SystemRoot, L"System32\\config\\SOFTWARE")) + if (!DoesFileExist(SystemRootDirectory, L"System32\\config\\SOFTWARE")) { // DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); return FALSE; } #endif - RtlInitEmptyUnicodeString(&VendorName, PathBuffer, sizeof(PathBuffer)); + RtlInitEmptyUnicodeString(&VendorName, VendorNameBuffer, sizeof(VendorNameBuffer)); /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, L"System32\\ntoskrnl.exe", &VendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntoskrnl.exe", &VendorName); if (!Success) DPRINT1("Kernel file ntoskrnl.exe is either not a PE file, or does not have any vendor?\n"); @@ -726,7 +664,7 @@ /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ /* Check for the existence of \SystemRoot\System32\ntdll.dll and retrieves its vendor name */ - Success = CheckForValidPEAndVendor(SystemRootDirectory, SystemRoot, L"System32\\ntdll.dll", &VendorName); + Success = CheckForValidPEAndVendor(SystemRootDirectory, L"System32\\ntdll.dll", &VendorName); if (!Success) DPRINT1("User-mode file ntdll.dll is either not a PE file, or does not have any vendor?\n"); if (Success) @@ -743,6 +681,50 @@ } return Success; +} + +static BOOLEAN +IsValidNTOSInstallation_UStr( + IN PUNICODE_STRING SystemRootPath) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE SystemRootDirectory; + BOOLEAN Success; + + /* Open SystemRootPath */ + InitializeObjectAttributes(&ObjectAttributes, + SystemRootPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&SystemRootDirectory, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open SystemRoot '%wZ', Status 0x%08lx\n", SystemRootPath, Status); + return FALSE; + } + + Success = IsValidNTOSInstallationByHandle(SystemRootDirectory); + + /* Done! */ + NtClose(SystemRootDirectory); + return Success; +} + +/*static*/ BOOLEAN +IsValidNTOSInstallation( + IN PCWSTR SystemRoot) +{ + UNICODE_STRING SystemRootPath; + RtlInitUnicodeString(&SystemRootPath, SystemRoot); + return IsValidNTOSInstallationByHandle(&SystemRootPath); } static VOID @@ -932,7 +914,7 @@ for (i = 0; i < ARRAYSIZE(NtosBootLoaders); ++i) { /* Check whether the loader executable exists */ - if (!DoesFileExist(PartitionHandle, NULL, NtosBootLoaders[i].LoaderExecutable)) + if (!DoesFileExist(PartitionHandle, NtosBootLoaders[i].LoaderExecutable)) { /* The loader does not exist, continue with another one */ DPRINT1("Loader executable '%S' does not exist, continue with another one...\n", NtosBootLoaders[i].LoaderExecutable); @@ -940,7 +922,7 @@ } /* Check whether the loader configuration file exists */ - Status = OpenAndMapFile(PartitionHandle, NULL, NtosBootLoaders[i].LoaderConfigurationFile, + Status = OpenAndMapFile(PartitionHandle, NtosBootLoaders[i].LoaderConfigurationFile, &FileHandle, &SectionHandle, &ViewBase, &FileSize); if (!NT_SUCCESS(Status)) { Modified: branches/setup_improvements/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] Wed May 24 16:37:49 2017 @@ -2279,7 +2279,7 @@ /* Prepare for possibly copying 'freeldr.ini' */ CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); - DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); + DoesFreeLdrExist = DoesFileExist(NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ @@ -2296,8 +2296,8 @@ /* Check for NT and other bootloaders */ // FIXME: Check for Vista+ bootloader! - if (DoesFileExist(NULL, SystemRootPath->Buffer, L"ntldr") == TRUE || - DoesFileExist(NULL, SystemRootPath->Buffer, L"boot.ini") == TRUE) + if (DoesFileExist_2(SystemRootPath->Buffer, L"ntldr") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"boot.ini") == TRUE) { /* Search root directory for 'ntldr' and 'boot.ini' */ DPRINT1("Found Microsoft Windows NT/2000/XP boot loader\n"); @@ -2374,8 +2374,8 @@ PWCHAR BootSector; PWCHAR BootSectorFileName; - if (DoesFileExist(NULL, SystemRootPath->Buffer, L"io.sys") == TRUE || - DoesFileExist(NULL, SystemRootPath->Buffer, L"msdos.sys") == TRUE) + if (DoesFileExist_2(SystemRootPath->Buffer, L"io.sys") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"msdos.sys") == TRUE) { /* Search for root directory for 'io.sys' and 'msdos.sys' */ DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); @@ -2389,7 +2389,7 @@ BootSectorFileName = L"\\bootsect.dos"; } else - if (DoesFileExist(NULL, SystemRootPath->Buffer, L"kernel.sys") == TRUE) + if (DoesFileExist_2(SystemRootPath->Buffer, L"kernel.sys") == TRUE) { /* Search for root directory for 'kernel.sys' */ DPRINT1("Found FreeDOS boot loader\n"); @@ -2525,7 +2525,7 @@ /* Prepare for possibly copying 'freeldr.ini' */ CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); - DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); + DoesFreeLdrExist = DoesFileExist(NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed May 24 16:37:49 2017 @@ -432,7 +432,7 @@ CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"\\unattend.inf"); - if (DoesFileExist(NULL, NULL, UnattendInfPath) == FALSE) + if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); return;

7 years, 3 months

[hbelusca] 74640: [USETUP]: Use the newly-introduced CombinePaths and ConcatPaths functions. Fix also few comments, and place some UNICODE_NULLs here & there.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 23 22:40:34 2017 New Revision: 74640 URL: http://svn.reactos.org/svn/reactos?rev=74640&view=rev Log: [USETUP]: Use the newly-introduced CombinePaths and ConcatPaths functions. Fix also few comments, and place some UNICODE_NULLs here & there. Modified: branches/setup_improvements/base/setup/lib/arcname.c branches/setup_improvements/base/setup/usetup/bootsup.c branches/setup_improvements/base/setup/usetup/filequeue.c branches/setup_improvements/base/setup/usetup/interface/devinst.c branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/registry.c Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Tue May 23 22:40:34 2017 @@ -787,7 +787,7 @@ if (BeginOfPath && *BeginOfPath) { HRESULT hr; - hr = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), BeginOfPath); + hr = ConcatPaths(NtPath->Buffer, NtPath->MaximumLength / sizeof(WCHAR), 1, BeginOfPath); if (FAILED(hr)) { /* Buffer not large enough, or whatever...: just bail out */ Modified: branches/setup_improvements/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] Tue May 23 22:40:34 2017 @@ -1272,7 +1272,10 @@ return Status; } - /* Copy partition table from old MBR to new */ + /* + * Copy the disk signature, the reserved fields and + * the partition table from the old MBR to the new one. + */ RtlCopyMemory(&NewBootSector->Signature, &OrigBootSector->Signature, sizeof(PARTITION_SECTOR) - offsetof(PARTITION_SECTOR, Signature) /* Length of partition table */); @@ -2262,10 +2265,8 @@ DPRINT("System path: '%wZ'\n", SystemRootPath); /* Copy FreeLoader to the system partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2276,10 +2277,9 @@ } /* Prepare for possibly copying 'freeldr.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - DoesFreeLdrExist = DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); + + DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ @@ -2296,8 +2296,8 @@ /* Check for NT and other bootloaders */ // FIXME: Check for Vista+ bootloader! - if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") == TRUE || - DoesFileExist(SystemRootPath->Buffer, L"boot.ini") == TRUE) + if (DoesFileExist(NULL, SystemRootPath->Buffer, L"ntldr") == TRUE || + DoesFileExist(NULL, SystemRootPath->Buffer, L"boot.ini") == TRUE) { /* Search root directory for 'ntldr' and 'boot.ini' */ DPRINT1("Found Microsoft Windows NT/2000/XP boot loader\n"); @@ -2307,8 +2307,7 @@ { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - // wcscpy(DstPath, SystemRootPath->Buffer); - // wcscat(DstPath, L"\\freeldr.ini"); + // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) @@ -2318,15 +2317,13 @@ } /* Install new bootcode into a file */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.ros"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\bootsect.ros"); if (PartitionType == PARTITION_FAT32 || PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat32.bin"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat32BootCodeToFile(SrcPath, DstPath, @@ -2340,8 +2337,7 @@ else { /* Install FAT16 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat16BootCodeToFile(SrcPath, DstPath, @@ -2355,8 +2351,7 @@ } /* Update 'boot.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\boot.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\boot.ini"); DPRINT1("Update 'boot.ini': %S\n", DstPath); Status = UpdateBootIni(DstPath, @@ -2379,8 +2374,8 @@ PWCHAR BootSector; PWCHAR BootSectorFileName; - if (DoesFileExist(SystemRootPath->Buffer, L"io.sys") == TRUE || - DoesFileExist(SystemRootPath->Buffer, L"msdos.sys") == TRUE) + if (DoesFileExist(NULL, SystemRootPath->Buffer, L"io.sys") == TRUE || + DoesFileExist(NULL, SystemRootPath->Buffer, L"msdos.sys") == TRUE) { /* Search for root directory for 'io.sys' and 'msdos.sys' */ DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); @@ -2394,7 +2389,7 @@ BootSectorFileName = L"\\bootsect.dos"; } else - if (DoesFileExist(SystemRootPath->Buffer, L"kernel.sys") == TRUE) + if (DoesFileExist(NULL, SystemRootPath->Buffer, L"kernel.sys") == TRUE) { /* Search for root directory for 'kernel.sys' */ DPRINT1("Found FreeDOS boot loader\n"); @@ -2426,8 +2421,7 @@ { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - // wcscpy(DstPath, SystemRootPath->Buffer); - // wcscat(DstPath, L"\\freeldr.ini"); + // CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); if (IsThereAValidBootSector(SystemRootPath->Buffer)) { @@ -2442,8 +2436,7 @@ } /* Save current bootsector */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, BootSectorFileName); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, BootSectorFileName); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); Status = SaveBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); @@ -2468,8 +2461,7 @@ PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat32.bin"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat32BootCodeToDisk(SrcPath, SystemRootPath->Buffer); @@ -2482,8 +2474,7 @@ else { /* Install FAT16 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); DPRINT1("Install FAT16 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat16BootCodeToDisk(SrcPath, SystemRootPath->Buffer); @@ -2520,10 +2511,8 @@ DPRINT("System path: '%wZ'\n", SystemRootPath); /* Copy FreeLoader to the system partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2534,10 +2523,9 @@ } /* Prepare for possibly copying 'freeldr.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - DoesFreeLdrExist = DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); + + DoesFreeLdrExist = DoesFileExist(NULL, NULL, DstPath); if (DoesFreeLdrExist) { /* Update existing 'freeldr.ini' */ @@ -2558,8 +2546,7 @@ { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\freeldr.ini"); /* Certainly SysLinux, GRUB, LILO... or an unknown boot loader */ DPRINT1("*nix or unknown boot loader found\n"); @@ -2577,8 +2564,7 @@ } /* Save current bootsector */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"\\bootsect.old"); DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); Status = SaveBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); @@ -2602,8 +2588,7 @@ // if (PartitionType == PARTITION_EXT2) { /* Install EXT2 bootcode */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\ext2.bin"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\ext2.bin"); DPRINT1("Install EXT2 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallExt2BootCodeToDisk(SrcPath, SystemRootPath->Buffer); @@ -2696,10 +2681,9 @@ } /* Copy FreeLoader to the boot partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - - wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); + + StringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2710,7 +2694,7 @@ } /* Create new 'freeldr.ini' */ - wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); + StringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0\\freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); @@ -2721,10 +2705,9 @@ } /* Install FAT12/16 boosector */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); - - wcscpy(DstPath, L"\\Device\\Floppy0"); + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\fat.bin"); + + StringCchCopyW(DstPath, ARRAYSIZE(DstPath), L"\\Device\\Floppy0"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat12BootCodeToFloppy(SrcPath, DstPath); Modified: branches/setup_improvements/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filequeue.c [iso-8859-1] Tue May 23 22:40:34 2017 @@ -369,46 +369,32 @@ while (Entry != NULL) { /* Build the full source path */ - wcscpy(FileSrcPath, Entry->SourceRootPath); - if (Entry->SourcePath != NULL) - wcscat(FileSrcPath, Entry->SourcePath); - wcscat(FileSrcPath, L"\\"); - wcscat(FileSrcPath, Entry->SourceFilename); + CombinePaths(FileSrcPath, ARRAYSIZE(FileSrcPath), 3, + Entry->SourceRootPath, Entry->SourcePath, + Entry->SourceFilename); /* Build the full target path */ wcscpy(FileDstPath, TargetRootPath); - if (Entry->TargetDirectory[0] == 0) + if (Entry->TargetDirectory[0] == UNICODE_NULL) { /* Installation path */ /* Add the installation path */ - if (TargetPath != NULL) - { - if (TargetPath[0] != L'\\') - wcscat(FileDstPath, L"\\"); - wcscat(FileDstPath, TargetPath); - } + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, TargetPath); } else if (Entry->TargetDirectory[0] == L'\\') { /* Absolute path */ - if (Entry->TargetDirectory[1] != 0) - wcscat(FileDstPath, Entry->TargetDirectory); + if (Entry->TargetDirectory[1] != UNICODE_NULL) + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, Entry->TargetDirectory); } else // if (Entry->TargetDirectory[0] != L'\\') { /* Path relative to the installation path */ /* Add the installation path */ - if (TargetPath != NULL) - { - if (TargetPath[0] != L'\\') - wcscat(FileDstPath, L"\\"); - wcscat(FileDstPath, TargetPath); - } - - wcscat(FileDstPath, L"\\"); - wcscat(FileDstPath, Entry->TargetDirectory); + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 2, + TargetPath, Entry->TargetDirectory); } /* @@ -417,11 +403,10 @@ */ if (Entry->SourceCabinet == NULL) { - wcscat(FileDstPath, L"\\"); if (Entry->TargetFilename != NULL) - wcscat(FileDstPath, Entry->TargetFilename); + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, Entry->TargetFilename); else - wcscat(FileDstPath, Entry->SourceFilename); + ConcatPaths(FileDstPath, ARRAYSIZE(FileDstPath), 1, Entry->SourceFilename); } /* FIXME: Do it! */ @@ -435,11 +420,9 @@ if (Entry->SourceCabinet != NULL) { /* Extract the file */ - wcscpy(CabinetName, Entry->SourceRootPath); - if (Entry->SourcePath != NULL) - wcscat(CabinetName, Entry->SourcePath); - wcscat(CabinetName, L"\\"); - wcscat(CabinetName, Entry->SourceCabinet); + CombinePaths(CabinetName, ARRAYSIZE(CabinetName), 3, + Entry->SourceRootPath, Entry->SourcePath, + Entry->SourceCabinet); Status = SetupExtractFile(CabinetName, Entry->SourceFilename, FileDstPath); } else Modified: branches/setup_improvements/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/devinst.c [iso-8859-1] Tue May 23 22:40:34 2017 @@ -50,13 +50,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hService; INFCONTEXT Context; - LPWSTR Driver, ImagePath, FullImagePath; + PWSTR Driver, ImagePath, FullImagePath; ULONG dwValue; ULONG Disposition; NTSTATUS Status; BOOLEAN deviceInstalled = FALSE; UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); - LPWSTR keyboardClass = L"kbdclass\0"; + PWSTR keyboardClass = L"kbdclass\0"; BOOLEAN keyboardDevice = FALSE; /* Check if we know the hardware */ @@ -70,7 +70,7 @@ if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context) && !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver, &Context) && !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context) - && !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context)) + && !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context)) { if (!SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context)) return FALSE; @@ -83,14 +83,14 @@ /* Prepare full driver path */ dwValue = PathPrefix.MaximumLength + wcslen(ImagePath) * sizeof(WCHAR); - FullImagePath = (LPWSTR)RtlAllocateHeap(ProcessHeap, 0, dwValue); + FullImagePath = (PWSTR)RtlAllocateHeap(ProcessHeap, 0, dwValue); if (!FullImagePath) { DPRINT1("RtlAllocateHeap() failed\n"); return FALSE; } RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); - wcscat(FullImagePath, ImagePath); + ConcatPaths(FullImagePath, dwValue / sizeof(WCHAR), 1, ImagePath); DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId); Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue May 23 22:40:34 2017 @@ -430,14 +430,13 @@ INT IntValue; PWCHAR Value; - if (DoesFileExist(SourcePath.Buffer, L"unattend.inf") == FALSE) - { - DPRINT("Does not exist: %S\\%S\n", SourcePath.Buffer, L"unattend.inf"); + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, SourcePath.Buffer, L"\\unattend.inf"); + + if (DoesFileExist(NULL, NULL, UnattendInfPath) == FALSE) + { + DPRINT("Does not exist: %S\n", UnattendInfPath); return; } - - wcscpy(UnattendInfPath, SourcePath.Buffer); - wcscat(UnattendInfPath, L"\\unattend.inf"); /* Load 'unattend.inf' from install media. */ UnattendInf = SetupOpenInfFileW(UnattendInfPath, @@ -530,7 +529,7 @@ return; } - UnattendDestinationPartitionNumber = IntValue; + UnattendDestinationPartitionNumber = (LONG)IntValue; /* Search for 'InstallationDirectory' in the 'Unattend' section */ if (!SetupFindFirstLineW(UnattendInf, L"Unattend", L"InstallationDirectory", &Context)) @@ -827,9 +826,7 @@ #endif /* Load txtsetup.sif from install media. */ - wcscpy(FileNameBuffer, SourcePath.Buffer); - wcscat(FileNameBuffer, L"\\txtsetup.sif"); - + CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, SourcePath.Buffer, L"\\txtsetup.sif"); SetupInf = SetupOpenInfFileW(FileNameBuffer, NULL, INF_STYLE_WIN4, @@ -1499,8 +1496,8 @@ return HandleGenericList(&ListUi, DEVICE_SETTINGS_PAGE, Ir); } - - + + /* * Displays the DisplaySettingsPage. * @@ -1958,7 +1955,7 @@ if (Quit != NULL) *Quit = TRUE; - PartitionSizeBuffer[0] = 0; + PartitionSizeBuffer[0] = UNICODE_NULL; break; } else if (Ir.Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ @@ -1970,14 +1967,14 @@ if (Cancel != NULL) *Cancel = TRUE; - PartitionSizeBuffer[0] = 0; + PartitionSizeBuffer[0] = UNICODE_NULL; break; } else if ((Ir.Event.KeyEvent.wVirtualKeyCode == VK_BACK) && /* BACKSPACE */ (Index > 0)) { Index--; - PartitionSizeBuffer[Index] = 0; + PartitionSizeBuffer[Index] = UNICODE_NULL; CONSOLE_SetInputTextXY(iLeft, iTop, @@ -1993,7 +1990,7 @@ { PartitionSizeBuffer[Index] = ch; Index++; - PartitionSizeBuffer[Index] = 0; + PartitionSizeBuffer[Index] = UNICODE_NULL; CONSOLE_SetInputTextXY(iLeft, iTop, @@ -3296,12 +3293,8 @@ /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); - wcscpy(PathBuffer, DestinationRootPath.Buffer); - - if (InstallDir[0] != L'\\') - wcscat(PathBuffer, L"\\"); - - wcscat(PathBuffer, InstallDir); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + DestinationRootPath.Buffer, InstallDir); RtlCreateUnicodeString(&DestinationPath, PathBuffer); /* Create 'DestinationArcPath' */ @@ -3310,11 +3303,7 @@ L"multi(0)disk(0)rdisk(%lu)partition(%lu)", DiskEntry->BiosDiskNumber, PartEntry->PartitionNumber); - - if (InstallDir[0] != L'\\') - wcscat(PathBuffer, L"\\"); - - wcscat(PathBuffer, InstallDir); + ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); return PREPARE_COPY_PAGE; @@ -3591,7 +3580,7 @@ break; } - if ((DirKeyValue[0] == 0) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == 0)) + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) { /* Installation path */ wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); @@ -3604,16 +3593,15 @@ else // if (DirKeyValue[0] != L'\\') { /* Path relative to the installation path */ - wcscpy(CompleteOrigDirName, SourceRootDir.Buffer); - wcscat(CompleteOrigDirName, L"\\"); - wcscat(CompleteOrigDirName, DirKeyValue); + CombinePaths(CompleteOrigDirName, ARRAYSIZE(CompleteOrigDirName), 2, + SourceRootDir.Buffer, DirKeyValue); } /* Remove trailing backslash */ Length = wcslen(CompleteOrigDirName); if ((Length > 0) && (CompleteOrigDirName[Length - 1] == L'\\')) { - CompleteOrigDirName[Length - 1] = 0; + CompleteOrigDirName[Length - 1] = UNICODE_NULL; } if (!SetupQueueCopy(SetupFileQueue, @@ -3680,7 +3668,7 @@ Length = wcslen(PathBuffer); if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { - PathBuffer[Length - 1] = 0; + PathBuffer[Length - 1] = UNICODE_NULL; } /* Create the install directory */ @@ -3716,7 +3704,7 @@ break; } - if ((DirKeyValue[0] == 0) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == 0)) + if ((DirKeyValue[0] == UNICODE_NULL) || (DirKeyValue[0] == L'\\' && DirKeyValue[1] == UNICODE_NULL)) { /* Installation path */ DPRINT("InstallationPath: '%S'\n", DirKeyValue); @@ -3730,14 +3718,14 @@ /* Absolute path */ DPRINT("Absolute Path: '%S'\n", DirKeyValue); - wcscpy(PathBuffer, DestinationRootPath.Buffer); - wcscat(PathBuffer, DirKeyValue); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + DestinationRootPath.Buffer, DirKeyValue); /* Remove trailing backslash */ Length = wcslen(PathBuffer); if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { - PathBuffer[Length - 1] = 0; + PathBuffer[Length - 1] = UNICODE_NULL; } DPRINT("FullPath: '%S'\n", PathBuffer); @@ -3755,15 +3743,14 @@ /* Path relative to the installation path */ DPRINT("RelativePath: '%S'\n", DirKeyValue); - wcscpy(PathBuffer, DestinationPath.Buffer); - wcscat(PathBuffer, L"\\"); - wcscat(PathBuffer, DirKeyValue); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + DestinationPath.Buffer, DirKeyValue); /* Remove trailing backslash */ Length = wcslen(PathBuffer); if ((Length > 0) && (PathBuffer[Length - 1] == L'\\')) { - PathBuffer[Length - 1] = 0; + PathBuffer[Length - 1] = UNICODE_NULL; } DPRINT("FullPath: '%S'\n", PathBuffer); @@ -3838,9 +3825,8 @@ if (!INF_GetData(&CabinetsContext, NULL, &KeyValue)) break; - wcscpy(PathBuffer, SourcePath.Buffer); - wcscat(PathBuffer, L"\\"); - wcscat(PathBuffer, KeyValue); + CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2, + SourcePath.Buffer, KeyValue); #ifdef __REACTOS__ CabinetInitialize(); @@ -4424,7 +4410,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesFileExist(L"\\Device\\Floppy0", L"\\") == FALSE) + if (DoesPathExist(NULL, L"\\Device\\Floppy0\\") == FALSE) { MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE; @@ -4515,14 +4501,12 @@ L"\\Device\\Harddisk%d\\Partition0", PartitionList->SystemPartition->DiskEntry->DiskNumber); - wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); - wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); + CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, SourceRootPath.Buffer, L"\\loader\\dosmbr.bin"); if (IsThereAValidBootSector(DestinationDevicePathBuffer)) { /* Save current MBR */ - wcscpy(DstPath, SystemRootPath.Buffer); - wcscat(DstPath, L"\\mbr.old"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath.Buffer, L"\\mbr.old"); DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); Modified: branches/setup_improvements/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/registry.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/registry.c [iso-8859-1] Tue May 23 22:40:34 2017 @@ -627,9 +627,8 @@ UINT ErrorLine; /* Load inf file from install media. */ - wcscpy(FileNameBuffer, SourcePath.Buffer); - wcscat(FileNameBuffer, L"\\"); - wcscat(FileNameBuffer, Filename); + CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, + SourcePath.Buffer, Filename); hInf = SetupOpenInfFileW(FileNameBuffer, NULL,

7 years, 3 months

[hbelusca] 74639: Addendum to r74636: whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 23 22:34:07 2017 New Revision: 74639 URL: http://svn.reactos.org/svn/reactos?rev=74639&view=rev Log: Addendum to r74636: whitespace fixes only. Modified: branches/setup_improvements/base/setup/usetup/interface/consup.c Modified: branches/setup_improvements/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/consup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/consup.c [iso-8859-1] Tue May 23 22:34:07 2017 @@ -665,11 +665,11 @@ if (Flags & TEXT_ALIGN_CENTER) { - coPos.X = (xScreen - Length) /2; + coPos.X = (xScreen - Length) /2; } else if(Flags & TEXT_ALIGN_RIGHT) { - coPos.X = coPos.X - Length; + coPos.X = coPos.X - Length; if (Flags & TEXT_PADDING_SMALL) { @@ -677,7 +677,7 @@ } else if (Flags & TEXT_PADDING_MEDIUM) { - coPos.X -= 2; + coPos.X -= 2; } else if (Flags & TEXT_PADDING_BIG) { @@ -692,8 +692,8 @@ } else if (Flags & TEXT_PADDING_MEDIUM) { - coPos.X += 2; - } + coPos.X += 2; + } else if (Flags & TEXT_PADDING_BIG) { coPos.X += 3;

7 years, 3 months

[hbelusca] 74638: [USETUP]: Fix the file headers.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 23 22:31:46 2017 New Revision: 74638 URL: http://svn.reactos.org/svn/reactos?rev=74638&view=rev Log: [USETUP]: Fix the file headers. Modified: branches/setup_improvements/base/setup/lib/osdetect.c branches/setup_improvements/base/setup/lib/osdetect.h Modified: branches/setup_improvements/base/setup/lib/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] Tue May 23 22:31:46 2017 @@ -1,11 +1,13 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/osdetect.c + * FILE: base/setup/lib/osdetect.c * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) * operating systems detection code. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ + +/* INCLUDES *****************************************************************/ #include "precomp.h" Modified: branches/setup_improvements/base/setup/lib/osdetect.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.h [iso-8859-1] Tue May 23 22:31:46 2017 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/osdetect.c + * FILE: base/setup/lib/osdetect.c * PURPOSE: NT 5.x family (MS Windows <= 2003, and ReactOS) * operating systems detection code. * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr)

7 years, 3 months

[hbelusca] 74637: [USETUP]: Transform the existing ConcatPaths() function into a variadic function, and derive a CombinePaths() from it (plus their equivalent taking va_list). This allows building ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 23 22:30:54 2017 New Revision: 74637 URL: http://svn.reactos.org/svn/reactos?rev=74637&view=rev Log: [USETUP]: Transform the existing ConcatPaths() function into a variadic function, and derive a CombinePaths() from it (plus their equivalent taking va_list). This allows building concatenated paths with an arbitrary number of separated components (as done in the rest of the code). Will be used soon. Modified: branches/setup_improvements/base/setup/lib/filesup.c branches/setup_improvements/base/setup/lib/filesup.h Modified: branches/setup_improvements/base/setup/lib/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] Tue May 23 22:30:54 2017 @@ -40,35 +40,108 @@ #endif HRESULT -ConcatPaths( - IN OUT PWSTR PathElem1, +ConcatPathsV( + IN OUT PWSTR PathBuffer, IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL) -{ - HRESULT hr; + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList) +{ + HRESULT hr = S_OK; SIZE_T cchPathLen; - - if (!PathElem2) + PCWSTR PathComponent; + + if (cchPathSize < 1) return S_OK; - if (cchPathSize <= 1) - return S_OK; - - cchPathLen = min(cchPathSize, wcslen(PathElem1)); - - if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') - { - /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ - hr = StringCchCatW(PathElem1, cchPathSize, L"\\"); + + while (NumberOfPathComponents--) + { + PathComponent = va_arg(PathComponentsList, PCWSTR); + if (!PathComponent) + continue; + + cchPathLen = min(cchPathSize, wcslen(PathBuffer)); + if (cchPathLen >= cchPathSize) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + if (PathComponent[0] != OBJ_NAME_PATH_SEPARATOR && + cchPathLen > 0 && PathBuffer[cchPathLen-1] != OBJ_NAME_PATH_SEPARATOR) + { + /* PathComponent does not start with '\' and PathBuffer does not end with '\' */ + hr = StringCchCatW(PathBuffer, cchPathSize, L"\\"); + if (FAILED(hr)) + return hr; + } + else if (PathComponent[0] == OBJ_NAME_PATH_SEPARATOR && + cchPathLen > 0 && PathBuffer[cchPathLen-1] == OBJ_NAME_PATH_SEPARATOR) + { + /* PathComponent starts with '\' and PathBuffer ends with '\' */ + while (*PathComponent == OBJ_NAME_PATH_SEPARATOR) + ++PathComponent; // Skip any backslash + } + hr = StringCchCatW(PathBuffer, cchPathSize, PathComponent); if (FAILED(hr)) return hr; } - else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') - { - /* PathElem2 starts with '\' and PathElem1 ends with '\' */ - while (*PathElem2 == L'\\') - ++PathElem2; // Skip any backslash - } - hr = StringCchCatW(PathElem1, cchPathSize, PathElem2); + + return hr; +} + +HRESULT +CombinePathsV( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList) +{ + if (cchPathSize < 1) + return S_OK; + + *PathBuffer = UNICODE_NULL; + return ConcatPathsV(PathBuffer, cchPathSize, + NumberOfPathComponents, PathComponentsList); +} + +HRESULT +ConcatPaths( + IN OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...) +{ + HRESULT hr; + va_list PathComponentsList; + + if (cchPathSize < 1) + return S_OK; + + va_start(PathComponentsList, NumberOfPathComponents); + hr = ConcatPathsV(PathBuffer, cchPathSize, + NumberOfPathComponents, PathComponentsList); + va_end(PathComponentsList); + + return hr; +} + +HRESULT +CombinePaths( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...) +{ + HRESULT hr; + va_list PathComponentsList; + + if (cchPathSize < 1) + return S_OK; + + *PathBuffer = UNICODE_NULL; + + va_start(PathComponentsList, NumberOfPathComponents); + hr = CombinePathsV(PathBuffer, cchPathSize, + NumberOfPathComponents, PathComponentsList); + va_end(PathComponentsList); + return hr; } @@ -121,13 +194,7 @@ UNICODE_STRING Name; WCHAR FullName[MAX_PATH]; - if (PathName) - StringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); - else - FullName[0] = UNICODE_NULL; - - ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); - + CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); RtlInitUnicodeString(&Name, FullName); InitializeObjectAttributes(&ObjectAttributes, @@ -268,14 +335,7 @@ UNICODE_STRING Name; WCHAR FullName[MAX_PATH]; - if (PathName) - StringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); - else - FullName[0] = UNICODE_NULL; - - if (FileName) - ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); - + CombinePaths(FullName, ARRAYSIZE(FullName), 2, PathName, FileName); RtlInitUnicodeString(&Name, FullName); InitializeObjectAttributes(&ObjectAttributes, Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Tue May 23 22:30:54 2017 @@ -17,10 +17,32 @@ #endif HRESULT +ConcatPathsV( + IN OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList); + +HRESULT +CombinePathsV( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN va_list PathComponentsList); + +HRESULT ConcatPaths( - IN OUT PWSTR PathElem1, + IN OUT PWSTR PathBuffer, IN SIZE_T cchPathSize, - IN PCWSTR PathElem2 OPTIONAL); + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...); + +HRESULT +CombinePaths( + OUT PWSTR PathBuffer, + IN SIZE_T cchPathSize, + IN ULONG NumberOfPathComponents, + IN /* PCWSTR */ ...); BOOLEAN DoesPathExist(

7 years, 3 months

[hbelusca] 74636: [USETUP]: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 23 21:01:10 2017 New Revision: 74636 URL: http://svn.reactos.org/svn/reactos?rev=74636&view=rev Log: [USETUP]: Whitespace fixes only. Modified: branches/setup_improvements/base/setup/usetup/cabinet.c branches/setup_improvements/base/setup/usetup/lang/it-IT.h branches/setup_improvements/base/setup/usetup/lang/nl-NL.h branches/setup_improvements/base/setup/usetup/lang/pt-BR.h branches/setup_improvements/base/setup/usetup/lang/sq-AL.h branches/setup_improvements/base/setup/usetup/lang/sv-SE.h branches/setup_improvements/base/setup/usetup/lang/tr-TR.h branches/setup_improvements/base/setup/usetup/lang/uk-UA.h Modified: branches/setup_improvements/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/cabinet.c [iso-8859-1] Tue May 23 21:01:10 2017 @@ -764,7 +764,7 @@ Search->CFData = NULL; Search->Offset = 0; } - + /* don't match the file we started with */ if (wcscmp(Search->Search, L"*") == 0) { @@ -1032,7 +1032,7 @@ CurrentOffset += CFData->UncompSize; CFData = (PCFDATA)((char *)(CFData + 1) + DataReserved + CFData->CompSize); } - + Search->CFData = CFData; Search->Offset = CurrentOffset; Modified: branches/setup_improvements/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/it-IT.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -56,7 +56,7 @@ static MUI_ENTRY itITWelcomePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -92,7 +92,7 @@ TEXT_STYLE_NORMAL }, { - 8, + 8, 19, "\x07 Premere L per vedere i termini e condizioni della licenza.", TEXT_STYLE_NORMAL @@ -104,14 +104,14 @@ TEXT_STYLE_NORMAL }, { - 6, + 6, 23, "Per maggiori informazioni riguardo ReactOS, visitate il sito:", TEXT_STYLE_NORMAL }, { - 6, - 24, + 6, + 24, "http://www.reactos.org", TEXT_STYLE_HIGHLIGHT }, @@ -132,38 +132,38 @@ static MUI_ENTRY itITIntroPageEntries[] = { { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, "Il setup di ReactOS ancora in una fase preliminare.", TEXT_STYLE_NORMAL }, { - 6, + 6, 9, "Non ha ancora tutte le funzioni di installazione.", TEXT_STYLE_NORMAL }, { - 6, + 6, 12, "Si applicano le seguenti limitazioni:", TEXT_STYLE_NORMAL }, { - 8, - 13, + 8, + 13, "- Il setup supporta solamente il sistema FAT.", TEXT_STYLE_NORMAL }, @@ -174,20 +174,20 @@ TEXT_STYLE_NORMAL }, { - 8, - 23, + 8, + 23, "\x07 Premere INVIO per installare ReactOS.", TEXT_STYLE_NORMAL }, { - 8, - 25, + 8, + 25, "\x07 Premere F3 per uscire senza installare ReactOS.", TEXT_STYLE_NORMAL }, { 0, - 0, + 0, " INVIO = Continua F3 = Termina", TEXT_TYPE_STATUS }, @@ -202,7 +202,7 @@ static MUI_ENTRY itITLicensePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -279,43 +279,43 @@ "della licenza GNU GPL con ReactOS, visiti il sito:", TEXT_STYLE_NORMAL }, - { + { 8, 20, "http://www.gnu.org/licenses/licenses.html", TEXT_STYLE_HIGHLIGHT }, - { + { 8, 22, "Garanzia:", TEXT_STYLE_HIGHLIGHT }, - { + { 8, 24, "Questo software libero; vedere il codice per le condizioni di copia.", TEXT_STYLE_NORMAL }, - { + { 8, 25, "NON esiste garanzia; n di COMMERCIABILIT·", TEXT_STYLE_NORMAL }, - { + { 8, 26, "o adeguatezza ad un uso particolare", TEXT_STYLE_NORMAL }, - { + { 0, 0, " INVIO = Ritorna", TEXT_TYPE_STATUS }, - { + { 0, 0, NULL, @@ -326,13 +326,13 @@ static MUI_ENTRY itITDevicePageEntries[] = { { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, 8, "L'elenco che segue mostra le impostazioni correnti delle periferiche.", TEXT_STYLE_NORMAL @@ -368,7 +368,7 @@ TEXT_STYLE_NORMAL }, { - 25, + 25, 16, "Accettare queste impostazioni", TEXT_STYLE_NORMAL }, @@ -379,25 +379,25 @@ TEXT_STYLE_NORMAL }, { - 6, - 20, + 6, + 20, "e modificarlo premendo INVIO per selezionare un valore alternativo.", TEXT_STYLE_NORMAL }, { - 6, + 6, 21, " ", TEXT_STYLE_NORMAL }, { - 6, - 23, + 6, + 23, "Quando le impostazioni saranno corrette, selezionare", TEXT_STYLE_NORMAL }, { - 6, + 6, 24, "\"Accettare queste impostazioni\" e premere INVIO.", TEXT_STYLE_NORMAL @@ -419,7 +419,7 @@ static MUI_ENTRY itITUpgradePageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -489,7 +489,7 @@ static MUI_ENTRY itITComputerPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -505,7 +505,7 @@ 10, "\x07 Premere i tasti SU e GIë per scegliere il tipo.", TEXT_STYLE_NORMAL - }, + }, { 8, 11, @@ -541,7 +541,7 @@ static MUI_ENTRY itITFlushPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -581,7 +581,7 @@ static MUI_ENTRY itITQuitPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -627,7 +627,7 @@ static MUI_ENTRY itITDisplayPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -678,7 +678,7 @@ static MUI_ENTRY itITSuccessPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -724,7 +724,7 @@ static MUI_ENTRY itITBootPageEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -771,7 +771,7 @@ static MUI_ENTRY itITSelectPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -841,7 +841,7 @@ static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -935,7 +935,7 @@ static MUI_ENTRY itITFormatPartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -969,7 +969,7 @@ static MUI_ENTRY itITInstallDirectoryEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1021,7 +1021,7 @@ static MUI_ENTRY itITFileCopyEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1061,7 +1061,7 @@ static MUI_ENTRY itITBootLoaderEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1113,7 +1113,7 @@ static MUI_ENTRY itITKeyboardSettingsEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1165,7 +1165,7 @@ static MUI_ENTRY itITLayoutSettingsEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1218,7 +1218,7 @@ static MUI_ENTRY itITPrepareCopyEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1247,7 +1247,7 @@ static MUI_ENTRY itITSelectFSEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE @@ -1294,7 +1294,7 @@ static MUI_ENTRY itITDeletePartitionEntries[] = { { - 4, + 4, 3, " Installazione di ReactOS " KERNEL_VERSION_STR " ", TEXT_STYLE_UNDERLINE Modified: branches/setup_improvements/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -44,7 +44,7 @@ }, { 8, - 13, + 13, "\x07 Deze taal wordt later als standaard taal door het systeem gebruikt.", TEXT_STYLE_NORMAL }, @@ -1481,7 +1481,7 @@ NULL }, { - //ERROR_DELETE_SPACE, + //ERROR_DELETE_SPACE, "U kunt ongebruikte schijfruimte voor partities niet verwijderen!\n" "\n" " * Druk op een willekeurige toets om door te gaan.", Modified: branches/setup_improvements/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -1060,7 +1060,7 @@ { 50, 0, - "\xB3 Por favor, aguarde...", + "\xB3 Por favor, aguarde...", TEXT_TYPE_STATUS }, { Modified: branches/setup_improvements/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -1,4 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) * DATE OF TR: 29-11-2013 */ Modified: branches/setup_improvements/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Setup - * FILE: base/setup/usetup/lang/sv-SE.h + * FILE: base/setup/usetup/lang/sv-SE.h * PURPOSE: Swedish resource file * Translation: Jaix Bly plus perhaps GreatLord if blame and translate.reactos.se is consulted. */ Modified: branches/setup_improvements/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -1415,7 +1415,7 @@ //ERROR_WARN_PARTITION, "Kur, dzgn ynetilemeyen bir uyumsuz blm tablosu ieren en az\n" "bir sbit disk buldu!\n" - "\n" + "\n" "Blmleri oluturmak vey silmek blm tablosunu yok edebilir.\n" "\n" " \x07 Kur'dan kmak iin F3'e basnz.\n" Modified: branches/setup_improvements/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Tue May 23 21:01:10 2017 @@ -1,7 +1,7 @@ /* * translated by Artem Reznikov, Igor Paliychuk, 2010 * http://www.reactos.org/uk/ - */ + */ #pragma once

7 years, 3 months

[hbelusca] 74635: [USETUP]: Flatten out the "native/" directory, and introduce the host_native.c from the original console.c so that the directory makes more sense.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue May 23 12:08:24 2017 New Revision: 74635 URL: http://svn.reactos.org/svn/reactos?rev=74635&view=rev Log: [USETUP]: Flatten out the "native/" directory, and introduce the host_native.c from the original console.c so that the directory makes more sense. Added: branches/setup_improvements/base/setup/usetup/native/console.c - copied unchanged from r74634, branches/setup_improvements/base/setup/usetup/native/utils/console.c branches/setup_improvements/base/setup/usetup/native/console.h - copied unchanged from r74634, branches/setup_improvements/base/setup/usetup/native/utils/console.h branches/setup_improvements/base/setup/usetup/native/host_native.c - copied unchanged from r74634, branches/setup_improvements/base/setup/usetup/native/console.c branches/setup_improvements/base/setup/usetup/native/keytrans.c - copied unchanged from r74634, branches/setup_improvements/base/setup/usetup/native/utils/keytrans.c branches/setup_improvements/base/setup/usetup/native/keytrans.h - copied unchanged from r74634, branches/setup_improvements/base/setup/usetup/native/utils/keytrans.h Removed: branches/setup_improvements/base/setup/usetup/native/utils/ Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Tue May 23 12:08:24 2017 @@ -13,9 +13,9 @@ interface/usetup.c interface/devinst.c interface/consup.c - native/utils/keytrans.c - native/utils/console.c native/console.c + native/keytrans.c + native/host_native.c bootsup.c cabinet.c chkdsk.c

7 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017