- 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

4 files changed, 0 insertions, 2339 deletions

diff --git a/src/modules/icolib/IcoLib.h b/src/modules/icolib/IcoLib.h
deleted file mode 100644
index e8bd131b1d..0000000000
--- a/src/modules/icolib/IcoLib.h
+++ /dev/null
@@ -1,108 +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.

-*/

-

-#define SECTIONPARAM_MAKE(index, level, flags) MAKELONG((index)&0xFFFF, MAKEWORD(level, flags))

-#define SECTIONPARAM_INDEX(lparam) LOWORD(lparam)

-#define SECTIONPARAM_LEVEL(lparam) LOBYTE(HIWORD(lparam))

-#define SECTIONPARAM_FLAGS(lparam) HIBYTE(HIWORD(lparam))

-#define SECTIONPARAM_HAVEPAGE	0x0001

-

-struct SectionItem

-{

-	TCHAR* name;

-	int    flags;

-	int    maxOrder;

-	int    ref_count;

-};

-

-struct IconSourceFile

-{

-	TCHAR*       file;

-	int          ref_count;

-};

-

-struct IconSourceItem

-{

-	IconSourceFile* file;

-	int          indx;

-	int          cx, cy;

-

-	int          ref_count;

-

-	HICON        icon;

-	int          icon_ref_count;

-

-	BYTE*        icon_data;

-	int          icon_size;

-};

-

-struct IcolibItem

-{

-	char*        name;

-	SectionItem* section;

-	int          orderID;

-	TCHAR*       description;

-	TCHAR*       default_file;

-	int          default_indx;

-	int          cx, cy;

-	int          hLangpack;

-

-	IconSourceItem* source_small;

-	IconSourceItem* source_big;

-	IconSourceItem* default_icon;

-

-	TCHAR*       temp_file;

-	HICON        temp_icon;

-	BOOL         temp_reset;

-

-	__inline TCHAR* getDescr() const { return TranslateTH(hLangpack, description); }

-};

-

-// extracticon.c

-

-UINT _ExtractIconEx(LPCTSTR lpszFile, int iconIndex, int cxIcon, int cyIcon, HICON *phicon, UINT flags);

-

-void __fastcall SAFE_FREE(void** p);

-void __fastcall SafeDestroyIcon(HICON* icon);

-

-int   IconSourceItem_Release(IconSourceItem** pitem);

-int   IconSourceItem_ReleaseIcon(IconSourceItem* item);

-HICON IconSourceItem_GetIcon(IconSourceItem* item);

-IconSourceItem* GetIconSourceItem(const TCHAR* file, int indx, int cxIcon, int cyIcon);

-

-IcolibItem* IcoLib_FindHIcon(HICON hIcon, bool &big);

-IcolibItem* IcoLib_FindIcon(const char* pszIconName);

-

-HICON IconItem_GetIcon(IcolibItem* item, bool big);

-

-int SkinOptionsInit(WPARAM, LPARAM);

-

-extern mir_cs csIconList;

-extern LIST<IcolibItem> iconList;

-extern LIST<SectionItem> sectionList;

-

-extern BOOL bNeedRebuild;

-extern int iconEventActive;

-extern HICON hIconBlank;

-extern HANDLE hIcons2ChangedEvent, hIconsChangedEvent;

diff --git a/src/modules/icolib/extracticon.cpp b/src/modules/icolib/extracticon.cpp
deleted file mode 100644
index d3bafc6bde..0000000000
--- a/src/modules/icolib/extracticon.cpp
+++ /dev/null
@@ -1,282 +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"

-

-#ifdef _ASSERT

-#undef _ASSERT

-#endif

-#define _ASSERT(n)

-// http://msdn.microsoft.com/library/default.asp?url = /library/en-us/winui/winui/windowsuserinterface/resources/introductiontoresources/resourcereference/resourcestructures/newheader.asp

-typedef struct

-{

-	WORD    Reserved;

-	WORD    ResType;

-	WORD    ResCount;

-}

-	NEWHEADER;

-

-#define MAGIC_ICON       0

-#define MAGIC_ICO1       1

-#define MAGIC_CUR        2

-#define MAGIC_BMP        ((WORD)'B'+((WORD)'M'<<8))

-

-#define MAGIC_ANI1       ((WORD)'R'+((WORD)'I'<<8))

-#define MAGIC_ANI2       ((WORD)'F'+((WORD)'F'<<8))

-#define MAGIC_ANI3       ((WORD)'A'+((WORD)'C'<<8))

-#define MAGIC_ANI4       ((WORD)'O'+((WORD)'N'<<8))

-

-#define VER30            0x00030000

-

-void* _RelativeVirtualAddresstoPtr(IMAGE_DOS_HEADER* pDosHeader, DWORD rva)

-{

-	IMAGE_NT_HEADERS* pPE = (IMAGE_NT_HEADERS*)((BYTE*)pDosHeader + pDosHeader->e_lfanew);

-	IMAGE_SECTION_HEADER* pSection = IMAGE_FIRST_SECTION(pPE);

-	int i;

-

-	for (i=0; i < pPE->FileHeader.NumberOfSections; i++) {

-		IMAGE_SECTION_HEADER* cSection = &pSection[i];

-		DWORD size = cSection->Misc.VirtualSize ? cSection->Misc.VirtualSize : cSection->SizeOfRawData;

-

-		if (rva >= cSection->VirtualAddress && rva < cSection->VirtualAddress + size)

-			return (LPBYTE)pDosHeader + cSection->PointerToRawData + (rva - cSection->VirtualAddress);

-	}

-

-	return NULL;

-}

-

-void* _GetResourceTable(IMAGE_DOS_HEADER* pDosHeader)

-{

-	IMAGE_NT_HEADERS* pPE = (IMAGE_NT_HEADERS*)((BYTE*)pDosHeader + pDosHeader->e_lfanew);

-

-	if (pPE->Signature != IMAGE_NT_SIGNATURE)

-		return NULL;

-	if (pPE->FileHeader.SizeOfOptionalHeader < 2)

-		return NULL;

-

-	// The DataDirectory is an array of 16 structures.

-	// Each array entry has a predefined meaning for what it refers to.

-

-	switch (pPE->OptionalHeader.Magic)

-	{

-	case IMAGE_NT_OPTIONAL_HDR32_MAGIC:

-		if (pPE->FileHeader.SizeOfOptionalHeader >= sizeof(IMAGE_OPTIONAL_HEADER32))

-			return _RelativeVirtualAddresstoPtr(pDosHeader, ((PIMAGE_NT_HEADERS32)pPE)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress);

-		break;

-

-	case IMAGE_NT_OPTIONAL_HDR64_MAGIC:

-		if (pPE->FileHeader.SizeOfOptionalHeader >= sizeof(IMAGE_OPTIONAL_HEADER64))

-			return _RelativeVirtualAddresstoPtr(pDosHeader, ((PIMAGE_NT_HEADERS64)pPE)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress);

-		break;

-	}

-

-	return NULL;

-}

-

-IMAGE_RESOURCE_DIRECTORY_ENTRY* _FindResourceBase(void* prt, int resType, int* pCount)

-{

-	IMAGE_RESOURCE_DIRECTORY* pDir = (IMAGE_RESOURCE_DIRECTORY*)prt;

-	IMAGE_RESOURCE_DIRECTORY_ENTRY* pRes;

-	int i, count;

-

-	*pCount = 0;

-

-	count = pDir->NumberOfIdEntries + pDir->NumberOfNamedEntries;

-	pRes = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(pDir+1);

-

-	for (i=0; i < count; i++)

-		if (pRes[i].Name == (DWORD)resType) break;

-

-	if (i == count) return NULL;

-

-	pDir = (IMAGE_RESOURCE_DIRECTORY*)((LPBYTE)prt +

-		(pRes[i].OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY));

-

-	count = pDir->NumberOfIdEntries + pDir->NumberOfNamedEntries;

-	*pCount = count;

-	pRes = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(pDir+1);

-

-	return pRes;

-}

-

-int _FindResourceCount(void* prt, int resType)

-{

-	int count;

-

-	_FindResourceBase(prt, resType, &count);

-	return count;

-}

-

-void* _FindResource(IMAGE_DOS_HEADER* pDosHeader, void* prt, int resIndex, int resType, DWORD* pcbSize)

-{

-	int count, index = 0;

-	IMAGE_RESOURCE_DIRECTORY_ENTRY* pRes;

-	IMAGE_RESOURCE_DATA_ENTRY* pEntry;

-

-	pRes = _FindResourceBase(prt, resType, &count);

-	if (resIndex < 0) {

-		for (index = 0; index < count; index++)

-			if (pRes[index].Name == (DWORD)(-resIndex))

-				break;

-	}

-	else index = resIndex;

-

-	if (index >= count)

-		return NULL;

-

-	if (pRes[index].OffsetToData & IMAGE_RESOURCE_DATA_IS_DIRECTORY) {

-		IMAGE_RESOURCE_DIRECTORY* pDir;

-		pDir = (IMAGE_RESOURCE_DIRECTORY*)((LPBYTE)prt + (pRes[index].OffsetToData & ~IMAGE_RESOURCE_DATA_IS_DIRECTORY));

-		pRes = (IMAGE_RESOURCE_DIRECTORY_ENTRY*)(pDir+1);

-		index = 0;

-	}

-

-	if (pRes[index].OffsetToData & IMAGE_RESOURCE_DATA_IS_DIRECTORY)

-		return NULL;

-

-	pEntry = (IMAGE_RESOURCE_DATA_ENTRY*)((LPBYTE)prt + pRes[index].OffsetToData);

-	*pcbSize = pEntry->Size;

-	return _RelativeVirtualAddresstoPtr(pDosHeader, pEntry->OffsetToData);

-}

-

-UINT _ExtractFromExe(HANDLE hFile, int iconIndex, int cxIconSize, int cyIconSize, HICON *phicon, UINT flags)

-{

-	int retval = 0;

-	DWORD fileLen = GetFileSize(hFile, NULL);

-	HANDLE hFileMap = INVALID_HANDLE_VALUE, pFile = NULL;

-	IMAGE_DOS_HEADER* pDosHeader;

-	void* pRes;

-	DWORD cbSize = 0;

-	NEWHEADER* pIconDir;

-	int idIcon;

-	LPBITMAPINFOHEADER pIcon;

-	//  UINT res = 0;

-

-	hFileMap = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);

-	if (hFileMap == NULL) goto cleanup;

-

-	pFile = MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, 0);

-	if (pFile == NULL) goto cleanup;

-

-	pDosHeader = (IMAGE_DOS_HEADER*)(void*)pFile;

-	if (pDosHeader->e_magic != IMAGE_DOS_SIGNATURE) goto cleanup;

-	if (pDosHeader->e_lfanew <= 0) goto cleanup;

-	if ((DWORD)(pDosHeader->e_lfanew) >= fileLen) goto cleanup;

-

