Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 75764: [FSUTIL] Add a skeleton for the fsutil tool. As a proof of concept, implement fsutil dirty query. More to follow ; -).
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 12:56:45 2017 New Revision: 75764 URL: http://svn.reactos.org/svn/reactos?rev=75764&view=rev Log: [FSUTIL] Add a skeleton for the fsutil tool. As a proof of concept, implement fsutil dirty query. More to follow ;-). Added: trunk/reactos/base/applications/cmdutils/fsutil/ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/fsutil/dirty.c (with props) trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c (with props) trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h (with props) trunk/reactos/base/applications/cmdutils/fsutil/fsutil.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Sep 5 12:56:45 2017 @@ -6,6 +6,7 @@ add_subdirectory(doskey) add_subdirectory(eventcreate) add_subdirectory(find) +add_subdirectory(fsutil) add_subdirectory(help) add_subdirectory(hostname) add_subdirectory(lodctr) Added: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] Tue Sep 5 12:56:45 2017 @@ -0,0 +1,9 @@ +list(APPEND SOURCE + dirty.c + fsutil.c + fsutil.h) +add_executable(fsutil ${SOURCE} fsutil.rc) +set_module_type(fsutil win32cui UNICODE) +add_importlibs(fsutil msvcrt kernel32 ntdll) +add_pch(fsutil fsutil.h SOURCE) +add_cd_file(TARGET fsutil DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Tue Sep 5 12:56:45 2017 @@ -0,0 +1,126 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/dirty.c + * PURPOSE: FSutil dirty bit handling + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include "fsutil.h" +#include <winioctl.h> + +/* Add handlers here for subcommands */ +static int QueryMain(int argc, const TCHAR *argv[]); +static int SetMain(int argc, const TCHAR *argv[]); +static HandlerItem HandlersList[] = +{ + /* Proc, name, help */ + { QueryMain, _T("query"), _T("Show the dirty bit") }, + { SetMain, _T("set"), _T("Set the dirty bit") }, +}; + +static int +QueryMain(int argc, const TCHAR *argv[]) +{ + HANDLE Volume; + TCHAR VolumeID[PATH_MAX]; + ULONG VolumeStatus, BytesRead; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil dirty query <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil dirty query c:\n")); + return 1; + } + + /* Create full name */ + _stprintf(VolumeID, _T("\\\\.\\%s"), argv[1]); + + /* Open the volume */ + Volume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (Volume == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return 1; + } + + /* And query the dirty status */ + if (DeviceIoControl(Volume, FSCTL_IS_VOLUME_DIRTY, NULL, 0, &VolumeStatus, + sizeof(ULONG), &BytesRead, NULL) == FALSE) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + CloseHandle(Volume); + return 1; + } + + CloseHandle(Volume); + + /* Print the status */ + _ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], (VolumeStatus & VOLUME_IS_DIRTY ? _T("dirty") : _T("clean"))); + + return 1; +} + +static int +SetMain(int argc, const TCHAR *argv[]) +{ + /* FIXME */ + _ftprintf(stderr, _T("Not implemented\n")); + return 1; +} + +static void +PrintUsage(const TCHAR * Command) +{ + int i; + + /* If we were given a command, print it's not supported */ + if (Command != NULL) + { + _ftprintf(stderr, _T("Unhandled DIRTY command: %s\n"), Command); + } + + /* And dump any available command */ + _ftprintf(stderr, _T("---- Handled DIRTY commands ----\n\n")); + for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) + { + _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); + } +} + +int +DirtyMain(int argc, const TCHAR *argv[]) +{ + int i; + int ret; + const TCHAR * Command; + + ret = 1; + Command = NULL; + i = (sizeof(HandlersList) / sizeof(HandlersList[0])); + + /* If we have a command, does it match a known one? */ + if (argc > 1) + { + /* Browse all the known commands finding the right one */ + Command = argv[1]; + for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) + { + if (_tcsicmp(Command, HandlersList[i].Command) == 0) + { + ret = HandlersList[i].Handler(argc - 1, &argv[1]); + break; + } + } + } + + /* We failed finding someone to handle the caller's needs, print out */ + if (i == (sizeof(HandlersList) / sizeof(HandlersList[0]))) + { + PrintUsage(Command); + } + + return ret; +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Tue Sep 5 12:56:45 2017 @@ -0,0 +1,72 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/fsutil.c + * PURPOSE: FSutil main + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include "fsutil.h" + +/* Add handlers here for commands */ +int DirtyMain(int argc, const TCHAR *argv[]); +static HandlerItem HandlersList[] = +{ + /* Proc, name, help */ + { DirtyMain, _T("dirty"), _T("Manipulates the dirty bit") }, +}; + +static void +PrintUsage(const TCHAR * Command) +{ + int i; + + /* If we were given a command, print it's not supported */ + if (Command != NULL) + { + _ftprintf(stderr, _T("Unhandled command: %s\n"), Command); + } + + /* And dump any available command */ + _ftprintf(stderr, _T("---- Handled commands ----\n\n")); + for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) + { + _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); + } +} + +int +__cdecl +_tmain(int argc, const TCHAR *argv[]) +{ + int i; + int ret; + const TCHAR * Command; + + ret = 1; + Command = NULL; + i = (sizeof(HandlersList) / sizeof(HandlersList[0])); + + /* If we have a command, does it match a known one? */ + if (argc > 1) + { + /* Browse all the known commands finding the right one */ + Command = argv[1]; + for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) + { + if (_tcsicmp(Command, HandlersList[i].Command) == 0) + { + ret = HandlersList[i].Handler(argc - 1, &argv[1]); + break; + } + } + } + + /* We failed finding someone to handle the caller's needs, print out */ + if (i == (sizeof(HandlersList) / sizeof(HandlersList[0]))) + { + PrintUsage(Command); + } + + return ret; +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Tue Sep 5 12:56:45 2017 @@ -0,0 +1,15 @@ +#ifndef __FSUTIL_H__ +#define __FSUTIL_H__ + +#include <windows.h> +#include <tchar.h> +#include <stdio.h> + +typedef struct +{ + int (*Handler)(int argc, const TCHAR *argv[]); + const TCHAR * Command; + const TCHAR * Desc; +} HandlerItem; + +#endif Propchange: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.rc (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.rc [iso-8859-1] Tue Sep 5 12:56:45 2017 @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "FS utility\0" +#define REACTOS_STR_INTERNAL_NAME "fsutil\0" +#define REACTOS_STR_ORIGINAL_FILENAME "fsutil.exe\0" +#include <reactos/version.rc> Propchange: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 75763: [PSDK] Add FSCTL for dirty bit read
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 12:51:08 2017 New Revision: 75763 URL: http://svn.reactos.org/svn/reactos?rev=75763&view=rev Log: [PSDK] Add FSCTL for dirty bit read Modified: trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Tue Sep 5 12:51:08 2017 @@ -627,6 +627,21 @@ ((t)==PARTITION_EXTENDED)||\ ((t)==PARTITION_XINT13_EXTENDED)) +#ifndef _FILESYSTEMFSCTL_ +#define _FILESYSTEMFSCTL_ + +#if (_WIN32_WINNT >= _WIN32_WINNT_NT4) +#define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif + +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) +#define VOLUME_IS_DIRTY (0x00000001) +#define VOLUME_UPGRADE_SCHEDULED (0x00000002) +#define VOLUME_SESSION_OPEN (0x00000004) +#endif + +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif

