Jacek Caban : mshtml:
Remove auto detection of Mozilla and Mozilla ActiveX control.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 7 09:10:27 CDT 2007
Module: wine
Branch: master
Commit: 4ccee1ae499d9d6e2aac65e2484e1f796933401a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccee1ae499d9d6e2aac65e2484e1f796933401a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun May 6 15:02:51 2007 +0200
mshtml: Remove auto detection of Mozilla and Mozilla ActiveX control.
---
dlls/mshtml/nsembed.c | 76 -------------------------------------------------
1 files changed, 0 insertions(+), 76 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 17d22a0..452be8b 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -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
More information about the wine-cvs
mailing list