mshtml: Remove superfluous pointer casts.

dlls/mshtml/htmlanchor.c

@@ -38,7 +38,7 @@ typedef struct {
     const IHTMLAnchorElementVtbl *lpHTMLAnchorElementVtbl;
 } HTMLAnchorElement;
 
-#define HTMLANCHOR(x)  ((IHTMLAnchorElement*)  &(x)->lpHTMLAnchorElementVtbl)
+#define HTMLANCHOR(x)  (&(x)->lpHTMLAnchorElementVtbl)
 
 #define HTMLANCHOR_THIS(iface) DEFINE_THIS(HTMLAnchorElement, HTMLAnchorElement, iface)
 

dlls/mshtml/htmlbody.c

@@ -42,7 +42,7 @@ typedef struct {
     nsIDOMHTMLBodyElement *nsbody;
 } HTMLBodyElement;
 
-#define HTMLBODY(x)  ((IHTMLBodyElement*)  &(x)->lpHTMLBodyElementVtbl)
+#define HTMLBODY(x)  (&(x)->lpHTMLBodyElementVtbl)
 
 static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr)
 {

dlls/mshtml/htmlcomment.c

@@ -37,7 +37,7 @@ struct HTMLCommentElement {
     const IHTMLCommentElementVtbl   *lpIHTMLCommentElementVtbl;
 };
 
-#define HTMLCOMMENT(x)  ((IHTMLCommentElement*)  &(x)->lpIHTMLCommentElementVtbl)
+#define HTMLCOMMENT(x)  (&(x)->lpIHTMLCommentElementVtbl)
 
 #define HTMLCOMMENT_THIS(iface) DEFINE_THIS(HTMLCommentElement, IHTMLCommentElement, iface)
 

dlls/mshtml/htmlgeneric.c

@@ -38,7 +38,7 @@ typedef struct {
     const IHTMLGenericElementVtbl *lpHTMLGenericElementVtbl;
 } HTMLGenericElement;
 
-#define HTMLGENERIC(x)  ((IHTMLGenericElement*)  &(x)->lpHTMLGenericElementVtbl)
+#define HTMLGENERIC(x)  (&(x)->lpHTMLGenericElementVtbl)
 
 #define HTMLGENERIC_THIS(iface) DEFINE_THIS(HTMLGenericElement, HTMLGenericElement, iface)
 

dlls/mshtml/htmliframe.c

@@ -41,7 +41,7 @@ typedef struct {
     HTMLDocument *content_doc;
 } HTMLIFrame;
 
-#define HTMLFRAMEBASE2(x)  ((IHTMLFrameBase2*)  &(x)->lpIHTMLFrameBase2Vtbl)
+#define HTMLFRAMEBASE2(x)  (&(x)->lpIHTMLFrameBase2Vtbl)
 
 #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface)
 

dlls/mshtml/htmlimg.c

@@ -39,7 +39,7 @@ typedef struct {
     nsIDOMHTMLImageElement *nsimg;
 } HTMLImgElement;
 
-#define HTMLIMG(x)  ((IHTMLImgElement*)  &(x)->lpHTMLImgElementVtbl)
+#define HTMLIMG(x)  (&(x)->lpHTMLImgElementVtbl)
 
 #define HTMLIMG_THIS(iface) DEFINE_THIS(HTMLImgElement, HTMLImgElement, iface)
 

dlls/mshtml/htmlinput.c

@@ -41,7 +41,7 @@ typedef struct {
 } HTMLInputElement;
 
 #define HTMLINPUT(x)      ((IHTMLInputElement*)      &(x)->lpHTMLInputElementVtbl)
-#define HTMLINPUTTEXT(x)  ((IHTMLInputTextElement*)  &(x)->lpHTMLInputTextElementVtbl)
+#define HTMLINPUTTEXT(x)  (&(x)->lpHTMLInputTextElementVtbl)
 
 #define HTMLINPUT_THIS(iface) DEFINE_THIS(HTMLInputElement, HTMLInputElement, iface)
 

dlls/mshtml/htmloption.c

@@ -39,7 +39,7 @@ typedef struct {
     nsIDOMHTMLOptionElement *nsoption;
 } HTMLOptionElement;
 
-#define HTMLOPTION(x)  ((IHTMLOptionElement*)  &(x)->lpHTMLOptionElementVtbl)
+#define HTMLOPTION(x)  (&(x)->lpHTMLOptionElementVtbl)
 
 #define HTMLOPTION_THIS(iface) DEFINE_THIS(HTMLOptionElement, HTMLOptionElement, iface)
 

dlls/mshtml/htmlscript.c

@@ -39,7 +39,7 @@ typedef struct {
     nsIDOMHTMLScriptElement *nsscript;
 } HTMLScriptElement;
 
-#define HTMLSCRIPT(x)  ((IHTMLScriptElement*)  &(x)->lpHTMLScriptElementVtbl)
+#define HTMLSCRIPT(x)  (&(x)->lpHTMLScriptElementVtbl)
 
 #define HTMLSCRIPT_THIS(iface) DEFINE_THIS(HTMLScriptElement, HTMLScriptElement, iface)
 

dlls/mshtml/htmlstyle.c

@@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttribut
     if(lFlags == 1)
         FIXME("Parameter lFlags ignored\n");
 
-    hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, (LPOLESTR*)&strAttributeName, 1,
+    hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, &strAttributeName, 1,
                         LOCALE_USER_DEFAULT, &dispid);
     if(hres == S_OK)
     {
@@ -2205,7 +2205,7 @@ static HRESULT WINAPI HTMLStyle_getAttribute(IHTMLStyle *iface, BSTR strAttribut
     if(lFlags == 1)
         FIXME("Parameter lFlags ignored\n");
 
-    hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, (LPOLESTR*)&strAttributeName, 1,
+    hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, &strAttributeName, 1,
                         LOCALE_USER_DEFAULT, &dispid);
     if(hres == S_OK)
     {

dlls/mshtml/htmltable.c

@@ -40,7 +40,7 @@ typedef struct {
     nsIDOMHTMLTableElement *nstable;
 } HTMLTable;
 
-#define HTMLTABLE(x)  ((IHTMLTable*)  &(x)->lpHTMLTableVtbl)
+#define HTMLTABLE(x)  (&(x)->lpHTMLTableVtbl)
 
 #define HTMLTABLE_THIS(iface) DEFINE_THIS(HTMLTable, HTMLTable, iface)
 

dlls/mshtml/htmltablerow.c

@@ -39,7 +39,7 @@ typedef struct {
     nsIDOMHTMLTableRowElement *nsrow;
 } HTMLTableRow;
 
-#define HTMLTABLEROW(x)  ((IHTMLTableRow*)  &(x)->lpHTMLTableRowVtbl)
+#define HTMLTABLEROW(x)  (&(x)->lpHTMLTableRowVtbl)
 
 #define HTMLTABLEROW_THIS(iface) DEFINE_THIS(HTMLTableRow, HTMLTableRow, iface)
 

dlls/mshtml/htmltextnode.c

@@ -37,7 +37,7 @@ struct HTMLDOMTextNode {
     const IHTMLDOMTextNodeVtbl   *lpIHTMLDOMTextNodeVtbl;
 };
 
-#define HTMLTEXT(x)  ((IHTMLDOMTextNode*)  &(x)->lpIHTMLDOMTextNodeVtbl)
+#define HTMLTEXT(x)  (&(x)->lpIHTMLDOMTextNodeVtbl)
 
 #define HTMLTEXT_THIS(iface) DEFINE_THIS(HTMLDOMTextNode, IHTMLDOMTextNode, iface)
 

dlls/mshtml/protocol.c

@@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
  * common ProtocolFactory implementation
  */
 
-#define PROTOCOLINFO(x) ((IInternetProtocolInfo*) &(x)->lpInternetProtocolInfoVtbl)
-#define CLASSFACTORY(x) ((IClassFactory*)         &(x)->lpClassFactoryVtbl)
+#define CLASSFACTORY(x) (&(x)->lpClassFactoryVtbl)
 #define PROTOCOL(x)     ((IInternetProtocol*)     &(x)->lpInternetProtocolVtbl)
+#define PROTOCOLINFO(x) ((IInternetProtocolInfo*) &(x)->lpInternetProtocolInfoVtbl)
 
 typedef struct {
     const IInternetProtocolInfoVtbl *lpInternetProtocolInfoVtbl;

dlls/mshtml/script.c

@@ -63,9 +63,9 @@ typedef struct {
 } ScriptHost;
 
 #define ACTSCPSITE(x)  ((IActiveScriptSite*)               &(x)->lpIActiveScriptSiteVtbl)
-#define ACTSCPPOLL(x)  ((IActiveScriptSiteInterruptPoll*)  &(x)->lpIActiveScriptSiteInterruptPollVtbl)
-#define ACTSCPWIN(x)   ((IActiveScriptSiteWindow*)         &(x)->lpIActiveScriptSiteWindowVtbl)
-#define ACTSCPDBG32(x) ((IActiveScriptSiteDebug32*)        &(x)->lpIActiveScriptSiteDebug32Vtbl)
+#define ACTSCPPOLL(x)  (&(x)->lpIActiveScriptSiteInterruptPollVtbl)
+#define ACTSCPWIN(x)   (&(x)->lpIActiveScriptSiteWindowVtbl)
+#define ACTSCPDBG32(x) (&(x)->lpIActiveScriptSiteDebug32Vtbl)
 
 static BOOL init_script_engine(ScriptHost *script_host)
 {

dlls/mshtml/tests/dom.c

@@ -1798,7 +1798,7 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name)
     HRESULT hres;
     DISPID dispid;
 
-    hres = IHTMLStyle_GetIDsOfNames(pStyle, &IID_NULL, (LPOLESTR*)&Name, 1,
+    hres = IHTMLStyle_GetIDsOfNames(pStyle, &IID_NULL, &Name, 1,
                         LOCALE_USER_DEFAULT, &dispid);
     ok_(__FILE__,line) (hres == S_OK, "GetIDsOfNames: %08x\n", hres);
     if(hres == S_OK)