1 0

[hbelusca] 75762: [USETUP]: Move the SetupExtractFile() function to where it is (only) used.
by hbelusca＠svn.reactos.org 04 Sep '17

04 Sep '17

Author: hbelusca Date: Mon Sep 4 20:00:22 2017 New Revision: 75762 URL: http://svn.reactos.org/svn/reactos?rev=75762&view=rev Log: [USETUP]: Move the SetupExtractFile() function to where it is (only) used. Modified: branches/setup_improvements/base/setup/usetup/filequeue.c branches/setup_improvements/base/setup/usetup/filequeue.h branches/setup_improvements/base/setup/usetup/filesup.c branches/setup_improvements/base/setup/usetup/filesup.h 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] Mon Sep 4 20:00:22 2017 @@ -57,6 +57,90 @@ /* FUNCTIONS ****************************************************************/ +#ifdef __REACTOS__ +static BOOLEAN HasCurrentCabinet = FALSE; +static WCHAR CurrentCabinetName[MAX_PATH]; +static CAB_SEARCH Search; + +NTSTATUS +SetupExtractFile( + PWCHAR CabinetFileName, + PWCHAR SourceFileName, + PWCHAR DestinationPathName) +{ + ULONG CabStatus; + + DPRINT("SetupExtractFile(CabinetFileName %S, SourceFileName %S, DestinationPathName %S)\n", + CabinetFileName, SourceFileName, DestinationPathName); + + if (HasCurrentCabinet) + { + DPRINT("CurrentCabinetName: %S\n", CurrentCabinetName); + } + + if ((HasCurrentCabinet) && (wcscmp(CabinetFileName, CurrentCabinetName) == 0)) + { + DPRINT("Using same cabinet as last time\n"); + + /* Use our last location because the files should be sequential */ + CabStatus = CabinetFindNextFileSequential(SourceFileName, &Search); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("Sequential miss on file: %S\n", SourceFileName); + + /* Looks like we got unlucky */ + CabStatus = CabinetFindFirst(SourceFileName, &Search); + } + } + else + { + DPRINT("Using new cabinet\n"); + + if (HasCurrentCabinet) + { + CabinetCleanup(); + } + + wcscpy(CurrentCabinetName, CabinetFileName); + + CabinetInitialize(); + CabinetSetEventHandlers(NULL, NULL, NULL); + CabinetSetCabinetName(CabinetFileName); + + CabStatus = CabinetOpen(); + if (CabStatus == CAB_STATUS_SUCCESS) + { + DPRINT("Opened cabinet %S\n", CabinetGetCabinetName()); + HasCurrentCabinet = TRUE; + } + else + { + DPRINT("Cannot open cabinet (%d)\n", CabStatus); + return STATUS_UNSUCCESSFUL; + } + + /* We have to start at the beginning here */ + CabStatus = CabinetFindFirst(SourceFileName, &Search); + } + + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT1("Unable to find '%S' in cabinet '%S'\n", SourceFileName, CabinetGetCabinetName()); + return STATUS_UNSUCCESSFUL; + } + + CabinetSetDestinationPath(DestinationPathName); + CabStatus = CabinetExtractFile(&Search); + if (CabStatus != CAB_STATUS_SUCCESS) + { + DPRINT("Cannot extract file %S (%d)\n", SourceFileName, CabStatus); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; +} +#endif + HSPFILEQ WINAPI SetupOpenFileQueue(VOID) Modified: branches/setup_improvements/base/setup/usetup/filequeue.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filequeue.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filequeue.h [iso-8859-1] Mon Sep 4 20:00:22 2017 @@ -69,6 +69,12 @@ /* FUNCTIONS ****************************************************************/ +NTSTATUS +SetupExtractFile( + PWCHAR CabinetFileName, + PWCHAR SourceFileName, + PWCHAR DestinationFileName); + HSPFILEQ WINAPI SetupOpenFileQueue(VOID); Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Mon Sep 4 20:00:22 2017 @@ -15,10 +15,6 @@ #include <debug.h> /* FUNCTIONS ****************************************************************/ - -static BOOLEAN HasCurrentCabinet = FALSE; -static WCHAR CurrentCabinetName[MAX_PATH]; -static CAB_SEARCH Search; static NTSTATUS @@ -143,86 +139,6 @@ return Status; } -#ifdef __REACTOS__ -NTSTATUS -SetupExtractFile( - PWCHAR CabinetFileName, - PWCHAR SourceFileName, - PWCHAR DestinationPathName) -{ - ULONG CabStatus; - - DPRINT("SetupExtractFile(CabinetFileName %S, SourceFileName %S, DestinationPathName %S)\n", - CabinetFileName, SourceFileName, DestinationPathName); - - if (HasCurrentCabinet) - { - DPRINT("CurrentCabinetName: %S\n", CurrentCabinetName); - } - - if ((HasCurrentCabinet) && (wcscmp(CabinetFileName, CurrentCabinetName) == 0)) - { - DPRINT("Using same cabinet as last time\n"); - - /* Use our last location because the files should be sequential */ - CabStatus = CabinetFindNextFileSequential(SourceFileName, &Search); - if (CabStatus != CAB_STATUS_SUCCESS) - { - DPRINT("Sequential miss on file: %S\n", SourceFileName); - - /* Looks like we got unlucky */ - CabStatus = CabinetFindFirst(SourceFileName, &Search); - } - } - else - { - DPRINT("Using new cabinet\n"); - - if (HasCurrentCabinet) - { - CabinetCleanup(); - } - - wcscpy(CurrentCabinetName, CabinetFileName); - - CabinetInitialize(); - CabinetSetEventHandlers(NULL, NULL, NULL); - CabinetSetCabinetName(CabinetFileName); - - CabStatus = CabinetOpen(); - if (CabStatus == CAB_STATUS_SUCCESS) - { - DPRINT("Opened cabinet %S\n", CabinetGetCabinetName()); - HasCurrentCabinet = TRUE; - } - else - { - DPRINT("Cannot open cabinet (%d)\n", CabStatus); - return STATUS_UNSUCCESSFUL; - } - - /* We have to start at the beginning here */ - CabStatus = CabinetFindFirst(SourceFileName, &Search); - } - - if (CabStatus != CAB_STATUS_SUCCESS) - { - DPRINT1("Unable to find '%S' in cabinet '%S'\n", SourceFileName, CabinetGetCabinetName()); - return STATUS_UNSUCCESSFUL; - } - - CabinetSetDestinationPath(DestinationPathName); - CabStatus = CabinetExtractFile(&Search); - if (CabStatus != CAB_STATUS_SUCCESS) - { - DPRINT("Cannot extract file %S (%d)\n", SourceFileName, CabStatus); - return STATUS_UNSUCCESSFUL; - } - - return STATUS_SUCCESS; -} -#endif - BOOLEAN IsValidPath( IN PWCHAR InstallDir, Modified: branches/setup_improvements/base/setup/usetup/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] Mon Sep 4 20:00:22 2017 @@ -13,12 +13,6 @@ SetupCreateDirectory( PWCHAR DirectoryName); -NTSTATUS -SetupExtractFile( - PWCHAR CabinetFileName, - PWCHAR SourceFileName, - PWCHAR DestinationFileName); - BOOLEAN IsValidPath( IN PWCHAR InstallDir,

