unused Miranda_SetIdleCallback() call removed

5 files changed, 37 insertions, 54 deletions

diff --git a/include/m_system.h b/include/m_system.h
index a9eacd27b3..1f7f134d65 100644
--- a/include/m_system.h
+++ b/include/m_system.h
@@ -120,9 +120,6 @@ EXTERN_C MIR_APP_DLL(bool) Miranda_OkToExit(void);
 // Waits for a permission to exit and destroys contact list
 EXTERN_C MIR_APP_DLL(void) Miranda_Close(void);
 
-// Sets up a function pointer to be called after main loop iterations, suitable for idle processing
-EXTERN_C MIR_APP_DLL(void) Miranda_SetIdleCallback(void(MIR_CDECL *pfnCallback)(void));
-
 // returns the last window tick where a monitored event was seen, currently WM_CHAR/WM_MOUSEMOVE
 EXTERN_C MIR_APP_DLL(uint32_t) Miranda_GetIdle(void);
 
diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp
index 759c7535f7..395a19fe71 100644
--- a/src/mir_app/src/menu_utils.cpp
+++ b/src/mir_app/src/menu_utils.cpp
@@ -83,6 +83,42 @@ LPTSTR GetMenuItemText(TMO_IntMenuItem *pimi)
 

 ///////////////////////////////////////////////////////////////////////////////

 

+HBITMAP ConvertIconToBitmap(HIMAGELIST hIml, int iconId)

+{

+	BITMAPINFO bmi = { 0 };

+	bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

+	bmi.bmiHeader.biPlanes = 1;

+	bmi.bmiHeader.biCompression = BI_RGB;

+	bmi.bmiHeader.biBitCount = 32;

+	bmi.bmiHeader.biWidth = g_iIconSX;

+	bmi.bmiHeader.biHeight = g_iIconSY;

+

+	HDC hdc = CreateCompatibleDC(nullptr);

+	HBITMAP hbmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, nullptr, nullptr, 0);

+	HBITMAP hbmpOld = (HBITMAP)SelectObject(hdc, hbmp);

+

+	BLENDFUNCTION bfAlpha = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };

+	BP_PAINTPARAMS paintParams = { 0 };

+	paintParams.cbSize = sizeof(paintParams);

+	paintParams.dwFlags = BPPF_ERASE;

+	paintParams.pBlendFunction = &bfAlpha;

+

+	HDC hdcBuffer;

+	RECT rcIcon = { 0, 0, g_iIconSX, g_iIconSY };

+	HANDLE hPaintBuffer = beginBufferedPaint(hdc, &rcIcon, BPBF_DIB, &paintParams, &hdcBuffer);

+	if (hPaintBuffer) {

+		ImageList_Draw(hIml, iconId, hdc, 0, 0, ILD_TRANSPARENT);

+		endBufferedPaint(hPaintBuffer, TRUE);

+	}

+

+	SelectObject(hdc, hbmpOld);

+	DeleteDC(hdc);

+

+	return hbmp;

+}

+

+///////////////////////////////////////////////////////////////////////////////

+

 TMO_IntMenuItem* MO_RecursiveWalkMenu(TMO_IntMenuItem *parent, pfnWalkFunc func, void* param)

 {

 	if (parent == nullptr)

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index bd1cb17638..a647bd99eb 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -3,7 +3,6 @@ LIBRARY mir_app.mir
 EXPORTS

 Miranda_Close               @1 NONAME

 CallProtoService            @2

-Miranda_SetIdleCallback     @3 NONAME

 Skin_LoadProtoIcon          @4

 Skin_LoadIcon               @5

 Button_FreeIcon_IcoLib      @6

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 542d588276..d9a6785125 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -3,7 +3,6 @@ LIBRARY mir_app.mir
 EXPORTS

 Miranda_Close               @1 NONAME

 CallProtoService            @2

-Miranda_SetIdleCallback     @3 NONAME

 Skin_LoadProtoIcon          @4

 Skin_LoadIcon               @5

 Button_FreeIcon_IcoLib      @6

diff --git a/src/mir_app/src/miranda.cpp b/src/mir_app/src/miranda.cpp
index 29c2ee6f6e..7c6219aa17 100644
--- a/src/mir_app/src/miranda.cpp
+++ b/src/mir_app/src/miranda.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "clc.h"

 

 #if defined(VLD_ENABLED)

-#include "msapi\vld.h"

+#include "msapi/vld.h"

 #endif

 

 #pragma comment(lib, "version.lib")

@@ -58,42 +58,6 @@ CMPlugin g_plugin;
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-HBITMAP ConvertIconToBitmap(HIMAGELIST hIml, int iconId)

-{

-	BITMAPINFO bmi = { 0 };

-	bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

-	bmi.bmiHeader.biPlanes = 1;

-	bmi.bmiHeader.biCompression = BI_RGB;

-	bmi.bmiHeader.biBitCount = 32;

-	bmi.bmiHeader.biWidth = g_iIconSX;

-	bmi.bmiHeader.biHeight = g_iIconSY;

-

-	HDC hdc = CreateCompatibleDC(nullptr);

-	HBITMAP hbmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, nullptr, nullptr, 0);

-	HBITMAP hbmpOld = (HBITMAP)SelectObject(hdc, hbmp);

-

-	BLENDFUNCTION bfAlpha = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };

-	BP_PAINTPARAMS paintParams = { 0 };

-	paintParams.cbSize = sizeof(paintParams);

-	paintParams.dwFlags = BPPF_ERASE;

-	paintParams.pBlendFunction = &bfAlpha;

-

-	HDC hdcBuffer;

-	RECT rcIcon = { 0, 0, g_iIconSX, g_iIconSY };

-	HANDLE hPaintBuffer = beginBufferedPaint(hdc, &rcIcon, BPBF_DIB, &paintParams, &hdcBuffer);

-	if (hPaintBuffer) {

-		ImageList_Draw(hIml, iconId, hdc, 0, 0, ILD_TRANSPARENT);

-		endBufferedPaint(hPaintBuffer, TRUE);

-	}

-

-	SelectObject(hdc, hbmpOld);

-	DeleteDC(hdc);

-

-	return hbmp;

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

 static PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

 	"Miranda NG",

@@ -185,9 +149,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, uint32_t dwReason, LPVOID)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-typedef LONG(WINAPI *pNtQIT)(HANDLE, LONG, PVOID, ULONG, PULONG);

-#define ThreadQuerySetWin32StartAddress 9

-

 static void __cdecl compactHeapsThread(void*)

 {

 	Thread_SetName("compactHeapsThread");

@@ -208,13 +169,6 @@ static void __cdecl compactHeapsThread(void*)
 	}

 }

 

-void (*SetIdleCallback)(void) = nullptr;

-

-MIR_APP_DLL(void) Miranda_SetIdleCallback(void(__cdecl *pfnCallback)(void))

-{

-	SetIdleCallback = pfnCallback;

-}

-

 static uint32_t dwEventTime = 0;

 void checkIdle(MSG * msg)

 {

@@ -418,8 +372,6 @@ int WINAPI mir_main(LPTSTR cmdLine)
 

 					TranslateMessage(&msg);

 					DispatchMessage(&msg);

-					if (SetIdleCallback != nullptr)

-						SetIdleCallback();

 				}

 				else if (!dying) {

 					dying++;