- miranda32.exe now does nothing bug extends PATH to %miranda_root%\libs and loads mir_app.dll;

- everything that was in miranda32.exe (including resources) moved to mir_app.dll;
- exports from mir_app.dll now available for using directly, without perversions;
- src/stdplug.h deleted;

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

1 files changed, 0 insertions, 705 deletions

diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
deleted file mode 100644
index c298d6b3d8..0000000000
--- a/src/modules/clist/clcitems.cpp
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2000-12 Miranda IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include "..\..\core\commonheaders.h"
-#include "clc.h"
-
-//routines for managing adding/removal of items in the list, including sorting
-
-int fnAddItemToGroup(ClcGroup *group, int iAboveItem)
-{
-	ClcContact* newItem = cli.pfnCreateClcContact();
-	newItem->type = CLCIT_DIVIDER;
-	newItem->flags = 0;
-	newItem->szText[0] = '\0';
-	memset(newItem->iExtraImage, 0xFF, sizeof(newItem->iExtraImage));
-
-	List_Insert((SortedList*)&group->cl, newItem, iAboveItem);
-	return iAboveItem;
-}
-
-ClcGroup* fnAddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers)
-{
-	TCHAR *pBackslash, *pNextField, szThisField[ SIZEOF(dat->list.cl.items[0]->szText) ];
-	ClcGroup *group = &dat->list;
-	int i, compareResult;
-
-	dat->needsResort = 1;
-	if (!(GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_USEGROUPS))
-		return &dat->list;
-
-	pNextField = (TCHAR*)szName;
-	do {
-		pBackslash = _tcschr(pNextField, '\\');
-		if (pBackslash == NULL) {
-			mir_tstrncpy(szThisField, pNextField, SIZEOF(szThisField));
-			pNextField = NULL;
-		}
-		else {
-			mir_tstrncpy(szThisField, pNextField, min(SIZEOF(szThisField), pBackslash - pNextField + 1));
-			pNextField = pBackslash + 1;
-		}
-		compareResult = 1;
-		for (i=0; i < group->cl.count; i++) {
-			if (group->cl.items[i]->type == CLCIT_CONTACT)
-				break;
-			if (group->cl.items[i]->type != CLCIT_GROUP)
-				continue;
-			compareResult = mir_tstrcmp(szThisField, group->cl.items[i]->szText);
-			if (compareResult == 0) {
-				if (pNextField == NULL && flags != (DWORD) - 1) {
-					group->cl.items[i]->groupId = (WORD) groupId;
-					group = group->cl.items[i]->group;
-					group->expanded = (flags & GROUPF_EXPANDED) != 0;
-					group->hideOffline = (flags & GROUPF_HIDEOFFLINE) != 0;
-					group->groupId = groupId;
-				}
-				else
-					group = group->cl.items[i]->group;
-				break;
-			}
-			if (pNextField == NULL && group->cl.items[i]->groupId == 0)
-				break;
-			if (!(dat->exStyle & CLS_EX_SORTGROUPSALPHA) && groupId && group->cl.items[i]->groupId > groupId)
-				break;
-		}
-		if (compareResult) {
-			if (groupId == 0)
-				return NULL;
-			i = cli.pfnAddItemToGroup(group, i);
-			group->cl.items[i]->type = CLCIT_GROUP;
-			mir_tstrncpy(group->cl.items[i]->szText, szThisField, SIZEOF(group->cl.items[i]->szText));
-			group->cl.items[i]->groupId = (WORD) (pNextField ? 0 : groupId);
-			group->cl.items[i]->group = (ClcGroup *) mir_alloc(sizeof(ClcGroup));
-			group->cl.items[i]->group->parent = group;
-			group = group->cl.items[i]->group;
-			memset(&group->cl, 0, sizeof(group->cl));
-			group->cl.increment = 10;
-			if (flags == (DWORD) - 1 || pNextField != NULL) {
-				group->expanded = 0;
-				group->hideOffline = 0;
-			}
-			else {
-				group->expanded = (flags & GROUPF_EXPANDED) != 0;
-				group->hideOffline = (flags & GROUPF_HIDEOFFLINE) != 0;
-			}
-			group->groupId = pNextField ? 0 : groupId;
-			group->totalMembers = 0;
-			if (flags != (DWORD) - 1 && pNextField == NULL && calcTotalMembers) {
-				DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
-				for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
-					ClcCacheEntry *cache = cli.pfnGetCacheEntry(hContact);
-					if (!mir_tstrcmp(cache->tszGroup, szName) && (style & CLS_SHOWHIDDEN || !cache->bIsHidden))
-						group->totalMembers++;
-				}
-			}
-		}
-	}
-		while (pNextField);
-	return group;
-}
-
-void fnFreeContact(ClcContact* p)
-{
-	if (p->type == CLCIT_GROUP) {
-		cli.pfnFreeGroup(p->group);
-		mir_free(p->group);
-		p->group = NULL;
-	}
-}
-
-void fnFreeGroup(ClcGroup *group)
-{
-	if (!group)
-		return;
-	if (group->cl.items) {
-		for (int i=0; i < group->cl.count; i++) {
-			cli.pfnFreeContact(group->cl.items[i]);
-			mir_free(group->cl.items[i]);
-		}
-		mir_free(group->cl.items);
-		group->cl.items = NULL;
-	}
-	group->cl.limit = group->cl.count = 0;
-}
-
-static int iInfoItemUniqueHandle = 0;
-int fnAddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText)
-{
-	int i=0;
-
-	if (flags & CLCIIF_BELOWCONTACTS)
-		i = group->cl.count;
-	else if (flags & CLCIIF_BELOWGROUPS) {
-		for (; i < group->cl.count; i++)
-			if (group->cl.items[i]->type == CLCIT_CONTACT)
-				break;
-	}
-	else
-		for (; i < group->cl.count; i++)
-			if (group->cl.items[i]->type != CLCIT_INFO)
-				break;
-	i = cli.pfnAddItemToGroup(group, i);
-	iInfoItemUniqueHandle = LOWORD(iInfoItemUniqueHandle+1);
-	if (iInfoItemUniqueHandle == 0)
-		++iInfoItemUniqueHandle;
-	group->cl.items[i]->type = CLCIT_INFO;
-	group->cl.items[i]->flags = (BYTE) flags;
-	group->cl.items[i]->hContact = (MCONTACT)++iInfoItemUniqueHandle;
-	mir_tstrncpy(group->cl.items[i]->szText, pszText, SIZEOF(group->cl.items[i]->szText));
-	return i;
-}
-
-int fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact)
-{
-	int i, index = -1;
-
-	dat->needsResort = 1;
-	for (i = group->cl.count - 1; i >= 0; i--) {
-		if (group->cl.items[i]->hContact == hContact)
-			return i;
-
-		if (index == -1)
-			if (group->cl.items[i]->type != CLCIT_INFO || !(group->cl.items[i]->flags & CLCIIF_BELOWCONTACTS))
-				index = i;
-	}
-
-	i = cli.pfnAddItemToGroup(group, index + 1);
-	char *szProto = GetContactProto(hContact);
-	group->cl.items[i]->type = CLCIT_CONTACT;
-	group->cl.items[i]->iImage = CallService(MS_CLIST_GETCONTACTICON, hContact, 0);
-	group->cl.items[i]->hContact = hContact;
-	group->cl.items[i]->proto = szProto;
-	if (szProto != NULL && !cli.pfnIsHiddenMode(dat, db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)))
-		group->cl.items[i]->flags |= CONTACTF_ONLINE;
-	WORD apparentMode = szProto != NULL ? db_get_w(hContact, szProto, "ApparentMode", 0) : 0;
-	if (apparentMode == ID_STATUS_OFFLINE)
-		group->cl.items[i]->flags |= CONTACTF_INVISTO;
-	else if (apparentMode == ID_STATUS_ONLINE)
-		group->cl.items[i]->flags |= CONTACTF_VISTO;
-	else if (apparentMode)
-		group->cl.items[i]->flags |= CONTACTF_VISTO | CONTACTF_INVISTO;
-	if (db_get_b(hContact, "CList", "NotOnList", 0))
-		group->cl.items[i]->flags |= CONTACTF_NOTONLIST;
-	DWORD idleMode = szProto != NULL ? db_get_dw(hContact, szProto, "IdleTS", 0) : 0;
-	if (idleMode)
-		group->cl.items[i]->flags |= CONTACTF_IDLE;
-	mir_tstrncpy(group->cl.items[i]->szText, cli.pfnGetContactDisplayName(hContact, 0), SIZEOF(group->cl.items[i]->szText));
-
-	ClcCacheEntry *p = cli.pfnGetCacheEntry(hContact);
-	if (p != NULL)
-		replaceStrT(p->tszGroup, NULL);
-
-	return i;
-}
-
-void fnAddContactToTree(HWND hwnd, struct ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline)
-{
-	ClcGroup *group;
-	DBVARIANT dbv;
-	DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
-	WORD status = ID_STATUS_OFFLINE;
-	char *szProto = GetContactProto(hContact);
-
-	dat->needsResort = 1;
-	if (style & CLS_NOHIDEOFFLINE)
-		checkHideOffline = 0;
-	if (checkHideOffline)
-		if (szProto != NULL)
-			status = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
-
-	if (db_get_ts(hContact, "CList", "Group", &dbv))
-		group = &dat->list;
-	else {
-		group = cli.pfnAddGroup(hwnd, dat, dbv.ptszVal, (DWORD) - 1, 0, 0);
-		if (group == NULL) {
-			int i;
-			DWORD groupFlags;
-			TCHAR *szGroupName;
-			if (!(style & CLS_HIDEEMPTYGROUPS)) {
-				mir_free(dbv.ptszVal);
-				return;
-			}
-			if (checkHideOffline && cli.pfnIsHiddenMode(dat, status)) {
-				for (i = 1;; i++) {
-					szGroupName = cli.pfnGetGroupName(i, &groupFlags);
-					if (szGroupName == NULL) {
-						mir_free(dbv.ptszVal);
-						return;
-					}
-					if (!mir_tstrcmp(szGroupName, dbv.ptszVal))
-						break;
-				}
-				if (groupFlags & GROUPF_HIDEOFFLINE) {
-					mir_free(dbv.ptszVal);
-					return;
-				}
-			}
-			for (i = 1;; i++) {
-				szGroupName = cli.pfnGetGroupName(i, &groupFlags);
-				if (szGroupName == NULL) {
-					mir_free(dbv.ptszVal);
-					return;
-				}
-				if (!mir_tstrcmp(szGroupName, dbv.ptszVal))
-					break;
-				size_t len = mir_tstrlen(szGroupName);
-				if (!_tcsncmp(szGroupName, dbv.ptszVal, len) && dbv.ptszVal[len] == '\\')
-					cli.pfnAddGroup(hwnd, dat, szGroupName, groupFlags, i, 1);
-			}
-			group = cli.pfnAddGroup(hwnd, dat, dbv.ptszVal, groupFlags, i, 1);
-		}
-		mir_free(dbv.ptszVal);
-	}
-	if (checkHideOffline) {
-		if (cli.pfnIsHiddenMode(dat, status) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {
-			if (updateTotalCount)
-				group->totalMembers++;
-			return;
-		}
-	}
-	cli.pfnAddContactToGroup(dat, group, hContact);
-	if (updateTotalCount)
-		group->totalMembers++;
-}
-
-ClcGroup* fnRemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact, int updateTotalCount)
-{
-	int iContact;
-	if ((iContact = List_IndexOf((SortedList*)&group->cl, contact)) == -1)
-		return group;
-
-	if (contact->type == CLCIT_CONTACT) {
-		if (updateTotalCount)
-			group->totalMembers--;
-
-		ClcCacheEntry *p = cli.pfnGetCacheEntry(contact->hContact);
-		if (p != NULL)
-			replaceStrT(p->tszGroup, NULL);
-	}
-
-	cli.pfnFreeContact(group->cl.items[iContact]);
-	mir_free(group->cl.items[iContact]);
-	List_Remove((SortedList*)&group->cl, iContact);
-
-	if ((GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_HIDEEMPTYGROUPS) && group->cl.count == 0 && group->parent != NULL)
-		for (int i=0; i < group->parent->cl.count; i++)
-			if (group->parent->cl.items[i]->type == CLCIT_GROUP && group->parent->cl.items[i]->groupId == group->groupId)
-				return cli.pfnRemoveItemFromGroup(hwnd, group->parent, group->parent->cl.items[i], 0);
-
-	return group;
-}
-
-void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem)
-{
-	ClcContact *contact;
-	ClcGroup *group;
-	struct ClcData *dat = (struct ClcData *) GetWindowLongPtr(hwnd, 0);
-
-	dat->needsResort = 1;
-	if (!cli.pfnFindItem(hwnd, dat, hItem, &contact, &group, NULL)) {
-		DBVARIANT dbv;
-		int i, nameOffset;
-		if (!IsHContactContact(hItem))
-			return;
-		if (db_get_ts(hItem, "CList", "Group", &dbv))
-			return;
-
-		//decrease member counts of all parent groups too
-		group = &dat->list;
-		nameOffset = 0;
-		for (i=0;; i++) {
-			if (group->scanIndex == group->cl.count)
-				break;
-			if (group->cl.items[i]->type == CLCIT_GROUP) {
-				size_t len = mir_tstrlen(group->cl.items[i]->szText);
-				if (!_tcsncmp(group->cl.items[i]->szText, dbv.ptszVal + nameOffset, len) &&
-					 (dbv.ptszVal[nameOffset + len] == '\\' || dbv.ptszVal[nameOffset + len] == '\0')) {
-					group->totalMembers--;
-					if (dbv.ptszVal[nameOffset + len] == '\0')
-						break;
-				}
-			}
-		}
-		mir_free(dbv.ptszVal);
-	}
-	else cli.pfnRemoveItemFromGroup(hwnd, group, contact, 1);
-}
-
-void fnRebuildEntireList(HWND hwnd, struct ClcData *dat)
-{
-	DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
-	ClcGroup *group;
-
-	dat->list.expanded = 1;
-	dat->list.hideOffline = db_get_b(NULL, "CLC", "HideOfflineRoot", 0) && style&CLS_USEGROUPS;
-	dat->list.cl.count = dat->list.cl.limit = 0;
-	dat->selection = -1;
-
-	for (int i = 1;; i++) {
-		DWORD groupFlags;
-		TCHAR *szGroupName = cli.pfnGetGroupName(i, &groupFlags);
-		if (szGroupName == NULL)
-			break;
-		cli.pfnAddGroup(hwnd, dat, szGroupName, groupFlags, i, 0);
-	}
-
-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
-		if (style & CLS_SHOWHIDDEN || !db_get_b(hContact, "CList", "Hidden", 0)) {
-			DBVARIANT dbv;
-			if (db_get_ts(hContact, "CList", "Group", &dbv))
-				group = &dat->list;
-			else {
-				group = cli.pfnAddGroup(hwnd, dat, dbv.ptszVal, (DWORD) - 1, 0, 0);
-				if (group == NULL && style & CLS_SHOWHIDDEN) group = &dat->list;
-				mir_free(dbv.ptszVal);
-			}
-
-			if (group != NULL) {
-				group->totalMembers++;
-
-				if (dat->filterSearch && dat->szQuickSearch[0] != '\0') {
-					TCHAR *name = cli.pfnGetContactDisplayName(hContact, 0);
-					TCHAR *lowered_name = CharLowerW(NEWTSTR_ALLOCA(name));
-					TCHAR *lowered_search = CharLowerW(NEWTSTR_ALLOCA(dat->szQuickSearch));
-
-					if (_tcsstr(lowered_name, lowered_search))
-						cli.pfnAddContactToGroup(dat, group, hContact);
-				}
-				else if (!(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {
-					char *szProto = GetContactProto(hContact);
-					if (szProto == NULL) {
-						if (!cli.pfnIsHiddenMode(dat, ID_STATUS_OFFLINE))
-							cli.pfnAddContactToGroup(dat, group, hContact);
-					}
-					else if (!cli.pfnIsHiddenMode(dat, db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)))
-						cli.pfnAddContactToGroup(dat, group, hContact);
-				}
-				else cli.pfnAddContactToGroup(dat, group, hContact);
-			}
-		}
-	}
-
-	if (style & CLS_HIDEEMPTYGROUPS) {
-		group = &dat->list;
-		group->scanIndex = 0;
-		for (;;) {
-			if (group->scanIndex == group->cl.count) {
-				group = group->parent;
-				if (group == NULL)
-					break;
-			}
-			else if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {
-				if (group->cl.items[group->scanIndex]->group->cl.count == 0) {
-					group = cli.pfnRemoveItemFromGroup(hwnd, group, group->cl.items[group->scanIndex], 0);
-				}
-				else {
-					group = group->cl.items[group->scanIndex]->group;
-					group->scanIndex = 0;
-				}
-				continue;
-			}
-			group->scanIndex++;
-		}
-	}
-
-	cli.pfnSortCLC(hwnd, dat, 0);
-	cli.pfnSetAllExtraIcons(0);
-}
-
-int fnGetGroupContentsCount(ClcGroup *group, int visibleOnly)
-{
-	int count = group->cl.count;
-	ClcGroup *topgroup = group;
-
-	group->scanIndex = 0;
-	for (;;) {
-		if (group->scanIndex == group->cl.count) {
-			if (group == topgroup)
-				break;
-			group = group->parent;
-		}
-		else if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP && (!visibleOnly || group->cl.items[group->scanIndex]->group->expanded)) {
-			group = group->cl.items[group->scanIndex]->group;
-			group->scanIndex = 0;
-			count += group->cl.count;
-			continue;
-		}
-		group->scanIndex++;
-	}
-	return count;
-}
-
-static int __cdecl GroupSortProc(const void* p1, const void* p2)
-{
-	ClcContact **contact1 = (ClcContact**)p1, **contact2 = (ClcContact**)p2;
-
-	return mir_tstrcmpi(contact1[0]->szText, contact2[0]->szText);
-}
-
-static int __cdecl ContactSortProc(const void* p1, const void* p2)
-{
-	ClcContact **contact1 = (ClcContact**)p1, **contact2 = (ClcContact**)p2;
-
-	int result = cli.pfnCompareContacts(contact1[0], contact2[0]);
-	if (result)
-		return result;
-	//nothing to distinguish them, so make sure they stay in the same order
-	return (int)((INT_PTR) contact2[0]->hContact - (INT_PTR) contact1[0]->hContact);
-}
-
-static void InsertionSort(ClcContact **pContactArray, int nArray, int (*CompareProc) (const void *, const void *))
-{
-	int i, j;
-	ClcContact* testElement;
-
-	for (i = 1; i < nArray; i++) {
-		if (CompareProc(&pContactArray[i - 1], &pContactArray[i]) > 0) {
-			testElement = pContactArray[i];
-			for (j = i - 2; j >= 0; j--)
-				if (CompareProc(&pContactArray[j], &testElement) <= 0)
-					break;
-			j++;
-			memmove(&pContactArray[j + 1], &pContactArray[j], sizeof(void*) * (i - j));
-			pContactArray[j] = testElement;
-		}
-	}
-}
-
-static void SortGroup(struct ClcData *dat, ClcGroup *group, int useInsertionSort)
-{
-	int i, sortCount;
-
-	for (i = group->cl.count - 1; i >= 0; i--) {
-		if (group->cl.items[i]->type == CLCIT_DIVIDER) {
-			mir_free(group->cl.items[i]);
-			List_Remove((SortedList*)&group->cl, i);
-		}
-	}
-
-	for (i=0; i < group->cl.count; i++)
-		if (group->cl.items[i]->type != CLCIT_INFO)
-			break;
-	if (i > group->cl.count - 2)
-		return;
-	if (group->cl.items[i]->type == CLCIT_GROUP) {
-		if (dat->exStyle & CLS_EX_SORTGROUPSALPHA) {
-			for (sortCount = 0; i + sortCount < group->cl.count; sortCount++)
-				if (group->cl.items[i + sortCount]->type != CLCIT_GROUP)
-					break;
-			qsort(group->cl.items + i, sortCount, sizeof(void*), GroupSortProc);
-			i = i + sortCount;
-		}
-		for (; i < group->cl.count; i++)
-			if (group->cl.items[i]->type == CLCIT_CONTACT)
-				break;
-		if (group->cl.count - i < 2)
-			return;
-	}
-	for (sortCount = 0; i + sortCount < group->cl.count; sortCount++)
-		if (group->cl.items[i + sortCount]->type != CLCIT_CONTACT)
-			break;
-	if (useInsertionSort)
-		InsertionSort(group->cl.items + i, sortCount, ContactSortProc);
-	else
-		qsort(group->cl.items + i, sortCount, sizeof(void*), ContactSortProc);
-	if (dat->exStyle & CLS_EX_DIVIDERONOFF) {
-		int prevContactOnline = 0;
-		for (i=0; i < group->cl.count; i++) {
-			if (group->cl.items[i]->type != CLCIT_CONTACT)
-				continue;
-			if (group->cl.items[i]->flags & CONTACTF_ONLINE)
-				prevContactOnline = 1;
-			else {
-				if (prevContactOnline) {
-					i = cli.pfnAddItemToGroup(group, i);
-					group->cl.items[i]->type = CLCIT_DIVIDER;
-					mir_tstrcpy(group->cl.items[i]->szText, TranslateT("Offline"));
-				}
-				break;
-			}
-		}
-	}
-}
-
-void fnSortCLC(HWND hwnd, struct ClcData *dat, int useInsertionSort)
-{
-	ClcContact *selcontact;
-	ClcGroup *group = &dat->list, *selgroup;
-	MCONTACT hSelItem;
-
-	if (dat->needsResort) {
-		if (cli.pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) == -1)
-			hSelItem = NULL;
-		else
-			hSelItem = (MCONTACT)cli.pfnContactToHItem(selcontact);
-		group->scanIndex = 0;
-		SortGroup(dat, group, useInsertionSort);
-		for (;;) {
-			if (group->scanIndex == group->cl.count) {
-				group = group->parent;
-				if (group == NULL)
-					break;
-			}
-			else if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {
-				group = group->cl.items[group->scanIndex]->group;
-				group->scanIndex = 0;
-				SortGroup(dat, group, useInsertionSort);
-				continue;
-			}
-			group->scanIndex++;
-		}
-		if (hSelItem)
-			if (cli.pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))
-				dat->selection = cli.pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact));
-
-		cli.pfnRecalcScrollBar(hwnd, dat);
-	}
-	dat->needsResort = 0;
-	cli.pfnInvalidateRect(hwnd, NULL, FALSE);
-}
-
-struct SavedContactState_t
-{
-	MCONTACT hContact;
-	WORD iExtraImage[EXTRA_ICON_COUNT];
-	int checked;
-};
-
-struct SavedGroupState_t
-{
-	int groupId, expanded;
-};
-
-struct SavedInfoState_t
-{
-	int parentId;
-	ClcContact contact;
-};
-
-void fnSaveStateAndRebuildList(HWND hwnd, struct ClcData *dat)
-{
-	NMCLISTCONTROL nm;
-	int i, j;
-	ClcGroup *group;
-	ClcContact *contact;
-
-	cli.pfnHideInfoTip(hwnd, dat);
-	KillTimer(hwnd, TIMERID_INFOTIP);
-	KillTimer(hwnd, TIMERID_RENAME);
-	cli.pfnEndRename(hwnd, dat, 1);
-
-	OBJLIST<SavedContactState_t> saveContact(10, NumericKeySortT);
-	OBJLIST<SavedGroupState_t> saveGroup(100, NumericKeySortT);
-	OBJLIST<SavedInfoState_t> saveInfo(10, NumericKeySortT);
-
-	dat->needsResort = 1;
-	group = &dat->list;
-	group->scanIndex = 0;
-	for (;;) {
-		if (group->scanIndex == group->cl.count) {
-			group = group->parent;
-			if (group == NULL)
-				break;
-		}
-		else if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {
-			group = group->cl.items[group->scanIndex]->group;
-			group->scanIndex = 0;
-
-			SavedGroupState_t* p = new SavedGroupState_t;
-			p->groupId = group->groupId;
-			p->expanded = group->expanded;
-			saveGroup.insert(p);
-			continue;
-		}
-		else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) {
-			SavedContactState_t* p = new SavedContactState_t;
-			p->hContact = group->cl.items[group->scanIndex]->hContact;
-			memcpy(p->iExtraImage, group->cl.items[group->scanIndex]->iExtraImage, sizeof(p->iExtraImage));
-			p->checked = group->cl.items[group->scanIndex]->flags & CONTACTF_CHECKED;
-			saveContact.insert(p);
-		}
-		else if (group->cl.items[group->scanIndex]->type == CLCIT_INFO) {
-			SavedInfoState_t* p = new SavedInfoState_t;
-			p->parentId = (group->parent == NULL) ? -1 : group->groupId;
-			p->contact = *group->cl.items[group->scanIndex];
-			saveInfo.insert(p);
-		}
-		group->scanIndex++;
-	}
-
-	cli.pfnFreeGroup(&dat->list);
-	cli.pfnRebuildEntireList(hwnd, dat);
-
-	group = &dat->list;
-	group->scanIndex = 0;
-	for (;;) {
-		if (group->scanIndex == group->cl.count) {
-			group = group->parent;
-			if (group == NULL)
-				break;
-		}
-		else if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {
-			group = group->cl.items[group->scanIndex]->group;
-			group->scanIndex = 0;
-
-			SavedGroupState_t tmp, *p;
-			tmp.groupId = group->groupId;
-			if ((p = saveGroup.find(&tmp)) != NULL)
-				group->expanded = p->expanded;
-			continue;
-		}
-		else if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT) {
-			SavedContactState_t tmp, *p;
-			tmp.hContact = group->cl.items[group->scanIndex]->hContact;
-			if ((p = saveContact.find(&tmp)) != NULL) {
-				memcpy(group->cl.items[group->scanIndex]->iExtraImage, p->iExtraImage, sizeof(p->iExtraImage));
-				if (p->checked)
-					group->cl.items[group->scanIndex]->flags |= CONTACTF_CHECKED;
-			}
-		}
-
-		group->scanIndex++;
-	}
-
-	for (i=0; i < saveInfo.getCount(); i++) {
-		if (saveInfo[i].parentId == -1)
-			group = &dat->list;
-		else {
-			if (!cli.pfnFindItem(hwnd, dat, saveInfo[i].parentId | HCONTACT_ISGROUP, &contact, NULL, NULL))
-				continue;
-			group = contact->group;
-		}
-		j = cli.pfnAddInfoItemToGroup(group, saveInfo[i].contact.flags, _T(""));
-		*group->cl.items[j] = saveInfo[i].contact;
-	}
-
-	cli.pfnRecalculateGroupCheckboxes(hwnd, dat);
-
-	cli.pfnRecalcScrollBar(hwnd, dat);
-	nm.hdr.code = CLN_LISTREBUILT;
-	nm.hdr.hwndFrom = hwnd;
-	nm.hdr.idFrom = GetDlgCtrlID(hwnd);
-	SendMessage(GetParent(hwnd), WM_NOTIFY, 0, (LPARAM) & nm);
-}