1 0

[ashaposhnikov] 75761: [RAPPS] Merged two Installed and Available enum values into one enum
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 21:10:24 2017 New Revision: 75761 URL: http://svn.reactos.org/svn/reactos?rev=75761&view=rev Log: [RAPPS] Merged two Installed and Available enum values into one enum Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sun Sep 3 21:10:24 2017 @@ -923,7 +923,7 @@ FreeLogs(); m_AvailableApps.FreeCachedEntries(); - if (IS_INSTALLED_ENUM(SelectedEnumType)) + if (IsInstalledEnum(SelectedEnumType)) FreeInstalledAppList(); delete m_ClientPanel; @@ -953,7 +953,7 @@ break; case IDS_APPLICATIONS: - UpdateApplicationsList(ENUM_APPLICATIONS); + UpdateApplicationsList(ENUM_INSTALLED_APPLICATIONS); break; case IDS_UPDATES: @@ -1087,7 +1087,7 @@ (pnic->uNewState & LVIS_FOCUSED) && !(pnic->uOldState & LVIS_FOCUSED)) { - if (IS_INSTALLED_ENUM(SelectedEnumType)) + if (IsInstalledEnum(SelectedEnumType)) ShowInstalledAppInfo(ItemIndex); if (IsAvailableEnum(SelectedEnumType)) CAvailableAppView::ShowAvailableAppInfo(ItemIndex); @@ -1125,7 +1125,7 @@ { if (data->hwndFrom == m_ListView->m_hWnd && ((LPNMLISTVIEW) lParam)->iItem != -1) { - if (IS_INSTALLED_ENUM(SelectedEnumType)) + if (IsInstalledEnum(SelectedEnumType)) ShowInstalledAppInfo(-1); if (IsAvailableEnum(SelectedEnumType)) CAvailableAppView::ShowAvailableAppInfo(-1); @@ -1502,7 +1502,7 @@ { ATL::CStringW szBuffer1, szBuffer2; HIMAGELIST hImageListView; - BOOL bWasInInstalled = IS_INSTALLED_ENUM(SelectedEnumType); + BOOL bWasInInstalled = IsInstalledEnum(SelectedEnumType); bUpdating = TRUE; m_ListView->SetRedraw(FALSE); @@ -1533,7 +1533,7 @@ ImageList_Destroy(hImageListBuf); } - if (IS_INSTALLED_ENUM(EnumType)) + if (IsInstalledEnum(EnumType)) { if (!bWasInInstalled) { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Sun Sep 3 21:10:24 2017 @@ -6,34 +6,6 @@ #include <atlcoll.h> #include "misc.h" - -/* EnumType flags for EnumAvailableApplications */ -enum AvailableCategories -{ - ENUM_ALL_AVAILABLE, - ENUM_CAT_AUDIO, - ENUM_CAT_VIDEO, - ENUM_CAT_GRAPHICS, - ENUM_CAT_GAMES, - ENUM_CAT_INTERNET, - ENUM_CAT_OFFICE, - ENUM_CAT_DEVEL, - ENUM_CAT_EDU, - ENUM_CAT_ENGINEER, - ENUM_CAT_FINANCE, - ENUM_CAT_SCIENCE, - ENUM_CAT_TOOLS, - ENUM_CAT_DRIVERS, - ENUM_CAT_LIBS, - ENUM_CAT_OTHER, - ENUM_AVAILABLE_MIN = ENUM_ALL_AVAILABLE, - ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER -}; - -inline BOOL IsAvailableEnum(INT x) -{ - return (x >= AvailableCategories::ENUM_AVAILABLE_MIN && x <= AvailableCategories::ENUM_AVAILABLE_MAX); -} enum LicenseType { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h [iso-8859-1] Sun Sep 3 21:10:24 2017 @@ -31,4 +31,40 @@ #define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" #define MAX_STR_LEN 256 -#define ENUM_ALL_COMPONENTS 30 + +enum AppsCategories +{ + ENUM_ALL_AVAILABLE, + ENUM_CAT_AUDIO, + ENUM_CAT_VIDEO, + ENUM_CAT_GRAPHICS, + ENUM_CAT_GAMES, + ENUM_CAT_INTERNET, + ENUM_CAT_OFFICE, + ENUM_CAT_DEVEL, + ENUM_CAT_EDU, + ENUM_CAT_ENGINEER, + ENUM_CAT_FINANCE, + ENUM_CAT_SCIENCE, + ENUM_CAT_TOOLS, + ENUM_CAT_DRIVERS, + ENUM_CAT_LIBS, + ENUM_CAT_OTHER, + ENUM_ALL_INSTALLED, + ENUM_INSTALLED_APPLICATIONS = 31, + ENUM_UPDATES = 32, + ENUM_INSTALLED_MIN = ENUM_ALL_INSTALLED, + ENUM_INSTALLED_MAX = ENUM_UPDATES, + ENUM_AVAILABLE_MIN = ENUM_ALL_AVAILABLE, + ENUM_AVAILABLE_MAX = ENUM_CAT_OTHER, +}; + +inline BOOL IsAvailableEnum(INT x) +{ + return (x >= AppsCategories::ENUM_AVAILABLE_MIN && x <= AppsCategories::ENUM_AVAILABLE_MAX); +} + +inline BOOL IsInstalledEnum(INT x) +{ + return (x >= AppsCategories::ENUM_INSTALLED_MIN && x <= AppsCategories::ENUM_INSTALLED_MAX); +} Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h [iso-8859-1] Sun Sep 3 21:10:24 2017 @@ -2,14 +2,6 @@ #include <windef.h> #include <atlstr.h> - -#define ENUM_APPLICATIONS 31 -#define ENUM_UPDATES 32 - -#define ENUM_INSTALLED_MIN ENUM_ALL_COMPONENTS -#define ENUM_INSTALLED_MAX ENUM_UPDATES - -#define IS_INSTALLED_ENUM(a) (a >= ENUM_INSTALLED_MIN && a <= ENUM_INSTALLED_MAX) struct INSTALLED_INFO { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Sun Sep 3 21:10:24 2017 @@ -54,7 +54,7 @@ HKEY hKey; PINSTALLED_INFO ItemInfo; - if (!IS_INSTALLED_ENUM(SelectedEnumType)) + if (!IsInstalledEnum(SelectedEnumType)) return FALSE; if (Index == -1) @@ -146,7 +146,7 @@ ATL::CStringW szMsgText, szMsgTitle; INT ItemIndex = SendMessageW(hListView, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); - if (!IS_INSTALLED_ENUM(SelectedEnumType)) + if (!IsInstalledEnum(SelectedEnumType)) return; Info = (PINSTALLED_INFO) ListViewGetlParam(Index); @@ -238,13 +238,13 @@ &dwSize) == ERROR_SUCCESS) { szDisplayName.ReleaseBuffer(); - if (EnumType < ENUM_ALL_COMPONENTS || EnumType > ENUM_UPDATES) - EnumType = ENUM_ALL_COMPONENTS; + if (EnumType < ENUM_ALL_INSTALLED || EnumType > ENUM_UPDATES) + EnumType = ENUM_ALL_INSTALLED; if (!bIsSystemComponent) { - if ((EnumType == ENUM_ALL_COMPONENTS) || /* All components */ - ((EnumType == ENUM_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */ + if ((EnumType == ENUM_ALL_INSTALLED) || /* All components */ + ((EnumType == ENUM_INSTALLED_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */ ((EnumType == ENUM_UPDATES) && (bIsUpdate))) /* Updates only */ { if (!lpEnumProc(ItemIndex, szDisplayName, &Info)) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sun Sep 3 21:10:24 2017 @@ -15,7 +15,7 @@ HWND hMainWnd; HINSTANCE hInst; -INT SelectedEnumType = ENUM_ALL_COMPONENTS; +INT SelectedEnumType = ENUM_ALL_INSTALLED; SETTINGS_INFO SettingsInfo; ATL::CStringW szSearchPattern;

