mshtml.inf: Add default GeckoCabDir

GOUJON Alexandre ale.goujon at gmail.com
Fri Oct 1 06:06:22 CDT 2010


On 10/01/2010 12:17 PM, Austin English wrote:
> On Fri, Oct 1, 2010 at 4:29 AM, Alexandre Goujon<ale.goujon at gmail.com>  wrote:
>    
>> diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf
>> index d7d2428..dea1712 100644
>> --- a/dlls/mshtml/mshtml.inf
>> +++ b/dlls/mshtml/mshtml.inf
>> @@ -273,6 +273,7 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47
>>
>>   [WineGecko.Reg]
>>   HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php"
>> +HKCU,Software\Wine\MSHTML,"GeckoCabDir",,"/usr/share/wine/gecko/"
>>      
> The directory isn't always /usr/share, it's relative to where wine is installed
>    
dll/mshtml/install.c:
  541          * Try to find Gecko .cab file in following order:
  542          * - directory stored in GeckoCabDir value of 
HKCU/Software/MSHTML key
-> install_from_registered_dir()
  543          * - $datadir/gecko
-> install_from_default_dir()
  544          * - download from URL stored in GeckoUrl value of 
HKCU/Software/MSHTML key
-> DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc);
  545          */

The above comment says :
(1) the default way to find gecko is to look at the registry value
(2) if not found, try to find gecko relatively
(3) fallback : ask the user to fetch it from the Internet

(1) can't work as GeckoCabDir is not defined in the registry
So currently, wine can only find gecko with (2)

My git-wine directory is at /home/alex/Projects/wine/
So when I run `/home/alex/Projects/wine/wine winecfg` with an empty 
~/.wine, it looks for gecko in /home/alex/Projects/wine/../gecko/
Or gecko is present in /usr/share/wine/gecko as I installed the 
wine1.3-gecko package

This patch does not break the current behavior
  and let people who are running wine in some weird prefix to use the 
packaged gecko

I read again http://wiki.winehq.org/Gecko and /usr/share/wine/gecko/ 
seems to be the default path

Anyway, thanks for your comment
  but I think it's Jacek Caban who have to answer and say if I'm right 
or wrong.



More information about the wine-devel mailing list