diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 0b967e5..59db2b7 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -25,7 +25,7 @@ env: # You can convert this to a build matrix if you need coverage of multiple configuration types. # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix BUILD_CONFIGURATION: Release - BUILD_VERSION: 1.0.15.11 # Version + BUILD_VERSION: 1.0.15.12 # Version # permissions: actions: write diff --git a/ProductVersionInfo.cmd b/ProductVersionInfo.cmd index ea4cea6..938e6a3 100644 --- a/ProductVersionInfo.cmd +++ b/ProductVersionInfo.cmd @@ -3,6 +3,6 @@ rem cd %~dp0 rem %~d0 -set PRODUCT_VERSION_VERS=1.0.15.11 +set PRODUCT_VERSION_VERS=1.0.15.12 @exit /b diff --git a/ProductVersionInfo.txt b/ProductVersionInfo.txt index 9db260a..e468f4c 100644 --- a/ProductVersionInfo.txt +++ b/ProductVersionInfo.txt @@ -1,4 +1,4 @@ -1.0.15.11 +1.0.15.12 wsrm -wsrm (x86) : Sun Oct 06 13:04 1.0.15.11 -wsrm (x64) : Sun Oct 06 13:04 1.0.15.11 +wsrm (x86) : Sun Oct 06 13:33 1.0.15.12 +wsrm (x64) : Sun Oct 06 13:33 1.0.15.12 diff --git a/ProductVersionSize.txt b/ProductVersionSize.txt index 27b244b..2ad7d01 100644 --- a/ProductVersionSize.txt +++ b/ProductVersionSize.txt @@ -1 +1 @@ -1.0.15.011 +1.0.15.012 diff --git a/wsrm/AutomaticProductName.h b/wsrm/AutomaticProductName.h index ace421a..417019d 100644 --- a/wsrm/AutomaticProductName.h +++ b/wsrm/AutomaticProductName.h @@ -6,22 +6,22 @@ #ifdef _WIN64 #ifdef UNICODE #define ORIGINAL_FILENAME L"wsrm (x64 Unicode) (MSVC)\0" -#define PRODUCT_NAME L"wsrm - Version 1.0.15.011\r\n(Build 195) - (x64 Unicode) (MSVC)\0" +#define PRODUCT_NAME L"wsrm - Version 1.0.15.012\r\n(Build 196) - (x64 Unicode) (MSVC)\0" #else #define ORIGINAL_FILENAME "wsrm (x64 MBCS) (MSVC)\0" -#define PRODUCT_NAME "wsrm - Version 1.0.15.011\r\n(Build 195) - (x64 MBCS) (MSVC)\0" +#define PRODUCT_NAME "wsrm - Version 1.0.15.012\r\n(Build 196) - (x64 MBCS) (MSVC)\0" #endif #elif _WIN32 #ifdef UNICODE #define ORIGINAL_FILENAME L"wsrm (x86 Unicode) (MSVC)\0" -#define PRODUCT_NAME L"wsrm - Version 1.0.15.011\r\n(Build 195) - (x86 Unicode) (MSVC)\0" +#define PRODUCT_NAME L"wsrm - Version 1.0.15.012\r\n(Build 196) - (x86 Unicode) (MSVC)\0" #else #define ORIGINAL_FILENAME "wsrm (x86 MBCS) (MSVC)\0" -#define PRODUCT_NAME "wsrm - Version 1.0.15.011\r\n(Build 195) - (x86 MBCS) (MSVC)\0" +#define PRODUCT_NAME "wsrm - Version 1.0.15.012\r\n(Build 196) - (x86 MBCS) (MSVC)\0" #endif #else #define ORIGINAL_FILENAME "wsrm (MSVC)\0" -#define PRODUCT_NAME "wsrm - Version 1.0.15.011\r\n(Build 195) - (MSVC)\0" +#define PRODUCT_NAME "wsrm - Version 1.0.15.012\r\n(Build 196) - (MSVC)\0" #endif #endif diff --git a/wsrm/AutomaticVersionHeader.h b/wsrm/AutomaticVersionHeader.h index 8da2556..9fe74e4 100644 --- a/wsrm/AutomaticVersionHeader.h +++ b/wsrm/AutomaticVersionHeader.h @@ -5,7 +5,7 @@ // // (c) 2003 - 2024 Macallan - mailto:ian.macallan@gmail.com // -// Generated : 06/10/2024 13:04:04 +// Generated : 06/10/2024 13:33:47 // //=========================================================================================== // @@ -57,22 +57,22 @@ #endif #ifdef UNICODE -#define PROGRAM_DATE L"Sun Oct 06 13:04" -#define PROGRAM_DATE_F L"Sun Oct 06 13:04 2024" +#define PROGRAM_DATE L"Sun Oct 06 13:33" +#define PROGRAM_DATE_F L"Sun Oct 06 13:33 2024" #define PROGRAM_YEAR L"2024" -#define PROGRAM_TIME L"2024/10/06 13:04:04" +#define PROGRAM_TIME L"2024/10/06 13:33:47" #else -#define PROGRAM_DATE "Sun Oct 06 13:04" -#define PROGRAM_DATE_F "Sun Oct 06 13:04 2024" +#define PROGRAM_DATE "Sun Oct 06 13:33" +#define PROGRAM_DATE_F "Sun Oct 06 13:33 2024" #define PROGRAM_YEAR "2024" -#define PROGRAM_TIME "2024/10/06 13:04:04" +#define PROGRAM_TIME "2024/10/06 13:33:47" #endif #ifdef UNICODE -#define PROGRAM_VERSION L"1.0.15.011" -#define PROGRAM_INSTALL L"1.0.15011" -#define PROGRAM_VER_NUM 10015011 -#define PROGRAM_BUILD L"195" +#define PROGRAM_VERSION L"1.0.15.012" +#define PROGRAM_INSTALL L"1.0.15012" +#define PROGRAM_VER_NUM 10015012 +#define PROGRAM_BUILD L"196" #define PROGRAM_TITLE L"wsrm" #ifdef _WIN64 #define PROGRAM_TITLE_P L"wsrm (x64 Unicode)" @@ -80,10 +80,10 @@ #define PROGRAM_TITLE_P L"wsrm (x86 Unicode)" #endif #else -#define PROGRAM_VERSION "1.0.15.011" -#define PROGRAM_INSTALL "1.0.15011" -#define PROGRAM_VER_NUM 10015011 -#define PROGRAM_BUILD "195" +#define PROGRAM_VERSION "1.0.15.012" +#define PROGRAM_INSTALL "1.0.15012" +#define PROGRAM_VER_NUM 10015012 +#define PROGRAM_BUILD "196" #define PROGRAM_TITLE "wsrm" #ifdef _WIN64 #define PROGRAM_TITLE_P "wsrm (x64 MBCS)" diff --git a/wsrm/srm.cpp b/wsrm/srm.cpp index 6793a99..cbc5b5f 100644 --- a/wsrm/srm.cpp +++ b/wsrm/srm.cpp @@ -606,7 +606,11 @@ BOOL readFillFile ( ) // // We will hav to prepend '\\?\' - wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + ZeroMemory ( szPrependFilename, LEN_PATHNAME * sizeof(WCHAR) ); + if ( wcsncmp ( szFillWithFile, L"\\\\", 2 ) != 0 ) + { + wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + } wcscat_s ( szPrependFilename, LEN_PATHNAME, szFillWithFile ); HANDLE hFile = @@ -837,7 +841,11 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory ) if ( ! bDirectory ) { // We will hav to prepend '\\?\' - wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + ZeroMemory ( szPrependFilename, LEN_PATHNAME * sizeof(WCHAR) ); + if ( wcsncmp ( pFullPathname, L"\\\\", 2 ) != 0 ) + { + wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + } wcscat_s ( szPrependFilename, LEN_PATHNAME, pFullPathname ); bDeleted = DeleteFile ( szPrependFilename ); @@ -845,7 +853,11 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory ) else { // We will hav to prepend '\\?\' - wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + ZeroMemory ( szPrependFilename, LEN_PATHNAME * sizeof(WCHAR) ); + if ( wcsncmp ( pFullPathname, L"\\\\", 2 ) != 0 ) + { + wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + } wcscat_s ( szPrependFilename, LEN_PATHNAME, pFullPathname ); bDeleted = RemoveDirectory ( szPrependFilename ); @@ -1006,7 +1018,11 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory ) if ( ! bDirectory ) { // We will hav to prepend '\\?\' - wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + ZeroMemory ( szPrependFilename, LEN_PATHNAME * sizeof(WCHAR) ); + if ( wcsncmp ( pRenamePathname, L"\\\\", 2 ) != 0 ) + { + wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + } wcscat_s ( szPrependFilename, LEN_PATHNAME, pRenamePathname ); bDeleted = DeleteFile ( szPrependFilename ); @@ -1014,7 +1030,11 @@ BOOL renameAndDelete ( WCHAR *pFullPathname, BOOL bDirectory ) else { // We will hav to prepend '\\?\' - wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + ZeroMemory ( szPrependFilename, LEN_PATHNAME * sizeof(WCHAR) ); + if ( wcsncmp ( pRenamePathname, L"\\\\", 2 ) != 0 ) + { + wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + } wcscat_s ( szPrependFilename, LEN_PATHNAME, pRenamePathname ); bDeleted = RemoveDirectory ( szPrependFilename ); @@ -1180,7 +1200,11 @@ BOOL writeOverFile(WCHAR *pFullPathname, WIN32_FIND_DATA *pFindFileData ) // // We will hav to prepend '\\?\' - wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + ZeroMemory ( szPrependFilename, LEN_PATHNAME * sizeof(WCHAR) ); + if ( wcsncmp ( pFullPathname, L"\\\\", 2 ) != 0 ) + { + wcscpy_s ( szPrependFilename, LEN_PATHNAME, L"\\\\?\\" ); + } wcscat_s ( szPrependFilename, LEN_PATHNAME, pFullPathname ); HANDLE hFile = diff --git a/wsrm/wsrm.rc b/wsrm/wsrm.rc index 09fddf5..189f840 100644 --- a/wsrm/wsrm.rc +++ b/wsrm/wsrm.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,15,011 - PRODUCTVERSION 1,0,15,011 + FILEVERSION 1,0,15,012 + PRODUCTVERSION 1,0,15,012 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,15 +70,15 @@ BEGIN VALUE "Comments", "mailto:ian.macallan@gmail.com\0" VALUE "CompanyName", "Macallan (c)\0" VALUE "FileDescription", "wsrm - (MSVC)\0" - VALUE "FileVersion", "1.0.15.011\0" + VALUE "FileVersion", "1.0.15.012\0" VALUE "InternalName", "https://www.macallan.org/\0" - VALUE "LegalCopyright", "Copyright (C) Sun Oct 06 13:04, 2024\0" + VALUE "LegalCopyright", "Copyright (C) Sun Oct 06 13:33, 2024\0" VALUE "LegalTrademarks", "Author: Ian Macallan\0" VALUE "OriginalFilename", ORIGINAL_FILENAME - VALUE "PrivateBuild", "195\0" + VALUE "PrivateBuild", "196\0" VALUE "ProductName", PRODUCT_NAME - VALUE "ProductVersion", "1.0.15.011\0" - VALUE "SpecialBuild", "195\0" + VALUE "ProductVersion", "1.0.15.012\0" + VALUE "SpecialBuild", "196\0" END END BLOCK "VarFileInfo"