Jacek Caban : mshtml: Download Gecko in DllRegisterServer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 10b0b86cbc655099e3a070198bdfd4662e931b71
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=10b0b86cbc655099e3a070198b...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Nov 12 14:52:43 2009 +0100

mshtml: Download Gecko in DllRegisterServer.

---

 dlls/mshtml/main.c    |   11 +++++++----
 dlls/mshtml/nsembed.c |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 548c50c..6a358e5 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -391,9 +391,6 @@ static HRESULT register_server(BOOL do_register)
     if(FAILED(hres))
         ERR("typelib registration failed: %08x\n", hres);
 
-    if(do_register && SUCCEEDED(hres))
-        load_gecko(TRUE);
-
     return hres;
 }
 
@@ -405,7 +402,13 @@ static HRESULT register_server(BOOL do_register)
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
-    return register_server(TRUE);
+    HRESULT hres;
+
+    hres = register_server(TRUE);
+    if(SUCCEEDED(hres))
+        load_gecko(FALSE);
+
+    return hres;
 }
 
 /***********************************************************************
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 6207c13..2150a0f 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -1615,7 +1615,7 @@ NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent)
     NSContainer *ret;
     nsresult nsres;
 
-    if(!load_gecko(FALSE))
+    if(!load_gecko(TRUE))
         return NULL;
 
     ret = heap_alloc_zero(sizeof(NSContainer));