[mingw-Bugs-1751518]

	* include/mshtml.h (IHTMLDocument2): Correct spelling of put_URL, get_URL.

	[mingw-Bugs-1751565]
	* include/basetyps.h (IID); Guard with __IID_DEFINED__

	[mingw-Bugs-1751595]
	* include/exdisp.h (DWebBrowserEvents2): Remove undocumented STDDISP
	methods.

4 files changed, 19 insertions, 34 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 7659196af..67aad5014 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-12  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	[mingw-Bugs-1751518]
+	* include/mshtml.h (IHTMLDocument2): Correct spelling of put_URL, get_URL.
+
+	[mingw-Bugs-1751565]
+	* include/basetyps.h (IID); Guard with __IID_DEFINED__.
+
+	[mingw-Bugs-1751595] 
+	* include/exdisp.h (DWebBrowserEvents2): Remove undocumented STDDISP
+	methods.
+
+	Thanks to Yuji Kuwabara  <yujikuwabara at sf dot net>.
+
 2007-07-10  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	[mingw-Bugs-1750898]
diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h
index 7c38b3943..b644bdf6f 100644
--- a/winsup/w32api/include/basetyps.h
+++ b/winsup/w32api/include/basetyps.h
@@ -124,7 +124,10 @@ typedef struct _GUID
 #define UUID_DEFINED
 typedef GUID UUID;
 #endif /* UUID_DEFINED */
+#ifndef __IID_DEFINED__
+#define __IID_DEFINED__
 typedef GUID IID;
+#endif /* __IID_DEFINED__ */
 typedef GUID CLSID;
 typedef CLSID *LPCLSID;
 typedef IID *LPIID;
diff --git a/winsup/w32api/include/exdisp.h b/winsup/w32api/include/exdisp.h
index 0656c063b..55c0288b3 100644
--- a/winsup/w32api/include/exdisp.h
+++ b/winsup/w32api/include/exdisp.h
@@ -205,8 +205,6 @@ DECLARE_INTERFACE_(IWebBrowser2,IWebBrowserApp)
 };
 #undef INTERFACE
 
-#define STDDISP(m) STDMETHOD_(void,m)
-
 EXTERN_C const IID DIID_DWebBrowserEvents2;
 #define INTERFACE DWebBrowserEvents2
 DECLARE_INTERFACE_(DWebBrowserEvents2,IDispatch)
@@ -218,39 +216,9 @@ DECLARE_INTERFACE_(DWebBrowserEvents2,IDispatch)
 	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
 	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
 	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDDISP(StatusTextChange)(THIS_ BSTR) PURE;
-	STDDISP(ProgressChange)(THIS_ long,long) PURE;
-	STDDISP(CommandStateChange)(THIS_ long,VARIANT_BOOL) PURE;
-	STDDISP(DownloadBegin)(THIS) PURE;
-	STDDISP(DownloadComplete)(THIS) PURE;
-	STDDISP(TitleChange)(THIS_ BSTR) PURE;
-	STDDISP(PropertyChange)(THIS_ BSTR) PURE;
-	STDDISP(BeforeNavigate2)(THIS_ IDispatch*,VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT_BOOL*) PURE;
-	STDDISP(NewWindow2)(THIS_ IDispatch**,VARIANT_BOOL*) PURE;
-	STDDISP(NavigateComplete)(THIS_ IDispatch*,VARIANT*) PURE;
-	STDDISP(DocumentComplete)(THIS_ IDispatch*,VARIANT*) PURE;
-	STDDISP(OnQuit)(THIS) PURE;
-	STDDISP(OnVisible)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnToolBar)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnMenuBar)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnStatusBar)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnFullScreen)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnTheaterMode)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(WindowSetResizable)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(WindowSetLeft)(THIS_ long) PURE;
-	STDDISP(WindowSetTop)(THIS_ long) PURE;
-	STDDISP(WindowSetWidth)(THIS_ long) PURE;
-	STDDISP(WindowSetHeight)(THIS_ long) PURE;
-	STDDISP(WindowClosing)(THIS_ VARIANT_BOOL,VARIANT_BOOL*) PURE;
-	STDDISP(ClientToHostWindow)(THIS_ long*,long*) PURE;
-	STDDISP(SetSecureLockIcon)(THIS_ long) PURE;
-	STDDISP(FileDownload)(THIS_ VARIANT_BOOL*) PURE;
 };
 #undef INTERFACE
 
-#undef STDDISP
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/w32api/include/mshtml.h b/winsup/w32api/include/mshtml.h
index a91eefa03..288a427e2 100644
--- a/winsup/w32api/include/mshtml.h
+++ b/winsup/w32api/include/mshtml.h
@@ -208,8 +208,8 @@ DECLARE_INTERFACE_(IHTMLDocument2,IHTMLDocument)
 	STDMETHOD(get_referrer)(THIS_ BSTR*) PURE;
 	STDMETHOD(get_location)(THIS_ LPHTMLLOCATION*) PURE;
 	STDMETHOD(get_lastModified)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_url)(THIS_ BSTR) PURE;
-	STDMETHOD(get_url)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_URL)(THIS_ BSTR) PURE;
+	STDMETHOD(get_URL)(THIS_ BSTR*) PURE;
 	STDMETHOD(put_domain)(THIS_ BSTR) PURE;
 	STDMETHOD(get_domain)(THIS_ BSTR*) PURE;
 	STDMETHOD(put_cookie)(THIS_ BSTR) PURE;