-	pRes = _GetResourceTable(pDosHeader);

-	if (!pRes) goto cleanup;

-	if (!phicon) {

-		retval = _FindResourceCount(pRes, (int)RT_GROUP_ICON);

-		goto cleanup;

-	}

-

-	pIconDir = (NEWHEADER*)_FindResource(pDosHeader, pRes, iconIndex, (int)RT_GROUP_ICON, &cbSize);

-	if (!pIconDir) goto cleanup;

-	if (pIconDir->Reserved || pIconDir->ResType != RES_ICON) goto cleanup;

-

-	idIcon = LookupIconIdFromDirectoryEx((LPBYTE)pIconDir, TRUE, cxIconSize, cyIconSize, flags);

-	pIcon = (LPBITMAPINFOHEADER)_FindResource(pDosHeader, pRes, -idIcon, (int)RT_ICON, &cbSize);

-	if (!pIcon) goto cleanup;

-

-	if (pIcon->biSize != sizeof(BITMAPINFOHEADER) && pIcon->biSize != sizeof(BITMAPCOREHEADER)) {

-		_ASSERT(0);

-		goto cleanup;

-	}

-

-	*phicon = CreateIconFromResourceEx((LPBYTE)pIcon, cbSize, TRUE, VER30, cxIconSize, cyIconSize, flags);

-	retval = 1;

-

-cleanup:

-	if (pFile) UnmapViewOfFile(pFile);

-	if (hFileMap != INVALID_HANDLE_VALUE) CloseHandle(hFileMap);

-

-	return retval;

-}

-

-UINT _ExtractFromICO(LPCTSTR pFileName, int iconIndex, int cxIcon, int cyIcon, HICON* phicon, UINT flags)

-{

-	HICON hicon;

-

-	if (iconIndex >= 1)

-		return 0;

-

-	//  do we just want a count?

-	if (!phicon)

-		return 1;

-

-	flags |= LR_LOADFROMFILE;

-	hicon = (HICON)LoadImage(NULL, pFileName, IMAGE_ICON, cxIcon, cyIcon, flags);

-	if (!hicon)

-		return 0;

-

-	*phicon = hicon;

-	return 1;

-}

-

-UINT _ExtractIconEx(LPCTSTR lpszFile, int iconIndex, int cxIcon, int cyIcon, HICON *phicon, UINT flags)

-{

-	HANDLE hFile;

-	WORD magic[6];

-	DWORD read = 0;

-	UINT res = 0;

-

-	if (cxIcon == GetSystemMetrics(SM_CXICON) && cyIcon == GetSystemMetrics(SM_CYICON))

-		res = ExtractIconEx(lpszFile, iconIndex, phicon, NULL, 1);

-	else if (cxIcon == GetSystemMetrics(SM_CXSMICON) && cyIcon == GetSystemMetrics(SM_CYSMICON))

-		res = ExtractIconEx(lpszFile, iconIndex, NULL, phicon, 1);

-	else if (cxIcon == 0 || cyIcon == 0)

-		res = ExtractIconEx(lpszFile, iconIndex, NULL, phicon, 1);

-	// check if the api succeded, if not try our method too

-	if (res) return res;

-

-	hFile = CreateFile(lpszFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);

-	if (hFile == INVALID_HANDLE_VALUE)

-		return 0;

-

-	// failed to read file signature

-	if (!ReadFile(hFile, &magic, sizeof(magic), &read, NULL) || (read != sizeof(magic))) {

-		CloseHandle(hFile);

-		return 0;

-	}

-

-	switch (magic[0]) {

-	case IMAGE_DOS_SIGNATURE:

-		res = _ExtractFromExe(hFile, iconIndex, cxIcon, cyIcon, phicon, flags);

-		break;

-

-	case MAGIC_ANI1: //  ani cursors are RIFF file of type 'ACON'

-		if (magic[1] == MAGIC_ANI2 && magic[4] == MAGIC_ANI3 && magic[5] == MAGIC_ANI4)

-			res = _ExtractFromICO(lpszFile, iconIndex, cxIcon, cyIcon, phicon, flags);

-		break;

-

-	case MAGIC_ICON:

-		if ((magic[1] == MAGIC_ICO1 || magic[1] == MAGIC_CUR) && magic[2] >= 1)

-			res = _ExtractFromICO(lpszFile, iconIndex, cxIcon, cyIcon, phicon, flags);

-

-		break;

-	}

-

-	CloseHandle(hFile);

-	return res;

-}

diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp
deleted file mode 100644
index 5b41b14e36..0000000000
--- a/src/modules/icolib/skin2icons.cpp
+++ /dev/null
@@ -1,902 +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 "IcoLib.h"

-

-static BOOL bModuleInitialized = FALSE;

-HANDLE hIcons2ChangedEvent, hIconsChangedEvent;

-

-HICON hIconBlank = NULL;

-

-static HANDLE

-	hIcoLib_AddNewIcon, hIcoLib_RemoveIcon, hIcoLib_GetIcon, hIcoLib_GetIcon2,

-	hIcoLib_GetIconHandle, hIcoLib_IsManaged, hIcoLib_AddRef, hIcoLib_ReleaseIcon;

-

-int iconEventActive = 0;

-

-BOOL bNeedRebuild = FALSE;

-

-mir_cs csIconList;

-

-static int sttCompareSections(const SectionItem* p1, const SectionItem* p2)

-{

-	return mir_tstrcmp(p1->name, p2->name);

-}

-

-LIST<SectionItem> sectionList(20, sttCompareSections);

-

-static int sttCompareIconSourceFiles(const IconSourceFile* p1, const IconSourceFile* p2)

-{

-	return mir_tstrcmpi(p1->file, p2->file);

-}

-

-static LIST<IconSourceFile> iconSourceFileList(10, sttCompareIconSourceFiles);

-

-static int sttCompareIconSourceItems(const IconSourceItem* p1, const IconSourceItem* p2)

-{

-	if (p1->indx < p2->indx)

-		return -1;

-

-	if (p1->indx > p2->indx)

-		return 1;

-

-	if (p1->cx < p2->cx)

-		return -1;

-

-	if (p1->cx > p2->cx)

-		return 1;

-

-	if (p1->cy < p2->cy)

-		return -1;

-

-	if (p1->cy > p2->cy)

-		return 1;

-

-	if (p1->file == p2->file)

-		return 0;

-

-	return (p1->file > p2->file) ? 1 : -1;

-}

-

-static LIST<IconSourceItem> iconSourceList(20, sttCompareIconSourceItems);

-

-static int sttCompareIcons(const IcolibItem* p1, const IcolibItem* p2)

-{

-	return mir_strcmp(p1->name, p2->name);

-}

-

-LIST<IcolibItem> iconList(20, sttCompareIcons);

-

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

-// Utility functions

-

-void __fastcall SAFE_FREE(void** p)

-{

-	if (*p) {

-		mir_free(*p);

-		*p = NULL;

-	}

-}

-

-void __fastcall SafeDestroyIcon(HICON* icon)

-{

-	if (*icon) {

-		DestroyIcon(*icon);

-		*icon = NULL;

-	}

-}

-

-// Helper functions to manage Icon resources

-

-IconSourceFile* IconSourceFile_Get(const TCHAR* file, bool isPath)

-{

-	TCHAR fileFull[ MAX_PATH ];

-

-	if (!file)

-		return NULL;

-

-	if (isPath)

-		PathToAbsoluteT(file, fileFull); /// TODO: convert path to long - eliminate duplicate items

-	else

-		_tcsncpy_s(fileFull, file, _TRUNCATE);

-

-	IconSourceFile key = { fileFull };

-	int ix;

-	if ((ix = iconSourceFileList.getIndex(&key)) != -1) {

-		iconSourceFileList[ ix ]->ref_count++;

-		return iconSourceFileList[ ix ];

-	}

-

-	IconSourceFile* newItem = (IconSourceFile*)mir_calloc(sizeof(IconSourceFile));

-	newItem->file = mir_tstrdup(fileFull);

-	newItem->ref_count = 1;

-	iconSourceFileList.insert(newItem);

-

-	return newItem;

-}

-

-int IconSourceFile_Release(IconSourceFile** pitem)

-{

-	if (pitem && *pitem && (*pitem)->ref_count) {

-		IconSourceFile* item = *pitem;

-		if (--item->ref_count <= 0) {

-			int indx;

-			if ((indx = iconSourceFileList.getIndex(item)) != -1) {

-				SAFE_FREE((void**)&item->file);

-				iconSourceFileList.remove(indx);

-				SAFE_FREE((void**)&item);

-			}

-		}

-		*pitem = NULL;

-		return 0;

-	}

-	return 1;

-}

-

-static int BytesPerScanLine(int PixelsPerScanline, int BitsPerPixel, int Alignment)

-{

-	Alignment--;

-	int bytes = ((PixelsPerScanline * BitsPerPixel) + Alignment) & ~Alignment;

-	return bytes / 8;

-}

-

-static int InitializeBitmapInfoHeader(HBITMAP bitmap, BITMAPINFOHEADER* bi)

-{

-	DIBSECTION DS;

-	int bytes;

-

-	DS.dsBmih.biSize = 0;

-	bytes = GetObject(bitmap, sizeof(DS), &DS);

-	if (bytes == 0) return 1; // Failure

-	else if ((bytes >= (sizeof(DS.dsBm) + sizeof(DS.dsBmih))) &&

-		(DS.dsBmih.biSize >= DWORD(sizeof(DS.dsBmih))))

-		*bi = DS.dsBmih;

-	else {

-		memset(bi, 0, sizeof(BITMAPINFOHEADER));

-		bi->biSize = sizeof(BITMAPINFOHEADER);

-		bi->biWidth = DS.dsBm.bmWidth;

-		bi->biHeight = DS.dsBm.bmHeight;

-	}

-	bi->biBitCount = DS.dsBm.bmBitsPixel * DS.dsBm.bmPlanes;

-	bi->biPlanes = 1;

-	if (bi->biClrImportant > bi->biClrUsed)

-		bi->biClrImportant = bi->biClrUsed;

-	if (!bi->biSizeImage)

-		bi->biSizeImage = BytesPerScanLine(bi->biWidth, bi->biBitCount, 32) * abs(bi->biHeight);

-	return 0; // Success

-}

-

-static int InternalGetDIBSizes(HBITMAP bitmap, int* InfoHeaderSize, int* ImageSize)

-{

-	BITMAPINFOHEADER bi;

-

-	if (InitializeBitmapInfoHeader(bitmap, &bi)) return 1; // Failure

-	if (bi.biBitCount > 8) {

-		*InfoHeaderSize = sizeof(BITMAPINFOHEADER);

-		if ((bi.biCompression & BI_BITFIELDS) != 0)

-			*InfoHeaderSize += 12;

-	}

-	else {

-		if (bi.biClrUsed == 0)

-			*InfoHeaderSize = sizeof(BITMAPINFOHEADER) +

-				sizeof(RGBQUAD) * (int)(1 << bi.biBitCount);

-		else

-			*InfoHeaderSize = sizeof(BITMAPINFOHEADER) +

-				sizeof(RGBQUAD) * bi.biClrUsed;

-	}

-	*ImageSize = bi.biSizeImage;

-	return 0; // Success

-}

