Avoid depending on the non-standard IUnknown_METHODS macro in Wine
internal headers.
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index 4c35096..44ad4ae 100644
--- a/dlls/shell32/shellfolder.h
+++ b/dlls/shell32/shellfolder.h
@@ -40,13 +40,18 @@
*/
#define INTERFACE ISFHelper
-#define ISFHelper_METHODS \
- IUnknown_METHODS \
- STDMETHOD(GetUniqueName)(THIS_ LPSTR lpName, UINT uLen) PURE; \
- STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCSTR lpName, LPITEMIDLIST * ppidlOut) PURE; \
- STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; \
- STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE;
-DECLARE_INTERFACE_(ISFHelper, IUnknown) { ISFHelper_METHODS };
+DECLARE_INTERFACE_(ISFHelper,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** ISFHelper methods ***/
+ STDMETHOD(GetUniqueName)(THIS_ LPSTR lpName, UINT uLen) PURE;
+ STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCSTR lpName, LPITEMIDLIST * ppidlOut) PURE;
+ STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE;
+ STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE;
+};
#undef INTERFACE
#ifdef COBJMACROS
