Skip to content

Commit

Permalink
Minor
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ian-Macallan
Ian-Macallan committed Oct 6, 2024
1 parent 436a792 commit ee0a949
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/msbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ProductVersionInfo.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions ProductVersionInfo.txt
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ProductVersionSize.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.15.011
1.0.15.012
10 changes: 5 additions & 5 deletions wsrm/AutomaticProductName.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 15 additions & 15 deletions wsrm/AutomaticVersionHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===========================================================================================
//
Expand Down Expand Up @@ -57,33 +57,33 @@
#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)"
#else
#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)"
Expand Down
36 changes: 30 additions & 6 deletions wsrm/srm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -837,15 +841,23 @@ 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 );
}
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 );
Expand Down Expand Up @@ -1006,15 +1018,23 @@ 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 );
}
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 );
Expand Down Expand Up @@ -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 =
Expand Down
14 changes: 7 additions & 7 deletions wsrm/wsrm.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down

0 comments on commit ee0a949

Please # to comment.