-

-static int InternalGetDIB(HBITMAP bitmap, HPALETTE palette, void* bitmapInfo, void* Bits)

-{

-	HPALETTE oldPal = 0;

-

-	if (InitializeBitmapInfoHeader(bitmap, (BITMAPINFOHEADER*)bitmapInfo)) return 1; // Failure

-

-	HDC DC = CreateCompatibleDC(0);

-	if (palette) {

-		oldPal = SelectPalette(DC, palette, FALSE);

-		RealizePalette(DC);

-	}

-	int result = GetDIBits(DC, bitmap, 0, ((BITMAPINFOHEADER*)bitmapInfo)->biHeight, Bits, (BITMAPINFO*)bitmapInfo, DIB_RGB_COLORS) == 0;

-

-	if (oldPal) SelectPalette(DC, oldPal, FALSE);

-	DeleteDC(DC);

-	return result;

-}

-

-static int GetIconData(HICON icon, BYTE** data, int* size)

-{

-	ICONINFO iconInfo;

-	int MonoInfoSize, ColorInfoSize;

-	int MonoBitsSize, ColorBitsSize;

-

-	if (!data || !size) return 1; // Failure

-

-	if (!GetIconInfo(icon, &iconInfo)) return 1; // Failure

-

-	if (InternalGetDIBSizes(iconInfo.hbmMask, &MonoInfoSize, &MonoBitsSize) ||

-		InternalGetDIBSizes(iconInfo.hbmColor, &ColorInfoSize, &ColorBitsSize)) {

-		DeleteObject(iconInfo.hbmColor);

-		DeleteObject(iconInfo.hbmMask);

-		return 1; // Failure

-	}

-	void* MonoInfo = mir_alloc(MonoInfoSize);

-	void* MonoBits = mir_alloc(MonoBitsSize);

-	void* ColorInfo = mir_alloc(ColorInfoSize);

-	void* ColorBits = mir_alloc(ColorBitsSize);

-

-	if (InternalGetDIB(iconInfo.hbmMask, 0, MonoInfo, MonoBits) ||

-		InternalGetDIB(iconInfo.hbmColor, 0, ColorInfo, ColorBits)) {

-		SAFE_FREE(&MonoInfo);

-		SAFE_FREE(&MonoBits);

-		SAFE_FREE(&ColorInfo);

-		SAFE_FREE(&ColorBits);

-		DeleteObject(iconInfo.hbmColor);

-		DeleteObject(iconInfo.hbmMask);

-		return 1; // Failure

-	}

-

-	*size = ColorInfoSize + ColorBitsSize + MonoBitsSize;

-	*data = (BYTE*)mir_alloc(*size);

-

-	BYTE* buf = *data;

-	((BITMAPINFOHEADER*)ColorInfo)->biHeight *= 2; // color height includes mono bits

-	memcpy(buf, ColorInfo, ColorInfoSize);

-	buf += ColorInfoSize;

-	memcpy(buf, ColorBits, ColorBitsSize);

-	buf += ColorBitsSize;

-	memcpy(buf, MonoBits, MonoBitsSize);

-

-	SAFE_FREE(&MonoInfo);

-	SAFE_FREE(&MonoBits);

-	SAFE_FREE(&ColorInfo);

-	SAFE_FREE(&ColorBits);

-	DeleteObject(iconInfo.hbmColor);

-	DeleteObject(iconInfo.hbmMask);

-	return 0; // Success

-}

-

-#define VER30           0x00030000

-

-HICON IconSourceItem_GetIcon(IconSourceItem* item)

-{

-	if (item->icon) {

-		item->icon_ref_count++;

-		return item->icon;

-	}

-

-	if (item->icon_size) {

-		item->icon = CreateIconFromResourceEx(item->icon_data, item->icon_size, TRUE, VER30, item->cx, item->cy, LR_COLOR);

-		if (item->icon) {

-			item->icon_ref_count++;

-			return item->icon;

-		}

-	}

-	//SHOULD BE REPLACED WITH GOOD ENOUGH FUNCTION

-	_ExtractIconEx(item->file->file, item->indx, item->cx, item->cy, &item->icon, LR_COLOR);

-

-	if (item->icon)

-		item->icon_ref_count++;

-

-	return item->icon;

-}

-

-int IconSourceItem_ReleaseIcon(IconSourceItem* item)

-{

-	if (item && item->icon_ref_count) {

-		item->icon_ref_count--;

-		if (!item->icon_ref_count) {

-			if (!item->icon_size)

-				if (GetIconData(item->icon, &item->icon_data, &item->icon_size))

-					item->icon_size = 0; // Failure

-			SafeDestroyIcon(&item->icon);

-		}

-		return 0; // Success

-	}

-	return 1; // Failure

-}

-

-IconSourceItem* GetIconSourceItem(const TCHAR* file, int indx, int cxIcon, int cyIcon)

-{

-	if (!file)

-		return NULL;

-

-	IconSourceFile* r_file = IconSourceFile_Get(file, true);

-	IconSourceItem key = { r_file, indx, cxIcon, cyIcon };

-	int ix;

-	if ((ix = iconSourceList.getIndex(&key)) != -1) {

-		IconSourceFile_Release(&r_file);

-		iconSourceList[ ix ]->ref_count++;

-		return iconSourceList[ ix ];

-	}

-

-	IconSourceItem* newItem = (IconSourceItem*)mir_calloc(sizeof(IconSourceItem));

-	newItem->file = r_file;

-	newItem->indx = indx;

-	newItem->ref_count = 1;

-	newItem->cx = cxIcon;

-	newItem->cy = cyIcon;

-	iconSourceList.insert(newItem);

-

-	return newItem;

-}

-

-IconSourceItem* GetIconSourceItemFromPath(const TCHAR* path, int cxIcon, int cyIcon)

-{

-	if (!path)

-		return NULL;

-

-	TCHAR file[ MAX_PATH ];

-	mir_tstrncpy(file, path, SIZEOF(file));

-	TCHAR *comma = _tcsrchr(file, ',');

-

-	int n;

-	if (!comma)

-		n = 0;

-	else {

-		n = _ttoi(comma+1);

-		*comma = 0;

-	}

-	return GetIconSourceItem(file, n, cxIcon, cyIcon);

-}

-

-IconSourceItem* CreateStaticIconSourceItem(int cxIcon, int cyIcon)

-{

-	TCHAR sourceName[ MAX_PATH ];

-	IconSourceFile key = { sourceName };

-

-	int i=0;

-	do { // find new unique name

-		mir_sntprintf(sourceName, SIZEOF(sourceName), _T("*StaticIcon_%d"), i++);

-	}

-		while (iconSourceFileList.getIndex(&key) != -1);

-

-	IconSourceItem* newItem = (IconSourceItem*)mir_calloc(sizeof(IconSourceItem));

-	newItem->file = IconSourceFile_Get(sourceName, false);

-	newItem->indx = 0;

-	newItem->ref_count = 1;

-	newItem->cx = cxIcon;

-	newItem->cy = cyIcon;

-	iconSourceList.insert(newItem);

-

-	return newItem;

-}

-

-int IconSourceItem_Release(IconSourceItem** pitem)

-{

-	if (pitem && *pitem && (*pitem)->ref_count) {

-		IconSourceItem* item = *pitem;

-		item->ref_count--;

-		if (!item->ref_count) {

-			int indx;

-			if ((indx = iconSourceList.getIndex(item)) != -1) {

-				IconSourceFile_Release(&item->file);

-				SafeDestroyIcon(&item->icon);

-				SAFE_FREE((void**)&item->icon_data);

-				iconSourceList.remove(indx);

-				SAFE_FREE((void**)&item);

-			}

-		}

-		*pitem = NULL;

-		return 0;

-	}

-	return 1;

-}

-

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

-// Service functions

-

-static SectionItem* IcoLib_AddSection(TCHAR *sectionName, BOOL create_new)

-{

-	if (!sectionName)

-		return NULL;

-

-	int indx;

-	SectionItem key = { sectionName, 0 };

-	if ((indx = sectionList.getIndex(&key)) != -1)

-		return sectionList[ indx ];

-

-	if (create_new) {

-		SectionItem* newItem = (SectionItem*)mir_calloc(sizeof(SectionItem));

-		newItem->name = mir_tstrdup(sectionName);

-		newItem->flags = 0;

-		sectionList.insert(newItem);

-		bNeedRebuild = TRUE;

-		return newItem;

-	}

-

-	return NULL;

-}

-

-static void IcoLib_RemoveSection(SectionItem* section)

-{

-	if (!section)

-		return;

-

-	int indx;

-	if ((indx = sectionList.getIndex(section)) != -1) {

-		sectionList.remove(indx);

-		SAFE_FREE((void**)&section->name);

-		SAFE_FREE((void**)&section);

-		bNeedRebuild = TRUE;

-	}

-}

-

-IcolibItem* IcoLib_FindIcon(const char* pszIconName)

-{

-	int indx = iconList.getIndex((IcolibItem*)&pszIconName);

-	return (indx != -1) ? iconList[ indx ] : 0;

-}

-

-IcolibItem* IcoLib_FindHIcon(HICON hIcon, bool &big)

-{

-	if (hIcon == NULL)

-		return NULL;

-

-	for (int i = 0; i < iconList.getCount(); i++) {

-		IcolibItem *p = iconList[i];

-		if ((void*)p == hIcon) {

-			big = (p->source_small == NULL);

-			return p;

-		}

-		if (p->source_small && p->source_small->icon == hIcon) {

-			big = false;

-			return p;

-		}

-		if (p->source_big && p->source_big->icon == hIcon) {

-			big = true;

-			return p;

-		}

-	}

-

-	return NULL;

-}

-

-static void IcoLib_FreeIcon(IcolibItem* icon)

-{

-	if (!icon) return;

-

-	SAFE_FREE((void**)&icon->name);

-	SAFE_FREE((void**)&icon->description);

-	SAFE_FREE((void**)&icon->default_file);

-	SAFE_FREE((void**)&icon->temp_file);

-	if (icon->section) {

-		if (!--icon->section->ref_count)

-			IcoLib_RemoveSection(icon->section);

-		icon->section = NULL;

-	}

-	IconSourceItem_Release(&icon->source_small);

-	IconSourceItem_Release(&icon->source_big);

-	IconSourceItem_Release(&icon->default_icon);

-	SafeDestroyIcon(&icon->temp_icon);

-}

-

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

-// IcoLib_AddNewIcon

-

-HANDLE IcoLib_AddNewIcon(int hLangpack, SKINICONDESC *sid)

