From 077510f386ab4a327e3358c8a5de2fa91b99d9e1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 13 Nov 2018 21:07:40 +0300 Subject: getByte/getWord/getDword: correct default values restored --- include/newpluginapi.h | 12 ++++++------ libs/win32/mir_app.lib | Bin 186012 -> 186012 bytes libs/win64/mir_app.lib | Bin 181270 -> 181270 bytes src/mir_app/src/mir_app.def | 12 ++++++------ src/mir_app/src/mir_app64.def | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/newpluginapi.h b/include/newpluginapi.h index ca4b95487b..2be52e3d47 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -238,29 +238,29 @@ public: return db_get_b(hContact, m_szModuleName, name, defaultValue) != 0; } - __forceinline int getByte(const char *name, BYTE defaultValue = 0) + __forceinline int getByte(const char *name, int defaultValue = 0) { return db_get_b(0, m_szModuleName, name, defaultValue); } - __forceinline int getByte(MCONTACT hContact, const char *name, BYTE defaultValue = 0) + __forceinline int getByte(MCONTACT hContact, const char *name, int defaultValue = 0) { return db_get_b(hContact, m_szModuleName, name, defaultValue); } - __forceinline int getWord(const char *name, WORD defaultValue = 0) + __forceinline int getWord(const char *name, int defaultValue = 0) { return db_get_w(0, m_szModuleName, name, defaultValue); } - __forceinline int getWord(MCONTACT hContact, const char *name, WORD defaultValue = 0) + __forceinline int getWord(MCONTACT hContact, const char *name, int defaultValue = 0) { return db_get_w(hContact, m_szModuleName, name, defaultValue); } - __forceinline DWORD getDword(const char *name, DWORD defaultValue = 0) + __forceinline DWORD getDword(const char *name, int defaultValue = 0) { return db_get_dw(0, m_szModuleName, name, defaultValue); } - __forceinline DWORD getDword(MCONTACT hContact, const char *name, DWORD defaultValue = 0) + __forceinline DWORD getDword(MCONTACT hContact, const char *name, int defaultValue = 0) { return db_get_dw(hContact, m_szModuleName, name, defaultValue); } diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 5e12104d7c..d2b975207e 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 0488a494e4..0b9f77aa92 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index cef5d03f20..f758a80cce 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -488,10 +488,10 @@ Proto_GetAverageStatus @512 ?delSetting@CMPluginBase@@QAEHPBD@Z @519 NONAME ?getBool@CMPluginBase@@QAE_NIPBD_N@Z @520 NONAME ?getBool@CMPluginBase@@QAE_NPBD_N@Z @521 NONAME -?getByte@CMPluginBase@@QAEHIPBDE@Z @522 NONAME -?getByte@CMPluginBase@@QAEHPBDE@Z @523 NONAME -?getDword@CMPluginBase@@QAEKIPBDK@Z @524 NONAME -?getDword@CMPluginBase@@QAEKPBDK@Z @525 NONAME +?getByte@CMPluginBase@@QAEHIPBDH@Z @522 NONAME +?getByte@CMPluginBase@@QAEHPBDH@Z @523 NONAME +?getDword@CMPluginBase@@QAEKIPBDH@Z @524 NONAME +?getDword@CMPluginBase@@QAEKPBDH@Z @525 NONAME ?getString@CMPluginBase@@QAEHIPBDPAUDBVARIANT@@@Z @526 NONAME ?getString@CMPluginBase@@QAEHPBDPAUDBVARIANT@@@Z @527 NONAME ?getStringA@CMPluginBase@@QAEPADIPBD@Z @528 NONAME @@ -500,8 +500,8 @@ Proto_GetAverageStatus @512 ?getWString@CMPluginBase@@QAEHPBDPAUDBVARIANT@@@Z @531 NONAME ?getWStringA@CMPluginBase@@QAEPA_WIPBD@Z @532 NONAME ?getWStringA@CMPluginBase@@QAEPA_WPBD@Z @533 NONAME -?getWord@CMPluginBase@@QAEHIPBDG@Z @534 NONAME -?getWord@CMPluginBase@@QAEHPBDG@Z @535 NONAME +?getWord@CMPluginBase@@QAEHIPBDH@Z @534 NONAME +?getWord@CMPluginBase@@QAEHPBDH@Z @535 NONAME ?setByte@CMPluginBase@@QAEXIPBDE@Z @536 NONAME ?setByte@CMPluginBase@@QAEXPBDE@Z @537 NONAME ?setDword@CMPluginBase@@QAEXIPBDK@Z @538 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index b91d38854b..55a947a380 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -488,10 +488,10 @@ Proto_GetAverageStatus @512 ?delSetting@CMPluginBase@@QEAA_JPEBD@Z @519 NONAME ?getBool@CMPluginBase@@QEAA_NIPEBD_N@Z @520 NONAME ?getBool@CMPluginBase@@QEAA_NPEBD_N@Z @521 NONAME -?getByte@CMPluginBase@@QEAAHIPEBDE@Z @522 NONAME -?getByte@CMPluginBase@@QEAAHPEBDE@Z @523 NONAME -?getDword@CMPluginBase@@QEAAKIPEBDK@Z @524 NONAME -?getDword@CMPluginBase@@QEAAKPEBDK@Z @525 NONAME +?getByte@CMPluginBase@@QEAAHIPEBDH@Z @522 NONAME +?getByte@CMPluginBase@@QEAAHPEBDH@Z @523 NONAME +?getDword@CMPluginBase@@QEAAKIPEBDH@Z @524 NONAME +?getDword@CMPluginBase@@QEAAKPEBDH@Z @525 NONAME ?getString@CMPluginBase@@QEAA_JIPEBDPEAUDBVARIANT@@@Z @526 NONAME ?getString@CMPluginBase@@QEAA_JPEBDPEAUDBVARIANT@@@Z @527 NONAME ?getStringA@CMPluginBase@@QEAAPEADIPEBD@Z @528 NONAME @@ -500,8 +500,8 @@ Proto_GetAverageStatus @512 ?getWString@CMPluginBase@@QEAA_JPEBDPEAUDBVARIANT@@@Z @531 NONAME ?getWStringA@CMPluginBase@@QEAAPEA_WIPEBD@Z @532 NONAME ?getWStringA@CMPluginBase@@QEAAPEA_WPEBD@Z @533 NONAME -?getWord@CMPluginBase@@QEAAHIPEBDG@Z @534 NONAME -?getWord@CMPluginBase@@QEAAHPEBDG@Z @535 NONAME +?getWord@CMPluginBase@@QEAAHIPEBDH@Z @534 NONAME +?getWord@CMPluginBase@@QEAAHPEBDH@Z @535 NONAME ?setByte@CMPluginBase@@QEAAXIPEBDE@Z @536 NONAME ?setByte@CMPluginBase@@QEAAXPEBDE@Z @537 NONAME ?setDword@CMPluginBase@@QEAAXIPEBDK@Z @538 NONAME -- cgit v1.2.3