Plugin Updater: update dialog -> UI classes

1 files changed, 296 insertions, 298 deletions

diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 3d558cfc54..a5fdbb2abf 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -19,8 +19,6 @@ Boston, MA 02111-1307, USA.
 

 #include "stdafx.h"

 

-#define UM_ERROR (WM_USER+1)

-

 static bool bShowDetails;

 static HWND hwndDialog;

 static HANDLE hCheckThread, hTimer;

@@ -36,343 +34,344 @@ static void SelectAll(HWND hDlg, bool bEnable)
 	}

 }

 

-static void SetStringText(HWND hWnd, size_t i, wchar_t *ptszText)

+class CUpdateDLg : public CDlgBase

 {

-	ListView_SetItemText(hWnd, i, 1, ptszText);

-}

+	bool bThreadActive = false;

+	CCtrlButton btnDetails, btnSelAll, btnSelNone, btnOk;

+	CCtrlListView m_list;

+	OBJLIST<FILEINFO> *m_todo;

 

-static void ApplyUpdates(void *param)

-{

-	Thread_SetName("PluginUpdater: ApplyUpdates");

+	static void ApplyUpdates(CUpdateDLg *pDlg)

+	{

+		Thread_SetName("PluginUpdater: ApplyUpdates");

 

-	HWND hDlg = (HWND)param;

-	OBJLIST<FILEINFO> &fileList = *(OBJLIST<FILEINFO> *)GetWindowLongPtr(hDlg, GWLP_USERDATA);

-	if (fileList.getCount() == 0) {

-		return;

-	}

-

-	// make a local copy not to crash if a window was closed

-	OBJLIST<FILEINFO> todo(fileList);

-

-	// 1) If we need to escalate priviledges, launch a stub

-	if (!PrepareEscalation()) {

-		PostMessage(hDlg, WM_CLOSE, 0, 0);

-		return;

-	}

+		// make a local copy not to crash if a window was closed

+		OBJLIST<FILEINFO> todo(*pDlg->m_todo);

 

-	AutoHandle pipe(hPipe);

-	HWND hwndList = GetDlgItem(hDlg, IDC_LIST_UPDATES);

-	//create needed folders after escalating priviledges. Folders creates when we actually install updates

-	wchar_t tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];

-	mir_snwprintf(tszFileBack, L"%s\\Backups", g_tszRoot);

-	SafeCreateDirectory(tszFileBack);

-	mir_snwprintf(tszFileTemp, L"%s\\Temp", g_tszRoot);

-	SafeCreateDirectory(tszFileTemp);

-

-	// 2) Download all plugins

-	HNETLIBCONN nlc = nullptr;

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

-		ListView_EnsureVisible(hwndList, i, FALSE);

-		if (!todo[i].bEnabled) {

-			SetStringText(hwndList, i, TranslateT("Skipped."));

-		}

-		else if (todo[i].bDeleteOnly) {

-			SetStringText(hwndList, i, TranslateT("Will be deleted!"));

+		// 1) If we need to escalate priviledges, launch a stub

+		if (!PrepareEscalation()) {

+			pDlg->Close();

+			return;

 		}

-		else {

-			// download update

-			SetStringText(hwndList, i, TranslateT("Downloading..."));

-

-			FILEURL *pFileUrl = &todo[i].File;

-			if (!DownloadFile(pFileUrl, nlc)) {

-				SetStringText(hwndList, i, TranslateT("Failed!"));

 

-				// interrupt update as we require all components to be updated

-				Netlib_CloseHandle(nlc);

-				PostMessage(hDlg, UM_ERROR, 0, 0);

-				Skin_PlaySound("updatefailed");

-				return;

+		pDlg->bThreadActive = true;

+		AutoHandle pipe(hPipe);

+		//create needed folders after escalating priviledges. Folders creates when we actually install updates

+		wchar_t tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];

+		mir_snwprintf(tszFileBack, L"%s\\Backups", g_tszRoot);

+		SafeCreateDirectory(tszFileBack);

+		mir_snwprintf(tszFileTemp, L"%s\\Temp", g_tszRoot);

+		SafeCreateDirectory(tszFileTemp);

+

+		// 2) Download all plugins

+		HNETLIBCONN nlc = nullptr;

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

+			pDlg->m_list.EnsureVisible(i, false);

+			if (!todo[i].bEnabled) {

+				pDlg->m_list.SetItemText(i, 1, TranslateT("Skipped."));

 			}

-			SetStringText(hwndList, i, TranslateT("Succeeded."));

-		}

-	}

-	Netlib_CloseHandle(nlc);

-

-	// 3) Unpack all zips

-	VARSW tszMirandaPath(L"%miranda_path%");

-	for (auto &it : todo) {

-		if (it->bEnabled) {

-			if (it->bDeleteOnly) {

-				// we need only to backup the old file

-				wchar_t *ptszRelPath = it->tszNewName + wcslen(tszMirandaPath) + 1, tszBackFile[MAX_PATH];

-				mir_snwprintf(tszBackFile, L"%s\\%s", tszFileBack, ptszRelPath);

-				BackupFile(it->tszNewName, tszBackFile);

+			else if (todo[i].bDeleteOnly) {

+				pDlg->m_list.SetItemText(i, 1, TranslateT("Will be deleted!"));

 			}

 			else {

-				// if file name differs, we also need to backup the old file here

-				// otherwise it would be replaced by unzip

-				if (_wcsicmp(it->tszOldName, it->tszNewName)) {

-					wchar_t tszSrcPath[MAX_PATH], tszBackFile[MAX_PATH];

-					mir_snwprintf(tszSrcPath, L"%s\\%s", tszMirandaPath.get(), it->tszOldName);

-					mir_snwprintf(tszBackFile, L"%s\\%s", tszFileBack, it->tszOldName);

-					BackupFile(tszSrcPath, tszBackFile);

+				// download update

+				pDlg->m_list.SetItemText(i, 1, TranslateT("Downloading..."));

+

+				FILEURL *pFileUrl = &todo[i].File;

+				if (!DownloadFile(pFileUrl, nlc)) {

+					pDlg->m_list.SetItemText(i, 1, TranslateT("Failed!"));

+

+					// interrupt update as we require all components to be updated

+					Netlib_CloseHandle(nlc);

+					pDlg->ShowError();

+					Skin_PlaySound("updatefailed");

+					return;

 				}

+				pDlg->m_list.SetItemText(i, 1, TranslateT("Succeeded."));

+			}

+		}

+		Netlib_CloseHandle(nlc);

+

+		// 3) Unpack all zips

+		VARSW tszMirandaPath(L"%miranda_path%");

+		for (auto &it : todo) {

+			if (it->bEnabled) {

+				if (it->bDeleteOnly) {

+					// we need only to backup the old file

+					wchar_t *ptszRelPath = it->tszNewName + wcslen(tszMirandaPath) + 1, tszBackFile[MAX_PATH];

+					mir_snwprintf(tszBackFile, L"%s\\%s", tszFileBack, ptszRelPath);

+					BackupFile(it->tszNewName, tszBackFile);

+				}

+				else {

+					// if file name differs, we also need to backup the old file here

+					// otherwise it would be replaced by unzip

+					if (_wcsicmp(it->tszOldName, it->tszNewName)) {

+						wchar_t tszSrcPath[MAX_PATH], tszBackFile[MAX_PATH];

+						mir_snwprintf(tszSrcPath, L"%s\\%s", tszMirandaPath.get(), it->tszOldName);

+						mir_snwprintf(tszBackFile, L"%s\\%s", tszFileBack, it->tszOldName);

+						BackupFile(tszSrcPath, tszBackFile);

+					}

 

-				if (unzip(it->File.tszDiskPath, tszMirandaPath, tszFileBack, true))

-					SafeDeleteFile(it->File.tszDiskPath);  // remove .zip after successful update

+					if (unzip(it->File.tszDiskPath, tszMirandaPath, tszFileBack, true))

+						SafeDeleteFile(it->File.tszDiskPath);  // remove .zip after successful update

+				}

 			}

 		}

-	}

-	Skin_PlaySound("updatecompleted");

+		Skin_PlaySound("updatecompleted");

 

-	g_plugin.setByte(DB_SETTING_RESTART_COUNT, 5);

+		g_plugin.setByte(DB_SETTING_RESTART_COUNT, 5);

 

-	if (g_plugin.bBackup)

-		CallService(MS_AB_BACKUP, 0, 0);

+		if (g_plugin.bBackup)

+			CallService(MS_AB_BACKUP, 0, 0);

 

-	if (g_plugin.bChangePlatform) {

-		wchar_t mirandaPath[MAX_PATH];

-		GetModuleFileName(nullptr, mirandaPath, _countof(mirandaPath));

-		g_plugin.setWString("OldBin2", mirandaPath);

+		if (g_plugin.bChangePlatform) {

+			wchar_t mirandaPath[MAX_PATH];

+			GetModuleFileName(nullptr, mirandaPath, _countof(mirandaPath));

+			g_plugin.setWString("OldBin2", mirandaPath);

 

-		g_plugin.delSetting(DB_SETTING_CHANGEPLATFORM);

-	}

-	else {

-		ptrW oldbin(g_plugin.getWStringA("OldBin2"));

-		if (oldbin) {

-			SafeDeleteFile(oldbin);

-			g_plugin.delSetting("OldBin2");

+			g_plugin.delSetting(DB_SETTING_CHANGEPLATFORM);

 		}

-	}

-

-	// 5) Prepare Restart

-	if (!g_plugin.bAutoRestart)

-		if (IDYES != MessageBox(hDlg, TranslateT("Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit."), TranslateT("Plugin Updater"), MB_YESNO | MB_ICONQUESTION)) {

-			PostMessage(hDlg, WM_CLOSE, 0, 0);

-			return;

+		else {

+			ptrW oldbin(g_plugin.getWStringA("OldBin2"));

+			if (oldbin) {

+				SafeDeleteFile(oldbin);

+				g_plugin.delSetting("OldBin2");

+			}

 		}

 

-	PostMessage(hDlg, WM_CLOSE, 0, 0);

-	BOOL bRestartCurrentProfile = g_plugin.getBool("RestartCurrentProfile", true);

-	if (g_plugin.bChangePlatform) {

-		wchar_t mirstartpath[MAX_PATH];

+		// 5) Prepare Restart

+		pDlg->bThreadActive = false;

+		if (!g_plugin.bAutoRestart)

+			if (IDYES != MessageBox(pDlg->GetHwnd(), TranslateT("Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit."), TranslateT("Plugin Updater"), MB_YESNO | MB_ICONQUESTION)) {

+				pDlg->Close();

+				return;

+			}

+

+		pDlg->Close();

+		BOOL bRestartCurrentProfile = g_plugin.getBool("RestartCurrentProfile", true);

+		if (g_plugin.bChangePlatform) {

+			wchar_t mirstartpath[MAX_PATH];

 #ifdef _WIN64

-		mir_snwprintf(mirstartpath, L"%s\\miranda32.exe", tszMirandaPath.get());

+			mir_snwprintf(mirstartpath, L"%s\\miranda32.exe", tszMirandaPath.get());

 #else

-		mir_snwprintf(mirstartpath, L"%s\\miranda64.exe", tszMirandaPath.get());

+			mir_snwprintf(mirstartpath, L"%s\\miranda64.exe", tszMirandaPath.get());

 #endif

-		CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile, (LPARAM)mirstartpath);

+			CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile, (LPARAM)mirstartpath);

+		}

+		else CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile);

 	}

-	else CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile);

-}

 