-{

-	bool utf = (sid->flags & SIDF_UNICODE) != 0;

-	bool utf_path = (sid->flags & SIDF_PATH_UNICODE) != 0;

-

-	mir_cslock lck(csIconList);

-

-	IcolibItem *item = IcoLib_FindIcon(sid->pszName);

-	if (!item) {

-		item = (IcolibItem*)mir_calloc(sizeof(IcolibItem));

-		item->name = sid->pszName;

-		iconList.insert(item);

-	}

-	else IcoLib_FreeIcon(item);

-

-	item->name = mir_strdup(sid->pszName);

-	if (utf) {

-		item->description = mir_u2t(sid->description.w);

-		item->section = IcoLib_AddSection(sid->section.w, TRUE);

-	}

-	else {

-		item->description = mir_a2t(sid->description.a);

-		WCHAR *pwszSection = sid->section.a ? mir_a2u(sid->section.a) : NULL;

-		item->section = IcoLib_AddSection(pwszSection, TRUE);

-		SAFE_FREE((void**)&pwszSection);

-	}

-

-	if (item->section) {

-		item->section->ref_count++;

-		item->orderID = ++item->section->maxOrder;

-	}

-	else item->orderID = 0;

-

-	if (sid->defaultFile.a) {

-		WCHAR fileFull[ MAX_PATH ];

-		if (utf_path)

-			PathToAbsoluteT(sid->defaultFile.w, fileFull);

-		else

-			PathToAbsoluteT(_A2T(sid->defaultFile.a), fileFull);

-		item->default_file = mir_wstrdup(fileFull);

-	}

-	item->default_indx = sid->iDefaultIndex;

-

-	item->cx = sid->cx;

-	item->cy = sid->cy;

-	item->hLangpack = hLangpack;

-

-	if (sid->hDefaultIcon) {

-		bool big;

-		IcolibItem* def_item = IcoLib_FindHIcon(sid->hDefaultIcon, big);

-		if (def_item) {

-			item->default_icon = big ? def_item->source_big : def_item->source_small;

-			item->default_icon->ref_count++;

-		}

-		else {

-			int cx = item->cx ? item->cx : GetSystemMetrics(SM_CXSMICON);

-			int cy = item->cy ? item->cy : GetSystemMetrics(SM_CYSMICON);

-			item->default_icon = CreateStaticIconSourceItem(cx, cy);

-			if (GetIconData(sid->hDefaultIcon, &item->default_icon->icon_data, &item->default_icon->icon_size))

-				IconSourceItem_Release(&item->default_icon);

-		}

-	}

-

-	if (item->section)

-		item->section->flags = sid->flags & SIDF_SORTED;

-

-	return item;

-}

-

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

-// IcoLib_RemoveIcon

-

-static int IcoLib_RemoveIcon_Internal(int i)

-{

-	IcolibItem *item = iconList[ i ];

-	IcoLib_FreeIcon(item);

-	iconList.remove(i);

-	SAFE_FREE((void**)&item);

-	return 0;

-}

-

-static INT_PTR IcoLib_RemoveIcon(WPARAM wParam, LPARAM lParam)

-{

-	if (wParam) {

-		mir_cslock lck(csIconList);

-

-		int i = iconList.indexOf((IcolibItem*)wParam);

-		if (i != -1)

-			return IcoLib_RemoveIcon_Internal(i);

-	}

-

-	if (lParam) {

-		mir_cslock lck(csIconList);

-

-		int i = iconList.getIndex((IcolibItem*)&lParam);

-		if (i != -1)

-			return IcoLib_RemoveIcon_Internal(i);

-	}

-	return 1; // Failed

-}

-

-void KillModuleIcons(int hLangpack)

-{

-	if (!bModuleInitialized)

-		return;

-

-	mir_cslock lck(csIconList);

-	for (int i = iconList.getCount()-1; i >= 0; i--) {

-		IcolibItem *item = iconList[i];

-		if ( item->hLangpack == hLangpack) {

-			IcoLib_FreeIcon(item);

-			iconList.remove(i);

-			SAFE_FREE((void**)&item);

-		}

-	}

-}

-

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

-// IconItem_GetDefaultIcon

-

-HICON IconItem_GetDefaultIcon(IcolibItem* item, bool big)

-{

-	HICON hIcon = NULL;

-

-	if (item->default_icon && !big) {

-		IconSourceItem_Release(&item->source_small);

-		item->source_small = item->default_icon;

-		item->source_small->ref_count++;

-		hIcon = IconSourceItem_GetIcon(item->source_small);

-	}

-

-	if (!hIcon && item->default_file) {

-		int cx = item->cx ? item->cx : GetSystemMetrics(big ? SM_CXICON : SM_CXSMICON);

-		int cy = item->cy ? item->cy : GetSystemMetrics(big ? SM_CYICON : SM_CYSMICON);

-		IconSourceItem* def_icon = GetIconSourceItem(item->default_file, item->default_indx, cx, cy);

-		if (big) {

-			if (def_icon != item->source_big) {

-				IconSourceItem_Release(&item->source_big);

-				item->source_big = def_icon;

-				if (def_icon) {

-					def_icon->ref_count++;

-					hIcon = IconSourceItem_GetIcon(def_icon);

-				}

-			}

-			else

-				IconSourceItem_Release(&def_icon);

-		}

-		else {

-			if (def_icon != item->default_icon) {

-				IconSourceItem_Release(&item->default_icon);

-				item->default_icon = def_icon;

-				if (def_icon) {

-					IconSourceItem_Release(&item->source_small);

-					item->source_small = def_icon;

-					def_icon->ref_count++;

-					hIcon = IconSourceItem_GetIcon(def_icon);

-				}

-			}

-			else

-				IconSourceItem_Release(&def_icon);

-		}

-	}

-	return hIcon;

-}

-

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

-// IconItem_GetIcon

-

-HICON IconItem_GetIcon(IcolibItem* item, bool big)

-{

-	DBVARIANT dbv = {0};

-	HICON hIcon = NULL;

-

-	big = big && !item->cx;

-	IconSourceItem* &source = big ? item->source_big : item->source_small;

-

-	if (!source && !db_get_ts(NULL, "SkinIcons", item->name, &dbv)) {

-		TCHAR tszFullPath[MAX_PATH];

-		PathToAbsoluteT(dbv.ptszVal, tszFullPath);

-		int cx = item->cx ? item->cx : GetSystemMetrics(big ? SM_CXICON : SM_CXSMICON);

-		int cy = item->cy ? item->cy : GetSystemMetrics(big ? SM_CYICON : SM_CYSMICON);

-		source = GetIconSourceItemFromPath(tszFullPath, cx, cy);

-		db_free(&dbv);

-	}

-

-	if (source)

-		hIcon = IconSourceItem_GetIcon(source);

-

-	if (!hIcon)

-		hIcon = IconItem_GetDefaultIcon(item, big);

-

-	if (!hIcon)

-		return hIconBlank;

-

-	return hIcon;

-}

-

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

-// IcoLib_GetIcon

-// lParam: pszIconName

-// wParam: PLOADIMAGEPARAM or NULL.

-// if wParam == NULL, default is used:

-//     uType = IMAGE_ICON

-//     cx/cyDesired = GetSystemMetrics(SM_CX/CYSMICON)

-//     fuLoad = 0

-

-HICON IcoLib_GetIcon(const char* pszIconName, bool big)

-{

-	if (!pszIconName)

-		return hIconBlank;

-

-	mir_cslock lck(csIconList);

-	IcolibItem* item = IcoLib_FindIcon(pszIconName);

-	return (item) ? IconItem_GetIcon(item, big) : NULL;

-}

-

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

-// IcoLib_GetIconHandle

-// lParam: pszIconName

-

-HANDLE IcoLib_GetIconHandle(const char* pszIconName)

-{

-	if (!pszIconName)

-		return NULL;

-

-	mir_cslock lck(csIconList);

-	return IcoLib_FindIcon(pszIconName);

-}

-

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

-// IcoLib_GetIconByHandle

-// lParam: icolib item handle

-// wParam: 0

-

-HICON IcoLib_GetIconByHandle(HANDLE hItem, bool big)

-{

-	if (hItem == NULL)

-		return NULL;

-

-	mir_cslock lck(csIconList);

-	IcolibItem* pi = (IcolibItem*)hItem;

-	if ( iconList.getIndex(pi) != -1)

-		return IconItem_GetIcon(pi, big);

-

-	return hIconBlank;

-}

-

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

-// IcoLib_IsManaged

-// lParam: NULL

-// wParam: HICON

-

-HANDLE IcoLib_IsManaged(HICON hIcon)

-{

-	mir_cslock lck(csIconList);

-

-	bool big;

-	return IcoLib_FindHIcon(hIcon, big);

-}

-

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

-// IcoLib_AddRef

-// lParam: NULL

-// wParam: HICON

-

-static INT_PTR IcoLib_AddRef(WPARAM wParam, LPARAM)

-{

-	mir_cslock lck(csIconList);

-

-	bool big;

-	IcolibItem *item = IcoLib_FindHIcon((HICON)wParam, big);

-

-	INT_PTR res = 1;

-	if (item) {

-		IconSourceItem* source = big && !item->cx ? item->source_big : item->source_small;

-		if (source->icon_ref_count) {

-			source->icon_ref_count++;

-			res = 0;

-		}

-	}

-

-	return res;

-}

-

-static int SkinSystemModulesLoaded(WPARAM, LPARAM)

-{

-	HookEvent(ME_OPT_INITIALISE, SkinOptionsInit);

-	return 0;

-}

-

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

-// Module initialization and finalization procedure

-

-static INT_PTR sttIcoLib_AddNewIcon(WPARAM wParam, LPARAM lParam)

-{

-	return (INT_PTR)IcoLib_AddNewIcon((int)wParam, (SKINICONDESC*)lParam);

-}

-

-static INT_PTR sttIcoLib_GetIcon(WPARAM wParam, LPARAM lParam)

-{

-	return (INT_PTR)IcoLib_GetIcon((const char*)lParam, wParam != 0);

-}

-

-static INT_PTR sttIcoLib_GetIconHandle(WPARAM, LPARAM lParam)

-{

-	return (INT_PTR)IcoLib_GetIconHandle((const char*)lParam);

-}

-

-static INT_PTR sttIcoLib_GetIconByHandle(WPARAM wParam, LPARAM lParam)

-{

-	return (INT_PTR)IcoLib_GetIconByHandle((HANDLE)lParam, wParam != 0);

-}

-

-static INT_PTR sttIcoLib_ReleaseIcon(WPARAM wParam, LPARAM lParam)

-{

-	return (INT_PTR)IcoLib_ReleaseIcon((HICON)wParam, (char*)lParam, false);

-}

-

-static INT_PTR sttIcoLib_ReleaseIconBig(WPARAM wParam, LPARAM lParam)

-{

-	return (INT_PTR)IcoLib_ReleaseIcon((HICON)wParam, (char*)lParam, true);

-}

-

-static INT_PTR sttIcoLib_IsManaged(WPARAM wParam, LPARAM)

-{

-	return (INT_PTR)IcoLib_IsManaged((HICON)wParam);

-}

-

-int LoadIcoLibModule(void)

-{

-	bModuleInitialized = TRUE;

-

-	hIconBlank = LoadIconEx(NULL, MAKEINTRESOURCE(IDI_BLANK), 0);

-

-	hIcoLib_AddNewIcon    = CreateServiceFunction("Skin2/Icons/AddIcon",    sttIcoLib_AddNewIcon);

-	hIcoLib_RemoveIcon    = CreateServiceFunction(MS_SKIN2_REMOVEICON,      IcoLib_RemoveIcon);

-	hIcoLib_GetIcon       = CreateServiceFunction(MS_SKIN2_GETICON,         sttIcoLib_GetIcon);

-	hIcoLib_GetIconHandle = CreateServiceFunction(MS_SKIN2_GETICONHANDLE,   sttIcoLib_GetIconHandle);

-	hIcoLib_GetIcon2      = CreateServiceFunction(MS_SKIN2_GETICONBYHANDLE, sttIcoLib_GetIconByHandle);

-	hIcoLib_IsManaged     = CreateServiceFunction(MS_SKIN2_ISMANAGEDICON,   sttIcoLib_IsManaged);

-	hIcoLib_AddRef        = CreateServiceFunction(MS_SKIN2_ADDREFICON,      IcoLib_AddRef);

-	hIcoLib_ReleaseIcon   = CreateServiceFunction(MS_SKIN2_RELEASEICON,     sttIcoLib_ReleaseIcon);

-	hIcoLib_ReleaseIcon   = CreateServiceFunction(MS_SKIN2_RELEASEICONBIG,  sttIcoLib_ReleaseIconBig);

-

-	hIcons2ChangedEvent = CreateHookableEvent(ME_SKIN2_ICONSCHANGED);

-	hIconsChangedEvent  = CreateHookableEvent(ME_SKIN_ICONSCHANGED);

-

-	HookEvent(ME_SYSTEM_MODULESLOADED, SkinSystemModulesLoaded);

-

-	return 0;

-}

-

-void UnloadIcoLibModule(void)

-{

-	int i;

-

-	if (!bModuleInitialized) return;

-

-	DestroyHookableEvent(hIconsChangedEvent);

-	DestroyHookableEvent(hIcons2ChangedEvent);

-

-	DestroyServiceFunction(hIcoLib_AddNewIcon);

-	DestroyServiceFunction(hIcoLib_RemoveIcon);

-	DestroyServiceFunction(hIcoLib_GetIcon);

-	DestroyServiceFunction(hIcoLib_GetIconHandle);

-	DestroyServiceFunction(hIcoLib_GetIcon2);

-	DestroyServiceFunction(hIcoLib_IsManaged);

-	DestroyServiceFunction(hIcoLib_AddRef);

-	DestroyServiceFunction(hIcoLib_ReleaseIcon);

-

-	for (i = iconList.getCount()-1; i >= 0; i--) {

-		IcolibItem* p = iconList[i];

-		iconList.remove(i);

-		IcoLib_FreeIcon(p);

-		mir_free(p);

-	}

-

-	for (i = iconSourceList.getCount()-1; i >= 0; i--) {

-		IconSourceItem* p = iconSourceList[i];

-		iconSourceList.remove(i);

-		IconSourceFile_Release(&p->file);

-		SafeDestroyIcon(&p->icon);

-		SAFE_FREE((void**)&p->icon_data);

-		SAFE_FREE((void**)&p);

-	}

-

-	for (i = iconSourceFileList.getCount()-1; i >= 0; i--) {

-		IconSourceFile* p = iconSourceFileList[i];

-		iconSourceFileList.remove(i);

-		SAFE_FREE((void**)&p->file);

-		SAFE_FREE((void**)&p);

-	}

-

-	for (i = 0; i < sectionList.getCount(); i++) {

-		SAFE_FREE((void**)&sectionList[i]->name);

-		mir_free(sectionList[i]);

-	}

-

-	SafeDestroyIcon(&hIconBlank);

-	bModuleInitialized = false;

-}

diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp
deleted file mode 100644
index c856cd8b30..0000000000
--- a/src/modules/icolib/skin2opts.cpp
+++ /dev/null
@@ -1,1047 +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 "IcoLib.h"

-

-struct TreeItem

-{

-	char *paramName;

-	DWORD value;

-};

-

-struct IcoLibOptsData

-{

-	HWND hwndIndex;

-};

-

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

-

-static HICON ExtractIconFromPath(const TCHAR *path, int cxIcon, int cyIcon)

-{

-	TCHAR *comma;

-	TCHAR file[MAX_PATH], fileFull[MAX_PATH];

-	int n;

-	HICON hIcon;

-

-	if (!path)

-		return (HICON)NULL;

-

-	mir_tstrncpy(file, path, SIZEOF(file));

-	comma = _tcsrchr(file, ',');

-	if (!comma)

-		n = 0;

-	else {

-		n = _ttoi(comma + 1);

-		*comma = 0;

-	}

-	PathToAbsoluteT(file, fileFull);

-	hIcon = NULL;

-

-	//SHOULD BE REPLACED WITH GOOD ENOUGH FUNCTION

-	_ExtractIconEx(fileFull, n, cxIcon, cyIcon, &hIcon, LR_COLOR);

-	return hIcon;

-}

-

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

-// IcoLib_ReleaseIcon

-// lParam: pszIconName or NULL

-// wParam: HICON or NULL

-

-int IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big)

-{

-	mir_cslock lck(csIconList);

-

-	IcolibItem *item = NULL;

-	if (szIconName)

-		item = IcoLib_FindIcon(szIconName);

-

-	if (!item && hIcon) // find by HICON

-		item = IcoLib_FindHIcon(hIcon, big);

-

-	int res = 1;

-	if (item) {

-		IconSourceItem* source = big && !item->cx ? item->source_big : item->source_small;

-		if (source && source->icon_ref_count) {

-			if (iconEventActive)

-				source->icon_ref_count--;

-			else

-				IconSourceItem_ReleaseIcon(source);

-			res = 0;

-		}

-	}

-

-	return res;

-}

-

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

-// IconItem_GetIcon_Preview

-

-HICON IconItem_GetIcon_Preview(IcolibItem* item)

-{

-	HICON hIcon = NULL;

-

-	if (!item->temp_reset) {

-		HICON hRefIcon = IconItem_GetIcon(item, false);

-		hIcon = CopyIcon(hRefIcon);

-		if (item->source_small && item->source_small->icon == hRefIcon)

-			IconSourceItem_ReleaseIcon(item->source_small);

-	}

-	else {

-		if (item->default_icon) {

-			HICON hRefIcon = IconSourceItem_GetIcon(item->default_icon);

-			if (hRefIcon) {

-				hIcon = CopyIcon(hRefIcon);

-				if (item->default_icon->icon == hRefIcon)

-					IconSourceItem_ReleaseIcon(item->default_icon);

-			}

-		}

-

-		if (!hIcon && item->default_file) {

-			IconSourceItem_Release(&item->default_icon);

-			item->default_icon = GetIconSourceItem(item->default_file, item->default_indx, item->cx, item->cy);

-			if (item->default_icon) {

-				HICON hRefIcon = IconSourceItem_GetIcon(item->default_icon);

-				if (hRefIcon) {

-					hIcon = CopyIcon(hRefIcon);

-					if (item->default_icon->icon == hRefIcon)

-						IconSourceItem_ReleaseIcon(item->default_icon);

-				}

-			}

-		}

-

-		if (!hIcon)

-			return CopyIcon(hIconBlank);

-	}

-	return hIcon;

-}

-

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

-// IcoLib GUI service routines

-

-static void __fastcall MySetCursor(TCHAR* nCursor)

-{

-	SetCursor(LoadCursor(NULL, nCursor));

-}

-

-static void LoadSectionIcons(TCHAR *filename, SectionItem* sectionActive)

-{

-	TCHAR path[MAX_PATH];

-	mir_sntprintf(path, SIZEOF(path), _T("%s,"), filename);

-	size_t suffIndx = mir_tstrlen(path);

-

-	mir_cslock lck(csIconList);

-

-	for (int indx = 0; indx < iconList.getCount(); indx++) {

-		IcolibItem *item = iconList[indx];

-

-		if (item->default_file && item->section == sectionActive) {

-			_itot(item->default_indx, path + suffIndx, 10);

-			HICON hIcon = ExtractIconFromPath(path, item->cx, item->cy);

-			if (!hIcon)

-				continue;

-

-			SAFE_FREE((void**)&item->temp_file);

-			SafeDestroyIcon(&item->temp_icon);

-

-			item->temp_file = mir_tstrdup(path);

-			item->temp_icon = hIcon;

-			item->temp_reset = FALSE;

-		}

-	}

-}

-

-void LoadSubIcons(HWND htv, TCHAR *filename, HTREEITEM hItem)

-{

-	TVITEM tvi;

-	tvi.mask = TVIF_HANDLE | TVIF_PARAM;

-	tvi.hItem = hItem;

-	TreeView_GetItem(htv, &tvi);

-

-	TreeItem *treeItem = (TreeItem *)tvi.lParam;

-	SectionItem* sectionActive = sectionList[SECTIONPARAM_INDEX(treeItem->value)];

-

-	tvi.hItem = TreeView_GetChild(htv, tvi.hItem);

-	while (tvi.hItem) {

-		LoadSubIcons(htv, filename, tvi.hItem);

-		tvi.hItem = TreeView_GetNextSibling(htv, tvi.hItem);

-	}

-

-	if (SECTIONPARAM_FLAGS(treeItem->value) & SECTIONPARAM_HAVEPAGE)

-		LoadSectionIcons(filename, sectionActive);

-}

-

-static void UndoChanges(int iconIndx, int cmd)

-{

-	IcolibItem *item = iconList[iconIndx];

-

-	if (!item->temp_file && !item->temp_icon && item->temp_reset && cmd == ID_CANCELCHANGE)

-		item->temp_reset = FALSE;

-	else {

-		SAFE_FREE((void**)&item->temp_file);

-		SafeDestroyIcon(&item->temp_icon);

-	}

-

-	if (cmd == ID_RESET)

-		item->temp_reset = TRUE;

-}

-

-void UndoSubItemChanges(HWND htv, HTREEITEM hItem, int cmd)

