oops... some perversions remained :) fixing

git-svn-id: http://svn.miranda-ng.org/main/trunk@5100 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 39 insertions, 72 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clui.h b/plugins/Clist_modern/src/hdr/modern_clui.h
index 492889fadd..0b978fb7c1 100644
--- a/plugins/Clist_modern/src/hdr/modern_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_clui.h
@@ -70,46 +70,45 @@ public:
 

 		switch ( msg )

 		{

-			HANDLE_MESSAGE( WM_NCCREATE,				OnNcCreate );

-			HANDLE_MESSAGE( WM_CREATE,					OnCreate );

-			HANDLE_MESSAGE( UM_CREATECLC,				OnCreateClc );

-			HANDLE_MESSAGE( UM_SETALLEXTRAICONS,		OnSetAllExtraIcons );

-			HANDLE_MESSAGE( WM_INITMENU,				OnInitMenu );

-			HANDLE_MESSAGE( WM_SIZE,					OnSizingMoving );

-			HANDLE_MESSAGE( WM_SIZING,					OnSizingMoving );

-			HANDLE_MESSAGE( WM_MOVE,					OnSizingMoving );

-			HANDLE_MESSAGE( WM_EXITSIZEMOVE,			OnSizingMoving );

-			HANDLE_MESSAGE( WM_WINDOWPOSCHANGING,		OnSizingMoving );

-			HANDLE_MESSAGE( WM_DISPLAYCHANGE,			OnSizingMoving );

-			HANDLE_MESSAGE( WM_THEMECHANGED,			OnThemeChanged );

-			HANDLE_MESSAGE( WM_DWMCOMPOSITIONCHANGED,	OnDwmCompositionChanged );

-			HANDLE_MESSAGE( UM_SYNCCALL,				OnSyncCall );

-			HANDLE_MESSAGE( UM_UPDATE,					OnUpdate );

-			HANDLE_MESSAGE( WM_NCACTIVATE,				OnNcPaint );

-			HANDLE_MESSAGE( WM_PRINT,					OnNcPaint );

-			HANDLE_MESSAGE( WM_NCPAINT,					OnNcPaint );

-			HANDLE_MESSAGE( WM_ERASEBKGND,				OnEraseBkgnd );

-			HANDLE_MESSAGE( WM_PAINT,					OnPaint );

-			HANDLE_MESSAGE( WM_LBUTTONDOWN,				OnLButtonDown );

-			HANDLE_MESSAGE( WM_PARENTNOTIFY,			OnParentNotify );

-			HANDLE_MESSAGE( WM_SETFOCUS,				OnSetFocus );

-			HANDLE_MESSAGE( WM_TIMER,					OnTimer );

-			HANDLE_MESSAGE( WM_ACTIVATE,				OnActivate );

-			HANDLE_MESSAGE( WM_SETCURSOR,				OnSetCursor );

-			HANDLE_MESSAGE( WM_MOUSEACTIVATE,			OnMouseActivate );

-			HANDLE_MESSAGE( WM_NCLBUTTONDOWN,			OnNcLButtonDown );

-			HANDLE_MESSAGE( WM_NCLBUTTONDBLCLK,			OnNcLButtonDblClk );

-			HANDLE_MESSAGE( WM_NCHITTEST,				OnNcHitTest );

-			HANDLE_MESSAGE( WM_SHOWWINDOW,				OnShowWindow );

-			HANDLE_MESSAGE( WM_SYSCOMMAND,				OnSysCommand );

-			HANDLE_MESSAGE( WM_KEYDOWN,					OnKeyDown );

-			HANDLE_MESSAGE( WM_GETMINMAXINFO,			OnGetMinMaxInfo );

-			HANDLE_MESSAGE( WM_MOVING,					OnMoving );

-			HANDLE_MESSAGE( WM_NOTIFY,					OnNotify );

-			HANDLE_MESSAGE( WM_CONTEXTMENU,				OnContextMenu );

-			HANDLE_MESSAGE( WM_MEASUREITEM,				OnMeasureItem );

-			HANDLE_MESSAGE( WM_DRAWITEM,				OnDrawItem );

-			HANDLE_MESSAGE( WM_DESTROY,					OnDestroy );

+			HANDLE_MESSAGE(WM_NCCREATE,              OnNcCreate);

+			HANDLE_MESSAGE(WM_CREATE,                OnCreate);

+			HANDLE_MESSAGE(UM_CREATECLC,             OnCreateClc);

+			HANDLE_MESSAGE(UM_SETALLEXTRAICONS,      OnSetAllExtraIcons);

+			HANDLE_MESSAGE(WM_INITMENU,              OnInitMenu);

+			HANDLE_MESSAGE(WM_SIZE,                  OnSizingMoving);

+			HANDLE_MESSAGE(WM_SIZING,                OnSizingMoving);

+			HANDLE_MESSAGE(WM_MOVE,                  OnSizingMoving);

+			HANDLE_MESSAGE(WM_EXITSIZEMOVE,          OnSizingMoving);

+			HANDLE_MESSAGE(WM_WINDOWPOSCHANGING,     OnSizingMoving);

+			HANDLE_MESSAGE(WM_DISPLAYCHANGE,         OnSizingMoving);

+			HANDLE_MESSAGE(WM_THEMECHANGED,          OnThemeChanged);

+			HANDLE_MESSAGE(WM_DWMCOMPOSITIONCHANGED, OnDwmCompositionChanged);

+			HANDLE_MESSAGE(UM_UPDATE,                OnUpdate);

+			HANDLE_MESSAGE(WM_NCACTIVATE,            OnNcPaint);

+			HANDLE_MESSAGE(WM_PRINT,                 OnNcPaint);

+			HANDLE_MESSAGE(WM_NCPAINT,               OnNcPaint);

+			HANDLE_MESSAGE(WM_ERASEBKGND,            OnEraseBkgnd);

+			HANDLE_MESSAGE(WM_PAINT,                 OnPaint);

+			HANDLE_MESSAGE(WM_LBUTTONDOWN,           OnLButtonDown);

+			HANDLE_MESSAGE(WM_PARENTNOTIFY,          OnParentNotify);

+			HANDLE_MESSAGE(WM_SETFOCUS,              OnSetFocus);

+			HANDLE_MESSAGE(WM_TIMER,                 OnTimer);

+			HANDLE_MESSAGE(WM_ACTIVATE,              OnActivate);

+			HANDLE_MESSAGE(WM_SETCURSOR,             OnSetCursor);

+			HANDLE_MESSAGE(WM_MOUSEACTIVATE,         OnMouseActivate);

+			HANDLE_MESSAGE(WM_NCLBUTTONDOWN,         OnNcLButtonDown);

+			HANDLE_MESSAGE(WM_NCLBUTTONDBLCLK,       OnNcLButtonDblClk);

+			HANDLE_MESSAGE(WM_NCHITTEST,             OnNcHitTest);

+			HANDLE_MESSAGE(WM_SHOWWINDOW,            OnShowWindow);

+			HANDLE_MESSAGE(WM_SYSCOMMAND,            OnSysCommand);

+			HANDLE_MESSAGE(WM_KEYDOWN,               OnKeyDown);

+			HANDLE_MESSAGE(WM_GETMINMAXINFO,         OnGetMinMaxInfo);

+			HANDLE_MESSAGE(WM_MOVING,                OnMoving);

+			HANDLE_MESSAGE(WM_NOTIFY,                OnNotify);

+			HANDLE_MESSAGE(WM_CONTEXTMENU,           OnContextMenu);

+			HANDLE_MESSAGE(WM_MEASUREITEM,           OnMeasureItem);

+			HANDLE_MESSAGE(WM_DRAWITEM,              OnDrawItem);

+			HANDLE_MESSAGE(WM_DESTROY,               OnDestroy);

 		default:

 			return This->DefCluiWndProc(msg, wParam, lParam);

 		}

