From a334516a231bc13b93e20aa59023e37d7c4ba666 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Mar 2018 18:08:40 +0300 Subject: Import: the wizard dialog to use initialization structure instead of PostMessage --- plugins/Import/src/main.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/Import/src/main.cpp') diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index 02214a87dd..61d6da6cce 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -58,8 +58,8 @@ static INT_PTR ImportCommand(WPARAM, LPARAM) SetFocus(hwndWizard); } else { - hwndWizard = CreateDialog(hInst, MAKEINTRESOURCE(IDD_WIZARD), nullptr, WizardDlgProc); - PostMessage(hwndWizard, WIZM_GOTOPAGE, IDD_WIZARDINTRO, (LPARAM)WizardIntroPageProc); + WizardDlgParam param = { IDD_WIZARDINTRO, (LPARAM)WizardIntroPageProc }; + CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_WIZARD), nullptr, WizardDlgProc, (LPARAM)¶m); } return 0; @@ -76,7 +76,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) ///////////////////////////////////////////////////////////////////////////////////////// // MirandaInterfaces - returns the protocol interface to the core -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IMPORT, MIID_SERVICEMODE, MIID_LAST }; +extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IMPORT, MIID_DATABASE, MIID_SERVICEMODE, MIID_LAST }; ///////////////////////////////////////////////////////////////////////////////////////// // Performs a primary set of actions upon plugin loading @@ -109,20 +109,20 @@ static int OnExit(WPARAM, LPARAM) static INT_PTR ServiceMode(WPARAM, LPARAM) { g_bServiceMode = true; - hwndWizard = CreateDialog(hInst, MAKEINTRESOURCE(IDD_WIZARD), nullptr, WizardDlgProc); - PostMessage(hwndWizard, WIZM_GOTOPAGE, IDD_WIZARDINTRO, (LPARAM)WizardIntroPageProc); + + WizardDlgParam param = { IDD_WIZARDINTRO, (LPARAM)WizardIntroPageProc }; + CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_WIZARD), nullptr, WizardDlgProc, (LPARAM)¶m); return SERVICE_ONLYDB; } static INT_PTR CustomImport(WPARAM wParam, LPARAM) { - MImportOptions *param = (MImportOptions*)wParam; - wcsncpy_s(importFile, MAX_PATH, param->pwszFileName, _TRUNCATE); - nImportOptions = param->dwFlags; + MImportOptions *opts = (MImportOptions*)wParam; + wcsncpy_s(importFile, MAX_PATH, opts->pwszFileName, _TRUNCATE); + nImportOptions = opts->dwFlags; - hwndWizard = CreateDialog(hInst, MAKEINTRESOURCE(IDD_WIZARD), nullptr, WizardDlgProc); - PostMessage(hwndWizard, WIZM_GOTOPAGE, IDD_PROGRESS, (LPARAM)ProgressPageProc); - return 0; + WizardDlgParam param = { IDD_PROGRESS, (LPARAM)ProgressPageProc }; + return DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_WIZARD), nullptr, WizardDlgProc, LPARAM(¶m)); } extern "C" __declspec(dllexport) int Load(void) -- cgit v1.2.3