-{

-	TVITEM tvi = { 0 };

-	tvi.mask = TVIF_HANDLE | TVIF_PARAM;

-	tvi.hItem = hItem;

-	TreeView_GetItem(htv, &tvi);

-

-	TreeItem *treeItem = (TreeItem *)tvi.lParam;

-	if (SECTIONPARAM_FLAGS(treeItem->value) & SECTIONPARAM_HAVEPAGE) {

-		mir_cslock lck(csIconList);

-

-		for (int indx = 0; indx < iconList.getCount(); indx++)

-			if (iconList[indx]->section == sectionList[SECTIONPARAM_INDEX(treeItem->value)])

-				UndoChanges(indx, cmd);

-	}

-

-	tvi.hItem = TreeView_GetChild(htv, tvi.hItem);

-	while (tvi.hItem) {

-		UndoSubItemChanges(htv, tvi.hItem, cmd);

-		tvi.hItem = TreeView_GetNextSibling(htv, tvi.hItem);

-	}

-}

-

-static void OpenIconsPage()

-{

-	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/");

-}

-

-static int OpenPopupMenu(HWND hwndDlg)

-{

-	HMENU hMenu, hPopup;

-	POINT pt;

-	int cmd;

-

-	GetCursorPos(&pt);

-	hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_ICOLIB_CONTEXT));

-	hPopup = GetSubMenu(hMenu, 0);

-	TranslateMenu(hPopup);

-	cmd = TrackPopupMenu(hPopup, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);

-	DestroyMenu(hMenu);

-	return cmd;

-}

-

-static TCHAR* OpenFileDlg(HWND hParent, const TCHAR* szFile, BOOL bAll)

-{

-	OPENFILENAME ofn = { 0 };

-	TCHAR filter[512], *pfilter, file[MAX_PATH * 2];

-

-	ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

-	ofn.hwndOwner = hParent;

-

-	mir_tstrcpy(filter, TranslateT("Icon sets"));

-	if (bAll)

-		mir_tstrcat(filter, _T(" (*.dll;*.icl;*.exe;*.ico)"));

-	else

-		mir_tstrcat(filter, _T(" (*.dll)"));

-

-	pfilter = filter + mir_tstrlen(filter) + 1;

-	if (bAll)

-		mir_tstrcpy(pfilter, _T("*.DLL;*.ICL;*.EXE;*.ICO"));

-	else

-		mir_tstrcpy(pfilter, _T("*.DLL"));

-

-	pfilter += mir_tstrlen(pfilter) + 1;

-	mir_tstrcpy(pfilter, TranslateT("All files"));

-	mir_tstrcat(pfilter, _T(" (*)"));

-	pfilter += mir_tstrlen(pfilter) + 1;

-	mir_tstrcpy(pfilter, _T("*"));

-	pfilter += mir_tstrlen(pfilter) + 1;

-	*pfilter = '\0';

-

-	ofn.lpstrFilter = filter;

-	ofn.lpstrDefExt = _T("dll");

-	mir_tstrncpy(file, szFile, SIZEOF(file));

-	ofn.lpstrFile = file;

-	ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_DONTADDTORECENT;

-	ofn.nMaxFile = MAX_PATH * 2;

-

-	if (!GetOpenFileName(&ofn))

-		return NULL;

-

-	return mir_tstrdup(file);

-}

-

-//

-//  User interface

-//

-

-#define DM_REBUILDICONSPREVIEW  (WM_USER+10)

-#define DM_CHANGEICON           (WM_USER+11)

-#define DM_CHANGESPECIFICICON   (WM_USER+12)

-#define DM_UPDATEICONSPREVIEW   (WM_USER+13)

-#define DM_REBUILD_CTREE        (WM_USER+14)

-

-INT_PTR CALLBACK DlgProcIconImport(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-

-void DoOptionsChanged(HWND hwndDlg)

-{

-	SendMessage(hwndDlg, DM_UPDATEICONSPREVIEW, 0, 0);

-	SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-}

-

-void DoIconsChanged(HWND hwndDlg)

-{

-	SendMessage(hwndDlg, DM_UPDATEICONSPREVIEW, 0, 0);

-

-	iconEventActive = 1; // Disable icon destroying - performance boost

-	NotifyEventHooks(hIconsChangedEvent, 0, 0);

-	NotifyEventHooks(hIcons2ChangedEvent, 0, 0);

-	iconEventActive = 0;

-

-	mir_cslock lck(csIconList); // Destroy unused icons

-	for (int indx = 0; indx < iconList.getCount(); indx++) {

-		IcolibItem *item = iconList[indx];

-		if (item->source_small && !item->source_small->icon_ref_count) {

-			item->source_small->icon_ref_count++;

-			IconSourceItem_ReleaseIcon(item->source_small);

-		}

-		if (item->source_big && !item->source_big->icon_ref_count) {

-			item->source_big->icon_ref_count++;

-			IconSourceItem_ReleaseIcon(item->source_big);

-		}

-	}

-}

-

-static HTREEITEM FindNamedTreeItemAt(HWND hwndTree, HTREEITEM hItem, const TCHAR *name)

-{

-	TVITEM tvi = { 0 };

-	TCHAR str[MAX_PATH];

-

-	if (hItem)

-		tvi.hItem = TreeView_GetChild(hwndTree, hItem);

-	else

-		tvi.hItem = TreeView_GetRoot(hwndTree);

-

-	if (!name)

-		return tvi.hItem;

-

-	tvi.mask = TVIF_TEXT;

-	tvi.pszText = str;

-	tvi.cchTextMax = SIZEOF(str);

-

-	while (tvi.hItem) {

-		TreeView_GetItem(hwndTree, &tvi);

-

-		if (!mir_tstrcmp(tvi.pszText, name))

-			return tvi.hItem;

-

-		tvi.hItem = TreeView_GetNextSibling(hwndTree, tvi.hItem);

-	}

-	return NULL;

-}

-

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

-// icon import dialog's window procedure

-

-static int IconDlg_Resize(HWND, LPARAM, UTILRESIZECONTROL *urc)

-{

-	switch (urc->wId) {

-	case IDC_ICONSET:

-		return RD_ANCHORX_WIDTH | RD_ANCHORY_TOP;

-

-	case IDC_BROWSE:

-		return RD_ANCHORX_RIGHT | RD_ANCHORY_TOP;

-

-	case IDC_PREVIEW:

-		return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT;

-

-	case IDC_GETMORE:

-		return RD_ANCHORX_CENTRE | RD_ANCHORY_BOTTOM;

-	}

-	return RD_ANCHORX_LEFT | RD_ANCHORY_TOP; // default

-}

-

-INT_PTR CALLBACK DlgProcIconImport(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	static HWND hwndParent, hwndDragOver;

-	static int dragging;

-	static int dragItem, dropHiLite;

-	static HWND hPreview = NULL;

-

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-		hwndParent = (HWND)lParam;

-		hPreview = GetDlgItem(hwndDlg, IDC_PREVIEW);

-		dragging = dragItem = 0;

-		ListView_SetImageList(hPreview, ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 100), LVSIL_NORMAL);

-		ListView_SetIconSpacing(hPreview, 56, 67);

-		{

-			RECT rcThis, rcParent;

-			int cxScreen = GetSystemMetrics(SM_CXSCREEN);

-

-			GetWindowRect(hwndDlg, &rcThis);

-			GetWindowRect(hwndParent, &rcParent);

-			OffsetRect(&rcThis, rcParent.right - rcThis.left, 0);

-			OffsetRect(&rcThis, 0, rcParent.top - rcThis.top);

-			GetWindowRect(GetParent(hwndParent), &rcParent);

-			if (rcThis.right > cxScreen) {

-				OffsetRect(&rcParent, cxScreen - rcThis.right, 0);

-				OffsetRect(&rcThis, cxScreen - rcThis.right, 0);

-				MoveWindow(GetParent(hwndParent), rcParent.left, rcParent.top, rcParent.right - rcParent.left, rcParent.bottom - rcParent.top, TRUE);

-			}

-			MoveWindow(hwndDlg, rcThis.left, rcThis.top, rcThis.right - rcThis.left, rcThis.bottom - rcThis.top, FALSE);

-			GetClientRect(hwndDlg, &rcThis);

-			SendMessage(hwndDlg, WM_SIZE, 0, MAKELPARAM(rcThis.right - rcThis.left, rcThis.bottom - rcThis.top));

-		}

-

-		SHAutoComplete(GetDlgItem(hwndDlg, IDC_ICONSET), 1);

-

-		SetDlgItemText(hwndDlg, IDC_ICONSET, _T("icons.dll"));

-		return TRUE;

-

-	case DM_REBUILDICONSPREVIEW:

-		{

-			MySetCursor(IDC_WAIT);

-			ListView_DeleteAllItems(hPreview);

-			HIMAGELIST hIml = ListView_GetImageList(hPreview, LVSIL_NORMAL);

-			ImageList_RemoveAll(hIml);

-

-			TCHAR filename[MAX_PATH], caption[64];

-			GetDlgItemText(hwndDlg, IDC_ICONSET, filename, SIZEOF(filename));

-			{

-				RECT rcPreview, rcGroup;

-

-				GetWindowRect(hPreview, &rcPreview);

-				GetWindowRect(GetDlgItem(hwndDlg, IDC_IMPORTMULTI), &rcGroup);

-				//SetWindowPos(hPreview, 0, 0, 0, rcPreview.right-rcPreview.left, rcGroup.bottom-rcPreview.top, SWP_NOZORDER|SWP_NOMOVE);

-			}

-

-			if (_taccess(filename, 0) != 0) {

-				MySetCursor(IDC_ARROW);

-				break;

-			}

-

-			LVITEM lvi;

-			lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

-			lvi.iSubItem = 0;

-			lvi.iItem = 0;

-			int count = (int)_ExtractIconEx(filename, -1, 16, 16, NULL, LR_DEFAULTCOLOR);

-			for (int i = 0; i < count; lvi.iItem++, i++) {

-				mir_sntprintf(caption, SIZEOF(caption), _T("%d"), i + 1);

-				lvi.pszText = caption;

-

-				HICON hIcon;

-				_ExtractIconEx(filename, i, 16, 16, &hIcon, LR_DEFAULTCOLOR);

-				lvi.iImage = ImageList_AddIcon(hIml, hIcon);

-				DestroyIcon(hIcon);

-				lvi.lParam = i;

-				ListView_InsertItem(hPreview, &lvi);

-			}

-			MySetCursor(IDC_ARROW);

-		}

-		break;

-

-	case WM_COMMAND:

-		switch (LOWORD(wParam)) {

-		case IDC_BROWSE:

-			{

-				TCHAR str[MAX_PATH], *file;

-				GetDlgItemText(hwndDlg, IDC_ICONSET, str, SIZEOF(str));

-				if (!(file = OpenFileDlg(GetParent(hwndDlg), str, TRUE)))

-					break;

-				SetDlgItemText(hwndDlg, IDC_ICONSET, file);

-				SAFE_FREE((void**)&file);

-			}

-			break;

-

-		case IDC_GETMORE:

-			OpenIconsPage();

-			break;

-

-		case IDC_ICONSET:

-			if (HIWORD(wParam) == EN_CHANGE)

-				SendMessage(hwndDlg, DM_REBUILDICONSPREVIEW, 0, 0);

-			break;

-		}

-		break;

-

-	case WM_MOUSEMOVE:

-		if (dragging) {

-			LVHITTESTINFO lvhti;

-			int onItem = 0;

-			HWND hwndOver;

-			RECT rc;

-			POINT ptDrag;

-			HWND hPPreview = GetDlgItem(hwndParent, IDC_PREVIEW);

-

-			lvhti.pt.x = (short)LOWORD(lParam); lvhti.pt.y = (short)HIWORD(lParam);

-			ClientToScreen(hwndDlg, &lvhti.pt);

-			hwndOver = WindowFromPoint(lvhti.pt);

-			GetWindowRect(hwndOver, &rc);

-			ptDrag.x = lvhti.pt.x - rc.left; ptDrag.y = lvhti.pt.y - rc.top;

-			if (hwndOver != hwndDragOver) {

-				ImageList_DragLeave(hwndDragOver);

-				hwndDragOver = hwndOver;

-				ImageList_DragEnter(hwndDragOver, ptDrag.x, ptDrag.y);

-			}

-

-			ImageList_DragMove(ptDrag.x, ptDrag.y);

-			if (hwndOver == hPPreview) {

-				ScreenToClient(hPPreview, &lvhti.pt);

-

-				if (ListView_HitTest(hPPreview, &lvhti) != -1) {

-					if (lvhti.iItem != dropHiLite) {

-						ImageList_DragLeave(hwndDragOver);

-						if (dropHiLite != -1)

-							ListView_SetItemState(hPPreview, dropHiLite, 0, LVIS_DROPHILITED);

-						dropHiLite = lvhti.iItem;

-						ListView_SetItemState(hPPreview, dropHiLite, LVIS_DROPHILITED, LVIS_DROPHILITED);

-						UpdateWindow(hPPreview);

-						ImageList_DragEnter(hwndDragOver, ptDrag.x, ptDrag.y);

-					}

-					onItem = 1;

-				}

-			}

-

-			if (!onItem && dropHiLite != -1) {

-				ImageList_DragLeave(hwndDragOver);

-				ListView_SetItemState(hPPreview, dropHiLite, 0, LVIS_DROPHILITED);

-				UpdateWindow(hPPreview);

-				ImageList_DragEnter(hwndDragOver, ptDrag.x, ptDrag.y);

-				dropHiLite = -1;

-			}

-			MySetCursor(onItem ? IDC_ARROW : IDC_NO);

-		}

-		break;

-

-	case WM_LBUTTONUP:

-		if (dragging) {

-			ReleaseCapture();

-			ImageList_EndDrag();

-			dragging = 0;

-			if (dropHiLite != -1) {

-				TCHAR path[MAX_PATH], fullPath[MAX_PATH], filename[MAX_PATH];

-				LVITEM lvi;

-

-				GetDlgItemText(hwndDlg, IDC_ICONSET, fullPath, SIZEOF(fullPath));

-				PathToRelativeT(fullPath, filename);

-				lvi.mask = LVIF_PARAM;

-				lvi.iItem = dragItem; lvi.iSubItem = 0;

-				ListView_GetItem(hPreview, &lvi);

-				mir_sntprintf(path, SIZEOF(path), _T("%s,%d"), filename, (int)lvi.lParam);

-				SendMessage(hwndParent, DM_CHANGEICON, dropHiLite, (LPARAM)path);

-				ListView_SetItemState(GetDlgItem(hwndParent, IDC_PREVIEW), dropHiLite, 0, LVIS_DROPHILITED);

-			}

-		}

-		break;

-

-	case WM_NOTIFY:

-		switch (((LPNMHDR)lParam)->idFrom) {

-		case IDC_PREVIEW:

-			switch (((LPNMHDR)lParam)->code) {

-			case LVN_BEGINDRAG:

-				SetCapture(hwndDlg);

-				dragging = 1;

-				dragItem = ((LPNMLISTVIEW)lParam)->iItem;

-				dropHiLite = -1;

-				ImageList_BeginDrag(ListView_GetImageList(hPreview, LVSIL_NORMAL), dragItem, GetSystemMetrics(SM_CXICON) / 2, GetSystemMetrics(SM_CYICON) / 2);

-				{

-					POINT pt;

-					RECT rc;

-

-					GetCursorPos(&pt);

-					GetWindowRect(hwndDlg, &rc);

-					ImageList_DragEnter(hwndDlg, pt.x - rc.left, pt.y - rc.top);

-					hwndDragOver = hwndDlg;

-				}

-				break;

-			}

-			break;

-		}

-		break;

-

-	case WM_SIZE: // make the dlg resizeable

-		if (!IsIconic(hwndDlg)) {

-			UTILRESIZEDIALOG urd = { 0 };

-			urd.cbSize = sizeof(urd);

-			urd.hInstance = hInst;

-			urd.hwndDlg = hwndDlg;

-			urd.lParam = 0; // user-defined

-			urd.lpTemplate = MAKEINTRESOURCEA(IDD_ICOLIB_IMPORT);

-			urd.pfnResizer = IconDlg_Resize;

-			CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM)&urd);

