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 Feb 15, 2025
1 parent adaeb68 commit 6edb99b
Show file tree
Hide file tree
Showing 22 changed files with 191 additions and 145 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: 4.5.6.2 # Version
BUILD_VERSION: 4.5.6.5 # Version
#
permissions:
actions: write
Expand Down
14 changes: 7 additions & 7 deletions Analyze/Analyze.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 4,5,06,002
PRODUCTVERSION 4,5,06,002
FILEVERSION 4,5,06,005
PRODUCTVERSION 4,5,06,005
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", "Analyze - (MSVC)\0"
VALUE "FileVersion", "4.5.06.002\0"
VALUE "FileVersion", "4.5.06.005\0"
VALUE "InternalName", "https://www.macallan.org/\0"
VALUE "LegalCopyright", "Copyright (C) Thu Feb 13 19:04, 2025\0"
VALUE "LegalCopyright", "Copyright (C) Sat Feb 15 09:17, 2025\0"
VALUE "LegalTrademarks", "Author: Ian Macallan\0"
VALUE "OriginalFilename", ORIGINAL_FILENAME
VALUE "PrivateBuild", "977\0"
VALUE "PrivateBuild", "980\0"
VALUE "ProductName", PRODUCT_NAME
VALUE "ProductVersion", "4.5.06.002\0"
VALUE "SpecialBuild", "977\0"
VALUE "ProductVersion", "4.5.06.005\0"
VALUE "SpecialBuild", "980\0"
END
END
BLOCK "VarFileInfo"
Expand Down
10 changes: 5 additions & 5 deletions Analyze/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"Analyze (x64 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"Analyze - Version 4.5.06.002\r\n(Build 977) - (x64 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"Analyze - Version 4.5.06.005\r\n(Build 980) - (x64 Unicode) (MSVC)\0"
#else
#define ORIGINAL_FILENAME "Analyze (x64 MBCS) (MSVC)\0"
#define PRODUCT_NAME "Analyze - Version 4.5.06.002\r\n(Build 977) - (x64 MBCS) (MSVC)\0"
#define PRODUCT_NAME "Analyze - Version 4.5.06.005\r\n(Build 980) - (x64 MBCS) (MSVC)\0"
#endif
#elif _WIN32
#ifdef UNICODE
#define ORIGINAL_FILENAME L"Analyze (x86 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"Analyze - Version 4.5.06.002\r\n(Build 977) - (x86 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"Analyze - Version 4.5.06.005\r\n(Build 980) - (x86 Unicode) (MSVC)\0"
#else
#define ORIGINAL_FILENAME "Analyze (x86 MBCS) (MSVC)\0"
#define PRODUCT_NAME "Analyze - Version 4.5.06.002\r\n(Build 977) - (x86 MBCS) (MSVC)\0"
#define PRODUCT_NAME "Analyze - Version 4.5.06.005\r\n(Build 980) - (x86 MBCS) (MSVC)\0"
#endif
#else
#define ORIGINAL_FILENAME "Analyze (MSVC)\0"
#define PRODUCT_NAME "Analyze - Version 4.5.06.002\r\n(Build 977) - (MSVC)\0"
#define PRODUCT_NAME "Analyze - Version 4.5.06.005\r\n(Build 980) - (MSVC)\0"
#endif

#endif
30 changes: 15 additions & 15 deletions Analyze/AutomaticVersionHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
// (c) 2003 - 2025 Macallan - mailto:ian.macallan@gmail.com
//
// Generated : 13/02/2025 19:04:00
// Generated : 15/02/2025 09:17:57
//
//===========================================================================================
//
Expand Down Expand Up @@ -57,33 +57,33 @@
#endif

#ifdef UNICODE
#define PROGRAM_DATE L"Thu Feb 13 19:04"
#define PROGRAM_DATE_F L"Thu Feb 13 19:04 2025"
#define PROGRAM_DATE L"Sat Feb 15 09:17"
#define PROGRAM_DATE_F L"Sat Feb 15 09:17 2025"
#define PROGRAM_YEAR L"2025"
#define PROGRAM_TIME L"2025/02/13 19:04:00"
#define PROGRAM_TIME L"2025/02/15 09:17:57"
#else
#define PROGRAM_DATE "Thu Feb 13 19:04"
#define PROGRAM_DATE_F "Thu Feb 13 19:04 2025"
#define PROGRAM_DATE "Sat Feb 15 09:17"
#define PROGRAM_DATE_F "Sat Feb 15 09:17 2025"
#define PROGRAM_YEAR "2025"
#define PROGRAM_TIME "2025/02/13 19:04:00"
#define PROGRAM_TIME "2025/02/15 09:17:57"
#endif

#ifdef UNICODE
#define PROGRAM_VERSION L"4.5.06.002"
#define PROGRAM_INSTALL L"4.5.06002"
#define PROGRAM_VER_NUM 40506002
#define PROGRAM_BUILD L"977"
#define PROGRAM_VERSION L"4.5.06.005"
#define PROGRAM_INSTALL L"4.5.06005"
#define PROGRAM_VER_NUM 40506005
#define PROGRAM_BUILD L"980"
#define PROGRAM_TITLE L"Analyze"
#ifdef _WIN64
#define PROGRAM_TITLE_P L"Analyze (x64 Unicode)"
#else
#define PROGRAM_TITLE_P L"Analyze (x86 Unicode)"
#endif
#else
#define PROGRAM_VERSION "4.5.06.002"
#define PROGRAM_INSTALL "4.5.06002"
#define PROGRAM_VER_NUM 40506002
#define PROGRAM_BUILD "977"
#define PROGRAM_VERSION "4.5.06.005"
#define PROGRAM_INSTALL "4.5.06005"
#define PROGRAM_VER_NUM 40506005
#define PROGRAM_BUILD "980"
#define PROGRAM_TITLE "Analyze"
#ifdef _WIN64
#define PROGRAM_TITLE_P "Analyze (x64 MBCS)"
Expand Down
10 changes: 5 additions & 5 deletions 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"TRCheatWin (x64 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"TRCheatWin - Version 4.5.06.002\r\n(Build 1112) - (x64 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"TRCheatWin - Version 4.5.06.005\r\n(Build 1115) - (x64 Unicode) (MSVC)\0"
#else
#define ORIGINAL_FILENAME "TRCheatWin (x64 MBCS) (MSVC)\0"
#define PRODUCT_NAME "TRCheatWin - Version 4.5.06.002\r\n(Build 1112) - (x64 MBCS) (MSVC)\0"
#define PRODUCT_NAME "TRCheatWin - Version 4.5.06.005\r\n(Build 1115) - (x64 MBCS) (MSVC)\0"
#endif
#elif _WIN32
#ifdef UNICODE
#define ORIGINAL_FILENAME L"TRCheatWin (x86 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"TRCheatWin - Version 4.5.06.002\r\n(Build 1112) - (x86 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"TRCheatWin - Version 4.5.06.005\r\n(Build 1115) - (x86 Unicode) (MSVC)\0"
#else
#define ORIGINAL_FILENAME "TRCheatWin (x86 MBCS) (MSVC)\0"
#define PRODUCT_NAME "TRCheatWin - Version 4.5.06.002\r\n(Build 1112) - (x86 MBCS) (MSVC)\0"
#define PRODUCT_NAME "TRCheatWin - Version 4.5.06.005\r\n(Build 1115) - (x86 MBCS) (MSVC)\0"
#endif
#else
#define ORIGINAL_FILENAME "TRCheatWin (MSVC)\0"
#define PRODUCT_NAME "TRCheatWin - Version 4.5.06.002\r\n(Build 1112) - (MSVC)\0"
#define PRODUCT_NAME "TRCheatWin - Version 4.5.06.005\r\n(Build 1115) - (MSVC)\0"
#endif

#endif
30 changes: 15 additions & 15 deletions AutomaticVersionHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
// (c) 2003 - 2025 Macallan - mailto:ian.macallan@gmail.com
//
// Generated : 13/02/2025 19:04:00
// Generated : 15/02/2025 09:17:57
//
//===========================================================================================
//
Expand Down Expand Up @@ -57,33 +57,33 @@
#endif

#ifdef UNICODE
#define PROGRAM_DATE L"Thu Feb 13 19:04"
#define PROGRAM_DATE_F L"Thu Feb 13 19:04 2025"
#define PROGRAM_DATE L"Sat Feb 15 09:17"
#define PROGRAM_DATE_F L"Sat Feb 15 09:17 2025"
#define PROGRAM_YEAR L"2025"
#define PROGRAM_TIME L"2025/02/13 19:04:00"
#define PROGRAM_TIME L"2025/02/15 09:17:57"
#else
#define PROGRAM_DATE "Thu Feb 13 19:04"
#define PROGRAM_DATE_F "Thu Feb 13 19:04 2025"
#define PROGRAM_DATE "Sat Feb 15 09:17"
#define PROGRAM_DATE_F "Sat Feb 15 09:17 2025"
#define PROGRAM_YEAR "2025"
#define PROGRAM_TIME "2025/02/13 19:04:00"
#define PROGRAM_TIME "2025/02/15 09:17:57"
#endif

#ifdef UNICODE
#define PROGRAM_VERSION L"4.5.06.002"
#define PROGRAM_INSTALL L"4.5.06002"
#define PROGRAM_VER_NUM 40506002
#define PROGRAM_BUILD L"1112"
#define PROGRAM_VERSION L"4.5.06.005"
#define PROGRAM_INSTALL L"4.5.06005"
#define PROGRAM_VER_NUM 40506005
#define PROGRAM_BUILD L"1115"
#define PROGRAM_TITLE L"TRCheat Win"
#ifdef _WIN64
#define PROGRAM_TITLE_P L"TRCheat Win (x64 Unicode)"
#else
#define PROGRAM_TITLE_P L"TRCheat Win (x86 Unicode)"
#endif
#else
#define PROGRAM_VERSION "4.5.06.002"
#define PROGRAM_INSTALL "4.5.06002"
#define PROGRAM_VER_NUM 40506002
#define PROGRAM_BUILD "1112"
#define PROGRAM_VERSION "4.5.06.005"
#define PROGRAM_INSTALL "4.5.06005"
#define PROGRAM_VER_NUM 40506005
#define PROGRAM_BUILD "1115"
#define PROGRAM_TITLE "TRCheat Win"
#ifdef _WIN64
#define PROGRAM_TITLE_P "TRCheat Win (x64 MBCS)"
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=4.5.6.2
set PRODUCT_VERSION_VERS=4.5.6.5

@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 @@
4.5.6.2
4.5.6.5
TRCheatWin
TRCheatWin (x86) : Thu Feb 13 19:04 4.5.6.2
TRCheatWin (x64) : Thu Feb 13 19:04 4.5.6.2
TRCheatWin (x86) : Sat Feb 15 09:17 4.5.6.5
TRCheatWin (x64) : Sat Feb 15 09:17 4.5.6.5
2 changes: 1 addition & 1 deletion ProductVersionSize.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.5.06.002
4.5.06.005
10 changes: 5 additions & 5 deletions ReadTR2/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"ReadTR2 (x64 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"ReadTR2 - Version 4.5.06.002\r\n(Build 701) - (x64 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"ReadTR2 - Version 4.5.06.005\r\n(Build 704) - (x64 Unicode) (MSVC)\0"
#else
#define ORIGINAL_FILENAME "ReadTR2 (x64 MBCS) (MSVC)\0"
#define PRODUCT_NAME "ReadTR2 - Version 4.5.06.002\r\n(Build 701) - (x64 MBCS) (MSVC)\0"
#define PRODUCT_NAME "ReadTR2 - Version 4.5.06.005\r\n(Build 704) - (x64 MBCS) (MSVC)\0"
#endif
#elif _WIN32
#ifdef UNICODE
#define ORIGINAL_FILENAME L"ReadTR2 (x86 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"ReadTR2 - Version 4.5.06.002\r\n(Build 701) - (x86 Unicode) (MSVC)\0"
#define PRODUCT_NAME L"ReadTR2 - Version 4.5.06.005\r\n(Build 704) - (x86 Unicode) (MSVC)\0"
#else
#define ORIGINAL_FILENAME "ReadTR2 (x86 MBCS) (MSVC)\0"
#define PRODUCT_NAME "ReadTR2 - Version 4.5.06.002\r\n(Build 701) - (x86 MBCS) (MSVC)\0"
#define PRODUCT_NAME "ReadTR2 - Version 4.5.06.005\r\n(Build 704) - (x86 MBCS) (MSVC)\0"
#endif
#else
#define ORIGINAL_FILENAME "ReadTR2 (MSVC)\0"
#define PRODUCT_NAME "ReadTR2 - Version 4.5.06.002\r\n(Build 701) - (MSVC)\0"
#define PRODUCT_NAME "ReadTR2 - Version 4.5.06.005\r\n(Build 704) - (MSVC)\0"
#endif

#endif
30 changes: 15 additions & 15 deletions ReadTR2/AutomaticVersionHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
// (c) 2003 - 2025 Macallan - mailto:ian.macallan@gmail.com
//
// Generated : 13/02/2025 19:04:00
// Generated : 15/02/2025 09:17:57
//
//===========================================================================================
//
Expand Down Expand Up @@ -57,33 +57,33 @@
#endif

#ifdef UNICODE
#define PROGRAM_DATE L"Thu Feb 13 19:04"
#define PROGRAM_DATE_F L"Thu Feb 13 19:04 2025"
#define PROGRAM_DATE L"Sat Feb 15 09:17"
#define PROGRAM_DATE_F L"Sat Feb 15 09:17 2025"
#define PROGRAM_YEAR L"2025"
#define PROGRAM_TIME L"2025/02/13 19:04:00"
#define PROGRAM_TIME L"2025/02/15 09:17:57"
#else
#define PROGRAM_DATE "Thu Feb 13 19:04"
#define PROGRAM_DATE_F "Thu Feb 13 19:04 2025"
#define PROGRAM_DATE "Sat Feb 15 09:17"
#define PROGRAM_DATE_F "Sat Feb 15 09:17 2025"
#define PROGRAM_YEAR "2025"
#define PROGRAM_TIME "2025/02/13 19:04:00"
#define PROGRAM_TIME "2025/02/15 09:17:57"
#endif

#ifdef UNICODE
#define PROGRAM_VERSION L"4.5.06.002"
#define PROGRAM_INSTALL L"4.5.06002"
#define PROGRAM_VER_NUM 40506002
#define PROGRAM_BUILD L"701"
#define PROGRAM_VERSION L"4.5.06.005"
#define PROGRAM_INSTALL L"4.5.06005"
#define PROGRAM_VER_NUM 40506005
#define PROGRAM_BUILD L"704"
#define PROGRAM_TITLE L"Read TR2"
#ifdef _WIN64
#define PROGRAM_TITLE_P L"Read TR2 (x64 Unicode)"
#else
#define PROGRAM_TITLE_P L"Read TR2 (x86 Unicode)"
#endif
#else
#define PROGRAM_VERSION "4.5.06.002"
#define PROGRAM_INSTALL "4.5.06002"
#define PROGRAM_VER_NUM 40506002
#define PROGRAM_BUILD "701"
#define PROGRAM_VERSION "4.5.06.005"
#define PROGRAM_INSTALL "4.5.06005"
#define PROGRAM_VER_NUM 40506005
#define PROGRAM_BUILD "704"
#define PROGRAM_TITLE "Read TR2"
#ifdef _WIN64
#define PROGRAM_TITLE_P "Read TR2 (x64 MBCS)"
Expand Down
42 changes: 42 additions & 0 deletions ReadTR2/ExportDataFiles.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#include "stdafx.h"

#include "ExportDataFiles.h"


//
/////////////////////////////////////////////////////////////////////////////
//
/////////////////////////////////////////////////////////////////////////////
void ExportDataFiles ( FILE *hOutputFile, const char *pDirectory, int game, TR_MODE TRMode,
const char *pFilespec, const char *pPrefix )
{
static char szDirectory [ MAX_PATH ];
strcpy_s ( szDirectory, sizeof(szDirectory), pDirectory );

static char szPathname [ MAX_PATH ];
strcpy_s ( szPathname, sizeof(szPathname), szDirectory );
strcat_s ( szPathname, sizeof(szPathname), "\\" );
strcat_s ( szPathname, sizeof(szPathname), pFilespec );

struct _finddata_t fileinfo;
intptr_t handle = _findfirst ( szPathname, &fileinfo );
if ( handle != -1 )
{
int iRes = 0;
do
{
strcpy_s ( szPathname, sizeof(szPathname), szDirectory );
strcat_s ( szPathname, sizeof(szPathname), "\\" );
strcat_s ( szPathname, sizeof(szPathname), fileinfo.name );
ExtractData ( hOutputFile, game, szPathname, fileinfo.name, TRMode, pPrefix );

//
iRes = _findnext ( handle, &fileinfo );
}
while ( iRes == 0 );

_findclose(handle);
}

}

9 changes: 9 additions & 0 deletions ReadTR2/ExportDataFiles.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once

#include <Windows.h>
#include <io.h>

#include "ReadTRX.h"

extern void ExportDataFiles ( FILE *hOutputFile, const char *pDirectory, int game, TR_MODE TRMode,
const char *pFilespec, const char *pPrefix );
Loading

0 comments on commit 6edb99b

Please sign in to comment.