1 0

[ashaposhnikov] 75760: [RAPPS] Complete renaming
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 21:03:06 2017 New Revision: 75760 URL: http://svn.reactos.org/svn/reactos?rev=75760&view=rev Log: [RAPPS] Complete renaming Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sun Sep 3 21:03:06 2017 @@ -949,7 +949,7 @@ switch (((LPNMTREEVIEW) lParam)->itemNew.lParam) { case IDS_INSTALLED: - UpdateApplicationsList(ENUM_ALL_COMPONENTS); + UpdateApplicationsList(ENUM_ALL_INSTALLED); break; case IDS_APPLICATIONS:

1 0

[ashaposhnikov] 75759: [RAPPS] Amendment: undo renaming in loaddlg.cpp
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 20:48:53 2017 New Revision: 75759 URL: http://svn.reactos.org/svn/reactos?rev=75759&view=rev Log: [RAPPS] Amendment: undo renaming in loaddlg.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sun Sep 3 20:48:53 2017 @@ -67,17 +67,16 @@ return szString; } - struct DownloadInfo { DownloadInfo() {} DownloadInfo(const CAvailableApplicationInfo& AppInfo) - :szUrl(AppInfo.m_szUrlDownload), m_szName(AppInfo.m_szName), szSHA1(AppInfo.m_szSHA1) + :szUrl(AppInfo.m_szUrlDownload), szName(AppInfo.m_szName), szSHA1(AppInfo.m_szSHA1) { } ATL::CStringW szUrl; - ATL::CStringW m_szName; + ATL::CStringW szName; ATL::CStringW szSHA1; }; @@ -259,7 +258,7 @@ { for (INT i = 0; i < arrInfo.GetSize(); ++i) { - AddRow(i, arrInfo[i].m_szName.GetString(), DOWNLOAD_STATUS::DLWaiting); + AddRow(i, arrInfo[i].szName.GetString(), DOWNLOAD_STATUS::DLWaiting); } } @@ -639,7 +638,7 @@ // Change caption to show the currently downloaded app if (!bCab) { - szNewCaption.Format(szCaption, CurrentInfo.m_szName.GetString()); + szNewCaption.Format(szCaption, CurrentInfo.szName.GetString()); } else { @@ -868,7 +867,7 @@ { static DownloadInfo DatabaseDLInfo; DatabaseDLInfo.szUrl = lpUrl; - DatabaseDLInfo.m_szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); + DatabaseDLInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); Download(DatabaseDLInfo, TRUE); }

1 0