-		}

-		break;

-

-	case WM_CLOSE:

-		DestroyWindow(hwndDlg);

-		EnableWindow(GetDlgItem(hwndParent, IDC_IMPORT), TRUE);

-		break;

-

-	}

-

-	return FALSE;

-}

-

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

-// IcoLib options window procedure

-

-static int CALLBACK DoSortIconsFunc(LPARAM lParam1, LPARAM lParam2, LPARAM)

-{

-	return mir_tstrcmpi(iconList[lParam1]->getDescr(), iconList[lParam2]->getDescr());

-}

-

-static int CALLBACK DoSortIconsFuncByOrder(LPARAM lParam1, LPARAM lParam2, LPARAM)

-{

-	return iconList[lParam1]->orderID - iconList[lParam2]->orderID;

-}

-

-static void SaveCollapseState(HWND hwndTree)

-{

-	HTREEITEM hti = TreeView_GetRoot(hwndTree);

-	while (hti != NULL) {

-		TVITEM tvi;

-		tvi.mask = TVIF_STATE | TVIF_HANDLE | TVIF_CHILDREN | TVIF_PARAM;

-		tvi.hItem = hti;

-		tvi.stateMask = (DWORD)-1;

-		TreeView_GetItem(hwndTree, &tvi);

-

-		if (tvi.cChildren > 0) {

-			TreeItem *treeItem = (TreeItem *)tvi.lParam;

-			if (tvi.state & TVIS_EXPANDED)

-				db_set_b(NULL, "SkinIconsUI", treeItem->paramName, TVIS_EXPANDED);

-			else

-				db_set_b(NULL, "SkinIconsUI", treeItem->paramName, 0);

-		}

-

-		HTREEITEM ht = TreeView_GetChild(hwndTree, hti);

-		if (ht == NULL) {

-			ht = TreeView_GetNextSibling(hwndTree, hti);

-			while (ht == NULL) {

-				hti = TreeView_GetParent(hwndTree, hti);

-				if (hti == NULL) break;

-				ht = TreeView_GetNextSibling(hwndTree, hti);

-			}

-		}

-

-		hti = ht;

-	}

-}

-

-INT_PTR CALLBACK DlgProcIcoLibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	struct IcoLibOptsData *dat;

-	static HTREEITEM prevItem = 0;

-	static HWND hPreview = NULL;

-

-	dat = (struct IcoLibOptsData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-		hPreview = GetDlgItem(hwndDlg, IDC_PREVIEW);

-		dat = (struct IcoLibOptsData*)mir_alloc(sizeof(struct IcoLibOptsData));

-		dat->hwndIndex = NULL;

-		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

-		//

-		//  Reset temporary data & upload sections list

-		//

-		{

-			mir_cslock lck(csIconList);

-

-			for (int indx = 0; indx < iconList.getCount(); indx++) {

-				iconList[indx]->temp_file = NULL;

-				iconList[indx]->temp_icon = NULL;

-				iconList[indx]->temp_reset = FALSE;

-			}

-			bNeedRebuild = FALSE;

-		}

-

-		//

-		//  Setup preview listview

-		//

-		ListView_SetUnicodeFormat(hPreview, TRUE);

-		ListView_SetExtendedListViewStyleEx(hPreview, LVS_EX_INFOTIP, LVS_EX_INFOTIP);

-		ListView_SetImageList(hPreview, ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 30), LVSIL_NORMAL);

-		ListView_SetIconSpacing(hPreview, 56, 67);

-

-		SendMessage(hwndDlg, DM_REBUILD_CTREE, 0, 0);

-		return TRUE;

-

-	case DM_REBUILD_CTREE:

-		{

-			HWND hwndTree = GetDlgItem(hwndDlg, IDC_CATEGORYLIST);

-			int indx;

-			TCHAR itemName[1024];

-			HTREEITEM hSection;

-

-			if (!hwndTree) break;

-

-			TreeView_SelectItem(hwndTree, NULL);

-			TreeView_DeleteAllItems(hwndTree);

-

-			for (indx = 0; indx < sectionList.getCount(); indx++) {

-				TCHAR* sectionName;

-				int sectionLevel = 0;

-

-				hSection = NULL;

-				mir_tstrcpy(itemName, sectionList[indx]->name);

-				sectionName = itemName;

-

-				while (sectionName) {

-					// allow multi-level tree

-					TCHAR* pItemName = sectionName;

-					HTREEITEM hItem;

-

-					if (sectionName = _tcschr(sectionName, '/')) {

-						// one level deeper

-						*sectionName = 0;

-					}

-

-					pItemName = TranslateTS(pItemName);

-					hItem = FindNamedTreeItemAt(hwndTree, hSection, pItemName);

-					if (!sectionName || !hItem) {

-						if (!hItem) {

-							TVINSERTSTRUCT tvis = { 0 };

-							TreeItem *treeItem = (TreeItem *)mir_alloc(sizeof(TreeItem));

-							treeItem->value = SECTIONPARAM_MAKE(indx, sectionLevel, sectionName ? 0 : SECTIONPARAM_HAVEPAGE);

-							treeItem->paramName = mir_t2a(itemName);

-

-							tvis.hParent = hSection;

-							tvis.hInsertAfter = TVI_SORT;

-							tvis.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_STATE;

-							tvis.item.pszText = pItemName;

-							tvis.item.lParam = (LPARAM)treeItem;

-

-							tvis.item.state = tvis.item.stateMask = db_get_b(NULL, "SkinIconsUI", treeItem->paramName, TVIS_EXPANDED);

-							hItem = TreeView_InsertItem(hwndTree, &tvis);

-						}

-						else {

-							TVITEM tvi = { 0 };

-							tvi.hItem = hItem;

-							tvi.mask = TVIF_HANDLE | TVIF_PARAM;

-							TreeView_GetItem(hwndTree, &tvi);

-							TreeItem *treeItem = (TreeItem *)tvi.lParam;

-							treeItem->value = SECTIONPARAM_MAKE(indx, sectionLevel, SECTIONPARAM_HAVEPAGE);

-						}

-					}

-

-					if (sectionName) {

-						*sectionName = '/';

-						sectionName++;

-					}

-					sectionLevel++;

-

-					hSection = hItem;

-				}

-			}

-

-			ShowWindow(hwndTree, SW_SHOW);

-

-			TreeView_SelectItem(hwndTree, FindNamedTreeItemAt(hwndTree, 0, NULL));

-		}

