absolutely useless service MS_CLUI_GETCAPS removed as pre-kernel clist atavism

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

10 files changed, 5 insertions, 62 deletions

diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 2e98e50f79..9df4d4216f 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -31,7 +31,6 @@ extern ImageItem *g_glyphItem;
 

 extern int hClcProtoCount;

 

-extern HIMAGELIST hCListImages;

 static BYTE divide3[765] = { 255 };

 extern char *im_clients[];

 extern HICON im_clienthIcons[];

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 39afbc541a..a8b5a7851c 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -41,7 +41,6 @@ struct CListImlIcon
 };

 

 static int iconsOn;

-extern HIMAGELIST hCListImages;

 

 HANDLE hNotifyFrame = (HANDLE)-1;

 

diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp
index ece688f6aa..468dfddb44 100644
--- a/plugins/Clist_nicer/src/clistmod.cpp
+++ b/plugins/Clist_nicer/src/clistmod.cpp
@@ -24,16 +24,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 

-extern int AddEvent(WPARAM wParam, LPARAM lParam);

-extern int RemoveEvent(WPARAM wParam, LPARAM lParam);

-

 int InitCustomMenus(void);

 void UninitCustomMenus(void);

-INT_PTR GetContactStatusMessage(WPARAM wParam, LPARAM lParam);

-int EventsProcessContactDoubleClick(MCONTACT hContact);

-int SetHideOffline(WPARAM wParam, LPARAM lParam);

 

-extern HIMAGELIST hCListImages;

+INT_PTR GetContactStatusMessage(WPARAM wParam, LPARAM lParam);

 

 extern int       g_maxStatus;

 extern HANDLE    hSvc_GetContactStatusMsg;

@@ -92,23 +86,6 @@ int LoadContactListModule(void)
 

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

 

-static INT_PTR GetCaps(WPARAM wParam, LPARAM)

-{

-	switch (wParam) {

-	case CLUICAPS_FLAGS1:

-		return CLUIF_HIDEEMPTYGROUPS | CLUIF_DISABLEGROUPS | CLUIF_HASONTOPOPTION | CLUIF_HASAUTOHIDEOPTION;

-	case CLUICAPS_FLAGS2:

-		return MAKELONG(EXTRA_ICON_COUNT, 1);

-	}

-	return 0;

-}

-

-int PreloadContactListModule(void)

-{

-	CreateServiceFunction(MS_CLUI_GETCAPS, GetCaps);

-	return 0;

-}

-

 /*

 Begin of Hrk's code for bug

 */

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index ba7c67b453..0e41b66e01 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -54,28 +54,14 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		opt_gen_opts_changed = 0;

 		TranslateDialogDefault(hwndDlg);

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

