Jacek Caban : mshtml: Try installing Gecko from hardcoded '/usr/share/wine/ gecko/' location.

Alexandre Julliard julliard at winehq.org
Thu Dec 2 16:30:51 CST 2010


Module: wine
Branch: stable
Commit: d375ffab7d24c1b1f8c3494b290bcee222799804
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d375ffab7d24c1b1f8c3494b290bcee222799804

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Oct  1 15:30:19 2010 +0200

mshtml: Try installing Gecko from hardcoded '/usr/share/wine/gecko/' location.
(cherry picked from commit 1f716bcbf4b7784587a2cb3870041c4a032f1039)

---

 dlls/mshtml/install.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c
index 65faa5a..ab054bf 100644
--- a/dlls/mshtml/install.c
+++ b/dlls/mshtml/install.c
@@ -281,7 +281,10 @@ static BOOL install_from_default_dir(void)
     ret = install_from_unix_file(file_name);
 
     heap_free(file_name);
-    return ret;
+    if(ret)
+        return TRUE;
+
+    return install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME);
 }
 
 static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,




More information about the wine-cvs mailing list