Commit 7027ed45 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

shdocvw: Get rid of Mozilla ActiveX control dependency.

parent 346d5bc7
...@@ -122,19 +122,13 @@ static const IClassFactoryVtbl WBCF_Vtbl = ...@@ -122,19 +122,13 @@ static const IClassFactoryVtbl WBCF_Vtbl =
*/ */
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
{ {
HRESULT hres;
static IClassFactoryImpl WB1ClassFactory = {&WBCF_Vtbl, WebBrowserV1_Create}; static IClassFactoryImpl WB1ClassFactory = {&WBCF_Vtbl, WebBrowserV1_Create};
static IClassFactoryImpl WB2ClassFactory = {&WBCF_Vtbl, WebBrowserV2_Create}; static IClassFactoryImpl WB2ClassFactory = {&WBCF_Vtbl, WebBrowserV2_Create};
TRACE("\n"); TRACE("\n");
if(IsEqualGUID(&CLSID_WebBrowser, rclsid)) { if(IsEqualGUID(&CLSID_WebBrowser, rclsid))
hres = create_mozctl(riid, ppv);
if(SUCCEEDED(hres))
return hres;
return IClassFactory_QueryInterface(FACTORY(&WB2ClassFactory), riid, ppv); return IClassFactory_QueryInterface(FACTORY(&WB2ClassFactory), riid, ppv);
}
if(IsEqualGUID(&CLSID_WebBrowser_V1, rclsid)) if(IsEqualGUID(&CLSID_WebBrowser_V1, rclsid))
return IClassFactory_QueryInterface(FACTORY(&WB1ClassFactory), riid, ppv); return IClassFactory_QueryInterface(FACTORY(&WB1ClassFactory), riid, ppv);
......
...@@ -192,8 +192,6 @@ void deactivate_document(DocHost*); ...@@ -192,8 +192,6 @@ void deactivate_document(DocHost*);
void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*);
HRESULT navigate_url(DocHost*,LPCWSTR,PBYTE,ULONG,LPWSTR); HRESULT navigate_url(DocHost*,LPCWSTR,PBYTE,ULONG,LPWSTR);
HRESULT create_mozctl(REFIID,void**);
HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**);
void InternetExplorer_WebBrowser_Init(InternetExplorer*); void InternetExplorer_WebBrowser_Init(InternetExplorer*);
......
...@@ -288,7 +288,6 @@ HKLM,Software\Microsoft\Advanced INF Setup,,,"" ...@@ -288,7 +288,6 @@ HKLM,Software\Microsoft\Advanced INF Setup,,,""
HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\Session Manager,,,""
HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,""
HKLM,System\CurrentControlSet\Services\VxD\MSTCP,,,"" HKLM,System\CurrentControlSet\Services\VxD\MSTCP,,,""
HKCU,Software\Wine\shdocvw,"MozillaUrl",,"http://source.winehq.org/mozactivex"
HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php"
HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,""
HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment