Mercurial > dwindows

changeset 2019:583c2d62845c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win: Implemented the STARTED and COMPLETE signals for DW_SIGNAL_HTML_CHANGED for IE.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 08 Nov 2019 12:37:37 +0000
parents 663d79f28e46
children 59dfb86fb3b1
files win/browser.c
diffstat 1 files changed, 67 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/win/browser.c	Fri Nov 08 09:49:16 2019 +0000
+++ b/win/browser.c	Fri Nov 08 12:37:37 2019 +0000
@@ -24,6 +24,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <exdisp.h>		// Defines of stuff like IWebBrowser2. This is an include file with Visual C 6 and above
+#include <exdispid.h>
 #include <mshtml.h>		// Defines of stuff like IHTMLDocument2. This is an include file with Visual C 6 and above
 #include <mshtmhst.h>	// Defines of stuff like IDocHostUIHandler. This is an include file with Visual C 6 and above
 #include <crtdbg.h>		// for _ASSERT()
@@ -1096,12 +1097,14 @@
 #define INTERFACE DWEventHandler
 DECLARE_INTERFACE_ (INTERFACE, IUnknown)
 {
-	// IUnknown functions
-	STDMETHOD  (QueryInterface)		(THIS_ REFIID, void **) PURE;
-	STDMETHOD_ (ULONG, AddRef)		(THIS) PURE;
-	STDMETHOD_ (ULONG, Release)		(THIS) PURE;
-	// Extra functions
-	STDMETHOD_ (void, DocumentComplete)		(THIS_ IDispatch*, VARIANT*) PURE;
+	// Interface functions
+	STDMETHOD  (QueryInterface)				(THIS_ REFIID, void **) PURE;
+	STDMETHOD_ (ULONG, AddRef)				(THIS) PURE;
+	STDMETHOD_ (ULONG, Release)				(THIS) PURE;
+	STDMETHOD_ (HRESULT, GetTypeInfoCount)	(THIS_ UINT *) PURE;
+	STDMETHOD_ (HRESULT, GetTypeInfo)		(THIS_ UINT, LCID, ITypeInfo **) PURE;
+	STDMETHOD_ (HRESULT, GetIDsOfNames)		(THIS_ REFIID, LPOLESTR *, UINT, LCID, DISPID *) PURE;
+	STDMETHOD_ (HRESULT, Invoke)			(THIS_ DISPID, REFIID, LCID, WORD, DISPPARAMS, VARIANT *, EXCEPINFO *, UINT *) PURE;
 };
 
 // IWebBrowser2 supports us giving it only 1 DWEventHandler object, so for simplicity, we
@@ -1114,7 +1117,7 @@
 {
 	// This is an DWEventHandler object, so we must recognize DWEventHandler VTable's GUID,
 	// Our DWEventHandler can also masquerade as an IUnknown
-	if (!IsEqualIID(vTableGuid, &IID_IUnknown) && !IsEqualIID(vTableGuid, &DIID_DWEventHandler))
+	if (!IsEqualIID(vTableGuid, &IID_IUnknown) && !IsEqualIID(vTableGuid, &DIID_DWebBrowserEvents2))
 	{
 		*ppv = 0;
 		return(E_NOINTERFACE);
@@ -1138,12 +1141,59 @@
 {
 	return(1);
 }
-
-// This is the extra function for DWEventHandler. 
+static HRESULT STDMETHODCALLTYPE DWEventHandler_GetTypeInfoCount(DWEventHandler *this, UINT * pctinfo)
+{
+	return E_NOTIMPL;
+}
+static HRESULT STDMETHODCALLTYPE DWebBrowserEvent2_GetTypeInfo(DWEventHandler *this,  UINT iTInfo, LCID lcid, ITypeInfo ** ppTInfo)
+{
+	return E_NOTIMPL;
+}
+static HRESULT STDMETHODCALLTYPE DWebBrowserEvent2_GetIDsOfNames(DWEventHandler *this,  REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId)
+{
+	return E_NOTIMPL;
+}
+static HRESULT STDMETHODCALLTYPE DWebBrowserEvent2_Invoke(DWEventHandler *this, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult, EXCEPINFO * pExcepInfo, UINT * puArgErr)
+{
+	switch (dispIdMember)
+	{
+		case DISPID_BEFORENAVIGATE2:
+		{
+			// Params are in the variant array from right to left wrt how they are defined in the documentation.
+			LPCWSTR pszURL = pDispParams->rgvarg[5].pvarVal->bstrVal;
+			IWebBrowser2* pwb = (IWebBrowser2*)pDispParams->rgvarg[pDispParams->cArgs - 1].byref;
+			LONG_PTR tmp;
+			HWND hwnd;
 
-static void STDMETHODCALLTYPE DWEventHandler_DocumentComplete(DWEventHandler *this, IDispatch* pDisp, VARIANT* URL)
-{
-	dw_debug("DocumentComplete() called!\n");
+			/* Get the window handle and URL */
+			pwb->lpVtbl->get_HWND(pwb, &tmp);
+			hwnd = (HWND)tmp;
+			/* Send the event for signal handling */
+			_wndproc(hwnd, WM_USER+101, (WPARAM)DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), (LPARAM)WideToUTF8((LPWSTR)pszURL));
+
+			// Make sure you don't accidently cancel the navigation.
+			*V_BOOLREF(&pDispParams->rgvarg[0]) = VARIANT_FALSE;
+			break;
+		}
+		case DISPID_DOCUMENTCOMPLETE:
+		{
+			IWebBrowser2* pwb = (IWebBrowser2*)pDispParams->rgvarg[pDispParams->cArgs - 1].byref;
+			LONG_PTR tmp;
+			HWND hwnd;
+			BSTR locationURL;
+
+			/* Get the window handle and URL */
+			pwb->lpVtbl->get_HWND(pwb, &tmp);
+			hwnd = (HWND)tmp;
+			pwb->lpVtbl->get_LocationURL(pwb, &locationURL);
+			/* Send the event for signal handling */
+			_wndproc(hwnd, WM_USER+101, (WPARAM)DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), (LPARAM)WideToUTF8((LPWSTR)locationURL));
+			break;
+		}
+		default:
+			return DISP_E_MEMBERNOTFOUND;
+	}
+	return NOERROR;
 }
 
 
@@ -1153,7 +1203,10 @@
 	DWEventHandler_QueryInterface,
 	DWEventHandler_AddRef,
 	DWEventHandler_Release,
-	DWEventHandler_DocumentComplete
+	DWEventHandler_GetTypeInfoCount,
+	DWebBrowserEvent2_GetTypeInfo,
+	DWebBrowserEvent2_GetIDsOfNames,
+	DWebBrowserEvent2_Invoke
 };
 
 
@@ -1779,7 +1832,7 @@
 				// Get IWebBrowser2' IConnectionPoint sub-object for specifically giving
 				// IWebBRowser2 our DWEventHandler. We do this by calling IConnectionPointContainer's
 				// FindConnectionPoint, and pass it DWEventHandler VTable's GUID
-				hr = container->lpVtbl->FindConnectionPoint(container, &DIID_DWEventHandler, &point);
+				hr = container->lpVtbl->FindConnectionPoint(container, &DIID_DWebBrowserEvents2, &point);
 
 				// We don't need the IConnectionPointContainer, now that we got the one IConnectionPoint
 				// we want (ie, the one we use to give IWebBrowser2 our DWEventHandler)