From 9cf1444eb7888f2d942d220f938aa893396a8a1b Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 18 Apr 2018 20:51:18 +0300
Subject: g_hInstance incapulated into PLUGIN<>, no need in the separate
 variable

---
 src/mir_app/src/CMPluginBase.cpp | 5 ++---
 src/mir_app/src/mir_app.def      | 3 ++-
 src/mir_app/src/mir_app64.def    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/CMPluginBase.cpp b/src/mir_app/src/CMPluginBase.cpp
index b2fd90b048..55b557c0cc 100644
--- a/src/mir_app/src/CMPluginBase.cpp
+++ b/src/mir_app/src/CMPluginBase.cpp
@@ -24,9 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-CMPluginBase::CMPluginBase(HINSTANCE hInst, const char *moduleName) :
-	m_szModuleName(moduleName),
-	m_hInst(hInst)
+CMPluginBase::CMPluginBase(const char *moduleName) :
+	m_szModuleName(moduleName)
 {
 }
 
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 74e2bb6bbb..8038d95dc8 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -487,7 +487,7 @@ GetDatabasePlugin @508
 SetServiceModePlugin @510
 Proto_CreateAccount @511
 Proto_GetAverageStatus @512
-??0CMPluginBase@@IAE@PAUHINSTANCE__@@PBD@Z @513 NONAME
+??0CMPluginBase@@IAE@PBD@Z @513 NONAME
 ??1CMPluginBase@@IAE@XZ @514 NONAME
 ??4CMPluginBase@@QAEAAV0@ABV0@@Z @515 NONAME
 ?debugLogA@CMPluginBase@@QAAXPBDZZ @516 NONAME
@@ -579,3 +579,4 @@ Proto_GetStatus @601
 ?getCache@MDatabaseCommon@@QBEPAUMIDatabaseCache@@XZ @602 NONAME
 ?Compact@MDatabaseCommon@@UAGHXZ @603 NONAME
 ?getInst@CMPluginBase@@QBEPAUHINSTANCE__@@XZ @604 NONAME
+?setInst@CMPluginBase@@QAEXPAUHINSTANCE__@@@Z @605 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index d0e558a650..0a954143b1 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -487,7 +487,7 @@ GetDatabasePlugin @508
 SetServiceModePlugin @510
 Proto_CreateAccount @511
 Proto_GetAverageStatus @512
-??0CMPluginBase@@IEAA@PEAUHINSTANCE__@@PEBD@Z @513 NONAME
+??0CMPluginBase@@IEAA@PEBD@Z @513 NONAME
 ??1CMPluginBase@@IEAA@XZ @514 NONAME
 ??4CMPluginBase@@QEAAAEAV0@AEBV0@@Z @515 NONAME
 ?debugLogA@CMPluginBase@@QEAAXPEBDZZ @516 NONAME
@@ -579,3 +579,4 @@ Proto_GetStatus @601
 ?getCache@MDatabaseCommon@@QEBAPEAUMIDatabaseCache@@XZ @602 NONAME
 ?Compact@MDatabaseCommon@@UEAAHXZ @603 NONAME
 ?getInst@CMPluginBase@@QEBAPEAUHINSTANCE__@@XZ @604 NONAME
+?setInst@CMPluginBase@@QEAAXPEAUHINSTANCE__@@@Z @605 NONAME
-- 
cgit v1.2.3