From ab53b72bf7067feb9dede0fd76b5a3cbc13863b9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 2 Jun 2015 15:55:48 +0000
Subject: - old PNG conversion code (png2dib, dib2png) removed; - m_png.h also
 removed; - all calls of LoadImage replaced with CallService(MS_IMG_LOAD); -
 four invalid CloseHandle() calls removed; - massive code cleaning for Popup,
 HistoryStats & SplashScreen plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@13974 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SplashScreen/src/main.cpp | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'plugins/SplashScreen/src/main.cpp')

diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp
index 6f1dbf8546..e08d070729 100644
--- a/plugins/SplashScreen/src/main.cpp
+++ b/plugins/SplashScreen/src/main.cpp
@@ -25,8 +25,6 @@ int hLangpack;
 
 static HMODULE hAdvaimg = NULL;
 
-pfnConvertPng2dib png2dibConvertor = NULL;
-
 BOOL bstartup = true; // startup?
 BOOL bserviceinvoked = false;
 BOOL bmodulesloaded = false; // modules are loaded
@@ -41,7 +39,6 @@ TCHAR szLogFile[MAX_PATH];
 #endif
 SPLASHOPTS options;
 HWND hwndSplash;
-HANDLE hSplashThread;
 
 PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
@@ -87,32 +84,6 @@ void SplashMain()
 
 	if (bstartup & (options.active == 1))
 	{
-		if (hAdvaimg == NULL)
-		{
-			hAdvaimg = LoadLibrary(szhAdvaimgPath);
-			if (hAdvaimg == NULL)
-			{
-				png2dibavail = false;
-				bstartup = false;
-			}
-			if (hAdvaimg)
-			{
-				png2dibConvertor = (pfnConvertPng2dib)GetProcAddress(hAdvaimg, "mempng2dib");
-				if (png2dibConvertor == NULL)
-				{
-					FreeLibrary(hAdvaimg); hAdvaimg = NULL;
-					MessageBox(NULL,
-						TranslateT("Your advaimg.dll is either obsolete or damaged. Get latest from Miranda alpha builds."),
-						TranslateT("Error"),
-						MB_OK | MB_ICONSTOP);
-				}
-#ifdef _DEBUG
-				if (png2dibConvertor)
-					logMessage(_T("Loading advaimg"), _T("done"));
-#endif
-			}
-		}
-
 		DBVARIANT dbv = { 0 };
 		if (!db_get_ts(NULL, MODNAME, "VersionPrefix", &dbv))
 		{
@@ -315,9 +286,6 @@ extern "C" int __declspec(dllexport) Load(void)
 
 extern "C" int __declspec(dllexport) Unload(void)
 {
-	if (hSplashThread)
-		CloseHandle(hSplashThread);
-
 	UnregisterClass(_T(SPLASH_CLASS), hInst);
 
 	// Freeing loaded libraries
-- 
cgit v1.2.3