This is the first step for adding ActiveX support to mshtml. This patch
together with following two patches make the first visible step in this
direction by allowing to create the object. At this point we have access
to mshtml environment and plugin object from Gecko, that allows us to
implement proper ActiveX container (I have its working version in my
tree, but it still requires much clean up and better tests). I've been
able to achieve it without Gecko code changes. It has some limitations
like we don't have full control over MIME handling and window hierarchy
is different, but it's a matter of future improvements.
I know that this patch is the most questionable. Gecko expects us to
give it a DLL named np*.dll, so we can't do it in mshtml. Also, this
plugin will be visible to other NPAPI-based browsers running in Wine
(that's a matter of change in the next Gecko release), so it's good that
it's a tiny wrapper that fails to load if mshtml is not loaded (meaning
that we're not running in Wine Gecko).
---
dlls/mshtml/main.c | 9 +++
dlls/mshtml/mshtml.spec | 3 +
dlls/npmshtml/Makefile.in | 6 ++
dlls/npmshtml/main.c | 104
+++++++++++++++++++++++++++++++++++++++
dlls/npmshtml/npmshtml.rgs | 17 ++++++
dlls/npmshtml/npmshtml.spec | 5 ++
dlls/npmshtml/rsrc.rc | 28 ++++++++++
include/wine/wine_common_ver.rc | 3 +
tools/wine.inf.in | 1 +
9 files changed, 176 insertions(+), 0 deletions(-)
create mode 100644 dlls/npmshtml/Makefile.in
create mode 100644 dlls/npmshtml/main.c
create mode 100644 dlls/npmshtml/npmshtml.rgs
create mode 100644 dlls/npmshtml/npmshtml.spec
create mode 100644 dlls/npmshtml/rsrc.rc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-npmshtml-Added-Mozilla-plugin-for-mshtml-ActiveX-cont.diff
Type: text/x-patch
Size: 7246 bytes
Desc: not available
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20101201/e72516e5/attachment.bin>