[akhaldi] 60565: [MSHTML/GECKO] * 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 ...

Author: akhaldi
Date: Sun Oct  6 16:51:45 2013
New Revision: 60565

URL: http://svn.reactos.org/svn/reactos?rev=60565&view=rev
Log:
[MSHTML/GECKO]
* 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.

Modified:
    trunk/reactos/dll/win32/mshtml/nsembed.c
    trunk/reactos/dll/win32/syssetup/wizard.c

Modified: trunk/reactos/dll/win32/mshtml/nsembed.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c?...
==============================================================================
--- trunk/reactos/dll/win32/mshtml/nsembed.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/nsembed.c	[iso-8859-1] Sun Oct  6 16:51:45 2013
@@ -33,7 +33,6 @@
 #include <ole2.h>
 #include "shlobj.h"
 #include "shlwapi.h"
-#include "shellapi.h"

#include <wine/debug.h>

@@ -396,14 +395,6 @@
     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)
 {
     WCHAR path_env[MAX_PATH], buf[20];
@@ -732,8 +723,7 @@
     if(!loading_thread) {
         loading_thread = GetCurrentThreadId();

-        if(load_wine_gecko(gre_path)
-           || (install_wine_gecko() && load_wine_gecko(gre_path)))
+        if(load_wine_gecko(gre_path))
             ret = init_xpcom(gre_path);
         else
            MESSAGE("Could not load wine-gecko. HTML rendering will be disabled.\n");

Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c...
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c	[iso-8859-1] Sun Oct  6 16:51:45 2013
@@ -45,6 +45,9 @@

/* FUNCTIONS ****************************************************************/
+
+extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow);
+
 BOOL
 GetRosInstallCD(WCHAR *pwszPath, DWORD cchPathMax);

@@ -1902,7 +1905,6 @@
     }
 }

-
 static INT_PTR CALLBACK
 FinishDlgProc(HWND hwndDlg,
               UINT uMsg,
@@ -1914,10 +1916,11 @@
     {
         case WM_INITDIALOG:
         {
-            PSETUPDATA SetupData;
-
             /* 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 */
             SendDlgItemMessage(hwndDlg,