[ashaposhnikov] 75758: [RAPPS] Formatting fixes - CAvailableApplicationInfo: added m_ prefixes to members - CAvailableApps: renamed EnumAvailableApplications to Enum - Renamed LICENSE_TYPE enum to ...
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 20:37:14 2017 New Revision: 75758 URL: http://svn.reactos.org/svn/reactos?rev=75758&view=rev Log: [RAPPS] Formatting fixes - CAvailableApplicationInfo: added m_ prefixes to members - CAvailableApps: renamed EnumAvailableApplications to Enum - Renamed LICENSE_TYPE enum to LicenseType and renamed enum values - unattended.cpp: Added license header Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -21,16 +21,16 @@ CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) : m_Parser(sFileNameParam) { - LicenseType = LICENSE_TYPE::None; - - sFileName = sFileNameParam; + m_LicenseType = LicenseType::LICENSE_NONE; + + m_sFileName = sFileNameParam; RetrieveGeneralInfo(); } VOID CAvailableApplicationInfo::RefreshAppInfo() { - if (szUrlDownload.IsEmpty()) + if (m_szUrlDownload.IsEmpty()) { RetrieveGeneralInfo(); } @@ -39,23 +39,23 @@ // Lazily load general info from the file VOID CAvailableApplicationInfo::RetrieveGeneralInfo() { - Category = m_Parser.GetInt(L"Category"); - - if (!GetString(L"Name", szName) - || !GetString(L"URLDownload", szUrlDownload)) + m_Category = m_Parser.GetInt(L"Category"); + + if (!GetString(L"Name", m_szName) + || !GetString(L"URLDownload", m_szUrlDownload)) { return; } - GetString(L"RegName", szRegName); - GetString(L"Version", szVersion); - GetString(L"License", szLicense); - GetString(L"Description", szDesc); - GetString(L"Size", szSize); - GetString(L"URLSite", szUrlSite); - GetString(L"CDPath", szCDPath); - GetString(L"Language", szRegName); - GetString(L"SHA1", szSHA1); + GetString(L"RegName", m_szRegName); + GetString(L"Version", m_szVersion); + GetString(L"License", m_szLicense); + GetString(L"Description", m_szDesc); + GetString(L"Size", m_szSize); + GetString(L"URLSite", m_szUrlSite); + GetString(L"CDPath", m_szCDPath); + GetString(L"Language", m_szRegName); + GetString(L"SHA1", m_szSHA1); RetrieveLicenseType(); RetrieveLanguages(); @@ -68,16 +68,16 @@ VOID CAvailableApplicationInfo::RetrieveInstalledStatus() { - m_IsInstalled = ::GetInstalledVersion(NULL, szRegName) - || ::GetInstalledVersion(NULL, szName); + m_IsInstalled = ::GetInstalledVersion(NULL, m_szRegName) + || ::GetInstalledVersion(NULL, m_szName); } VOID CAvailableApplicationInfo::RetrieveInstalledVersion() { - ATL::CStringW szNameVersion = szName + L" " + szVersion; - m_HasInstalledVersion = ::GetInstalledVersion(&szInstalledVersion, szRegName) - || ::GetInstalledVersion(&szInstalledVersion, szName) - || ::GetInstalledVersion(&szInstalledVersion, szNameVersion); + ATL::CStringW szNameVersion = m_szName + L" " + m_szVersion; + m_HasInstalledVersion = ::GetInstalledVersion(&m_szInstalledVersion, m_szRegName) + || ::GetInstalledVersion(&m_szInstalledVersion, m_szName) + || ::GetInstalledVersion(&m_szInstalledVersion, szNameVersion); } VOID CAvailableApplicationInfo::RetrieveLanguages() @@ -105,7 +105,7 @@ { if (StrToIntExW(m_szLocale.GetString(), STIF_DEFAULT, &iLCID)) { - Languages.Add(static_cast<LCID>(iLCID)); + m_LanguageLCIDs.Add(static_cast<LCID>(iLCID)); m_szLocale.Empty(); } } @@ -116,7 +116,7 @@ { if (StrToIntExW(m_szLocale.GetString(), STIF_DEFAULT, &iLCID)) { - Languages.Add(static_cast<LCID>(iLCID)); + m_LanguageLCIDs.Add(static_cast<LCID>(iLCID)); } } @@ -127,13 +127,13 @@ { INT IntBuffer = m_Parser.GetInt(L"LicenseType"); - if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) - { - LicenseType = LICENSE_TYPE::None; + if (IsLicenseType(IntBuffer)) + { + m_LicenseType = static_cast<LicenseType>(IntBuffer); } else { - LicenseType = (LICENSE_TYPE) IntBuffer; + m_LicenseType = LicenseType::LICENSE_NONE; } } @@ -145,10 +145,10 @@ } //Find locale code in the list - const INT nLanguagesSize = Languages.GetSize(); + const INT nLanguagesSize = m_LanguageLCIDs.GetSize(); for (INT i = 0; i < nLanguagesSize; ++i) { - if (Languages[i] == what) + if (m_LanguageLCIDs[i] == what) { return TRUE; } @@ -184,12 +184,12 @@ BOOL CAvailableApplicationInfo::HasUpdate() const { - return (szInstalledVersion.Compare(szVersion) < 0) ? TRUE : FALSE; + return (m_szInstalledVersion.Compare(m_szVersion) < 0) ? TRUE : FALSE; } VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) { - RtlCopyMemory(&ftCacheStamp, ftTime, sizeof(FILETIME)); + RtlCopyMemory(&m_ftCacheStamp, ftTime, sizeof(FILETIME)); } inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString) @@ -317,7 +317,7 @@ return UpdateAppsDB(); } -BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc) +BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) { HANDLE hFind = INVALID_HANDLE_VALUE; @@ -343,10 +343,10 @@ Info = m_InfoList.GetNext(CurrentListPosition); // do we already have this entry in cache? - if (Info->sFileName == FindFileData.cFileName) + if (Info->m_sFileName == FindFileData.cFileName) { // is it current enough, or the file has been modified since our last time here? - if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->ftCacheStamp) == 1) + if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->m_ftCacheStamp) == 1) { // recreate our cache, this is the slow path m_InfoList.RemoveAt(LastListPosition); @@ -371,10 +371,10 @@ m_InfoList.AddTail(Info); skip_if_cached: - if (Info->Category == FALSE) + if (Info->m_Category == FALSE) continue; - if (EnumType != Info->Category && EnumType != ENUM_ALL_AVAILABLE) + if (EnumType != Info->m_Category && EnumType != ENUM_ALL_AVAILABLE) continue; Info->RefreshAppInfo(); @@ -388,7 +388,7 @@ return TRUE; } -CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) +CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) const { if (m_InfoList.IsEmpty()) { @@ -401,7 +401,7 @@ while (CurrentListPosition != NULL) { info = m_InfoList.GetNext(CurrentListPosition); - if (info->szName == szAppName) + if (info->m_szName == szAppName) { return info; } @@ -409,7 +409,7 @@ return NULL; } -ATL::CSimpleArray<CAvailableApplicationInfo*> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) +ATL::CSimpleArray<CAvailableApplicationInfo*> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const { ATL::CSimpleArray<CAvailableApplicationInfo*> result; for (INT i = 0; i < arrAppsNames.GetSize(); ++i) @@ -423,32 +423,32 @@ return result; } -const ATL::CStringW& CAvailableApps::GetFolderPath() +const ATL::CStringW& CAvailableApps::GetFolderPath() const { return m_szPath; } -const ATL::CStringW& CAvailableApps::GetAppPath() +const ATL::CStringW& CAvailableApps::GetAppPath() const { return m_szAppsPath; } -const ATL::CStringW& CAvailableApps::GetCabPath() +const ATL::CStringW& CAvailableApps::GetCabPath() const { return m_szCabPath; } -const LPCWSTR CAvailableApps::GetFolderPathString() +LPCWSTR CAvailableApps::GetFolderPathString() const { return m_szPath.GetString(); } -const LPCWSTR CAvailableApps::GetAppPathString() +LPCWSTR CAvailableApps::GetAppPathString() const { return m_szPath.GetString(); } -const LPCWSTR CAvailableApps::GetCabPathString() +LPCWSTR CAvailableApps::GetCabPathString() const { return m_szPath.GetString(); } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -90,7 +90,7 @@ else InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, Info->szInstalledVersion, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, Info->m_szInstalledVersion, CFE_BOLD, 0); } else { @@ -102,29 +102,29 @@ InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); } - InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->m_szVersion, CFE_BOLD, 0); } static VOID InsertLicenseInfo_RichEdit(CAvailableApplicationInfo* Info) { ATL::CStringW szLicense; - switch (Info->LicenseType) - { - case LICENSE_TYPE::OpenSource: + switch (Info->m_LicenseType) + { + case LicenseType::LICENSE_OPENSOURCE: szLicense.LoadStringW(IDS_LICENSE_OPENSOURCE); break; - case LICENSE_TYPE::Freeware: + case LicenseType::LICENSE_FREEWARE: szLicense.LoadStringW(IDS_LICENSE_FREEWARE); break; - case LICENSE_TYPE::Trial: + case LicenseType::LICENSE_TRIAL: szLicense.LoadStringW(IDS_LICENSE_TRIAL); break; default: - InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->m_szLicense, CFE_BOLD, 0); return; } - szLicense += L" (" + Info->szLicense + L")"; + szLicense += L" (" + Info->m_szLicense + L")"; InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0); } @@ -135,7 +135,7 @@ return; } - const INT nTranslations = Info->Languages.GetSize(); + const INT nTranslations = Info->m_LanguageLCIDs.GetSize(); ATL::CStringW szLangInfo; ATL::CStringW szLoadedTextAvailability; ATL::CStringW szLoadedAInfoText; @@ -189,15 +189,15 @@ CAvailableApplicationInfo* Info = (CAvailableApplicationInfo*) ListViewGetlParam(Index); if (!Info) return FALSE; - NewRichEditText(Info->szName, CFE_BOLD); + NewRichEditText(Info->m_szName, CFE_BOLD); InsertVersionInfo_RichEdit(Info); InsertLicenseInfo_RichEdit(Info); InsertLanguageInfo_RichEdit(Info); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->szDesc, CFE_BOLD, 0); - InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->szUrlDownload, CFE_BOLD, CFE_LINK); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->m_szSize, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->m_szUrlSite, CFE_BOLD, CFE_LINK); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->m_szDesc, CFE_BOLD, 0); + InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->m_szUrlDownload, CFE_BOLD, CFE_LINK); return TRUE; } @@ -305,7 +305,7 @@ { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn }, { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn }, { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, - { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE,{0}, 0, (INT_PTR) szSelectAll}, + { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szSelectAll}, {-1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, @@ -1414,13 +1414,13 @@ return StrStrIW(szHaystack, szNeedle) != NULL; } - static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &szName, PINSTALLED_INFO Info) + static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &m_szName, PINSTALLED_INFO Info) { PINSTALLED_INFO ItemInfo; ATL::CStringW szText; INT Index; - if (!SearchPatternMatch(szName.GetString(), szSearchPattern)) + if (!SearchPatternMatch(m_szName.GetString(), szSearchPattern)) { RegCloseKey(Info->hSubKey); return TRUE; @@ -1433,7 +1433,7 @@ return FALSE; } - Index = ListViewAddItem(ItemIndex, 0, szName, (LPARAM) ItemInfo); + Index = ListViewAddItem(ItemIndex, 0, m_szName, (LPARAM) ItemInfo); /* Get version info */ GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText); @@ -1453,15 +1453,15 @@ HIMAGELIST hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL); - if (!SearchPatternMatch(Info->szName, szSearchPattern) && - !SearchPatternMatch(Info->szDesc, szSearchPattern)) + if (!SearchPatternMatch(Info->m_szName, szSearchPattern) && + !SearchPatternMatch(Info->m_szDesc, szSearchPattern)) { return TRUE; } /* Load icon from file */ ATL::CStringW szIconPath; - szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->szName); + szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->m_szName); hIcon = (HICON) LoadImageW(NULL, szIconPath.GetString(), IMAGE_ICON, @@ -1478,11 +1478,11 @@ Index = ImageList_AddIcon(hImageListView, hIcon); DestroyIcon(hIcon); - Index = ListViewAddItem(Info->Category, Index, Info->szName, (LPARAM) Info); + Index = ListViewAddItem(Info->m_Category, Index, Info->m_szName, (LPARAM) Info); ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); - ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->szVersion.GetString())); - ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->szDesc.GetString())); + ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->m_szVersion.GetString())); + ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->m_szDesc.GetString())); return TRUE; } @@ -1556,7 +1556,7 @@ } // Enum available applications - m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc); + m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc); } SelectedEnumType = EnumType; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -4,6 +4,7 @@ #include <atlstr.h> #include <atlsimpcoll.h> #include <atlcoll.h> + #include "misc.h" /* EnumType flags for EnumAvailableApplications */ @@ -31,41 +32,46 @@ inline BOOL IsAvailableEnum(INT x) { - return (x >= ENUM_AVAILABLE_MIN && x <= ENUM_AVAILABLE_MAX); + return (x >= AvailableCategories::ENUM_AVAILABLE_MIN && x <= AvailableCategories::ENUM_AVAILABLE_MAX); } -typedef enum LICENSE_TYPE +enum LicenseType { - None, - OpenSource, - Freeware, - Trial, - Max = Trial, - Min = None -} *PLICENSE_TYPE; + LICENSE_NONE, + LICENSE_OPENSOURCE, + LICENSE_FREEWARE, + LICENSE_TRIAL, + LICENSE_MIN = LICENSE_NONE, + LICENSE_MAX = LICENSE_TRIAL +}; + +inline BOOL IsLicenseType(INT x) +{ + return (x >= LicenseType::LICENSE_MIN && x <= LicenseType::LICENSE_MAX); +} struct CAvailableApplicationInfo { - INT Category; - LICENSE_TYPE LicenseType; - ATL::CStringW szName; - ATL::CStringW szRegName; - ATL::CStringW szVersion; - ATL::CStringW szLicense; - ATL::CStringW szDesc; - ATL::CStringW szSize; - ATL::CStringW szUrlSite; - ATL::CStringW szUrlDownload; - ATL::CStringW szCDPath; - ATL::CSimpleArray<LCID> Languages; + INT m_Category; + LicenseType m_LicenseType; + ATL::CStringW m_szName; + ATL::CStringW m_szRegName; + ATL::CStringW m_szVersion; + ATL::CStringW m_szLicense; + ATL::CStringW m_szDesc; + ATL::CStringW m_szSize; + ATL::CStringW m_szUrlSite; + ATL::CStringW m_szUrlDownload; + ATL::CStringW m_szCDPath; + ATL::CSimpleArray<LCID> m_LanguageLCIDs; // Caching mechanism related entries - ATL::CStringW sFileName; - FILETIME ftCacheStamp; + ATL::CStringW m_sFileName; + FILETIME m_ftCacheStamp; // Optional integrity checks (SHA-1 digests are 160 bit = 40 characters in hex string form) - ATL::CStringW szSHA1; - ATL::CStringW szInstalledVersion; + ATL::CStringW m_szSHA1; + ATL::CStringW m_szInstalledVersion; CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam); @@ -115,16 +121,18 @@ static BOOL UpdateAppsDB(); static BOOL ForceUpdateAppsDB(); + static VOID DeleteCurrentAppsDB(); VOID FreeCachedEntries(); - static VOID DeleteCurrentAppsDB(); - BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc); - CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName); - ATL::CSimpleArray<CAvailableApplicationInfo*> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames); - const ATL::CStringW& GetFolderPath(); - const ATL::CStringW& GetAppPath(); - const ATL::CStringW& GetCabPath(); - const LPCWSTR GetFolderPathString(); - const LPCWSTR GetAppPathString(); - const LPCWSTR GetCabPathString(); + BOOL Enum(INT EnumType, AVAILENUMPROC lpEnumProc); + + CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; + ATL::CSimpleArray<CAvailableApplicationInfo*> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; + + const ATL::CStringW& GetFolderPath() const; + const ATL::CStringW& GetAppPath() const; + const ATL::CStringW& GetCabPath() const; + LPCWSTR GetFolderPathString() const; + LPCWSTR GetAppPathString() const; + LPCWSTR GetCabPathString() const; }; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -72,12 +72,12 @@ { DownloadInfo() {} DownloadInfo(const CAvailableApplicationInfo& AppInfo) - :szUrl(AppInfo.szUrlDownload), szName(AppInfo.szName), szSHA1(AppInfo.szSHA1) + :szUrl(AppInfo.m_szUrlDownload), m_szName(AppInfo.m_szName), szSHA1(AppInfo.m_szSHA1) { } ATL::CStringW szUrl; - ATL::CStringW szName; + ATL::CStringW m_szName; ATL::CStringW szSHA1; }; @@ -259,7 +259,7 @@ { for (INT i = 0; i < arrInfo.GetSize(); ++i) { - AddRow(i, arrInfo[i].szName.GetString(), DOWNLOAD_STATUS::DLWaiting); + AddRow(i, arrInfo[i].m_szName.GetString(), DOWNLOAD_STATUS::DLWaiting); } } @@ -639,7 +639,7 @@ // Change caption to show the currently downloaded app if (!bCab) { - szNewCaption.Format(szCaption, CurrentInfo.szName.GetString()); + szNewCaption.Format(szCaption, CurrentInfo.m_szName.GetString()); } else { @@ -868,7 +868,7 @@ { static DownloadInfo DatabaseDLInfo; DatabaseDLInfo.szUrl = lpUrl; - DatabaseDLInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); + DatabaseDLInfo.m_szName.LoadStringW(IDS_DL_DIALOG_DB_DISP); Download(DatabaseDLInfo, TRUE); } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1] Sun Sep 3 20:37:14 2017 @@ -1,3 +1,11 @@ +/* +* PROJECT: ReactOS Applications Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: base/applications/rapps/unattended.cpp +* PURPOSE: Functions to parse command-line flags and process them +* PROGRAMMERS: Alexander Shaposhnikov (chaez.san(a)gmail.com) +*/ + #include "unattended.h" #include "defines.h" #include "available.h" @@ -5,13 +13,14 @@ #include "setupapi.h" +#define MIN_ARGS 2 + BOOL CmdParser(LPWSTR lpCmdLine) { INT argc; LPWSTR* argv = CommandLineToArgvW(lpCmdLine, &argc); - ATL::CString szName; - if (!argv || argc < 2) + if (!argv || argc < MIN_ARGS) { return FALSE; } @@ -56,8 +65,9 @@ } CAvailableApps apps; - CAvailableApps::UpdateAppsDB(); - apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL); + apps.UpdateAppsDB(); + apps.Enum(ENUM_ALL_AVAILABLE, NULL); + ATL::CSimpleArray<CAvailableApplicationInfo*> arrAppInfo = apps.FindInfoList(arrNames); if (arrAppInfo.GetSize() > 0) {

1 0

[hbelusca] 75757: [SETUPLIB]: Use strsafe functions (cont).
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 20:34:29 2017 New Revision: 75757 URL: http://svn.reactos.org/svn/reactos?rev=75757&view=rev Log: [SETUPLIB]: Use strsafe functions (cont). Modified: branches/setup_improvements/base/setup/lib/bootsup.c branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/setuplib.c Modified: branches/setup_improvements/base/setup/lib/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -368,7 +368,7 @@ goto SkipThisEntry; } - swprintf(SystemPath, L"\"%s\"", Data->ArcPath); + StringCchPrintfW(SystemPath, ARRAYSIZE(SystemPath), L"\"%s\"", Data->ArcPath); if ((_wcsicmp(Options->OsLoadPath, Data->ArcPath) != 0) && (_wcsicmp(Options->OsLoadPath, SystemPath) != 0)) { Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -298,10 +298,10 @@ { if (uIndex > 19) break; - swprintf(szValueName, L"%u", uIndex + 1); + StringCchPrintfW(szValueName, ARRAYSIZE(szValueName), L"%u", uIndex + 1); RtlInitUnicodeString(&ValueName, szValueName); - swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); + StringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"0000%s", MuiLayouts[uIndex].LangID); if (_wcsicmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) { @@ -321,7 +321,7 @@ } else { - swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); + StringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); Status = NtSetValueKey(KeyHandle, &ValueName, 0, Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -423,7 +423,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - wcscpy(DisplayText, KeyValue); + StringCbCopyW(DisplayText, DisplayTextSize, KeyValue); *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); @@ -484,7 +484,7 @@ } DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); + StringCchCopyW(ComputerKey, ARRAYSIZE(ComputerKey), KeyName); INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); @@ -549,7 +549,7 @@ BusInstance = 0; while (TRUE) { - swprintf(Buffer, L"%lu", BusInstance); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"%lu", BusInstance); RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -585,7 +585,7 @@ while (TRUE) { /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); + StringCchPrintfW(Buffer, ARRAYSIZE(Buffer), L"%lu", ControllerInstance); RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -720,7 +720,7 @@ } DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); + StringCchCopyW(DisplayKey, ARRAYSIZE(DisplayKey), KeyName); INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); @@ -765,8 +765,8 @@ return FALSE; } - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); + StringCchPrintfW(SectionName, ARRAYSIZE(SectionName), + L"Files.%s", (PCWSTR)GetListEntryUserData(Entry)); *AdditionalSectionName = SectionName; return TRUE; @@ -814,7 +814,9 @@ ASSERT(wcslen(ServiceName) < 10); DPRINT1("Service name: '%S'\n", ServiceName); - swprintf(RegPath, L"System\\CurrentControlSet\\Services\\%s", ServiceName); + StringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Services\\%s", + ServiceName); RtlInitUnicodeString(&KeyName, RegPath); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -851,9 +853,9 @@ return FALSE; } - swprintf(RegPath, - L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", - ServiceName); + StringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", + ServiceName); DPRINT1("RegPath: '%S'\n", RegPath); RtlInitUnicodeString(&KeyName, RegPath); InitializeObjectAttributes(&ObjectAttributes, @@ -1111,7 +1113,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - wcscpy(DisplayText, KeyValue); + StringCbCopyW(DisplayText, DisplayTextSize, KeyValue); *Current = FALSE; Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] Sun Sep 3 20:34:29 2017 @@ -144,7 +144,11 @@ DPRINT("INF_GetData() failed for key 'InstallationDirectory'\n"); goto Quit; } - wcscpy(pSetupData->InstallationDirectory, Value); + + StringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); } @@ -186,7 +190,9 @@ if (INF_GetData(&Context, NULL, &Value)) { LONG Id = wcstol(Value, NULL, 16); - swprintf(pSetupData->LocaleID, L"%08lx", Id); + StringCchPrintfW(pSetupData->LocaleID, + ARRAYSIZE(pSetupData->LocaleID), + L"%08lx", Id); INF_FreeData(Value); } } @@ -558,7 +564,10 @@ if (!INF_GetData(&Context, NULL, &Value)) return ERROR_CORRUPT_TXTSETUPSIF; - wcscpy(pSetupData->InstallationDirectory, Value); + StringCchCopyW(pSetupData->InstallationDirectory, + ARRAYSIZE(pSetupData->InstallationDirectory), + Value); + INF_FreeData(Value); }

