tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix product version value displayed in file's properties

Browse Source 
Fix #14010, fix #11886, fix #11431, close #14025
This commit is contained in:
Don Ho 2023-08-18 19:46:33 +02:00
parent e39deab778
commit ea40755e14
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/Notepad_plus.rc
View File

@ -44,12 +44,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Don HO don.h@free.fr\0" VALUE "CompanyName", "Don HO don.h@free.fr\0"
VALUE "FileDescription", "Notepad++\0" VALUE "FileDescription", "Notepad++\0"
VALUE "FileVersion", VERSION_VALUE VALUE "FileVersion", VERSION_PRODUCT_VALUE
VALUE "InternalName", "notepad++.exe\0" VALUE "InternalName", "notepad++.exe\0"
VALUE "LegalCopyright", "Copyleft 1998-2022 by Don HO\0" VALUE "LegalCopyright", "Copyleft 1998-2023 by Don HO\0"
VALUE "OriginalFilename", "notepad++.exe\0" VALUE "OriginalFilename", "notepad++.exe\0"
VALUE "ProductName", "Notepad++\0" VALUE "ProductName", "Notepad++\0"
VALUE "ProductVersion", VERSION_VALUE VALUE "ProductVersion", VERSION_PRODUCT_VALUE
END END
END END
END END

2
PowerEditor/src/NppBigSwitch.cpp
View File

@ -1358,7 +1358,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
// 13.6.6.6 | 13 | 666 // 13.6.6.6 | 13 | 666
case NPPM_GETNPPVERSION: case NPPM_GETNPPVERSION:
{ {
const TCHAR* verStr = VERSION_VALUE; const TCHAR* verStr = VERSION_INTERNAL_VALUE;
TCHAR mainVerStr[16]{}; TCHAR mainVerStr[16]{};
TCHAR auxVerStr[16]{}; TCHAR auxVerStr[16]{};
bool isDot = false; bool isDot = false;

2
PowerEditor/src/NppCommands.cpp
View File

@ -3486,7 +3486,7 @@ void Notepad_plus::command(int id)
else else
{ {
param = TEXT("-verbose -v"); param = TEXT("-verbose -v");
param += VERSION_VALUE; param += VERSION_INTERNAL_VALUE;
int archType = NppParameters::getInstance().archType(); int archType = NppParameters::getInstance().archType();
if (archType == IMAGE_FILE_MACHINE_AMD64) if (archType == IMAGE_FILE_MACHINE_AMD64)
{ {

4
PowerEditor/src/resource.h
View File

@ -23,7 +23,9 @@
// should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
// ex : #define VERSION_VALUE TEXT("5.63\0") // ex : #define VERSION_VALUE TEXT("5.63\0")
#define VERSION_VALUE TEXT("8.56\0") #define VERSION_INTERNAL_VALUE TEXT("8.56\0")
#define VERSION_PRODUCT_VALUE TEXT("8.5.6\0")
#define VERSION_DIGITALVALUE 8, 5, 6, 0 #define VERSION_DIGITALVALUE 8, 5, 6, 0
// Notepad++ version: end // Notepad++ version: end

2
PowerEditor/src/winmain.cpp
View File

@ -617,7 +617,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE /*hPrevInstance
std::wstring updaterFullPath = updaterDir + TEXT("gup.exe"); std::wstring updaterFullPath = updaterDir + TEXT("gup.exe");
std::wstring updaterParams = TEXT("-v"); std::wstring updaterParams = TEXT("-v");
updaterParams += VERSION_VALUE; updaterParams += VERSION_INTERNAL_VALUE;
bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE); bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE);