mshtml: Merge ipwindow.c into pluginhost.c.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Merge ipwindow.c into pluginhost.c.
f0372fbf · Jacek Caban · Alexandre Julliard · 86bdba81 · f0372fbf · 86bdba81
Commit f0372fbf authored Feb 28, 2018 by Jacek Caban Committed by Alexandre Julliard Feb 28, 2018
Showing with 311 additions and 4 deletions

Makefile.in dlls/mshtml/Makefile.in +0 -1

ipwindow.c dlls/mshtml/ipwindow.c +0 -0

pluginhost.c dlls/mshtml/pluginhost.c +311 -0

pluginhost.h dlls/mshtml/pluginhost.h +0 -3

No files found.
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -38,7 +38,6 @@ C_SRCS = \
 	htmltextnode.c \
 	htmlwindow.c \
 	ifacewrap.c \
-	ipwindow.c \
 	loadopts.c \
 	main.c \
 	mutation.c \

--- a/dlls/mshtml/ipwindow.c
+++ b/dlls/mshtml/ipwindow.c
--- a/dlls/mshtml/pluginhost.c
+++ b/dlls/mshtml/pluginhost.c
--- a/dlls/mshtml/pluginhost.h
+++ b/dlls/mshtml/pluginhost.h
@@ -68,9 +68,6 @@ void detach_plugin_host(PluginHost*) DECLSPEC_HIDDEN;

 HRESULT create_param_prop_bag(nsIDOMElement*,IPropertyBag**) DECLSPEC_HIDDEN;

-HRESULT create_ip_window(IOleInPlaceUIWindow**) DECLSPEC_HIDDEN;
-HRESULT create_ip_frame(IOleInPlaceFrame**) DECLSPEC_HIDDEN;
-
 HRESULT get_plugin_disp(HTMLPluginContainer*,IDispatch**) DECLSPEC_HIDDEN;
 HRESULT get_plugin_dispid(HTMLPluginContainer*,WCHAR*,DISPID*) DECLSPEC_HIDDEN;
 HRESULT invoke_plugin_prop(HTMLPluginContainer*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*) DECLSPEC_HIDDEN;