unified version resource with explicitly stated language & code page

2 files changed, 29 insertions, 17 deletions

diff --git a/plugins/StatusManager/res/version.rc b/plugins/StatusManager/res/version.rc
index 53ff4f55f7..a6e3417a9e 100644
--- a/plugins/StatusManager/res/version.rc
+++ b/plugins/StatusManager/res/version.rc
@@ -1,43 +1,54 @@
+// Microsoft Visual C++ generated resource script.
+//
 #ifdef APSTUDIO_INVOKED
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
 #include "..\src\version.h"
-#include "winres.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+#include "afxres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 #endif //_WIN32
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION __FILEVERSION_STRING
  PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-//#else
-// FILEFLAGS 0x0L
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
 #endif
-
- FILEOS VOS__WINDOWS32 
- FILETYPE VFT_DLL 
- FILESUBTYPE VFT2_UNKNOWN
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "000004b0" // LOCALE_NEUTRAL<<16 + 1200 (ANSI - Unicode) 
+        BLOCK "000004b0"
         BEGIN
             VALUE "Author", __AUTHOR
-            VALUE "FileDescription", __DESC
+            VALUE "FileVersion", __VERSION_STRING
             VALUE "InternalName", __PLUGIN_NAME
             VALUE "LegalCopyright", __COPYRIGHT
             VALUE "OriginalFilename", __FILENAME
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "ProductName", "Miranda NG"
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", /*LOCALE_NEUTRAL from WinNT.h */ 0x0, 1200
+        VALUE "Translation", 0x0, 1200
     END
 END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/StatusManager/src/StartupStatus/ss_options.cpp b/plugins/StatusManager/src/StartupStatus/ss_options.cpp
index 3d734a7225..a8af185308 100644
--- a/plugins/StatusManager/src/StartupStatus/ss_options.cpp
+++ b/plugins/StatusManager/src/StartupStatus/ss_options.cpp
@@ -562,7 +562,7 @@ INT_PTR CALLBACK addProfileDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 class CSSAdvancedOptDlg : public CDlgBase
 {
-	bool bNeedRebuildMenu = false;
+	bool bNeedRebuildMenu;
 
 	OBJLIST<PROFILEOPTIONS> arProfiles;
 
@@ -673,7 +673,8 @@ public:
 		edtStatusMsg(this, IDC_STATUSMSG),
 		lstStatus(this, IDC_STATUS),
 		lstAccount(this, IDC_PROTOCOL),
-		arProfiles(5)
+		arProfiles(5),
+		bNeedRebuildMenu(false)
 	{
 		btnAdd.OnClick = Callback(this, &CSSAdvancedOptDlg::onClick_Add);
 		btnHelp.OnClick = Callback(this, &CSSAdvancedOptDlg::onClick_Help);