shell32: Remove superfluous pointer casts from macros.

dlls/shell32/autocomplete.c

@@ -84,9 +84,9 @@ static const IAutoCompleteDropDownVtbl acdropdownvt;
 /*
   converts This to an interface pointer
 */
-#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
-#define _IAutoComplete2_(This)  (IAutoComplete2*)&(This->lpVtbl)
-#define _IAutoCompleteDropDown_(This)  (IAutoCompleteDropDown*)&(This->lpDropDownVtbl)
+#define _IUnknown_(This)              ((IUnknown*)&(This)->lpVtbl)
+#define _IAutoComplete2_(This)        ((IAutoComplete2*)&(This)->lpVtbl)
+#define _IAutoCompleteDropDown_(This) (&(This)->lpDropDownVtbl)
 
 static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDropDown *iface)
 {

dlls/shell32/cpanelfolder.c

@@ -96,15 +96,15 @@ static inline ICPanelImpl *impl_from_IShellExecuteHookA( IShellExecuteHookA *ifa
 /*
   converts This to an interface pointer
 */
-#define _IUnknown_(This)	   (IUnknown*)&(This->lpVtbl)
-#define _IShellFolder_(This)	   (IShellFolder*)&(This->lpVtbl)
-#define _IShellFolder2_(This)	   (IShellFolder2*)&(This->lpVtbl)
-
-#define _IPersist_(This)	   (IPersist*)&(This->lpVtblPersistFolder2)
-#define _IPersistFolder_(This)	   (IPersistFolder*)&(This->lpVtblPersistFolder2)
-#define _IPersistFolder2_(This)	   (IPersistFolder2*)&(This->lpVtblPersistFolder2)
-#define _IShellExecuteHookW_(This) (IShellExecuteHookW*)&(This->lpVtblShellExecuteHookW)
-#define _IShellExecuteHookA_(This) (IShellExecuteHookA*)&(This->lpVtblShellExecuteHookA)
+#define _IUnknown_(This)           ((IUnknown*)&(This)->lpVtbl)
+#define _IShellFolder_(This)       ((IShellFolder*)&(This)->lpVtbl)
+#define _IShellFolder2_(This)      (&(This)->lpVtbl)
+
+#define _IPersist_(This)           (&(This)->lpVtblPersistFolder2)
+#define _IPersistFolder_(This)     (&(This)->lpVtblPersistFolder2)
+#define _IPersistFolder2_(This)    (&(This)->lpVtblPersistFolder2)
+#define _IShellExecuteHookW_(This) (&(This)->lpVtblShellExecuteHookW)
+#define _IShellExecuteHookA_(This) (&(This)->lpVtblShellExecuteHookA)
 
 /***********************************************************************
 *   IShellFolder [ControlPanel] implementation

dlls/shell32/dragdrophelper.c

@@ -54,8 +54,8 @@ typedef struct {
 
 static const IDropTargetHelperVtbl vt_IDropTargetHelper;
 
-#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
-#define _IDropTargetHelper_(This) (IDropTargetHelper*)&(This->lpVtbl)
+#define _IUnknown_(This)          ((IUnknown*)&(This)->lpVtbl)
+#define _IDropTargetHelper_(This) (&(This)->lpVtbl)
 
 /**************************************************************************
 *	IDropTargetHelper_Constructor

dlls/shell32/shfldr_fs.c

@@ -110,15 +110,15 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface )
 /*
   converts This to an interface pointer
 */
-#define _IUnknown_(This)        (IUnknown*)&(This->lpVtbl)
-#define _IShellFolder_(This)    (IShellFolder*)&(This->lpvtblShellFolder)
-#define _IShellFolder2_(This)   (IShellFolder2*)&(This->lpvtblShellFolder)
-#define _IPersist_(This)        (IPersist*)&(This->lpvtblPersistFolder3)
-#define _IPersistFolder_(This)  (IPersistFolder*)&(This->lpvtblPersistFolder3)
-#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpvtblPersistFolder3)
-#define _IPersistFolder3_(This) (IPersistFolder3*)&(This->lpvtblPersistFolder3)
-#define _IDropTarget_(This)     (IDropTarget*)&(This->lpvtblDropTarget)
-#define _ISFHelper_(This)       (ISFHelper*)&(This->lpvtblSFHelper)
+#define _IUnknown_(This)        ((IUnknown*)&(This)->lpVtbl)
+#define _IShellFolder_(This)    ((IShellFolder*)&(This)->lpvtblShellFolder)
+#define _IShellFolder2_(This)   ((IShellFolder2*)&(This)->lpvtblShellFolder)
+#define _IPersist_(This)        (&(This)->lpvtblPersistFolder3)
+#define _IPersistFolder_(This)  (&(This)->lpvtblPersistFolder3)
+#define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3)
+#define _IPersistFolder3_(This) (&(This)->lpvtblPersistFolder3)
+#define _IDropTarget_(This)     (&(This)->lpvtblDropTarget)
+#define _ISFHelper_(This)       (&(This)->lpvtblSFHelper)
 
 /**************************************************************************
 * registers clipboardformat once

dlls/shell32/shfldr_mycomp.c

@@ -75,13 +75,13 @@ static inline IGenericSFImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface
 /*
   converts This to an interface pointer
 */
-#define _IUnknown_(This)    (IUnknown*)&(This->lpVtbl)
-#define _IShellFolder_(This)    (IShellFolder*)&(This->lpVtbl)
-#define _IShellFolder2_(This)    (IShellFolder2*)&(This->lpVtbl)
+#define _IUnknown_(This)        ((IUnknown*)&(This)->lpVtbl)
+#define _IShellFolder_(This)    ((IShellFolder*)&(This)->lpVtbl)
+#define _IShellFolder2_(This)   (&(This)->lpVtbl)
 
-#define _IPersist_(This)    (IPersist*)&(This->lpVtblPersistFolder2)
-#define _IPersistFolder_(This)    (IPersistFolder*)&(This->lpVtblPersistFolder2)
-#define _IPersistFolder2_(This)    (IPersistFolder2*)&(This->lpVtblPersistFolder2)
+#define _IPersist_(This)        (&(This)->lpVtblPersistFolder2)
+#define _IPersistFolder_(This)  (&(This)->lpVtblPersistFolder2)
+#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2)
 
 /***********************************************************************
 *   IShellFolder [MyComputer] implementation

dlls/shell32/shfldr_netplaces.c

@@ -69,9 +69,9 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = \
     (class*)(((char*)name) - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2))
 
-#define _IUnknown_(This)	(IUnknown*)&(This->lpVtbl)
-#define _IShellFolder_(This)	(IShellFolder*)&(This->lpVtbl)
-#define _IPersistFolder2_(This)	(IPersistFolder2*)&(This->lpVtblPersistFolder2)
+#define _IUnknown_(This)        ((IUnknown*)&(This)->lpVtbl)
+#define _IShellFolder_(This)    ((IShellFolder*)&(This)->lpVtbl)
+#define _IPersistFolder2_(This) (&(This)->lpVtblPersistFolder2)
 
 static const shvheader NetworkPlacesSFHeader[] = {
     {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},