Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSHTML/GECKO]

Browse source 
* Move the gecko prompt from the mshtml registration to the second stage installer itself. This allows mshtml to register properly regardless of the availability of the gecko package.

svn path=/trunk/; revision=60565
This commit is contained in:
Amine Khaldi 2013-10-06 16:51:45 +00:00
parent 511ad66bae
commit 81708b99cd
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/mshtml/nsembed.c
View file

@ -33,7 +33,6 @@
#include <ole2.h> #include <ole2.h>
#include "shlobj.h" #include "shlobj.h"
#include "shlwapi.h" #include "shlwapi.h"
#include "shellapi.h"
#include <wine/debug.h> #include <wine/debug.h>
@ -396,14 +395,6 @@ static void register_nscontainer_class(void)
nscontainer_class = RegisterClassExW(&wndclass); nscontainer_class = RegisterClassExW(&wndclass);
} }
extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow);
static BOOL install_wine_gecko(void)
{
Control_RunDLLW(GetDesktopWindow(), 0, L"appwiz.cpl install_gecko", SW_SHOW);
return TRUE;
}
static void set_environment(LPCWSTR gre_path) static void set_environment(LPCWSTR gre_path)
{ {
WCHAR path_env[MAX_PATH], buf[20]; WCHAR path_env[MAX_PATH], buf[20];
@ -732,8 +723,7 @@ BOOL load_gecko(void)
if(!loading_thread) { if(!loading_thread) {
loading_thread = GetCurrentThreadId(); loading_thread = GetCurrentThreadId();
if(load_wine_gecko(gre_path) if(load_wine_gecko(gre_path))
|| (install_wine_gecko() && load_wine_gecko(gre_path)))
ret = init_xpcom(gre_path); ret = init_xpcom(gre_path);
else else
MESSAGE("Could not load wine-gecko. HTML rendering will be disabled.\n"); MESSAGE("Could not load wine-gecko. HTML rendering will be disabled.\n");

11
reactos/dll/win32/syssetup/wizard.c
View file

@ -45,6 +45,9 @@ SETUPDATA SetupData;
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow);
BOOL BOOL
GetRosInstallCD(WCHAR *pwszPath, DWORD cchPathMax); GetRosInstallCD(WCHAR *pwszPath, DWORD cchPathMax);
@ -1902,7 +1905,6 @@ SetInstallationCompleted(VOID)
} }
} }
static INT_PTR CALLBACK static INT_PTR CALLBACK
FinishDlgProc(HWND hwndDlg, FinishDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -1914,10 +1916,11 @@ FinishDlgProc(HWND hwndDlg,
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
PSETUPDATA SetupData;
/* Get pointer to the global setup data */ /* Get pointer to the global setup data */
SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; PSETUPDATA SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
/* Run the Wine Gecko prompt */
Control_RunDLLW(GetDesktopWindow(), 0, L"appwiz.cpl install_gecko", SW_SHOW);
/* Set title font */ /* Set title font */
SendDlgItemMessage(hwndDlg, SendDlgItemMessage(hwndDlg,