Module: wine Branch: stable Commit: d2525dc21671676f6f4ca08c06f96e52b0b8f5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2525dc21671676f6f4ca08c06...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Oct 20 21:38:46 2010 +0200
mshtml: Try installing Gecko from the global data dir too. (cherry picked from commit 2510df000d48dd8c505a633e97c31eef16c3113f)
---
dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/install.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index dcd81de..06812a8 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 -EXTRADEFS = -DCOM_NO_WINDOWS_H +EXTRADEFS = -DCOM_NO_WINDOWS_H -DGECKO_DATADIR=""$(datadir)"" DELAYIMPORTS = wininet
C_SRCS = \ diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index ab054bf..4113903 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -281,10 +281,12 @@ static BOOL install_from_default_dir(void) ret = install_from_unix_file(file_name);
heap_free(file_name); - if(ret) - return TRUE;
- return install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + if (!ret) + ret = install_from_unix_file( GECKO_DATADIR "/wine/gecko/" GECKO_FILE_NAME); + if (!ret && strcmp( GECKO_DATADIR, "/usr/share" )) + ret = install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + return ret; }
static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,