Author: spetreolle
Date: Thu Oct 30 20:50:30 2014
New Revision: 65128
URL: http://svn.reactos.org/svn/reactos?rev=65128&view=rev
Log:
[APPWIZ][SYSSETUP]
Enforce focus of the Wine Gecko download prompt in second stage.
Patch by Ismael Ferreras Morezuelas (swyter)
Modified:
trunk/reactos/dll/cpl/appwiz/addons.c
trunk/reactos/dll/cpl/appwiz/appwiz.c
trunk/reactos/dll/cpl/appwiz/appwiz.h
trunk/reactos/dll/win32/syssetup/classinst.c
trunk/reactos/dll/win32/syssetup/wizard.c
Modified: trunk/reactos/dll/cpl/appwiz/addons.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?rev=65128&r1=65127&r2=65128&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] Thu Oct 30
20:50:30 2014
@@ -397,7 +397,7 @@
return FALSE;
}
-BOOL install_addon(addon_t addon_type)
+BOOL install_addon(addon_t addon_type, HWND hwnd_parent)
{
if(!*ARCH_STRING)
@@ -411,7 +411,7 @@
* - download the package
*/
if (install_from_registered_dir() == INSTALL_NEXT)
- DialogBoxW(hApplet, addon->dialog_template, 0, installer_proc);
+ DialogBoxW(hApplet, addon->dialog_template, hwnd_parent,
installer_proc);
return TRUE;
}
Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?rev=65128&r1=65127&r2=65128&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.c [iso-8859-1] Thu Oct 30
20:50:30 2014
@@ -14,7 +14,7 @@
HINSTANCE hApplet = NULL;
-static LONG start_params(const WCHAR *params)
+static LONG start_params(const WCHAR *params, HWND hwnd_parent)
{
static const WCHAR install_geckoW[] =
{'i','n','s','t','a','l','l','_','g','e','c','k','o',0};
static const WCHAR install_monoW[] =
{'i','n','s','t','a','l','l','_','m','o','n','o',0};
@@ -23,12 +23,12 @@
return FALSE;
if(!strcmpW(params, install_geckoW)) {
- install_addon(ADDON_GECKO);
+ install_addon(ADDON_GECKO, hwnd_parent);
return TRUE;
}
if(!strcmpW(params, install_monoW)) {
- install_addon(ADDON_MONO);
+ install_addon(ADDON_MONO, hwnd_parent);
return TRUE;
}
@@ -51,7 +51,7 @@
return 1;
case CPL_STARTWPARMSW:
- return start_params((const WCHAR *)lParam2);
+ return start_params((const WCHAR *)lParam2, hwndCPl);
case CPL_INQUIRE:
CPlInfo = (CPLINFO*)lParam2;
Modified: trunk/reactos/dll/cpl/appwiz/appwiz.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.h?rev=65128&r1=65127&r2=65128&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.h [iso-8859-1] Thu Oct 30
20:50:30 2014
@@ -50,7 +50,7 @@
ADDON_MONO
} addon_t;
-BOOL install_addon(addon_t) DECLSPEC_HIDDEN;
+BOOL install_addon(addon_t, HWND hwnd_parent) DECLSPEC_HIDDEN;
extern HINSTANCE hInst DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/syssetup/classinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/classinst.c?rev=65128&r1=65127&r2=65128&view=diff
==============================================================================
--- trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] Thu Oct 30
20:50:30 2014
@@ -8,7 +8,7 @@
#include "precomp.h"
-#define NDEBUG
+//#define NDEBUG
#include <debug.h>
/*
Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c?rev=65128&r1=65127&r2=65128&view=diff
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Thu Oct 30
20:50:30 2014
@@ -1984,7 +1984,7 @@
PSETUPDATA SetupData =
(PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
/* Run the Wine Gecko prompt */
- Control_RunDLLW(GetDesktopWindow(), 0, L"appwiz.cpl
install_gecko", SW_SHOW);
+ Control_RunDLLW(hwndDlg, 0, L"appwiz.cpl install_gecko", SW_SHOW);
/* Set title font */
SendDlgItemMessage(hwndDlg,
