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

mshtml: Remove auto detection of Mozilla and Mozilla ActiveX control.

This commit is contained in:
Jacek Caban 2007-05-06 15:02:51 +02:00 committed by Alexandre Julliard
parent 26553b6c1d
commit 4ccee1ae49
1 changed files with 0 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
dlls/mshtml/nsembed.c
View File

@ -165,80 +165,6 @@ static BOOL load_xpcom(PRUnichar *gre_path)
return TRUE;
}
static BOOL load_mozilla(PRUnichar *gre_path)
{
DWORD res, type, i, size = MAX_PATH;
HKEY mozilla_key, hkey;
WCHAR key_name[100];
BOOL ret = FALSE;
static const WCHAR wszGreKey[] =
{'S','o','f','t','w','a','r','e','\\',
'm','o','z','i','l','l','a','.','o','r','g','\\',
'G','R','E',0};
static const WCHAR wszGreHome[] = {'G','r','e','H','o','m','e',0};
res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszGreKey, &mozilla_key);
if(res != ERROR_SUCCESS) {
TRACE("Could not open key %s\n", debugstr_w(wszGreKey));
return FALSE;
}
for(i=0; !ret && RegEnumKeyW(mozilla_key, i, key_name, sizeof(key_name)/sizeof(WCHAR)) == ERROR_SUCCESS; i++) {
RegOpenKeyW(mozilla_key, key_name, &hkey);
res = RegQueryValueExW(hkey, wszGreHome, NULL, &type, (LPBYTE)gre_path, &size);
if(res == ERROR_SUCCESS)
ret = TRUE;
RegCloseKey(hkey);
}
RegCloseKey(mozilla_key);
return ret ? load_xpcom(gre_path) : FALSE;
}
static BOOL load_mozctl(PRUnichar *gre_path)
{
HKEY hkey;
DWORD res, type, size = MAX_PATH;
static const WCHAR wszMozCtlKey[] =
{'S','o','f','t','w','a','r','e','\\','M','o','z','i','l','l','a',0};
static const WCHAR wszBinDirectoryPath[] =
{'B','i','n','D','i','r','e','c','t','o','r','y','P','a','t','h',0};
static const WCHAR wszMozCtlClsidKey[] =
{'C','L','S','I','D','\\',
'{','1','3','3','9','B','5','4','C','-','3','4','5','3','-','1','1','D','2',
'-','9','3','B','9','-','0','0','0','0','0','0','0','0','0','0','0','0','}','\\',
'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0};
res = RegOpenKeyW(HKEY_LOCAL_MACHINE, wszMozCtlKey, &hkey);
if(res == ERROR_SUCCESS) {
res = RegQueryValueExW(hkey, wszBinDirectoryPath, NULL, &type, (LPBYTE)gre_path, &size);
if(res == ERROR_SUCCESS)
return load_xpcom(gre_path);
else
ERR("Could not get value %s\n", debugstr_w(wszBinDirectoryPath));
}
res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszMozCtlClsidKey, &hkey);
if(res == ERROR_SUCCESS) {
res = RegQueryValueExW(hkey, NULL, NULL, &type, (LPBYTE)gre_path, &size);
if(res == ERROR_SUCCESS) {
WCHAR *ptr;
if((ptr = strrchrW(gre_path, '\\')))
ptr[1] = 0;
return load_xpcom(gre_path);
}else {
ERR("Could not get value of %s\n", debugstr_w(wszMozCtlClsidKey));
}
}
TRACE("Could not find Mozilla ActiveX Control\n");
return FALSE;
}
static void check_version(LPCWSTR gre_path)
{
WCHAR file_name[MAX_PATH];
@ -419,8 +345,6 @@ static BOOL load_gecko(void)
loading_thread = GetCurrentThreadId();
if(load_wine_gecko(gre_path)
|| load_mozctl(gre_path)
|| load_mozilla(gre_path)
|| (install_wine_gecko() && load_wine_gecko(gre_path)))
ret = init_xpcom(gre_path);
else