g_hInstance incapulated into PLUGIN<>, no need in the separate variable

4 files changed, 11 insertions, 5 deletions

diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp
index 1dacf3112e..a738bbe09b 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.cpp
+++ b/plugins/CloudFile/src/Services/dropbox_service.cpp
@@ -313,9 +313,9 @@ struct CMPluginDropbox : public PLUGIN<CMPluginDropbox>
 	CMPluginDropbox() :
 		PLUGIN<CMPluginDropbox>(MODULE "/Dropbox")
 	{
+		m_hInst = g_plugin.getInst();
+
 		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)CDropboxService::Init, (pfnUninitProto)CDropboxService::UnInit);
 	}
 }
 	g_pluginDropbox;
-
-extern "C" _pfnCrtInit _pRawDllMain = &CMPluginDropbox::RawDllMain;
diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp
index 665f5bc511..e3a7a95d15 100644
--- a/plugins/CloudFile/src/Services/google_service.cpp
+++ b/plugins/CloudFile/src/Services/google_service.cpp
@@ -295,8 +295,10 @@ UINT CGDriveService::Upload(FileTransferParam *ftp)
 struct CMPluginGoogle : public CMPluginBase
 {
 	CMPluginGoogle() :
-		CMPluginBase(g_hInstance, MODULE "/GDrive")
+		CMPluginBase(MODULE "/GDrive")
 	{
+		m_hInst = g_plugin.getInst();
+
 		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)CGDriveService::Init, (pfnUninitProto)CGDriveService::UnInit);
 	}
 }
diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp
index 656ccbdd4b..c4ec053eaa 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.cpp
+++ b/plugins/CloudFile/src/Services/microsoft_service.cpp
@@ -280,8 +280,10 @@ UINT COneDriveService::Upload(FileTransferParam *ftp)
 struct CMPluginOnedrive : public CMPluginBase
 {
 	CMPluginOnedrive() :
-		CMPluginBase(g_hInstance, MODULE "/OneDrive")
+		CMPluginBase(MODULE "/OneDrive")
 	{
+		m_hInst = g_plugin.getInst();
+
 		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)COneDriveService::Init, (pfnUninitProto)COneDriveService::UnInit);
 	}
 }
diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp
index 3212814db5..e05f216698 100644
--- a/plugins/CloudFile/src/Services/yandex_service.cpp
+++ b/plugins/CloudFile/src/Services/yandex_service.cpp
@@ -290,8 +290,10 @@ UINT CYandexService::Upload(FileTransferParam *ftp)
 struct CMPluginYandex : public CMPluginBase
 {
 	CMPluginYandex() :
-		CMPluginBase(g_hInstance, MODULE "/YandexDisk")
+		CMPluginBase(MODULE "/YandexDisk")
 	{
+		m_hInst = g_plugin.getInst();
+
 		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)CYandexService::Init, (pfnUninitProto)CYandexService::UnInit);
 	}
 }