diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 73079b9fb..074eebad6 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -44,12 +44,12 @@ BEGIN BEGIN VALUE "CompanyName", "Don HO don.h@free.fr\0" VALUE "FileDescription", "Notepad++\0" - VALUE "FileVersion", VERSION_VALUE + VALUE "FileVersion", VERSION_PRODUCT_VALUE 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 "ProductName", "Notepad++\0" - VALUE "ProductVersion", VERSION_VALUE + VALUE "ProductVersion", VERSION_PRODUCT_VALUE END END END diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 7a62150e2..e7cb8f24e 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -1358,7 +1358,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa // 13.6.6.6 | 13 | 666 case NPPM_GETNPPVERSION: { - const TCHAR* verStr = VERSION_VALUE; + const TCHAR* verStr = VERSION_INTERNAL_VALUE; TCHAR mainVerStr[16]{}; TCHAR auxVerStr[16]{}; bool isDot = false; diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 3ed211076..d9d70115f 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -3486,7 +3486,7 @@ void Notepad_plus::command(int id) else { param = TEXT("-verbose -v"); - param += VERSION_VALUE; + param += VERSION_INTERNAL_VALUE; int archType = NppParameters::getInstance().archType(); if (archType == IMAGE_FILE_MACHINE_AMD64) { diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index d74e9f829..473c22798 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -23,7 +23,9 @@ // 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") -#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 // Notepad++ version: end diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index 302b5e586..320c9a443 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -617,7 +617,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE /*hPrevInstance std::wstring updaterFullPath = updaterDir + TEXT("gup.exe"); std::wstring updaterParams = TEXT("-v"); - updaterParams += VERSION_VALUE; + updaterParams += VERSION_INTERNAL_VALUE; bool isUpExist = nppGui._doesExistUpdater = (::PathFileExists(updaterFullPath.c_str()) == TRUE);