1 0

[ashaposhnikov] 75756: [RAPPS] Removed unecessary `inline` in crichedit.h
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 20:23:44 2017 New Revision: 75756 URL: http://svn.reactos.org/svn/reactos?rev=75756&view=rev Log: [RAPPS] Removed unecessary `inline` in crichedit.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] Sun Sep 3 20:23:44 2017 @@ -5,7 +5,7 @@ public CWindow { HMODULE LoadedLibrary; - inline VOID GenericInsertText(LPCWSTR lpszText, LONG InsertedTextLen, DWORD dwEffects) + VOID GenericInsertText(LPCWSTR lpszText, LONG InsertedTextLen, DWORD dwEffects) { SETTEXTEX SetText; LONG Len = GetTextLen();

1 0

[hbelusca] 75755: [SETUPLIB]: Use strsafe functions.
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 20:05:11 2017 New Revision: 75755 URL: http://svn.reactos.org/svn/reactos?rev=75755&view=rev Log: [SETUPLIB]: Use strsafe functions. Modified: branches/setup_improvements/base/setup/lib/utils/bldrsup.c branches/setup_improvements/base/setup/lib/utils/genlist.c Modified: branches/setup_improvements/base/setup/lib/utils/bldrsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/bldrsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/bldrsup.c [iso-8859-1] Sun Sep 3 20:05:11 2017 @@ -999,13 +999,13 @@ return STATUS_INSUFFICIENT_RESOURCES; *Buffer = UNICODE_NULL; - if (IsNameNotQuoted) wcscat(Buffer, L"\""); - wcscat(Buffer, InstallName); - if (IsNameNotQuoted) wcscat(Buffer, L"\""); + if (IsNameNotQuoted) StringCchCatW(Buffer, BufferLength, L"\""); + StringCchCatW(Buffer, BufferLength, InstallName); + if (IsNameNotQuoted) StringCchCatW(Buffer, BufferLength, L"\""); if (OsOptions) { - wcscat(Buffer, L" "); - wcscat(Buffer, OsOptions); + StringCchCatW(Buffer, BufferLength, L" "); + StringCchCatW(Buffer, BufferLength, OsOptions); } /* Insert the entry into the "Operating Systems" section */ Modified: branches/setup_improvements/base/setup/lib/utils/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] Sun Sep 3 20:05:11 2017 @@ -23,9 +23,7 @@ { PGENERIC_LIST List; - List = (PGENERIC_LIST)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST)); + List = RtlAllocateHeap(ProcessHeap, 0, sizeof(GENERIC_LIST)); if (List == NULL) return NULL; @@ -72,15 +70,15 @@ IN BOOLEAN Current) { PGENERIC_LIST_ENTRY Entry; + SIZE_T TextSize; - Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, - 0, - sizeof(GENERIC_LIST_ENTRY) + - (wcslen(Text) + 1) * sizeof(WCHAR)); + TextSize = (wcslen(Text) + 1) * sizeof(WCHAR); + Entry = RtlAllocateHeap(ProcessHeap, 0, + sizeof(GENERIC_LIST_ENTRY) + TextSize); if (Entry == NULL) return FALSE; - wcscpy(Entry->Text, Text); + StringCbCopyW(Entry->Text, TextSize, Text); Entry->List = List; Entry->UserData = UserData;

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