summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/BossKeyPlus/BossKey_10.vcxproj.filters2
-rw-r--r--plugins/BossKeyPlus/res/version.rc36
-rw-r--r--plugins/BossKeyPlus/src/BossKey.cpp22
-rw-r--r--plugins/BossKeyPlus/src/BossKey.h3
-rw-r--r--plugins/BossKeyPlus/src/Options.cpp4
-rw-r--r--plugins/BossKeyPlus/src/version.h30
6 files changed, 47 insertions, 50 deletions
diff --git a/plugins/BossKeyPlus/BossKey_10.vcxproj.filters b/plugins/BossKeyPlus/BossKey_10.vcxproj.filters
index f1e5317181..83784f9bbf 100644
--- a/plugins/BossKeyPlus/BossKey_10.vcxproj.filters
+++ b/plugins/BossKeyPlus/BossKey_10.vcxproj.filters
@@ -44,7 +44,7 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="res\version.rc">
- <Filter>Source Files</Filter>
+ <Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/BossKeyPlus/res/version.rc b/plugins/BossKeyPlus/res/version.rc
index a637a7b7e4..5bfbab4754 100644
--- a/plugins/BossKeyPlus/res/version.rc
+++ b/plugins/BossKeyPlus/res/version.rc
@@ -1,44 +1,38 @@
+// Microsoft Visual C++ generated resource script.
+//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include <windows.h>
+#include "afxres.h"
#include "..\src\version.h"
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILE_VERSION
- PRODUCTVERSION __FILE_VERSION
- FILEFLAGSMASK 0x3fL
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
+ FILEOS 0x4L
+ FILETYPE 0x0L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
- BLOCK "040904b0"
+ BLOCK "000004b0"
BEGIN
- VALUE "CompanyName", __AUTHORS
- VALUE "FileDescription", __DESC
- VALUE "FileVersion", __FILE_VERSION_STR
- VALUE "InternalName", __MODULE_NAME
- VALUE "LegalCopyright", __COPYRIGHTS
- VALUE "OriginalFilename", "BossKey.dll"
- VALUE "ProductName", __MODULE_NAME
- VALUE "ProductVersion", __FILE_VERSION_STR
+ VALUE "FileDescription", __DESCRIPTION
+ VALUE "InternalName", __PLUGIN_NAME
+ VALUE "LegalCopyright", __COPYRIGHT
+ VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
END
END
BLOCK "VarFileInfo"
BEGIN
- VALUE "Translation", 0x409, 1200
+ VALUE "Translation", 0x0, 1200
END
END
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index 042b357a9d..f40ba58fe5 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -58,21 +58,21 @@ void LanguageChanged(HWND hDlg);
static PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
- __VERSION_DWORD,
- __DESC,
- __AUTHORS,
- __EMAIL,
- __COPYRIGHTS,
- __FL,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
//4fac353d-0a36-44a4-9064-6759c53ae782
- {0x4fac353d, 0x0a36, 0x44a4, { 0x90, 0x64, 0x67, 0x59, 0xc5, 0x3a, 0xe7, 0x82 }}
+ {0x4fac353d, 0x0a36, 0x44a4, {0x90, 0x64, 0x67, 0x59, 0xc5, 0x3a, 0xe7, 0x82}}
};
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
g_hInstance = hinstDLL;
- return(true);
+ return TRUE;
}
extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
@@ -80,8 +80,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
return &pluginInfo;
}
-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_BOSSKEY, MIID_LAST };
-
static BOOL IsAeroMode()
{
BOOL result;
@@ -384,7 +382,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
if (g_wMask & OPT_CHANGESTATUS) // is this even needed?
{
- BYTE bReqMode = DBGetContactSettingByte(NULL,MOD_NAME,"stattype",2);
+ BYTE bReqMode = DBGetContactSettingByte(NULL, MOD_NAME, "stattype", 2);
unsigned uMode = (STATUS_ARR_TO_ID[bReqMode]);
DBVARIANT dbVar;
if (g_wMask & OPT_USEDEFMSG || DBGetContactSettingTString(NULL,MOD_NAME,"statmsg",&dbVar))
diff --git a/plugins/BossKeyPlus/src/BossKey.h b/plugins/BossKeyPlus/src/BossKey.h
index ac5cb38dad..b423537eaa 100644
--- a/plugins/BossKeyPlus/src/BossKey.h
+++ b/plugins/BossKeyPlus/src/BossKey.h
@@ -57,9 +57,8 @@
#define MOD_NAME "BossKey"
#define KEY_DOWN(key) ((GetAsyncKeyState(key) & 0x8000) ? (true) : (false))
-#define MIID_BOSSKEY { 0xb0f05b6a, 0x8167, 0x4dc3, { 0xa1, 0x8a, 0xaf, 0xba, 0x4c, 0x77, 0xc4, 0x1d } }
#define MAXPASSLEN 16
-#define DEFAULTSETTING ( OPT_SETONLINEBACK | OPT_DISABLESNDS | OPT_ONLINEONLY | OPT_USEDEFMSG )
+#define DEFAULTSETTING (OPT_SETONLINEBACK | OPT_DISABLESNDS | OPT_ONLINEONLY | OPT_USEDEFMSG)
#define OLD_SOUND 1
#define OLD_POPUP 2
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp
index 838f329673..bc5765d6d5 100644
--- a/plugins/BossKeyPlus/src/Options.cpp
+++ b/plugins/BossKeyPlus/src/Options.cpp
@@ -76,7 +76,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
SetDlgItemTextA(hwndDlg,IDC_MAINOPT_PASS,dbVar.pszVal);
DBFreeVariant(&dbVar);
}
-
+
CheckDlgButton(hwndDlg,IDC_MAINOPT_SETONLINEBACK,(g_wMask & OPT_SETONLINEBACK) ? (BST_CHECKED) : (BST_UNCHECKED));
CheckDlgButton(hwndDlg,IDC_MAINOPT_CHANGESTATUSBOX,(g_wMask & OPT_CHANGESTATUS) ? (BST_CHECKED) : (BST_UNCHECKED));
CheckDlgButton(hwndDlg,IDC_MAINOPT_DISABLESNDS,(g_wMask & OPT_DISABLESNDS) ? (BST_CHECKED) : (BST_UNCHECKED));
@@ -90,7 +90,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
for (BYTE i = 0;i < 8; i++)
SendDlgItemMessage(hwndDlg,IDC_MAINOPT_CHGSTS,CB_INSERTSTRING,-1,(LPARAM)TranslateTS(STATUS_ARR_TO_NAME[i]));
- SendDlgItemMessage(hwndDlg,IDC_MAINOPT_CHGSTS,CB_SETCURSEL,DBGetContactSettingByte(NULL,MOD_NAME,"stattype",2),0);
+ SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, DBGetContactSettingByte(NULL, MOD_NAME, "stattype", 2), 0);
SendMessage(hwndDlg,WM_USER + 60,0,0);
SendMessage(hwndDlg,WM_USER + 50,0,0);
diff --git a/plugins/BossKeyPlus/src/version.h b/plugins/BossKeyPlus/src/version.h
index cf95da2703..efd83ca31a 100644
--- a/plugins/BossKeyPlus/src/version.h
+++ b/plugins/BossKeyPlus/src/version.h
@@ -1,14 +1,20 @@
-#define __FILE_VERSION 0,5,0,3
-#define __FILE_VERSION_STR "0, 5, 0, 3"
-#define __VERSION_DWORD 0x00050003
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 5
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 3
-#define __MODULE_NAME "BossKey+"
-#define __PLUGIN_ID 4305
-#define __PLUGIN_ID_STR "4305"
-#define __PLUGIN_NAME "BossKey+"
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-#define __FL "http://miranda-ng.org/"
-#define __DESC "Anti-Boss plugin."
-#define __AUTHORS "Goblineye Entertainment, Billy_Bons"
-#define __EMAIL "tatarinov.sergey@gmail.com"
-#define __COPYRIGHTS "© 2002-2003 Goblineye Entertainment, © 2007-2010 Billy_Bons"
+#define __STRINGIFY_IMPL(x) #x
+#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
+#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
+
+#define __PLUGIN_NAME "BossKey+"
+#define __INTERNAL_NAME "BossKey+"
+#define __FILENAME "BossKey.dll"
+#define __DESCRIPTION "Anti-Boss plugin."
+#define __AUTHOR "Goblineye Entertainment, Billy_Bons"
+#define __AUTHOREMAIL "tatarinov.sergey@gmail.com"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2002-2003 Goblineye Entertainment, 2007-2010 Billy_Bons"