ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Try installing Gecko from the global data dir too.

This commit is contained in:
Alexandre Julliard 2010-10-04 13:28:37 +02:00
parent a9b4f82c7c
commit 2510df000d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/Makefile.in
View File

@ -1,7 +1,7 @@
MODULE = mshtml.dll MODULE = mshtml.dll
IMPORTLIB = mshtml IMPORTLIB = mshtml
IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
EXTRADEFS = -DCOM_NO_WINDOWS_H EXTRADEFS = -DCOM_NO_WINDOWS_H -DGECKO_DATADIR="\"$(datadir)\""
DELAYIMPORTS = wininet DELAYIMPORTS = wininet
C_SRCS = \ C_SRCS = \

8
dlls/mshtml/install.c
View File

@ -258,10 +258,12 @@ static BOOL install_from_default_dir(void)
ret = install_from_unix_file(file_name); ret = install_from_unix_file(file_name);
heap_free(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, static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,