-static void ResizeVert(HWND hDlg, int yy)

-{

-	RECT r = { 0, 0, 244, yy };

-	MapDialogRect(hDlg, &r);

-	r.bottom += GetSystemMetrics(SM_CYSMCAPTION);

-	SetWindowPos(hDlg, nullptr, 0, 0, r.right, r.bottom, SWP_NOMOVE | SWP_NOZORDER);

-}

-

-static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)

-{

-	HWND hwndList = GetDlgItem(hDlg, IDC_LIST_UPDATES);

+	void ResizeVert(int yy)

+	{

+		RECT r = { 0, 0, 244, yy };

+		MapDialogRect(m_hwnd, &r);

+		r.bottom += GetSystemMetrics(SM_CYSMCAPTION);

+		SetWindowPos(m_hwnd, nullptr, 0, 0, r.right, r.bottom, SWP_NOMOVE | SWP_NOZORDER);

+	}

 

-	switch (message) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hDlg);

-		SendMessage(hwndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);

+public:

+	CUpdateDLg(OBJLIST<FILEINFO> *param) :

+		CDlgBase(g_plugin, IDD_UPDATE),

+		m_list(this, IDC_LIST_UPDATES),

+		btnOk(this, IDOK),

+		btnSelAll(this, IDC_SELALL),

