Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RAPPS] Display custom applications icons for installed applications CORE-17257 (#3144)
by Oleg Dubinskiy 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eb90143f8bd4af34f494… commit 7eb90143f8bd4af34f49437e456293cd67bd39f6 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Sep 20 20:19:59 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 19:19:59 2020 +0200 [RAPPS] Display custom applications icons for installed applications CORE-17257 (#3144) * [RAPPS] Display custom applications icons for installed applications - Implement `RetrieveIcon` helper function in `CInstalledApplicationInfo` class, which retrueves the current app's icon from registry, same as it done for `CAvailableApplicationInfo`. - Use it for loading the icon in `CAppsListView::AddInstalledApplication` function, via `ExtractIconW`. Load default Rapps icon only when the app has no its custom icon. - Retrieve `DisplayIcon` value from registry in `CInstalledApps::Enum` function, same as other registry values (like app name, description, etc).Store it in `szDisplayIcon` string, which is used in `CInstalledApplicationInfo::RetrieveIcon` for retrieving the data of that value. - Increase `LISTVIEW_ICON_SIZE` macro from 24 to 32, so 32x32 icon size is now used instead of 24x24. This makes displayed icons more accurate, since most of apps contain 32x32 icon, so they look a bit distorted with 24x24 size. --- base/applications/rapps/appview.cpp | 22 ++++++++++++++++++++-- base/applications/rapps/include/appview.h | 2 +- base/applications/rapps/include/installed.h | 2 ++ base/applications/rapps/installed.cpp | 11 +++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 58584fa3b72..0bdcc67cdbc 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1382,7 +1382,26 @@ BOOL CAppsListView::AddInstalledApplication(CInstalledApplicationInfo *InstAppIn return FALSE; } - HICON hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + /* Load icon from registry */ + HICON hIcon = NULL; + ATL::CStringW szIconPath; + if (InstAppInfo->RetrieveIcon(szIconPath)) + { + PathParseIconLocationW((LPWSTR)szIconPath.GetString()); + + /* Load only the 1st icon from the application executable, + * because all apps provide the executables which have the main icon + * as 1st in the index , so we don't need other icons here */ + hIcon = ExtractIconW(hInst, + szIconPath.GetString(), + 0); + } + + if (!hIcon) + { + /* Load default icon */ + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + } int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); DestroyIcon(hIcon); @@ -2024,4 +2043,3 @@ BOOL CApplicationView::ItemCheckStateChanged(BOOL bChecked, LPVOID CallbackParam return TRUE; } // **** CApplicationView **** - diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 7e8b9da6bc0..668131245ce 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -20,7 +20,7 @@ using namespace Gdiplus; -#define LISTVIEW_ICON_SIZE 24 +#define LISTVIEW_ICON_SIZE 32 // default broken-image icon size #define BROKENIMG_ICON_SIZE 96 diff --git a/base/applications/rapps/include/installed.h b/base/applications/rapps/include/installed.h index a719ed9057f..6e950056481 100644 --- a/base/applications/rapps/include/installed.h +++ b/base/applications/rapps/include/installed.h @@ -16,9 +16,11 @@ public: CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey); BOOL GetApplicationRegString(LPCWSTR lpKeyName, ATL::CStringW& String); BOOL GetApplicationRegDword(LPCWSTR lpKeyName, DWORD *lpValue); + BOOL RetrieveIcon(ATL::CStringW& IconLocation); BOOL UninstallApplication(BOOL bModify); LSTATUS RemoveFromRegistry(); + ATL::CStringW szDisplayIcon; ATL::CStringW szDisplayName; ATL::CStringW szDisplayVersion; ATL::CStringW szPublisher; diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 955ba012130..4179334a60a 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -126,6 +126,16 @@ BOOL CInstalledApplicationInfo::GetApplicationRegDword(LPCWSTR lpKeyName, DWORD return TRUE; } +BOOL CInstalledApplicationInfo::RetrieveIcon(ATL::CStringW& IconLocation) +{ + if (szDisplayIcon.IsEmpty()) + { + return FALSE; + } + IconLocation = szDisplayIcon; + return TRUE; +} + BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) { return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); @@ -206,6 +216,7 @@ BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) // those items without display name are ignored if (Info->GetApplicationRegString(L"DisplayName", Info->szDisplayName)) { + Info->GetApplicationRegString(L"DisplayIcon", Info->szDisplayIcon); Info->GetApplicationRegString(L"DisplayVersion", Info->szDisplayVersion); Info->GetApplicationRegString(L"Publisher", Info->szPublisher); Info->GetApplicationRegString(L"RegOwner", Info->szRegOwner);

1 0

[reactos] 01/01: [SDK] Add dummy import lib files for MSVC_IDE build, to work around a CMake bug generating broken dll targets ROSBE-159
by Mark Jansen 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5730485a51d8bb58ff9f8… commit 5730485a51d8bb58ff9f8f2131b85c128510a6b6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 10 22:03:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 19:18:15 2020 +0200 [SDK] Add dummy import lib files for MSVC_IDE build, to work around a CMake bug generating broken dll targets ROSBE-159 --- sdk/cmake/msvc.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 94847a84167..e1899089a6f 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -172,6 +172,13 @@ string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_LIBRARY "${C string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}") string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") +# HACK2: CMake lacks the ability to completely remove the 'implib' argument for solution files... +# To work around this, we just let it create a dummy file +if(MSVC_IDE) + set(CMAKE_IMPORT_LIBRARY_SUFFIX ".dummy") +endif() + + if(CMAKE_DISABLE_NINJA_DEPSLOG) set(cl_includes_flag "") else()

1 0

[reactos] 02/02: [CREATECABFILE] Update rapps example scripts for new usage
by Mark Jansen 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7119b13a2881721b63c8f… commit 7119b13a2881721b63c8f7db45294fdc56631fe5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 12 21:00:38 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 17:30:26 2020 +0200 [CREATECABFILE] Update rapps example scripts for new usage --- base/applications/rapps/CreateCabFile.bat | 32 +++++++++++++++++++++++------ base/applications/rapps/CreateCabFile.sh | 34 ++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/base/applications/rapps/CreateCabFile.bat b/base/applications/rapps/CreateCabFile.bat index 4e216478c33..bccd8b356a4 100644 --- a/base/applications/rapps/CreateCabFile.bat +++ b/base/applications/rapps/CreateCabFile.bat @@ -1,12 +1,32 @@ @echo off -cd ..\..\..\media +IF "%1"=="" GOTO show_usage +IF "%2"=="" GOTO show_usage +IF "%3"=="" GOTO show_usage -mkdir rapps\utf16 +SET CABMAN_CMD=%1 +SET UTF16LE_CMD=%2 +SET RAPPSDB_PATH=%3 -for %%f in (rapps\*.txt) do ( - ..\output-MinGW-i386\host-tools\utf16le.exe "rapps\%%~nf.txt" "rapps\utf16\%%~nf.txt" +mkdir "%RAPPSDB_PATH%\utf16" + +echo Converting txt files to utf16 +for %%f in (%RAPPSDB_PATH%\*.txt) do ( + %UTF16LE_CMD% "%RAPPSDB_PATH%\%%~nf.txt" "%RAPPSDB_PATH%\utf16\%%~nf.txt" ) -..\output-MinGW-i386\host-tools\cabman.exe -M mszip -S rapps\rappmgr.cab rapps\utf16\*.txt -rmdir /s /q rapps\utf16 +echo Building rappmgr.cab +%CABMAN_CMD% -M mszip -S "%RAPPSDB_PATH%\rappmgr.cab" "%RAPPSDB_PATH%\utf16\*.txt" + +echo Building rappmgr2.cab +%CABMAN_CMD% -M mszip -S "%RAPPSDB_PATH%\rappmgr2.cab" "%RAPPSDB_PATH%\utf16\*.txt" -F icons "%RAPPSDB_PATH%\icons\*.ico" + +echo Cleaning up +rmdir /s /q "%RAPPSDB_PATH%\utf16" + +echo Done + +goto :eof + +:show_usage +echo Usage: CreateCabFile.bat path\to\cabman.exe path\to\utf16le.exe path\to\rapps-db diff --git a/base/applications/rapps/CreateCabFile.sh b/base/applications/rapps/CreateCabFile.sh index 3a31ca7235c..c7783e6d772 100644 --- a/base/applications/rapps/CreateCabFile.sh +++ b/base/applications/rapps/CreateCabFile.sh @@ -1,9 +1,29 @@ #/bin/sh -cd ../../../media -mkdir rapps/utf16 -for i in $(find -type f); do - ../../host-tools/utf16le $i utf16/$i + +if [ "$#" != "3" ]; then + echo "Usage: CreateCabFile.sh path/to/cabman path/to/utf16le path/to/rapps-db" + exit -1 +fi + +CABMAN_CMD="$1" +UTF16LE_CMD="$2" +RAPPSDB_PATH="$3" + +mkdir "$RAPPSDB_PATH/utf16" + +echo Converting txt files to utf16 +for filename in $RAPPSDB_PATH/*.txt; do + just_filename=$(basename -- "$filename") + $UTF16LE_CMD "$filename" "$RAPPSDB_PATH/utf16/$just_filename" done -cd .. -../../host-tools/cabman -M mszip -S rapps/rappmgr.cab rapps/utf16/*.txt -rm -r rapps/uft16 \ No newline at end of file + +echo Building rappmgr.cab +$CABMAN_CMD -M mszip -S "$RAPPSDB_PATH/rappmgr.cab" "$RAPPSDB_PATH/utf16/*.txt" + +echo Building rappmgr2.cab +$CABMAN_CMD -M mszip -S "$RAPPSDB_PATH/rappmgr2.cab" "$RAPPSDB_PATH/utf16/*.txt" -F icons "$RAPPSDB_PATH/icons/*.ico" + +echo Cleaning up +rm -r "$RAPPSDB_PATH/utf16" + +echo Done

1 0

[reactos] 01/02: [CABMAN] Add commandline support for creating a cab with folders CORE-17230
by Mark Jansen 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70193adc891cd59b0379b… commit 70193adc891cd59b0379bef9dd5627ac222ba954 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 12 16:21:34 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 17:28:02 2020 +0200 [CABMAN] Add commandline support for creating a cab with folders CORE-17230 --- sdk/tools/cabman/cabinet.cxx | 77 ++++++++++++++++++++++++++------------------ sdk/tools/cabman/cabinet.h | 14 +++++--- sdk/tools/cabman/cabman.cxx | 25 +++++++++++--- sdk/tools/cabman/dfp.cxx | 8 ++--- 4 files changed, 78 insertions(+), 46 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 175efef918a..29f9975b6fe 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -155,7 +155,7 @@ void CCabinet::ConvertPath(std::string& Path) } -const char* CCabinet::GetFileName(const char* Path) +std::string CCabinet::GetFileName(const std::string& Path) /* * FUNCTION: Returns a pointer to file name * ARGUMENTS: @@ -172,7 +172,7 @@ const char* CCabinet::GetFileName(const char* Path) if (IsSeparator(Path [i - 1])) j = i; - return Path + j; + return Path.c_str() + j; } @@ -225,7 +225,7 @@ void CCabinet::SetDestinationPath(const char* DestinationPath) NormalizePath(DestPath); } -ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) +ULONG CCabinet::AddSearchCriteria(const std::string& SearchCriteria, const std::string& TargetFolder) /* * FUNCTION: Adds a criteria to the search criteria list * ARGUMENTS: @@ -248,6 +248,7 @@ ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) // Set the actual criteria string Criteria->Search = SearchCriteria; + Criteria->TargetFolder = TargetFolder; return CAB_STATUS_SUCCESS; } @@ -274,6 +275,16 @@ bool CCabinet::HasSearchCriteria() return !CriteriaList.empty(); } +std::string CCabinet::CreateCabFilename(PCFFILE_NODE Node) +{ + std::string fname = GetFileName(Node->FileName); + if (!Node->TargetFolder.empty()) + { + fname = Node->TargetFolder + fname; + } + return fname; +} + bool CCabinet::SetCompressionCodec(const char* CodecName) /* * FUNCTION: Selects the codec to use for compression @@ -591,6 +602,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) for (PSEARCH_CRITERIA Criteria : CriteriaList) { + // FIXME: We could handle path\filename here if (MatchFileNamePattern((*Search->Next)->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; @@ -1202,7 +1214,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) SourceFile = fopen(FileNode->FileName.c_str(), "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName.c_str())); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileNameOnDisk.c_str())); return CAB_STATUS_NOFILE; } @@ -1227,7 +1239,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName.c_str())) + 1; + Size = sizeof(CFFILE) + (ULONG)CreateCabFilename(FileNode).length() + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1500,7 +1512,7 @@ ULONG CCabinet::CloseCabinet() } -ULONG CCabinet::AddFile(char* FileName) +ULONG CCabinet::AddFile(const std::string& FileName, const std::string& TargetFolder) /* * FUNCTION: Adds a file to the current disk * ARGUMENTS: @@ -1534,6 +1546,9 @@ ULONG CCabinet::AddFile(char* FileName) FileNode->FolderNode = CurrentFolderNode; FileNode->FileName = NewFileName; + FileNode->TargetFolder = TargetFolder; + if (FileNode->TargetFolder.length() > 0 && FileNode->TargetFolder[FileNode->TargetFolder.length() - 1] != '\\') + FileNode->TargetFolder += '\\'; /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); @@ -1569,9 +1584,6 @@ bool CCabinet::CreateSimpleCabinet() */ { bool bRet = false; - const char* pszFile; - char szFilePath[PATH_MAX]; - char szFile[PATH_MAX]; ULONG Status; #if defined(_WIN32) @@ -1595,26 +1607,25 @@ bool CCabinet::CreateSimpleCabinet() for (PSEARCH_CRITERIA Criteria : CriteriaList) { // Store the file path with a trailing slash in szFilePath - ConvertPath(Criteria->Search); - pszFile = strrchr(Criteria->Search.c_str(), DIR_SEPARATOR_CHAR); + std::string szSearchPath = Criteria->Search; + ConvertPath(szSearchPath); + auto sep = szSearchPath.find_last_of(DIR_SEPARATOR_CHAR); + std::string szFilePath; + std::string pszFile; - if(pszFile) + if (sep != std::string::npos) { - // Set the pointer to the start of the file name, not the slash - pszFile++; + pszFile = szSearchPath.substr(sep + 1); // We want the filename, not the dir separator! - strncpy(szFilePath, Criteria->Search.c_str(), pszFile - Criteria->Search.c_str()); - szFilePath[pszFile - Criteria->Search.c_str()] = 0; + szFilePath = szSearchPath.substr(0, sep + 1); } else { - pszFile = Criteria->Search.c_str(); + pszFile = Criteria->Search; -#if defined(_WIN32) - szFilePath[0] = 0; -#else +#if !defined(_WIN32) // needed for opendir() - strcpy(szFilePath, "./"); + szFilePath = "./"; #endif } @@ -1633,10 +1644,10 @@ bool CCabinet::CreateSimpleCabinet() { if(!(FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy(szFile, szFilePath); - strcat(szFile, FindFileData.cFileName); + std::string szFile = szFilePath; + szFile += FindFileData.cFileName; - Status = AddFile(szFile); + Status = AddFile(szFile, Criteria->TargetFolder); if(Status != CAB_STATUS_SUCCESS) { @@ -1651,22 +1662,22 @@ bool CCabinet::CreateSimpleCabinet() FindClose(hFind); #else // Unix: Use opendir/readdir to loop through all entries, stat to check if it's a file and MatchFileNamePattern to match the file against the pattern - dirp = opendir(szFilePath); + dirp = opendir(szFilePath.c_str()); if(dirp) { while( (dp = readdir(dirp)) ) { - strcpy(szFile, szFilePath); - strcat(szFile, dp->d_name); + std::string szFile = szFilePath; + szFile += dp->d_name; - if(stat(szFile, &stbuf) == 0) + if(stat(szFile.c_str(), &stbuf) == 0) { if(stbuf.st_mode != S_IFDIR) { - if(MatchFileNamePattern(dp->d_name, pszFile)) + if(MatchFileNamePattern(dp->d_name, pszFile.c_str())) { - Status = AddFile(szFile); + Status = AddFile(szFile, Criteria->TargetFolder); if(Status != CAB_STATUS_SUCCESS) { @@ -1890,6 +1901,7 @@ ULONG CCabinet::LocateFile(const char* FileName, for (PCFFILE_NODE Node : FileList) { + // FIXME: We could handle path\filename here if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); @@ -2011,6 +2023,7 @@ ULONG CCabinet::ReadFileTable() Status = ReadString(Buf, PATH_MAX); if (Status != CAB_STATUS_SUCCESS) return Status; + // FIXME: We could split up folder\file.txt here File->FileName = Buf; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%u bytes) ControlId (0x%X).\n", @@ -2195,7 +2208,7 @@ void CCabinet::DestroyDeletedFileNodes() DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); - TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName.c_str())) + 1); + TotalFileSize -= (sizeof(CFFILE) + (ULONG)CreateCabFilename(CurNode).length() + 1); delete CurNode; } @@ -2669,7 +2682,7 @@ ULONG CCabinet::WriteFileEntries() return CAB_STATUS_CANNOT_WRITE; } - std::string fname = GetFileName(File->FileName.c_str()); + std::string fname = CreateCabFilename(File); if (fwrite(fname.c_str(), fname.length() + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 0940436d975..1697588bbfc 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -227,6 +227,7 @@ typedef struct _CFFILE_NODE { CFFILE File = { 0 }; std::string FileName; + std::string TargetFolder; PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known bool Commit = false; // true if the file data should be committed bool Delete = false; // true if marked for deletion @@ -235,7 +236,8 @@ typedef struct _CFFILE_NODE typedef struct _SEARCH_CRITERIA { - std::string Search; // The actual search criteria + std::string Search; // The actual search criteria + std::string TargetFolder; // The filename will be TargetFolder\file } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH @@ -311,8 +313,8 @@ public: bool IsSeparator(char Char); /* Replaces \ or / with the one used be the host environment */ void ConvertPath(std::string& Path); - /* Returns a pointer to the filename part of a fully qualified filename */ - const char* GetFileName(const char* Path); + /* Returns the filename part of a fully qualified filename */ + std::string GetFileName(const std::string& Path); /* Normalizes a path */ void NormalizePath(std::string& Path); /* Returns name of cabinet file */ @@ -342,12 +344,14 @@ public: /* Returns whether a codec engine is selected */ bool IsCodecSelected(); /* Adds a search criteria for adding files to a simple cabinet, displaying files in a cabinet or extracting them */ - ULONG AddSearchCriteria(const char* SearchCriteria); + ULONG AddSearchCriteria(const std::string& SearchCriteria, const std::string& TargetFolder); /* Destroys the search criteria list */ void DestroySearchCriteria(); /* Returns whether we have search criteria */ bool HasSearchCriteria(); + std::string CreateCabFilename(PCFFILE_NODE Node); + #ifndef CAB_READ_ONLY /* Creates a simple cabinet based on the search criteria data */ bool CreateSimpleCabinet(); @@ -370,7 +374,7 @@ public: /* Closes the current cabinet */ ULONG CloseCabinet(); /* Adds a file to the current disk */ - ULONG AddFile(char* FileName); + ULONG AddFile(const std::string& FileName, const std::string& TargetFolder); /* Sets the maximum size of the current disk */ void SetMaxDiskSize(ULONG Size); #endif /* CAB_READ_ONLY */ diff --git a/sdk/tools/cabman/cabman.cxx b/sdk/tools/cabman/cabman.cxx index 0dd0ceaab1d..d258b534e79 100644 --- a/sdk/tools/cabman/cabman.cxx +++ b/sdk/tools/cabman/cabman.cxx @@ -193,7 +193,7 @@ void CCABManager::Usage() printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); printf("CABMAN [-M mode] -C dirfile [-I] [-RC file] [-P dir]\n"); - printf("CABMAN [-M mode] -S cabinet filename [...]\n"); + printf("CABMAN [-M mode] -S cabinet filename [-F folder] [filename] [...]\n"); printf(" cabinet Cabinet file.\n"); printf(" filename Name of the file to add to or extract from the cabinet.\n"); printf(" Wild cards and multiple filenames\n"); @@ -206,6 +206,7 @@ void CCABManager::Usage() printf(" -C Create cabinet.\n"); printf(" -D Display cabinet directory.\n"); printf(" -E Extract files from cabinet.\n"); + printf(" -F Put the files from the next 'filename' filter in the cab in folder\filename.\n"); printf(" -I Don't create the cabinet, only the .inf file.\n"); printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); @@ -233,7 +234,7 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) int i; bool ShowUsage; bool FoundCabinet = false; - + std::string NextFolder; ShowUsage = (argc < 2); for (i = 1; i < argc; i++) @@ -262,6 +263,19 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) Mode = CM_MODE_EXTRACT; break; + case 'f': + case 'F': + if (argv[i][2] == 0) + { + i++; + NextFolder = argv[i]; + } + else + { + NextFolder = argv[i] + 2; + } + break; + case 'i': case 'I': InfFileOnly = true; @@ -374,7 +388,8 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) else if(FoundCabinet) { // For creating simple cabinets, displaying or extracting them, add the argument as a search criteria - AddSearchCriteria(argv[i]); + AddSearchCriteria(argv[i], NextFolder); + NextFolder.clear(); } else { @@ -618,7 +633,7 @@ void CCABManager::OnExtract(PCFFILE File, { if (Verbose) { - printf("Extracting %s\n", GetFileName(FileName)); + printf("Extracting %s\n", GetFileName(FileName).c_str()); } } @@ -651,7 +666,7 @@ void CCABManager::OnAdd(PCFFILE File, { if (Verbose) { - printf("Adding %s\n", GetFileName(FileName)); + printf("Adding %s\n", GetFileName(FileName).c_str()); } } diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index b6b4335e59a..575b48f0816 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -6,7 +6,7 @@ * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> * NOTES: The directive file format is similar to the - * directive file format used by Microsoft's MAKECAB + * directive file format used by Microsoft's MAKECAB (But not entirely compatible!) * REVISIONS: * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable @@ -1123,17 +1123,17 @@ ULONG CDFParser::PerformFileCopy() DPRINT(MID_TRACE, ("Adding file: '%s' destination: '%s'.\n", SrcName, DstName)); - Status = AddFile(SrcName); + Status = AddFile(SrcName, std::string()); if (Status == CAB_STATUS_CANNOT_OPEN) { strcpy(SrcName, FileRelativePath.c_str()); strcat(SrcName, BaseFilename); - Status = AddFile(SrcName); + Status = AddFile(SrcName, std::string()); } switch (Status) { case CAB_STATUS_SUCCESS: - sprintf(InfLine, "%s=%s", GetFileName(SrcName), DstName); + sprintf(InfLine, "%s=%s", GetFileName(SrcName).c_str(), DstName); WriteInfLine(InfLine); break;

1 0

[reactos] 01/01: [MORE] Implement 'Q' key for 'Quit' (#3210)
by Katayama Hirofumi MZ 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9f60321f088ebd2b02a3… commit a9f60321f088ebd2b02a334cd7241c9e1df21475 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 20 07:16:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 07:16:21 2020 +0900 [MORE] Implement 'Q' key for 'Quit' (#3210) Implement 'Quit' action for keyboard key 'Q'. CORE-4019 --- base/applications/cmdutils/more/more.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index 161818a5e6b..14dd0d54c32 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -8,6 +8,7 @@ * PROGRAMMERS: Paolo Pantaleo * Timothy Schepens * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ /* * MORE.C - external command. @@ -133,6 +134,7 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) */ ConClearLine(Pager->Screen->Stream); + /* Ctrl+C or Ctrl+Esc: Control Break */ if ((KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((KeyEvent.wVirtualKeyCode == L'C') && (KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) @@ -143,6 +145,17 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) return FALSE; } + /* 'Q': Quit */ + // FIXME: Available only when command extensions are enabled. + if ((KeyEvent.wVirtualKeyCode == L'Q') && + !(KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))) + { + /* We break, output a newline */ + WCHAR ch = L'\n'; + ConStreamWrite(Pager->Screen->Stream, &ch, 1); + return FALSE; + } + return TRUE; }

1 0

[reactos] 05/05: [CMD] FOR: Fix a bug when parsing the "delims=" option in FOR loops.
by Hermès Bélusca-Maïto 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d5a1a455c9e8b158e4c6… commit 5d5a1a455c9e8b158e4c6f4c51a1ee20e0da95f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 22:22:07 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:56 2020 +0200 [CMD] FOR: Fix a bug when parsing the "delims=" option in FOR loops. Suppose the following FOR-loop command, to be run from the command-line (if using a batch file, double each percent '%' sign): FOR %l IN ("a,b,c,d,e" "f,g,h,i,j") DO ( FOR /F "delims=, tokens=1-3*" %a IN (%l) DO @echo %a-%b-%c-%d ) The outermost FOR-loop enumerates the two strings "a,b,c,d,e" and "f,g,h,i,j" (placed in %l), and parse each of these in turn, splitting them at each specified delimiter (here only one character) ',' and storing the results in consecutive tokens %a, %b, %c, %d, with the last token %d containing all the remaining string (non-split). The expected result is: a-b-c-d,e f-g-h-i,j However, due to the way the delimiters string specified by the "delims=" option is stored (no stack/heap duplication of the FOR-option substring, but reading from it directly), during the first run of the innermost FOR-loop, the option string "delims=, tokens=1-3*" was truncated to just after the ',' due to the erroneous "delims=" parsing, so that when this FOR-loop ran for a second time (to deal with the second string), the option string was already erroneously truncated, without the "tokens=..." part, so that the parsing results were not stored in the tokens and resulting in: a-b-c-d,e f-%b-%c-%d instead. The solution is to save where the "delims=" string needs to be cut, but wait until running the actual FOR-loop to terminate it (and saving the original character too), run the FOR-loop body, and then restore the original character where termination took place. This allows having the FOR-loop option string valid for the next execution of the FOR-loop. --- base/shell/cmd/for.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index 67a9240c787..300588bed31 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -121,6 +121,8 @@ static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); + LPTSTR DelimsEndPtr = NULL; + TCHAR DelimsEndChr = _T('\0'); TCHAR Eol = _T(';'); INT SkipLines = 0; DWORD Tokens = (1 << 1); @@ -148,8 +150,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) else if (_tcsnicmp(Param, _T("delims="), 7) == 0) { Param += 7; - /* delims=xxx: Specifies the list of characters that separate tokens */ + /* + * delims=xxx: Specifies the list of characters that separate tokens. + * This option does not cumulate: only the latest 'delims=' specification + * is taken into account. + */ Delims = Param; + DelimsEndPtr = NULL; while (*Param && *Param != Quote) { if (*Param == _T(' ')) @@ -158,13 +165,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) Param += _tcsspn(Param, _T(" ")); /* Exclude trailing spaces if this is not the last parameter */ if (*Param && *Param != Quote) - *FirstSpace = _T('\0'); + { + /* Save where the delimiters specification string ends */ + DelimsEndPtr = FirstSpace; + } break; } Param++; } if (*Param == Quote) - *Param++ = _T('\0'); + { + /* Save where the delimiters specification string ends */ + DelimsEndPtr = Param++; + } } else if (_tcsnicmp(Param, _T("eol="), 4) == 0) { @@ -301,6 +314,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) return 1; } + /* Patch the delimiters string */ + if (DelimsEndPtr) + { + DelimsEndChr = *DelimsEndPtr; + *DelimsEndPtr = _T('\0'); + } + /* Loop over the input line by line */ for (In = FullInput, Skip = SkipLines; !ExitingOrGoto(Cmd) && (In != NULL); @@ -343,6 +363,10 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) Ret = RunInstance(Cmd); } + /* Restore the delimiters string */ + if (DelimsEndPtr) + *DelimsEndPtr = DelimsEndChr; + cmd_free(FullInput); }