-		break;

-

-		//  Rebuild preview to new section

-	case DM_REBUILDICONSPREVIEW:

-		{

-			SectionItem* sectionActive = (SectionItem*)lParam;

-			EnableWindow(hPreview, sectionActive != NULL);

-

-			ListView_DeleteAllItems(hPreview);

-			HIMAGELIST hIml = ListView_GetImageList(hPreview, LVSIL_NORMAL);

-			ImageList_RemoveAll(hIml);

-

-			if (sectionActive == NULL)

-				break;

-

-			LVITEM lvi = { 0 };

-			lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

-			{

-				mir_cslock lck(csIconList);

-

-				for (int indx = 0; indx < iconList.getCount(); indx++) {

-					IcolibItem *item = iconList[indx];

-					if (item->section == sectionActive) {

-						lvi.pszText = item->getDescr();

-						HICON hIcon = item->temp_icon;

-						if (!hIcon)

-							hIcon = IconItem_GetIcon_Preview(item);

-						lvi.iImage = ImageList_AddIcon(hIml, hIcon);

-						lvi.lParam = indx;

-						ListView_InsertItem(hPreview, &lvi);

-						if (hIcon != item->temp_icon)

-							SafeDestroyIcon(&hIcon);

-					}

-				}

-			}

-

-			if (sectionActive->flags & SIDF_SORTED)

-				ListView_SortItems(hPreview, DoSortIconsFunc, 0);

-			else

-				ListView_SortItems(hPreview, DoSortIconsFuncByOrder, 0);

-		}

-		break;

-

-	// Refresh preview to new section

-	case DM_UPDATEICONSPREVIEW:

-		{

-			LVITEM lvi = { 0 };

-			HICON hIcon;

-			int indx, count;

-			HIMAGELIST hIml = ListView_GetImageList(hPreview, LVSIL_NORMAL);

-

-			lvi.mask = LVIF_IMAGE | LVIF_PARAM;

-			count = ListView_GetItemCount(hPreview);

-

-			for (indx = 0; indx < count; indx++) {

-				lvi.iItem = indx;

-				ListView_GetItem(hPreview, &lvi);

-				{

-					mir_cslock lck(csIconList);

-					hIcon = iconList[lvi.lParam]->temp_icon;

-					if (!hIcon)

-						hIcon = IconItem_GetIcon_Preview(iconList[lvi.lParam]);

-				}

-

-				if (hIcon)

-					ImageList_ReplaceIcon(hIml, lvi.iImage, hIcon);

-				if (hIcon != iconList[lvi.lParam]->temp_icon) SafeDestroyIcon(&hIcon);

-			}

-			ListView_RedrawItems(hPreview, 0, count);

-		}

-		break;

-

-	// Temporary change icon - only inside options dialog

-	case DM_CHANGEICON:

-		{

-			LVITEM lvi = { 0 };

-			lvi.mask = LVIF_PARAM;

-			lvi.iItem = wParam;

-			ListView_GetItem(hPreview, &lvi);

-			{

-				mir_cslock lck(csIconList);

-				IcolibItem *item = iconList[lvi.lParam];

-

-				SAFE_FREE((void**)&item->temp_file);

-				SafeDestroyIcon(&item->temp_icon);

-

-				TCHAR *path = (TCHAR*)lParam;

-				item->temp_file = mir_tstrdup(path);

-				item->temp_icon = (HICON)ExtractIconFromPath(path, item->cx, item->cy);

-				item->temp_reset = FALSE;

-			}

-			DoOptionsChanged(hwndDlg);

-		}

-		break;

-

-	case WM_COMMAND:

-		if (LOWORD(wParam) == IDC_IMPORT) {

-			dat->hwndIndex = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ICOLIB_IMPORT), GetParent(hwndDlg), DlgProcIconImport, (LPARAM)hwndDlg);

-			EnableWindow((HWND)lParam, FALSE);

-		}

-		else if (LOWORD(wParam) == IDC_GETMORE) {

-			OpenIconsPage();

-			break;

-		}

-		else if (LOWORD(wParam) == IDC_LOADICONS) {

-			TCHAR filetmp[1] = { 0 };

-			TCHAR *file;

-

-			if (file = OpenFileDlg(hwndDlg, filetmp, FALSE)) {

-				HWND htv = GetDlgItem(hwndDlg, IDC_CATEGORYLIST);

-				TCHAR filename[MAX_PATH];

-

-				PathToRelativeT(file, filename);

-				SAFE_FREE((void**)&file);

-

-				MySetCursor(IDC_WAIT);

-				LoadSubIcons(htv, filename, TreeView_GetSelection(htv));

-				MySetCursor(IDC_ARROW);

-

-				DoOptionsChanged(hwndDlg);

-			}

-		}

-		break;

-

-	case WM_CONTEXTMENU:

-		if ((HWND)wParam == hPreview) {

-			UINT count = ListView_GetSelectedCount(hPreview);

-

-			if (count > 0) {

-				int cmd = OpenPopupMenu(hwndDlg);

-				switch (cmd) {

-				case ID_CANCELCHANGE:

-				case ID_RESET:

-					{

-						LVITEM lvi = { 0 };

-						int itemIndx = -1;

-

-						while ((itemIndx = ListView_GetNextItem(hPreview, itemIndx, LVNI_SELECTED)) != -1) {

-							lvi.mask = LVIF_PARAM;

-							lvi.iItem = itemIndx; //lvhti.iItem;

-							ListView_GetItem(hPreview, &lvi);

-

-							UndoChanges(lvi.lParam, cmd);

-						}

-

-						DoOptionsChanged(hwndDlg);

-						break;

-					}

-				}

-			}

-		}

-		else {

-			HWND htv = GetDlgItem(hwndDlg, IDC_CATEGORYLIST);

-			if ((HWND)wParam == htv) {

-				int cmd = OpenPopupMenu(hwndDlg);

-

-				switch (cmd) {

-				case ID_CANCELCHANGE:

-				case ID_RESET:

-					UndoSubItemChanges(htv, TreeView_GetSelection(htv), cmd);

-					DoOptionsChanged(hwndDlg);

-					break;

-				}

-			}

-		}

-		break;

-

-	case WM_NOTIFY:

-		switch (((LPNMHDR)lParam)->idFrom) {

-		case 0:

-			switch (((LPNMHDR)lParam)->code) {

-			case PSN_APPLY:

-				{

-					mir_cslock lck(csIconList);

-

-					for (int indx = 0; indx < iconList.getCount(); indx++) {

-						IcolibItem *item = iconList[indx];

-						if (item->temp_reset) {

-							db_unset(NULL, "SkinIcons", item->name);

-							if (item->source_small != item->default_icon) {

-								IconSourceItem_Release(&item->source_small);

-							}

-						}

-						else if (item->temp_file) {

-							db_set_ts(NULL, "SkinIcons", item->name, item->temp_file);

-							IconSourceItem_Release(&item->source_small);

-							SafeDestroyIcon(&item->temp_icon);

-						}

-					}

-				}

-

-				DoIconsChanged(hwndDlg);

-				return TRUE;

-			}

-			break;

-

-		case IDC_PREVIEW:

-			if (((LPNMHDR)lParam)->code == LVN_GETINFOTIP) {

-				IcolibItem *item;

-				NMLVGETINFOTIP *pInfoTip = (NMLVGETINFOTIP *)lParam;

-				LVITEM lvi;

-				lvi.mask = LVIF_PARAM;

-				lvi.iItem = pInfoTip->iItem;

-				ListView_GetItem(pInfoTip->hdr.hwndFrom, &lvi);

-

-				if (lvi.lParam < iconList.getCount()) {

-					item = iconList[lvi.lParam];

-					if (item->temp_file)

-						_tcsncpy_s(pInfoTip->pszText, pInfoTip->cchTextMax, item->temp_file, _TRUNCATE);

-					else if (item->default_file)

-						mir_sntprintf(pInfoTip->pszText, pInfoTip->cchTextMax, _T("%s, %d"), item->default_file, item->default_indx);

-				}

-			}

-			if (bNeedRebuild) {

-				bNeedRebuild = FALSE;

-				SendMessage(hwndDlg, DM_REBUILD_CTREE, 0, 0);

-			}

-			break;

-

-		case IDC_CATEGORYLIST:

-			switch (((NMHDR*)lParam)->code) {

-			case TVN_SELCHANGED:

-				{

-					NMTREEVIEW *pnmtv = (NMTREEVIEW*)lParam;

-					TVITEM tvi = pnmtv->itemNew;

-					TreeItem *treeItem = (TreeItem *)tvi.lParam;

-					if (treeItem)

-						SendMessage(hwndDlg, DM_REBUILDICONSPREVIEW, 0, (LPARAM)(

-						(SECTIONPARAM_FLAGS(treeItem->value)&SECTIONPARAM_HAVEPAGE) ?

-						sectionList[SECTIONPARAM_INDEX(treeItem->value)] : NULL));

-				}

-				break;

-

-			case TVN_DELETEITEM:

-				TreeItem *treeItem = (TreeItem *)(((LPNMTREEVIEW)lParam)->itemOld.lParam);

-				if (treeItem) {

-					mir_free(treeItem->paramName);

-					mir_free(treeItem);

-				}

-				break;

-			}

-

-			if (bNeedRebuild) {

-				{

-					mir_cslock lck(csIconList);

-					bNeedRebuild = FALSE;

-				}

-				SendMessage(hwndDlg, DM_REBUILD_CTREE, 0, 0);

-			}

-		}

-		break;

-

-	case WM_DESTROY:

-		SaveCollapseState(GetDlgItem(hwndDlg, IDC_CATEGORYLIST));

-		DestroyWindow(dat->hwndIndex);

-		{

-			mir_cslock lck(csIconList);

-			for (int indx = 0; indx < iconList.getCount(); indx++) {

-				IcolibItem *item = iconList[indx];

-

-				SAFE_FREE((void**)&item->temp_file);

-				SafeDestroyIcon(&item->temp_icon);

-			}

-		}

-

-		SAFE_FREE((void**)&dat);

-		break;

-	}

-

-	return FALSE;

-}

-

-int SkinOptionsInit(WPARAM wParam, LPARAM)

-{

-	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = hInst;

-	odp.flags = ODPF_BOLDGROUPS;

-	odp.position = -180000000;

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICOLIB);

-	odp.pszTitle = LPGEN("Icons");

-	odp.pfnDlgProc = DlgProcIcoLibOpts;

-	Options_AddPage(wParam, &odp);

-	return 0;

-}