+		btnSelNone(this, IDC_SELNONE),

+		btnDetails(this, IDC_DETAILS),

+		m_todo(param)

+	{

+		btnSelAll.OnClick = Callback(this, &CUpdateDLg::onClick_SelAll);

+		btnSelNone.OnClick = Callback(this, &CUpdateDLg::onClick_SelNone);

+		btnDetails.OnClick = Callback(this, &CUpdateDLg::onClick_Details);

+	}

 

-		Window_SetIcon_IcoLib(hDlg, iconList[0].hIcolib);

-		{

-			if (IsWinVerVistaPlus()) {

-				wchar_t szPath[MAX_PATH];

-				GetModuleFileName(nullptr, szPath, _countof(szPath));

-				wchar_t *ext = wcsrchr(szPath, '.');

-				if (ext != nullptr)

-					*ext = '\0';

-				wcscat(szPath, L".test");

-				HANDLE hFile = CreateFile(szPath, GENERIC_WRITE, FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);

-				if (hFile == INVALID_HANDLE_VALUE)

-					// Running Windows Vista or later (major version >= 6).

-					Button_SetElevationRequiredState(GetDlgItem(hDlg, IDOK), !IsProcessElevated());

-				else {

-					CloseHandle(hFile);

-					DeleteFile(szPath);

-				}

+	bool OnInitDialog() override

+	{

+		hwndDialog = m_hwnd;

+		m_list.SendMsg(LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);

+

+		Window_SetIcon_IcoLib(m_hwnd, iconList[0].hIcolib);

+

+		if (IsWinVerVistaPlus()) {

+			wchar_t szPath[MAX_PATH];

+			GetModuleFileName(nullptr, szPath, _countof(szPath));

+			wchar_t *ext = wcsrchr(szPath, '.');

+			if (ext != nullptr)

+				*ext = '\0';

+			wcscat(szPath, L".test");

+			HANDLE hFile = CreateFile(szPath, GENERIC_WRITE, FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);

+			if (hFile == INVALID_HANDLE_VALUE)

+				// Running Windows Vista or later (major version >= 6).

+				Button_SetElevationRequiredState(btnOk.GetHwnd(), !IsProcessElevated());

+			else {

+				CloseHandle(hFile);

+				DeleteFile(szPath);

 			}

+		}

 

-			// Initialize the LVCOLUMN structure.

-			// The mask specifies that the format, width, text, and

-			// subitem members of the structure are valid.

-			LVCOLUMN lvc = {};

-			lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT;

-			lvc.fmt = LVCFMT_LEFT;

+		// Initialize the LVCOLUMN structure.

+		// The mask specifies that the format, width, text, and

+		// subitem members of the structure are valid.

+		LVCOLUMN lvc = {};

+		lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT;

+		lvc.fmt = LVCFMT_LEFT;

+

+		lvc.iSubItem = 0;

+		lvc.pszText = TranslateT("Component Name");

+		lvc.cx = 220; // width of column in pixels

+		m_list.InsertColumn(0, &lvc);

+

+		lvc.iSubItem = 1;

+		lvc.pszText = TranslateT("State");

+		lvc.cx = 120 - GetSystemMetrics(SM_CXVSCROLL); // width of column in pixels

+		m_list.InsertColumn(1, &lvc);

+

+		// enumerate plugins, fill in list

+		m_list.DeleteAllItems();

+

+		LVGROUP lvg;

+		lvg.cbSize = sizeof(LVGROUP);

+		lvg.mask = LVGF_HEADER | LVGF_GROUPID;

+

+		lvg.pszHeader = TranslateT("Plugins");

+		lvg.iGroupId = 1;

+		m_list.InsertGroup(0, &lvg);

+

+		lvg.pszHeader = TranslateT("Miranda NG Core");

+		lvg.iGroupId = 2;

+		m_list.InsertGroup(0, &lvg);

+

+		lvg.pszHeader = TranslateT("Languages");

+		lvg.iGroupId = 3;

+		m_list.InsertGroup(0, &lvg);

+

+		lvg.pszHeader = TranslateT("Icons");

+		lvg.iGroupId = 4;

+		m_list.InsertGroup(0, &lvg);

+

+		m_list.EnableGroupView(true);

+

+		bool enableOk = false;

+		for (auto &it : *m_todo) {

+			LVITEM lvI = { 0 };

+			lvI.mask = LVIF_TEXT | LVIF_PARAM | LVIF_GROUPID | LVIF_NORECOMPUTE;

+			lvI.iGroupId = (wcsstr(it->tszOldName, L"Plugins") != nullptr) ? 1 :

+				((wcsstr(it->tszOldName, L"Languages") != nullptr) ? 3 :

+				((wcsstr(it->tszOldName, L"Icons") != nullptr) ? 4 : 2));

+			lvI.iSubItem = 0;

+			lvI.lParam = (LPARAM)it;

+			lvI.pszText = it->tszOldName;

+			lvI.iItem = m_todo->indexOf(&it);

+			m_list.InsertItem(&lvI);

+

+			m_list.SetCheckState(lvI.iItem, it->bEnabled);

+			if (it->bEnabled)

+				enableOk = true;

+

+			m_list.SetItemText(lvI.iItem, 1, it->bDeleteOnly ? TranslateT("Deprecated!") : TranslateT("Update found!"));

+		}

 

-			lvc.iSubItem = 0;

-			lvc.pszText = TranslateT("Component Name");

-			lvc.cx = 220; // width of column in pixels

-			ListView_InsertColumn(hwndList, 0, &lvc);

+		if (enableOk)

+			btnOk.Enable();

 

-			lvc.iSubItem = 1;

-			lvc.pszText = TranslateT("State");

-			lvc.cx = 120 - GetSystemMetrics(SM_CXVSCROLL); // width of column in pixels

-			ListView_InsertColumn(hwndList, 1, &lvc);

+		bShowDetails = false;

+		ResizeVert(60);

 

-			//enumerate plugins, fill in list

-			ListView_DeleteAllItems(hwndList);

-			///

-			LVGROUP lvg;

-			lvg.cbSize = sizeof(LVGROUP);

-			lvg.mask = LVGF_HEADER | LVGF_GROUPID;

+		Utils_RestoreWindowPositionNoSize(m_hwnd, 0, MODULENAME, "ConfirmWindow");

+		return true;

+	}

 

-			lvg.pszHeader = TranslateT("Plugins");

-			lvg.iGroupId = 1;

-			ListView_InsertGroup(hwndList, 0, &lvg);

+	bool OnApply() override

+	{

+		btnOk.Disable();

+		btnSelAll.Disable();

+		btnSelNone.Disable();

 

-			lvg.pszHeader = TranslateT("Miranda NG Core");

-			lvg.iGroupId = 2;

-			ListView_InsertGroup(hwndList, 0, &lvg);

+		if (m_todo->getCount() > 0)

+			mir_forkThread<CUpdateDLg>(ApplyUpdates, this);

+		return false;

+	}

 

-			lvg.pszHeader = TranslateT("Languages");

-			lvg.iGroupId = 3;

-			ListView_InsertGroup(hwndList, 0, &lvg);

+	bool OnClose() override

+	{

+		return !bThreadActive; // allow to close window only when thread is inactive

+	}

 

-			lvg.pszHeader = TranslateT("Icons");

-			lvg.iGroupId = 4;

-			ListView_InsertGroup(hwndList, 0, &lvg);

+	void OnDestroy() override

+	{

+		Window_FreeIcon_IcoLib(m_hwnd);

+		Utils_SaveWindowPosition(m_hwnd, NULL, MODULENAME, "ConfirmWindow");

+		hwndDialog = nullptr;

+		delete m_todo;

+	}

 

-			ListView_EnableGroupView(hwndList, TRUE);

+	void onItemCHanged_List(CCtrlListView::TEventInfo *ev)

+	{

+		NMLISTVIEW *nmlv = ev->nmlv;

+		if ((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK) {

+			LVITEM lvI = {};

+			lvI.iItem = nmlv->iItem;

+			lvI.mask = LVIF_PARAM;

+			m_list.GetItem(&lvI);

 

+			FILEINFO *p = (FILEINFO *)lvI.lParam;

+			db_set_b(0, DB_MODULE_FILES, StrToLower(_T2A(p->tszOldName)), p->bEnabled = m_list.GetCheckState(nmlv->iItem));

+

+			// Toggle the Download button

 			bool enableOk = false;

-			OBJLIST<FILEINFO> &todo = *(OBJLIST<FILEINFO> *)lParam;

+			OBJLIST<FILEINFO> &todo = *(OBJLIST<FILEINFO> *)GetWindowLongPtr(m_hwnd, GWLP_USERDATA);

 			for (auto &it : todo) {

-				LVITEM lvI = { 0 };

-				lvI.mask = LVIF_TEXT | LVIF_PARAM | LVIF_GROUPID | LVIF_NORECOMPUTE;

-				lvI.iGroupId = (wcsstr(it->tszOldName, L"Plugins") != nullptr) ? 1 :

-					((wcsstr(it->tszOldName, L"Languages") != nullptr) ? 3 :

-					((wcsstr(it->tszOldName, L"Icons") != nullptr) ? 4 : 2));

-				lvI.iSubItem = 0;

-				lvI.lParam = (LPARAM)it;

-				lvI.pszText = it->tszOldName;

-				lvI.iItem = todo.indexOf(&it);

-				ListView_InsertItem(hwndList, &lvI);

-

-				ListView_SetCheckState(hwndList, lvI.iItem, it->bEnabled);

-				if (it->bEnabled)

+				if (it->bEnabled) {

 					enableOk = true;

-

-				SetStringText(hwndList, lvI.iItem, it->bDeleteOnly ? TranslateT("Deprecated!") : TranslateT("Update found!"));

-			}

-			if (enableOk)

-				EnableWindow(GetDlgItem(hDlg, IDOK), TRUE);

-		}

-

-		bShowDetails = false;

-		ResizeVert(hDlg, 60);

-

-		// do this after filling list - enables 'ITEMCHANGED' below

-		SetWindowLongPtr(hDlg, GWLP_USERDATA, lParam);

-		Utils_RestoreWindowPositionNoSize(hDlg, 0, MODULENAME, "ConfirmWindow");

-		return TRUE;

-

-	case WM_NOTIFY:

-		if (((LPNMHDR)lParam)->hwndFrom == hwndList) {

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

-			case LVN_ITEMCHANGED:

-				if (GetWindowLongPtr(hDlg, GWLP_USERDATA)) {

-					NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam;

-					if ((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK) {

-						LVITEM lvI = { 0 };

-						lvI.iItem = nmlv->iItem;

-						lvI.iSubItem = 0;

-						lvI.mask = LVIF_PARAM;

-						ListView_GetItem(hwndList, &lvI);

-

-						FILEINFO *p = (FILEINFO*)lvI.lParam;

-						db_set_b(0, DB_MODULE_FILES, StrToLower(_T2A(p->tszOldName)), p->bEnabled = ListView_GetCheckState(hwndList, nmlv->iItem));

-

-						// Toggle the Download button

-						bool enableOk = false;

-						OBJLIST<FILEINFO> &todo = *(OBJLIST<FILEINFO> *)GetWindowLongPtr(hDlg, GWLP_USERDATA);

-						for (auto &it : todo) {

-							if (it->bEnabled) {

-								enableOk = true;

-								break;

-							}

-						}

-						EnableWindow(GetDlgItem(hDlg, IDOK), enableOk ? TRUE : FALSE);

-					}

+					break;

 				}

-				break;

 			}

+			btnOk.Enable(enableOk);

 		}

-		break;

-

-	case WM_COMMAND:

-		if (HIWORD(wParam) == BN_CLICKED) {

-			switch (LOWORD(wParam)) {

-			case IDOK:

-				EnableWindow(GetDlgItem(hDlg, IDOK), FALSE);

-				EnableWindow(GetDlgItem(hDlg, IDC_SELALL), FALSE);

-				EnableWindow(GetDlgItem(hDlg, IDC_SELNONE), FALSE);

-

-				mir_forkthread(ApplyUpdates, hDlg);

-				return TRUE;

-

-			case IDC_DETAILS:

-				if (bShowDetails) {

-					ResizeVert(hDlg, 60);

-					SetDlgItemText(hDlg, IDC_DETAILS, TranslateT("Details >>"));

-					bShowDetails = false;

-				}

-				else {

-					ResizeVert(hDlg, 242);

-					SetDlgItemText(hDlg, IDC_DETAILS, TranslateT("<< Details"));

-					bShowDetails = true;

-				}

-				break;

-

-			case IDC_SELALL:

-				SelectAll(hDlg, true);

-				break;

-

-			case IDC_SELNONE:

-				SelectAll(hDlg, false);

-				break;

+	}

 

-			case IDCANCEL:

-				DestroyWindow(hDlg);

-				return TRUE;

-			}

+	void onClick_Details(CCtrlButton *)

+	{

+		if (bShowDetails) {

+			ResizeVert(60);

+			btnDetails.SetText(TranslateT("Details >>"));

+			bShowDetails = false;

 		}

-		break;

-

-	case UM_ERROR:

-		MessageBox(hDlg, TranslateT("Update failed! One of the components wasn't downloaded correctly. Try it again later."), TranslateT("Plugin Updater"), MB_OK | MB_ICONERROR);

-		DestroyWindow(hDlg);

-		break;

-

-	case WM_CLOSE:

-		DestroyWindow(hDlg);

-		break;

+		else {

+			ResizeVert(242);

+			btnDetails.SetText(TranslateT("<< Details"));

+			bShowDetails = true;

+		}

+	}

 

-	case WM_DESTROY:

-		Window_FreeIcon_IcoLib(hDlg);

-		Utils_SaveWindowPosition(hDlg, NULL, MODULENAME, "ConfirmWindow");

-		hwndDialog = nullptr;

-		delete (OBJLIST<FILEINFO> *)GetWindowLongPtr(hDlg, GWLP_USERDATA);

-		SetWindowLongPtr(hDlg, GWLP_USERDATA, 0);

+	void onClick_SelAll(CCtrlButton *)

+	{

+		SelectAll(m_hwnd, true);

+	}

 

-		g_plugin.setDword(DB_SETTING_LAST_UPDATE, time(0));

+	void onClick_SelNone(CCtrlButton *)

+	{

+		SelectAll(m_hwnd, false);

+	}

 

-		InitTimer(0);

-		break;

+	void ShowError()

+	{

+		bThreadActive = false;

+		MessageBox(m_hwnd, TranslateT("Update failed! One of the components wasn't downloaded correctly. Try it again later."), TranslateT("Plugin Updater"), MB_OK | MB_ICONERROR);

+		Close();

 	}

+};

 

-	return FALSE;

+static void __stdcall LaunchDialog(void *param)

+{

+	auto *UpdateFiles = (OBJLIST<FILEINFO> *)param;

+	auto *pDlg = new CUpdateDLg(UpdateFiles);

+	pDlg->SetParent(GetDesktopWindow());

+	pDlg->Create();

 }

 

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

+// Silent update procedure

+

 static void DlgUpdateSilent(void *param)

 {

 	Thread_SetName("PluginUpdater: DlgUpdateSilent");

@@ -474,14 +473,6 @@ static void DlgUpdateSilent(void *param)
 	}

 }

 

-static void __stdcall LaunchDialog(void *param)

-{

-	if (g_plugin.bSilentMode && g_plugin.bSilent)

-		mir_forkthread(DlgUpdateSilent, param);

-	else

-		hwndDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_UPDATE), GetDesktopWindow(), DlgUpdate, (LPARAM)param);

-}

-

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

 // building file list in the separate thread

 

@@ -606,6 +597,7 @@ static bool CheckFileRename(const wchar_t *ptszOldName, wchar_t *pNewName)
 

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

 // We only update ".dll", ".exe", ".txt" and ".bat"

+

 static bool isValidExtension(const wchar_t *ptszFileName)

 {

 	const wchar_t *pExt = wcsrchr(ptszFileName, '.');

@@ -614,12 +606,14 @@ static bool isValidExtension(const wchar_t *ptszFileName)
 }

 

 // We only scan subfolders "Plugins", "Icons", "Languages", "Libs", "Core"

+

 static bool isValidDirectory(const wchar_t *ptszDirName)

 {

 	return !_wcsicmp(ptszDirName, L"Plugins") || !_wcsicmp(ptszDirName, L"Icons") || !_wcsicmp(ptszDirName, L"Languages") || !_wcsicmp(ptszDirName, L"Libs") || !_wcsicmp(ptszDirName, L"Core");

 }

 

 // Scans folders recursively

+

 static int ScanFolder(const wchar_t *tszFolder, size_t cbBaseLen, const wchar_t *tszBaseUrl, SERVLIST &hashes, OBJLIST<FILEINFO> *UpdateFiles, int level = 0)

 {

 	wchar_t tszBuf[MAX_PATH];

@@ -780,15 +774,19 @@ static void CheckUpdates(void *)
 	if (success) {

 		FILELIST *UpdateFiles = new FILELIST(20);

 		VARSW dirname(L"%miranda_path%");

-		int count = ScanFolder(dirname, lstrlen(dirname) + 1, baseUrl, hashes, UpdateFiles);

-

-		// Show dialog

+		int count = ScanFolder(dirname, mir_wstrlen(dirname) + 1, baseUrl, hashes, UpdateFiles);

 		if (count == 0) {

 			if (!g_plugin.bSilent)

 				ShowPopup(TranslateT("Plugin Updater"), TranslateT("No updates found."), POPUP_TYPE_INFO);

 			delete UpdateFiles;

 		}

-		else CallFunctionAsync(LaunchDialog, UpdateFiles);

+		else {

+			// Show dialog

+			if (g_plugin.bSilentMode && g_plugin.bSilent)

+				mir_forkthread(DlgUpdateSilent, UpdateFiles);

+			else

+				CallFunctionAsync(LaunchDialog, UpdateFiles);

+		}

 	}

 

 	CallFunctionAsync(InitTimer, (success ? nullptr : (void*)2));