1 0

[reactos] 04/05: [CMD] Code formatting in SubstituteVar().
by Hermès Bélusca-Maïto 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cf0517be1ad609838039… commit 5cf0517be1ad60983803900cd791bccc91bb1482 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 19 18:48:51 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:55 2020 +0200 [CMD] Code formatting in SubstituteVar(). --- base/shell/cmd/cmd.c | 225 +++++++++++++++++++++++++-------------------------- 1 file changed, 111 insertions(+), 114 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 774bc4782bc..ba4e90dd05e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1363,137 +1363,127 @@ do { \ if (!*Src || *Src == _T('\r') || *Src == _T('\n')) goto bad_subst; + if (bc && Delim == _T('%')) { - if (bc && Delim == _T('%')) + UINT NameLen; + Var = GetBatchVar(Src, &NameLen); + if (!Var && bParseError) { - UINT NameLen; - Var = GetBatchVar(Src, &NameLen); - if (!Var && bParseError) - { - /* Return the partially-parsed command to be - * echoed for error diagnostics purposes. */ - APPEND1(Delim); - APPEND(Src, _tcslen(Src) + 1); - return FALSE; - } - if (Var != NULL) - { - VarLength = _tcslen(Var); - APPEND(Var, VarLength); - Src += NameLen; - goto success; - } + /* Return the partially-parsed command to be + * echoed for error diagnostics purposes. */ + APPEND1(Delim); + APPEND(Src, _tcslen(Src) + 1); + return FALSE; } - - /* Find the end of the variable name. A colon (:) will usually - * end the name and begin the optional modifier, but not if it - * is immediately followed by the delimiter (%VAR:%). */ - SubstStart = Src; - while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + if (Var != NULL) { - ++Src; + VarLength = _tcslen(Var); + APPEND(Var, VarLength); + Src += NameLen; + goto success; } - /* If we are either at the end of the string, or the delimiter - * has been repeated more than once, fail the substitution. */ - if (!*Src || Src == SubstStart) - goto bad_subst; + } - EndChr = *Src; - *(PTSTR)Src = _T('\0'); // FIXME: HACK! - Var = GetEnvVarOrSpecial(SubstStart); - *(PTSTR)Src++ = EndChr; - if (Var == NULL) - { - /* In a batch context, %NONEXISTENT% "expands" to an - * empty string, otherwise fail the substitution. */ - if (bc) - goto success; - goto bad_subst; - } - VarLength = _tcslen(Var); + /* Find the end of the variable name. A colon (:) will usually + * end the name and begin the optional modifier, but not if it + * is immediately followed by the delimiter (%VAR:%). */ + SubstStart = Src; + while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + { + ++Src; + } + /* If we are either at the end of the string, or the delimiter + * has been repeated more than once, fail the substitution. */ + if (!*Src || Src == SubstStart) + goto bad_subst; + + EndChr = *Src; + *(PTSTR)Src = _T('\0'); // FIXME: HACK! + Var = GetEnvVarOrSpecial(SubstStart); + *(PTSTR)Src++ = EndChr; + if (Var == NULL) + { + /* In a batch context, %NONEXISTENT% "expands" to an + * empty string, otherwise fail the substitution. */ + if (bc) + goto success; + goto bad_subst; + } + VarLength = _tcslen(Var); - if (EndChr == Delim) + if (EndChr == Delim) + { + /* %VAR% - use as-is */ + APPEND(Var, VarLength); + } + else if (*Src == _T('~')) + { + /* %VAR:~[start][,length]% - substring + * Negative values are offsets from the end. + */ + size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + size_t End = VarLength; + if (Start < 0) + Start += VarLength; + Start = max(Start, 0); + Start = min(Start, VarLength); + if (*Src == _T(',')) { - /* %VAR% - use as-is */ - APPEND(Var, VarLength); + End = _tcstol(Src + 1, (PTSTR*)&Src, 0); + End += (End < 0) ? VarLength : Start; + End = max(End, Start); + End = min(End, VarLength); } - else if (*Src == _T('~')) + if (*Src++ != Delim) + goto bad_subst; + APPEND(&Var[Start], End - Start); + } + else + { + /* %VAR:old=new% - Replace all occurrences of old with new. + * %VAR:*old=new% - Replace first occurrence only, + * and remove everything before it. + */ + PCTSTR Old, New; + size_t OldLength, NewLength; + BOOL Star = FALSE; + size_t LastMatch = 0, i = 0; + + if (*Src == _T('*')) { - /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end. - */ - size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); - size_t End = VarLength; - if (Start < 0) - Start += VarLength; - Start = max(Start, 0); - Start = min(Start, VarLength); - if (*Src == _T(',')) - { - End = _tcstol(Src + 1, (PTSTR*)&Src, 0); - End += (End < 0) ? VarLength : Start; - End = max(End, Start); - End = min(End, VarLength); - } - if (*Src++ != Delim) - goto bad_subst; - APPEND(&Var[Start], End - Start); + Star = TRUE; + Src++; } - else - { - /* %VAR:old=new% - Replace all occurrences of old with new. - * %VAR:*old=new% - Replace first occurrence only, - * and remove everything before it. - */ - PCTSTR Old, New; - size_t OldLength, NewLength; - BOOL Star = FALSE; - size_t LastMatch = 0, i = 0; - - if (*Src == _T('*')) - { - Star = TRUE; - Src++; - } - /* The string to replace may contain the delimiter */ - Src = _tcschr(Old = Src, _T('=')); - if (Src == NULL) - goto bad_subst; - OldLength = Src++ - Old; - if (OldLength == 0) - goto bad_subst; + /* The string to replace may contain the delimiter */ + Src = _tcschr(Old = Src, _T('=')); + if (Src == NULL) + goto bad_subst; + OldLength = Src++ - Old; + if (OldLength == 0) + goto bad_subst; - Src = _tcschr(New = Src, Delim); - if (Src == NULL) - goto bad_subst; - NewLength = Src++ - New; + Src = _tcschr(New = Src, Delim); + if (Src == NULL) + goto bad_subst; + NewLength = Src++ - New; - while (i < VarLength) + while (i < VarLength) + { + if (_tcsnicmp(&Var[i], Old, OldLength) == 0) { - if (_tcsnicmp(&Var[i], Old, OldLength) == 0) - { - if (!Star) - APPEND(&Var[LastMatch], i - LastMatch); - APPEND(New, NewLength); - i += OldLength; - LastMatch = i; - if (Star) - break; - continue; - } - i++; + if (!Star) + APPEND(&Var[LastMatch], i - LastMatch); + APPEND(New, NewLength); + i += OldLength; + LastMatch = i; + if (Star) + break; + continue; } - APPEND(&Var[LastMatch], VarLength - LastMatch); + i++; } - - goto success; - - bad_subst: - Src = SubstStart; - /* Only if no batch context active do we echo the delimiter */ - if (!bc) - APPEND1(Delim); + APPEND(&Var[LastMatch], VarLength - LastMatch); } success: @@ -1501,6 +1491,13 @@ success: *DestIncLen = (Dest - End); return TRUE; +bad_subst: + Src = SubstStart; + /* Only if no batch context active do we echo the delimiter */ + if (!bc) + APPEND1(Delim); + goto success; + too_long: ConOutResPrintf(STRING_ALIAS_ERROR); nErrorLevel = 9023;

1 0

[reactos] 03/05: [CMD] Fix delayed expansion of variables. CORE-13682
by Hermès Bélusca-Maïto 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdc8e45b4828b53039646… commit cdc8e45b4828b53039646d4c9f50241cfb5d46ee Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 4 02:56:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:55 2020 +0200 [CMD] Fix delayed expansion of variables. CORE-13682 - Split SubstituteVars() into its main loop and a helper SubstituteVar() that just substitutes only one variable. - Use this new helper as the basis of the proper implementation of the delayed expansion of variables. - Fix a bug introduced in commit 495c82cc, when GetBatchVar() fails. --- base/shell/cmd/cmd.c | 255 ++++++++++++++++++++++++++++++++++++++++----------- base/shell/cmd/cmd.h | 21 ++++- 2 files changed, 220 insertions(+), 56 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index c4d41d0f247..774bc4782bc 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1318,32 +1318,52 @@ GetBatchVar( } BOOL -SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) +SubstituteVar( + IN PCTSTR Src, + OUT size_t* SrcIncLen, // VarNameLen + OUT PTCHAR Dest, + IN PTCHAR DestEnd, + OUT size_t* DestIncLen, + IN TCHAR Delim) { -#define APPEND(From, Length) { \ +#define APPEND(From, Length) \ +do { \ if (Dest + (Length) > DestEnd) \ goto too_long; \ - memcpy(Dest, From, (Length) * sizeof(TCHAR)); \ - Dest += Length; } -#define APPEND1(Char) { \ + memcpy(Dest, (From), (Length) * sizeof(TCHAR)); \ + Dest += (Length); \ +} while (0) + +#define APPEND1(Char) \ +do { \ if (Dest >= DestEnd) \ goto too_long; \ - *Dest++ = Char; } + *Dest++ = (Char); \ +} while (0) - TCHAR *DestEnd = Dest + CMDLINE_LENGTH - 1; - const TCHAR *Var; - int VarLength; - TCHAR *SubstStart; + PCTSTR Var; + PCTSTR Start, End, SubstStart; TCHAR EndChr; - while (*Src) - { - if (*Src != Delim) - { - APPEND1(*Src++) - continue; - } + size_t VarLength; + + Start = Src; + End = Dest; + *SrcIncLen = 0; + *DestIncLen = 0; + + if (!Delim) + return FALSE; + if (*Src != Delim) + return FALSE; - Src++; + ++Src; + + /* If we are already at the end of the string, fail the substitution */ + SubstStart = Src; + if (!*Src || *Src == _T('\r') || *Src == _T('\n')) + goto bad_subst; + + { if (bc && Delim == _T('%')) { UINT NameLen; @@ -1353,15 +1373,15 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) /* Return the partially-parsed command to be * echoed for error diagnostics purposes. */ APPEND1(Delim); - APPEND(Src, DestEnd-Dest); + APPEND(Src, _tcslen(Src) + 1); return FALSE; } if (Var != NULL) { VarLength = _tcslen(Var); - APPEND(Var, VarLength) + APPEND(Var, VarLength); Src += NameLen; - continue; + goto success; } } @@ -1369,22 +1389,25 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) * end the name and begin the optional modifier, but not if it * is immediately followed by the delimiter (%VAR:%). */ SubstStart = Src; - while (*Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) { - if (!*Src) - goto bad_subst; - Src++; + ++Src; } + /* If we are either at the end of the string, or the delimiter + * has been repeated more than once, fail the substitution. */ + if (!*Src || Src == SubstStart) + goto bad_subst; EndChr = *Src; - *Src = _T('\0'); + *(PTSTR)Src = _T('\0'); // FIXME: HACK! Var = GetEnvVarOrSpecial(SubstStart); - *Src++ = EndChr; + *(PTSTR)Src++ = EndChr; if (Var == NULL) { - /* In a batch file, %NONEXISTENT% "expands" to an empty string */ + /* In a batch context, %NONEXISTENT% "expands" to an + * empty string, otherwise fail the substitution. */ if (bc) - continue; + goto success; goto bad_subst; } VarLength = _tcslen(Var); @@ -1392,21 +1415,22 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) if (EndChr == Delim) { /* %VAR% - use as-is */ - APPEND(Var, VarLength) + APPEND(Var, VarLength); } else if (*Src == _T('~')) { /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end */ - int Start = _tcstol(Src + 1, &Src, 0); - int End = VarLength; + * Negative values are offsets from the end. + */ + size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + size_t End = VarLength; if (Start < 0) Start += VarLength; Start = max(Start, 0); Start = min(Start, VarLength); if (*Src == _T(',')) { - End = _tcstol(Src + 1, &Src, 0); + End = _tcstol(Src + 1, (PTSTR*)&Src, 0); End += (End < 0) ? VarLength : Start; End = max(End, Start); End = min(End, VarLength); @@ -1417,13 +1441,14 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) } else { - /* %VAR:old=new% - replace all occurrences of old with new - * %VAR:*old=new% - replace first occurrence only, - * and remove everything before it */ - TCHAR *Old, *New; - DWORD OldLength, NewLength; + /* %VAR:old=new% - Replace all occurrences of old with new. + * %VAR:*old=new% - Replace first occurrence only, + * and remove everything before it. + */ + PCTSTR Old, New; + size_t OldLength, NewLength; BOOL Star = FALSE; - int LastMatch = 0, i = 0; + size_t LastMatch = 0, i = 0; if (*Src == _T('*')) { @@ -1431,7 +1456,7 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) Src++; } - /* the string to replace may contain the delimiter */ + /* The string to replace may contain the delimiter */ Src = _tcschr(Old = Src, _T('=')); if (Src == NULL) goto bad_subst; @@ -1449,8 +1474,8 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) if (_tcsnicmp(&Var[i], Old, OldLength) == 0) { if (!Star) - APPEND(&Var[LastMatch], i - LastMatch) - APPEND(New, NewLength) + APPEND(&Var[LastMatch], i - LastMatch); + APPEND(New, NewLength); i += OldLength; LastMatch = i; if (Star) @@ -1459,21 +1484,87 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) } i++; } - APPEND(&Var[LastMatch], VarLength - LastMatch) + APPEND(&Var[LastMatch], VarLength - LastMatch); } - continue; + + goto success; bad_subst: Src = SubstStart; + /* Only if no batch context active do we echo the delimiter */ if (!bc) - APPEND1(Delim) + APPEND1(Delim); } - *Dest = _T('\0'); + +success: + *SrcIncLen = (Src - Start); + *DestIncLen = (Dest - End); return TRUE; + too_long: ConOutResPrintf(STRING_ALIAS_ERROR); nErrorLevel = 9023; return FALSE; + +#undef APPEND +#undef APPEND1 +} + +BOOL +SubstituteVars( + IN PCTSTR Src, + OUT PTSTR Dest, + IN TCHAR Delim) +{ +#define APPEND(From, Length) \ +do { \ + if (Dest + (Length) > DestEnd) \ + goto too_long; \ + memcpy(Dest, (From), (Length) * sizeof(TCHAR)); \ + Dest += (Length); \ +} while (0) + +#define APPEND1(Char) \ +do { \ + if (Dest >= DestEnd) \ + goto too_long; \ + *Dest++ = (Char); \ +} while (0) + + PTCHAR DestEnd = Dest + CMDLINE_LENGTH - 1; + PCTSTR End; + size_t SrcIncLen, DestIncLen; + + while (*Src /* && (Dest < DestEnd) */) + { + if (*Src != Delim) + { + End = _tcschr(Src, Delim); + if (End == NULL) + End = Src + _tcslen(Src); + APPEND(Src, End - Src); + Src = End; + continue; + } + + if (!SubstituteVar(Src, &SrcIncLen, Dest, DestEnd, &DestIncLen, Delim)) + { + return FALSE; + } + else + { + Src += SrcIncLen; + Dest += DestIncLen; + } + } + APPEND1(_T('\0')); + return TRUE; + +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return FALSE; + #undef APPEND #undef APPEND1 } @@ -1545,11 +1636,15 @@ SubstituteForVars( return TRUE; } -LPTSTR -DoDelayedExpansion(LPTSTR Line) +PTSTR +DoDelayedExpansion( + IN PCTSTR Line) { TCHAR Buf1[CMDLINE_LENGTH]; TCHAR Buf2[CMDLINE_LENGTH]; + PTCHAR Src, Dst; + PTCHAR DestEnd = Buf2 + CMDLINE_LENGTH - 1; + size_t SrcIncLen, DestIncLen; /* First, substitute FOR variables */ if (!SubstituteForVars(Line, Buf1)) @@ -1558,12 +1653,64 @@ DoDelayedExpansion(LPTSTR Line) if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) return cmd_dup(Buf1); - /* FIXME: Delayed substitutions actually aren't quite the same as - * immediate substitutions. In particular, it's possible to escape - * the exclamation point using ^. */ - if (!SubstituteVars(Buf1, Buf2, _T('!'))) - return NULL; + /* + * Delayed substitutions are not actually completely the same as + * immediate substitutions. In particular, it is possible to escape + * the exclamation point using the escape caret. + */ + + /* + * Perform delayed expansion: expand variables around '!', + * and reparse escape carets. + */ + +#define APPEND1(Char) \ +do { \ + if (Dst >= DestEnd) \ + goto too_long; \ + *Dst++ = (Char); \ +} while (0) + + Src = Buf1; + Dst = Buf2; + while (*Src && (Src < &Buf1[CMDLINE_LENGTH])) + { + if (*Src == _T('^')) + { + ++Src; + if (!*Src || !(Src < &Buf1[CMDLINE_LENGTH])) + break; + + APPEND1(*Src++); + } + else if (*Src == _T('!')) + { + if (!SubstituteVar(Src, &SrcIncLen, Dst, DestEnd, &DestIncLen, _T('!'))) + { + return NULL; // Got an error during parsing. + } + else + { + Src += SrcIncLen; + Dst += DestIncLen; + } + } + else + { + APPEND1(*Src++); + } + continue; + } + APPEND1(_T('\0')); + return cmd_dup(Buf2); + +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return NULL; + +#undef APPEND1 } diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index ac2d7fddd8c..93fefe4f4c6 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -95,14 +95,31 @@ ExecuteCommandWithEcho( LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); -BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); + +BOOL +SubstituteVar( + IN PCTSTR Src, + OUT size_t* SrcIncLen, // VarNameLen + OUT PTCHAR Dest, + IN PTCHAR DestEnd, + OUT size_t* DestIncLen, + IN TCHAR Delim); + +BOOL +SubstituteVars( + IN PCTSTR Src, + OUT PTSTR Dest, + IN TCHAR Delim); BOOL SubstituteForVars( IN PCTSTR Src, OUT PTSTR Dest); -LPTSTR DoDelayedExpansion(LPTSTR Line); +PTSTR +DoDelayedExpansion( + IN PCTSTR Line); + INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore);

1 0

[reactos] 02/05: [CMD] Some fixes for getting the enhanced '%~XXX' batch/FOR variables. CORE-11857 CORE-13736
by Hermès Bélusca-Maïto 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb2a9c31a6c8c207f2285… commit cb2a9c31a6c8c207f22852c68fc1464dd3b52080 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 17:40:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:54 2020 +0200 [CMD] Some fixes for getting the enhanced '%~XXX' batch/FOR variables. CORE-11857 CORE-13736 It will be followed with a separate fix for the FOR-loop code. Fixes some cmd_winetests. A NULL pointer can be returned for a valid existing batch/FOR variable, in which case the enhanced-variable getter should return an empty string. This situation can happen e.g. when forcing a FOR-loop to tokenize a text line with not enough tokens in it. --- base/shell/cmd/batch.c | 26 +++++--- base/shell/cmd/batch.h | 7 ++- base/shell/cmd/cmd.c | 164 +++++++++++++++++++++++++++++++++++-------------- base/shell/cmd/cmd.h | 7 ++- 4 files changed, 146 insertions(+), 58 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index a7dfa2fd11a..e9a1e5aa76e 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -74,29 +74,35 @@ TCHAR textline[BATCH_BUFFSIZE]; /* * Returns a pointer to the n'th parameter of the current batch file. * If no such parameter exists returns pointer to empty string. - * If no batch file is current, returns NULL - * + * If no batch file is current, returns NULL. */ -LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) +BOOL +FindArg( + IN TCHAR Char, + OUT PCTSTR* ArgPtr, + OUT BOOL* IsParam0) { - LPTSTR pp; + PCTSTR pp; INT n = Char - _T('0'); - TRACE ("FindArg: (%d)\n", n); + TRACE("FindArg: (%d)\n", n); + + *ArgPtr = NULL; if (n < 0 || n > 9) - return NULL; + return FALSE; n = bc->shiftlevel[n]; *IsParam0 = (n == 0); pp = bc->params; - /* Step up the strings till we reach the end */ - /* or the one we want */ + /* Step up the strings till we reach + * the end or the one we want. */ while (*pp && n--) - pp += _tcslen (pp) + 1; + pp += _tcslen(pp) + 1; - return pp; + *ArgPtr = pp; + return TRUE; } diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index de425ee2f11..d40b640e421 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -44,7 +44,12 @@ extern BOOL bEcho; /* The echo flag */ extern TCHAR textline[BATCH_BUFFSIZE]; /* Buffer for reading Batch file lines */ -LPTSTR FindArg(TCHAR, BOOL *); +BOOL +FindArg( + IN TCHAR Char, + OUT PCTSTR* ArgPtr, + OUT BOOL* IsParam0); + VOID ExitBatch(VOID); VOID ExitAllBatches(VOID); INT Batch(LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index caa60a466fe..c4d41d0f247 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -964,8 +964,10 @@ GetEnvVarOrSpecial(LPCTSTR varName) } /* Handle the %~var syntax */ -static LPTSTR -GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) +static PCTSTR +GetEnhancedVar( + IN OUT PCTSTR* pFormat, + IN BOOL (*GetVar)(TCHAR, PCTSTR*, BOOL*)) { static const TCHAR ModifierTable[] = _T("dpnxfsatz"); enum { @@ -980,28 +982,68 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) M_SIZE = 256, /* Z: file size */ } Modifiers = 0; - TCHAR *Format, *FormatEnd; - TCHAR *PathVarName = NULL; - LPTSTR Variable; - TCHAR *VarEnd; + PCTSTR Format, FormatEnd; + PCTSTR PathVarName = NULL; + PCTSTR Variable; + PCTSTR VarEnd; BOOL VariableIsParam0; TCHAR FullPath[MAX_PATH]; - TCHAR FixedPath[MAX_PATH], *Filename, *Extension; + TCHAR FixedPath[MAX_PATH]; + PTCHAR Filename, Extension; HANDLE hFind; WIN32_FIND_DATA w32fd; - TCHAR *In, *Out; + PTCHAR In, Out; static TCHAR Result[CMDLINE_LENGTH]; - /* There is ambiguity between modifier characters and FOR variables; - * the rule that cmd uses is to pick the longest possible match. - * For example, if there is a %n variable, then out of %~anxnd, - * %~anxn will be substituted rather than just %~an. */ + /* Check whether the current character is a recognized variable. + * If it is not, then restore the previous one: there is indeed + * ambiguity between modifier characters and FOR variables; + * the rule that CMD uses is to pick the longest possible match. + * This case can happen if we have a FOR-variable specification + * of the following form: + * + * %~<modifiers><actual FOR variable character><other characters> + * + * where the FOR variable character is also a similar to a modifier, + * but should not be interpreted as is, and the following other + * characters are not part of the possible modifier characters, and + * are unrelated to the FOR variable (they can be part of a command). + * For example, if there is a %n variable, then out of %~anxnd, + * %~anxn will be substituted rather than just %~an. + * + * In the following examples, all characters 'd','p','n','x' are valid modifiers. + * + * 1. In this example, the FOR variable character is 'x' and the actual + * modifiers are 'dpn'. Parsing will first determine that 'dpnx' + * are modifiers, with the possible (last) valid variable being 'x', + * and will stop at the letter 'g'. Since 'g' is not a valid + * variable, then the actual variable is the lattest one 'x', + * and the modifiers are then actually 'dpn'. + * The FOR-loop will then display the %x variable formatted with 'dpn' + * and will append any other characters following, 'g'. + * + * C:\Temp>for %x in (foo.exe bar.txt) do @echo %~dpnxg + * C:\Temp\foog + * C:\Temp\barg + * + * + * 2. In this second example, the FOR variable character is 'g' and + * the actual modifiers are 'dpnx'. Parsing will determine also that + * the possible (last) valid variable could be 'x', but since it's + * not present in the FOR-variables list, it won't be the case. + * This means that the actual FOR variable character must follow, + * in this case, 'g'. + * + * C:\Temp>for %g in (foo.exe bar.txt) do @echo %~dpnxg + * C:\Temp\foo.exe + * C:\Temp\bar.txt + */ /* First, go through as many modifier characters as possible */ FormatEnd = Format = *pFormat; while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) - FormatEnd++; + ++FormatEnd; if (*FormatEnd == _T('$')) { @@ -1012,48 +1054,52 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) return NULL; /* Must be immediately followed by the variable */ - Variable = GetVar(*++FormatEnd, &VariableIsParam0); - if (!Variable) + if (!GetVar(*++FormatEnd, &Variable, &VariableIsParam0)) return NULL; } else { /* Backtrack if necessary to get a variable name match */ - while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + while (!GetVar(*FormatEnd, &Variable, &VariableIsParam0)) { if (FormatEnd == Format) return NULL; - FormatEnd--; + --FormatEnd; } } - for (; Format < FormatEnd && *Format != _T('$'); Format++) - Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); - *pFormat = FormatEnd + 1; + /* If the variable is empty, return an empty string */ + if (!Variable || !*Variable) + return _T(""); + /* Exclude the leading and trailing quotes */ VarEnd = &Variable[_tcslen(Variable)]; if (*Variable == _T('"')) { - Variable++; + ++Variable; if (VarEnd > Variable && VarEnd[-1] == _T('"')) - VarEnd--; + --VarEnd; } - if ((char *)VarEnd - (char *)Variable >= sizeof Result) + if ((ULONG_PTR)VarEnd - (ULONG_PTR)Variable >= sizeof(Result)) return _T(""); - memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); + memcpy(Result, Variable, (ULONG_PTR)VarEnd - (ULONG_PTR)Variable); Result[VarEnd - Variable] = _T('\0'); + /* Now determine the actual modifiers */ + for (; Format < FormatEnd && *Format != _T('$'); ++Format) + Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); + if (PathVarName) { /* $PATH: syntax - search the directories listed in the * specified environment variable for the file */ - LPTSTR PathVar; - FormatEnd[-1] = _T('\0'); + PTSTR PathVar; + ((PTSTR)FormatEnd)[-1] = _T('\0'); // FIXME: HACK! PathVar = GetEnvVar(PathVarName); - FormatEnd[-1] = _T(':'); + ((PTSTR)FormatEnd)[-1] = _T(':'); if (!PathVar || !SearchPath(PathVar, Result, NULL, ARRAYSIZE(FullPath), FullPath, NULL)) { @@ -1070,6 +1116,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) /* Special case: If the variable is %0 and modifier characters are present, * use the batch file's path (which includes the .bat/.cmd extension) * rather than the actual %0 variable (which might not). */ + ASSERT(bc); _tcscpy(FullPath, bc->BatchFilePath); } else @@ -1103,7 +1150,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) /* If it doesn't exist, just leave the name as it was given */ if (hFind != INVALID_HANDLE_VALUE) { - LPTSTR FixedComponent = w32fd.cFileName; + PTSTR FixedComponent = w32fd.cFileName; if (*w32fd.cAlternateFileName && ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) { @@ -1194,7 +1241,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) } if (Modifiers & (M_PATH | M_FULL)) { - memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); + memcpy(Out, &FixedPath[2], (ULONG_PTR)Filename - (ULONG_PTR)&FixedPath[2]); Out += Filename - &FixedPath[2]; } if (Modifiers & (M_NAME | M_FULL)) @@ -1217,18 +1264,20 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) return Result; } -static LPCTSTR -GetBatchVar(TCHAR *varName, UINT *varNameLen) +static PCTSTR +GetBatchVar( + IN PCTSTR varName, + OUT PUINT varNameLen) { - LPCTSTR ret; - TCHAR *varNameEnd; - BOOL dummy; + PCTSTR ret; + PCTSTR varNameEnd; *varNameLen = 1; - switch ( *varName ) + switch (*varName) { case _T('~'): + { varNameEnd = varName + 1; ret = GetEnhancedVar(&varNameEnd, FindArg); if (!ret) @@ -1238,6 +1287,7 @@ GetBatchVar(TCHAR *varName, UINT *varNameLen) } *varNameLen = varNameEnd - varName; return ret; + } case _T('0'): case _T('1'): @@ -1249,7 +1299,13 @@ GetBatchVar(TCHAR *varName, UINT *varNameLen) case _T('7'): case _T('8'): case _T('9'): - return FindArg(*varName, &dummy); + { + BOOL dummy; + if (!FindArg(*varName, &ret, &dummy)) + return NULL; + else + return ret; + } case _T('*'): /* Copy over the raw params (not including the batch file name) */ @@ -1423,37 +1479,53 @@ too_long: } /* Search the list of FOR contexts for a variable */ -static LPTSTR -FindForVar(TCHAR Var, BOOL *IsParam0) +static BOOL +FindForVar( + IN TCHAR Var, + OUT PCTSTR* VarPtr, + OUT BOOL* IsParam0) { PFOR_CONTEXT Ctx; + *VarPtr = NULL; *IsParam0 = FALSE; + for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) { if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) - return Ctx->values[Var - Ctx->firstvar]; + { + *VarPtr = Ctx->values[Var - Ctx->firstvar]; + return TRUE; + } } - return NULL; + return FALSE; } BOOL -SubstituteForVars(TCHAR *Src, TCHAR *Dest) +SubstituteForVars( + IN PCTSTR Src, + OUT PTSTR Dest) { - TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; + PTCHAR DestEnd = &Dest[CMDLINE_LENGTH - 1]; while (*Src) { if (Src[0] == _T('%')) { BOOL Dummy; - LPTSTR End = &Src[2]; - LPTSTR Value = NULL; + PCTSTR End = &Src[2]; + PCTSTR Value = NULL; if (Src[1] == _T('~')) Value = GetEnhancedVar(&End, FindForVar); - if (!Value) - Value = FindForVar(Src[1], &Dummy); + if (!Value && Src[1]) + { + if (FindForVar(Src[1], &Value, &Dummy) && !Value) + { + /* The variable is empty, return an empty string */ + Value = _T(""); + } + } if (Value) { diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index b3c1c0f1d9d..ac2d7fddd8c 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -96,7 +96,12 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); -BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); + +BOOL +SubstituteForVars( + IN PCTSTR Src, + OUT PTSTR Dest); + LPTSTR DoDelayedExpansion(LPTSTR Line); INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore);

1 0

[reactos] 01/05: [CMD_ROSTEST] Add tests for delayed expansion.
by Hermès Bélusca-Maïto 19 Sep '20

19 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=014efdf7e85205fa2f899… commit 014efdf7e85205fa2f899675d19a243cf5b96b5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 5 00:41:31 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:53 2020 +0200 [CMD_ROSTEST] Add tests for delayed expansion. --- modules/rostests/win32/cmd/test_echoer_parser.cmd | 159 ++++++++++++++++++ .../rostests/win32/cmd/test_echoer_parser.cmd.exp | 187 +++++++++++++++++++++ 2 files changed, 346 insertions(+) diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd b/modules/rostests/win32/cmd/test_echoer_parser.cmd index 85d20ad9508..e94313871f7 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd @@ -92,6 +92,165 @@ if 1==0 (@echo lol) else (@echo better2) :: () +:: +:: Tests for delayed expansion. +:: + +@echo off +setlocal enableextensions +setlocal enabledelayedexpansion + +echo --------- Testing Delayed Expansion --------- + +:: Checking exclamation point escaping +set ENDV= ^(an open-source operating system^) +echo This is ReactOS^^!%ENDV% +echo Hello! +echo Hello!! +echo Hello!!! +echo Hello^^^! "^!" + +:: The following tests are adapted from +:: https://ss64.com/nt/delayedexpansion.html + +echo "Hello^World" +echo "Hello^World!" + +:: Checking expansion +set "_var=first" +set "_var=second" & Echo %_var% !_var! + +:: Checking expansion and replacement +set var1=Hello ABC how are you +set var2=ABC +set result=!var1:%var2%=Developer! +echo [!result!] + +:: Test of FOR-loop +set COUNT=0 +for /l %%v in (1,1,4) do ( + set /A COUNT=!COUNT! + 1 + echo [!COUNT!] +) +echo Total = %COUNT% + + +set "com[0]=lol0" +set "com[1]=lol2" +set "com[2]=lol4" +set "com[3]=lol6" +set "com[4]=lol8" +set "com[5]=lol10" + +for /l %%k in (1,1,5) do ( + echo(!com[%%k]! + if /I "%%k" equ "5" echo OHLALA +) + + +:: +:: Re-enable the command echoer +:: +@echo on + +setlocal disabledelayedexpansion + +echo %~DP0 + +set test=abc +set abc=def + +echo % +echo %% +echo %%% +echo %%%% + +echo %test% +echo %test%% +echo %%test% +echo %%test%% +echo %%%test%%% + +echo !test! +echo !!test!! + +endlocal +setlocal enabledelayedexpansion + +:: +:: Regular and Delayed variables +:: + +echo ! +echo !! +echo !!! +echo !!!! +echo !a! +echo !!a!! + +set a=b +:: Will display b +echo !!a!! +set b=c +:: Will still display b +echo !!a!! + +echo %test% +echo %test%% +echo %%test% +echo %%test%% +echo %%%test%%% + +echo %!test!% +echo !%test%! +echo !!test!! +:: That other one is the same as the previous one. +echo !^!test^!! +echo !^^!test^^!! +echo !test! +echo !test!! +echo !!test! +echo !!test!! +echo !!!test!!! + + +set proj=XYZ +echo !%proj%_folder! +echo !!proj!_folder! + +set %proj%_folder=\\server\folder\ +echo !%proj%_folder! +echo !!proj!_folder! + + +:: +:: Delayed variables in blocks +:: + +if 1==1 ( + set "pc=T" + echo pc == !pc! + + set i=3 + set "!pc!!i!=5" + + echo other pc == !pc! and !pc!!i! == !!pc!!i!! + echo other pc == !pc! and !pc!!i! == !^!pc^!^!i^!! + echo other pc == !pc! and !pc!!i! == ^!!pc!!i!^! + echo other pc == !pc! and !pc!!i! == ^!^!pc^!^!i^!^! + set "trol=!pc!!i!" + echo the var was !trol! + + set "!pc!N=!i!" + echo updated !pc!N == !!pc!N! + echo updated !pc!N == !^!pc^!N! + echo updated !pc!N == ^!!pc!N^! + echo updated !pc!N == ^!^!pc^!N^! + set "trol=!pc!N" + echo updated !pc!N == !trol! +) + + @echo off :: diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp index b582b62722f..796b31eef76 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp @@ -135,4 +135,191 @@ better2 @pwd@>(a)@space@ @pwd@>(a b )@space@ +--------- Testing Delayed Expansion --------- +This is ReactOS! (an open-source operating system) +Hello +Hello +Hello +Hello! "!" +"Hello^World" +"HelloWorld" +first second +[Hello Developer how are you] +[1] +[2] +[3] +[4] +Total = 4 +lol2 +lol4 +lol6 +lol8 +lol10 +OHLALA + +@pwd@>setlocal disabledelayedexpansion@space@ + +@pwd@>echo @pwd@\@space@ +@pwd@\ + +@pwd@>set test=abc@space@ + +@pwd@>set abc=def@space@ + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo %@space@ +% + +@pwd@>echo %@space@ +% + +@pwd@>echo %%@space@ +%% + +@pwd@>echo abc@space@ +abc + +@pwd@>echo abc@space@ +abc + +@pwd@>echo %test@space@ +%test + +@pwd@>echo %test%@space@ +%test% + +@pwd@>echo %abc%@space@ +%abc% + +@pwd@>echo !test!@space@ +!test! + +@pwd@>echo !!test!!@space@ +!!test!! + +@pwd@>endlocal + +@pwd@>setlocal enabledelayedexpansion@space@ + +@pwd@>echo !@space@ +ECHO is on. + +@pwd@>echo !!@space@ +ECHO is on. + +@pwd@>echo !!!@space@ +ECHO is on. + +@pwd@>echo !!!!@space@ +ECHO is on. + +@pwd@>echo !a!@space@ +ECHO is on. + +@pwd@>echo !!a!!@space@ +ECHO is on. + +@pwd@>set a=b@space@ + +@pwd@>echo !!a!!@space@ +b + +@pwd@>set b=c@space@ + +@pwd@>echo !!a!!@space@ +b + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo %test@space@ +%test + +@pwd@>echo %test%@space@ +%test% + +@pwd@>echo %%@space@ +%% + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo !!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !^!test^!!@space@ +test! + +@pwd@>echo !test!@space@ +ECHO is on. + +@pwd@>echo !test!!@space@ +ECHO is on. + +@pwd@>echo !!test!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !!!test!!!@space@ +ECHO is on. + +@pwd@>set proj=XYZ@space@ + +@pwd@>echo !XYZ_folder!@space@ +ECHO is on. + +@pwd@>echo !!proj!_folder!@space@ +XYZ_folder + +@pwd@>set XYZ_folder=\\server\folder\@space@ + +@pwd@>echo !XYZ_folder!@space@ +\\server\folder\ + +@pwd@>echo !!proj!_folder!@space@ +XYZ_folder + +@pwd@>if 1 == 1 ( +set "pc=T"@space@@space@ + echo pc == !pc!@space@@space@ + set i=3@space@@space@ + set "!pc!!i!=5"@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + set "trol=!pc!!i!"@space@@space@ + echo the var was !trol!@space@@space@ + set "!pc!N=!i!"@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + set "trol=!pc!N"@space@@space@ + echo updated !pc!N == !trol!@space@ +)@space@ +pc == T +other pc == T and T3 == T3 +other pc == T and T3 == T3 +other pc == T and T3 == T3 +other pc == T and T3 == T3 +the var was T3 +updated TN == TN +updated TN == TN +updated TN == TN +updated TN == TN +updated TN == TN --------- Finished --------------

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