-		CheckDlgButton(hwndDlg, IDC_ONTOP, cfg::getByte("CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, cfg::getByte(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, cfg::getByte("CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, cfg::getByte("CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED);

 		CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, cfg::getByte("CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		{

-			DWORD caps = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS1, 0);

-			if (!(caps & CLUIF_HIDEEMPTYGROUPS))

-				ShowWindow(GetDlgItem(hwndDlg, IDC_HIDEEMPTYGROUPS), SW_HIDE);

-			if (!(caps & CLUIF_DISABLEGROUPS))

-				ShowWindow(GetDlgItem(hwndDlg, IDC_DISABLEGROUPS), SW_HIDE);

-			if (caps & CLUIF_HASONTOPOPTION)

-				ShowWindow(GetDlgItem(hwndDlg, IDC_ONTOP), SW_HIDE);

-			if (caps & CLUIF_HASAUTOHIDEOPTION) {

-			}

-		}

-

 		CheckDlgButton(hwndDlg, IDC_SHOWBOTTOMBUTTONS, cfg::dat.dwFlags & CLUI_FRAME_SHOWBOTTOMBUTTONS ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CLISTSUNKEN, cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_EVENTAREAAUTOHIDE, cfg::dat.dwFlags & CLUI_FRAME_AUTOHIDENOTIFY ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_EVENTAREASUNKEN, (cfg::dat.dwFlags & CLUI_FRAME_EVENTAREASUNKEN) ? BST_CHECKED : BST_UNCHECKED);

-

 		CheckDlgButton(hwndDlg, IDC_ONECLK, cfg::getByte("CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_ALWAYSSTATUS, cfg::getByte("CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_ALWAYSMULTI, !cfg::getByte("CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

@@ -156,17 +142,8 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					return TRUE;

 

 				cfg::writeByte("CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

-				{

-					DWORD caps = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS1, 0);

-					if (caps & CLUIF_HIDEEMPTYGROUPS)

-						cfg::writeByte("CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

-					if (caps & CLUIF_DISABLEGROUPS)

-						cfg::writeByte("CList", "UseGroups", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

-					if (!(caps & CLUIF_HASONTOPOPTION)) {

-						cfg::writeByte("CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP));

-						SetWindowPos(pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

-					}

-				}

+				cfg::writeByte("CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

+				cfg::writeByte("CList", "UseGroups", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

 				cfg::writeByte("CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

 				cfg::writeByte("CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK));

 				cfg::writeByte("CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS));

diff --git a/plugins/Clist_nicer/src/clisttray.cpp b/plugins/Clist_nicer/src/clisttray.cpp
index b6524f9729..9dc29ab078 100644
--- a/plugins/Clist_nicer/src/clisttray.cpp
+++ b/plugins/Clist_nicer/src/clisttray.cpp
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define TRAYICON_ID_BASE 100

 

-extern HIMAGELIST hCListImages;

-

 // don't move to win2k.h, need new and old versions to work on 9x/2000/XP

 #define NIF_STATE		0x00000008

 #define NIF_INFO		0x00000010

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 6fcc9a0b85..0aff338a8a 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -42,8 +42,6 @@ static int transparentFocus = 1;
 static byte oldhideoffline;
 static int disableautoupd = 1;
 HANDLE hFrameContactTree;
-extern HIMAGELIST hCListImages;
-extern PLUGININFOEX pluginInfo;
 extern RECT old_window_rect, new_window_rect;
 
 extern BOOL g_trayTooltipActive;
@@ -67,7 +65,6 @@ TCHAR *statusNames[12];
 extern LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 extern HANDLE hNotifyFrame;
 
-int SortList(WPARAM wParam, LPARAM lParam);
 int LoadCluiServices(void);
 void InitGroupMenus();
 void FS_RegisterFonts();
diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index 1c47a705b3..1de847da64 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -25,9 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "cluiframes.h"

 

-extern HIMAGELIST hCListImages;

 extern ButtonItem *g_ButtonItems;

-extern PLUGININFOEX pluginInfo;

 

 static INT_PTR GetClistVersion(WPARAM, LPARAM lParam)

 {

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index f51fe04ad3..ece4a96e3f 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -91,7 +91,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)
 

 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_CLIST, MIID_LAST };

 

-int PreloadContactListModule(void);

 int LoadContactListModule(void);

 int LoadCLCModule(void);

 void LoadCLUIModule(void);

@@ -186,8 +185,6 @@ extern "C" int __declspec(dllexport) CListInitialise()
 	CallService(MS_DB_GETPROFILEPATHT, MAX_PATH, (LPARAM)cfg::dat.tszProfilePath);

 	_tcslwr(cfg::dat.tszProfilePath);

 

-	PreloadContactListModule();

-

 	// get the clist interface

 	pcli->hInst = g_hInst;

 	pcli->pfnCluiProtocolStatusChanged = CluiProtocolStatusChanged;

diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 58785fe0f2..6f792be800 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -73,8 +73,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // shared vars

 extern HINSTANCE g_hInst;

 extern LONG g_cxsmIcon, g_cysmIcon;

+extern PLUGININFOEX pluginInfo;

 extern LIST<StatusItems_t> arStatusItems;

 extern ImageItem *g_glyphItem;

+extern HIMAGELIST hCListImages;

 

 extern CLIST_INTERFACE coreCli;

 

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index c68cc5b022..8b679f4288 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define TIMERID_VIEWMODEEXPIRE 100

 

-extern HIMAGELIST hCListImages;

 extern HPEN g_hPenCLUIFrames;

 extern FRAMEWND *wndFrameViewMode;