shell32: Use FIELD_OFFSET instead of hand coding its functionality.

3591663c · Michael Stefaniuc · Alexandre Julliard · 311bef2a · 3591663c
Commit 3591663c authored Nov 05, 2008 by Michael Stefaniuc Committed by Alexandre Julliard Nov 05, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shfldr_netplaces.c dlls/shell32/shfldr_netplaces.c +2 -2

No files found.
--- a/dlls/shell32/shfldr_netplaces.c
+++ b/dlls/shell32/shfldr_netplaces.c
@@ -66,8 +66,8 @@ static const IShellFolder2Vtbl vt_ShellFolder2;
 static const IPersistFolder2Vtbl vt_NP_PersistFolder2;


-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
-#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
+#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)