Changeset 1553 for trunk/src/shell32/if_macros.h

Timestamp:

Nov 2, 1999, 9:05:35 PM (26 years ago)

Author:

phaller

Message:

Add: update to wine/shell32 1999/11/02 #3

File:

• trunk/src/shell32/if_macros.h (modified) (2 diffs)

trunk/src/shell32/if_macros.h

@@ -1 @@
-/* $Id: if_macros.h,v 1.1 1999-10-09 11:13:19 sandervl Exp $ */
+/* $Id: if_macros.h,v 1.2 1999-11-02 20:05:34 phaller Exp $ */
 
 /*
@@ -24 +24 @@
  *****************************************************************************/
 
-#define IShellBrowser_QueryInterface(p,a,b)     (p)->lpvtbl->fnQueryInterface(p,a,b)
-#define IShellBrowser_AddRef(p)                 (p)->lpvtbl->fnAddRef(p)
-#define IShellBrowser_Release(p)                (p)->lpvtbl->fnRelease(p)
-#define IShellBrowser_GetWindow(p,a)            (p)->lpvtbl->fnGetWindow(p,a)
-#define IShellBrowser_ContextSensitiveHelp(p,a) (p)->lpvtbl->fnContextSensitiveHelp(p,a)
-#define IShellBrowser_InsertMenusSB(p,a,b)      (p)->lpvtbl->fnInsertMenusSB(p,a,b)
-#define IShellBrowser_SetMenuSB(p,a,b,c)        (p)->lpvtbl->fnSetMenuSB(p,a,b,c)
-#define IShellBrowser_RemoveMenusSB(p,a)        (p)->lpvtbl->fnRemoveMenusSB(p,a)
-#define IShellBrowser_SetStatusTextSB(p,a)      (p)->lpvtbl->fnSetStatusTextSB(p,a)
-#define IShellBrowser_EnableModelessSB(p,a)     (p)->lpvtbl->fnEnableModelessSB(p,a)
-#define IShellBrowser_TranslateAcceleratorSB(p,a,b)     (p)->lpvtbl->fnTranslateAcceleratorSB(p,a,b)
-#define IShellBrowser_BrowseObject(p,a,b)       (p)->lpvtbl->fnBrowseObject(p,a,b)
-#define IShellBrowser_GetViewStateStream(p,a,b) (p)->lpvtbl->fnGetViewStateStream(p,a,b)
-#define IShellBrowser_GetControlWindow(p,a,b)   (p)->lpvtbl->fnGetControlWindow(p,a,b)
-#define IShellBrowser_SendControlMsg(p,a,b,c,d,e)       (p)->lpvtbl->fnSendControlMsg(p,a,b,c,d,e)
-#define IShellBrowser_QueryActiveShellView(p,a) (p)->lpvtbl->fnQueryActiveShellView(p,a)
-#define IShellBrowser_OnViewWindowActive(p,a)   (p)->lpvtbl->fnOnViewWindowActive(p,a)
-#define IShellBrowser_SetToolbarItems(p,a,b,c)  (p)->lpvtbl->fnSetToolbarItems(p,a,b,c)
+/*** IUnknown methods ***/
+#define IShellBrowser_QueryInterface(p,a,b)         ICOM_CALL2(QueryInterface,p,a,b)
+#define IShellBrowser_AddRef(p)                     ICOM_CALL (AddRef,p)
+#define IShellBrowser_Release(p)                    ICOM_CALL (Release,p)
+/*** IShellBrowser methods ***/
+#define IShellBrowser_GetWindow(p,a)                ICOM_CALL1(GetWindow,p,a)
+#define IShellBrowser_ContextSensitiveHelp(p,a)     ICOM_CALL1(ContextSensitiveHelp,p,a)
+#define IShellBrowser_InsertMenusSB(p,a,b)          ICOM_CALL2(InsertMenusSB,p,a,b)
+#define IShellBrowser_SetMenuSB(p,a,b,c)            ICOM_CALL3(SetMenuSB,p,a,b,c)
+#define IShellBrowser_RemoveMenusSB(p,a)            ICOM_CALL1(RemoveMenusSB,p,a)
+#define IShellBrowser_SetStatusTextSB(p,a)          ICOM_CALL1(SetStatusTextSB,p,a)
+#define IShellBrowser_EnableModelessSB(p,a)         ICOM_CALL1(EnableModelessSB,p,a)
+#define IShellBrowser_TranslateAcceleratorSB(p,a,b) ICOM_CALL2(TranslateAcceleratorSB,p,a,b)
+#define IShellBrowser_BrowseObject(p,a,b)           ICOM_CALL2(BrowseObject,p,a,b)
+#define IShellBrowser_GetViewStateStream(p,a,b)     ICOM_CALL2(GetViewStateStream,p,a,b)
+#define IShellBrowser_GetControlWindow(p,a,b)       ICOM_CALL2(GetControlWindow,p,a,b)
+#define IShellBrowser_SendControlMsg(p,a,b,c,d,e)   ICOM_CALL5(SendControlMsg,p,a,b,c,d,e)
+#define IShellBrowser_QueryActiveShellView(p,a)     ICOM_CALL1(QueryActiveShellView,p,a)
+#define IShellBrowser_OnViewWindowActive(p,a)       ICOM_CALL1(OnViewWindowActive,p,a)
+#define IShellBrowser_SetToolbarItems(p,a,b,c)      ICOM_CALL3(SetToolbarItems,p,a,b,c)
 
 #endif