mshtml: Try installing Gecko from the global data dir too.
This commit is contained in:
parent
a9b4f82c7c
commit
2510df000d
dlls/mshtml
|
@ -1,7 +1,7 @@
|
|||
MODULE = mshtml.dll
|
||||
IMPORTLIB = mshtml
|
||||
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
|
||||
|
||||
C_SRCS = \
|
||||
|
|
|
@ -258,10 +258,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,
|
||||
|
|
Loading…
Reference in New Issue