@@ -140,7 +139,6 @@ private:
 	LRESULT OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam);

 	LRESULT OnThemeChanged(UINT msg, WPARAM wParam, LPARAM lParam);

 	LRESULT OnDwmCompositionChanged(UINT msg, WPARAM wParam, LPARAM lParam);

-	LRESULT OnSyncCall(UINT msg, WPARAM wParam, LPARAM lParam);

 	LRESULT OnUpdate(UINT msg, WPARAM wParam, LPARAM lParam);

 	LRESULT OnInitMenu(UINT msg, WPARAM wParam, LPARAM lParam);

 	LRESULT OnNcPaint(UINT msg, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 9a57cc9bba..d17d94e3ad 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -134,7 +134,6 @@ extern char *g_szMetaModuleName;
 #define UM_CREATECLC                (WM_USER+1)

 #define UM_SETALLEXTRAICONS         (WM_USER+2)

 #define UM_UPDATE                   (WM_USER+50)

-#define UM_SYNCCALL                 (WM_USER+654)

 

 // Define constants for CLUI_SizingOnBorder SC_SIZE

 

diff --git a/plugins/Clist_modern/src/hdr/modern_sync.h b/plugins/Clist_modern/src/hdr/modern_sync.h
index 4f871b6ed4..1f583f79f2 100644
--- a/plugins/Clist_modern/src/hdr/modern_sync.h
+++ b/plugins/Clist_modern/src/hdr/modern_sync.h
@@ -3,13 +3,10 @@
 

 #include "hdr/modern_commonheaders.h"

 

-

 typedef INT_PTR (*PSYNCCALLBACKPROC)(WPARAM,LPARAM);

 

 int SyncCall(void * vproc, int count, ... );

 

-LRESULT SyncOnWndProcCall(WPARAM wParam );

-

 // Experimental sync caller

 

 int DoCall( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 51574a5b66..32823204d1 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -1959,11 +1959,6 @@ LRESULT CLUI::OnDwmCompositionChanged(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*
 	return FALSE;

 }

 

-LRESULT CLUI::OnSyncCall(UINT /*msg*/, WPARAM wParam, LPARAM /*lParam*/ )

-{

-	return SyncOnWndProcCall( wParam );

-}

-

 LRESULT CLUI::OnUpdate(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

 {

 	if ( g_flag_bPostWasCanceled )

diff --git a/plugins/Clist_modern/src/modern_sync.cpp b/plugins/Clist_modern/src/modern_sync.cpp
index 5f6901fe18..2d17b932b2 100644
--- a/plugins/Clist_modern/src/modern_sync.cpp
+++ b/plugins/Clist_modern/src/modern_sync.cpp
@@ -41,20 +41,6 @@ struct SYNCCALLITEM
 	PSYNCCALLBACKPROC pfnProc;    

 };

 

-static HRESULT SyncCallWinProcProxy( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam, int& nReturn )

-{

-	nReturn = 0;

-	if (pcli->hwndContactList == NULL )

-		return E_FAIL;

-	

-	SYNCCALLITEM item = {0};

-	item.wParam = wParam;

-	item.lParam = lParam;

-	item.pfnProc = pfnProc;

-	nReturn = SendMessage(pcli->hwndContactList, UM_SYNCCALL, (WPARAM)&item,0);

-	return S_OK;

-}

-

 static void CALLBACK _SyncCallerUserAPCProc(void* param)

 {

 	SYNCCALLITEM* item = (SYNCCALLITEM*)param;

@@ -86,14 +72,6 @@ static int SyncCallAPCProxy(PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lPa
 

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

 

-LRESULT SyncOnWndProcCall(WPARAM wParam )

-{

-	SYNCCALLITEM *psci = (SYNCCALLITEM *)wParam;

-	if (psci)

-		return psci->pfnProc( psci->wParam, psci->lParam);

-	return 0;

-}

-

 int DoCall( PSYNCCALLBACKPROC pfnProc, WPARAM wParam, LPARAM lParam)

 {

 	return SyncCallAPCProxy(pfnProc, 0, lParam);