From 876d1c2dc823adf8566d7168b20c9d5e4ee8222a Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Tue, 23 Jul 2024 22:21:11 +0900
Subject: [PATCH] [SHELL32] Use DECLARE_INTERFACE_ for IRecycleBin5 (#7168)

Improve interoperability between
C and C++.
JIRA issue: CORE-19595
Rewrite IRecycleBin5 interface
by using STDMETHOD and
DECLARE_INTERFACE_ macro.
---
 .../shell32/shellrecyclebin/recyclebin_v5.h   | 60 +++++++------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h
index 66d2db203da..52681b584f9 100644
--- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h
+++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h
@@ -27,51 +27,37 @@ typedef struct _DELETED_FILE_RECORD
 typedef interface IRecycleBin5 IRecycleBin5;
 EXTERN_C const IID IID_IRecycleBin5;
 
-typedef struct IRecycleBin5Vtbl
+#define INTERFACE IRecycleBin5
+DECLARE_INTERFACE_(IRecycleBin5, IUnknown)
 {
+    BEGIN_INTERFACE
+
+    /* IUnknown interface */
+    STDMETHOD(QueryInterface)(THIS_ IN REFIID riid, OUT void **ppvObject) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+
     /* IRecycleBin interface */
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IN IRecycleBin5 *This,
-        IN REFIID riid,
-        OUT void **ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IN IRecycleBin5 *This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IN IRecycleBin5 *This);
-
-    HRESULT (STDMETHODCALLTYPE *DeleteFile)(
-        IN IRecycleBin5 *This,
-        IN LPCWSTR szFileName);
-
-    HRESULT (STDMETHODCALLTYPE *EmptyRecycleBin)(
-        IN IRecycleBin5 *This);
-
-    HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IN IRecycleBin5 *This,
-        OUT IRecycleBinEnumList **ppEnumList);
+    STDMETHOD(DeleteFile)(THIS_ IN LPCWSTR szFileName) PURE;
+    STDMETHOD(EmptyRecycleBin)(THIS);
+    STDMETHOD(EnumObjects)(THIS_ OUT IRecycleBinEnumList **ppEnumList) PURE;
 
     /* IRecycleBin5 interface */
-    HRESULT (STDMETHODCALLTYPE *Delete)(
-        IN IRecycleBin5 *This,
+    STDMETHOD(Delete)(
+        THIS_
         IN LPCWSTR pDeletedFileName,
-        IN DELETED_FILE_RECORD *pDeletedFile);
-
-    HRESULT (STDMETHODCALLTYPE *Restore)(
-        IN IRecycleBin5 *This,
+        IN DELETED_FILE_RECORD *pDeletedFile) PURE;
+    STDMETHOD(Restore)(
+        THIS_
         IN LPCWSTR pDeletedFileName,
-        IN DELETED_FILE_RECORD *pDeletedFile);
+        IN DELETED_FILE_RECORD *pDeletedFile) PURE;
+    STDMETHOD(OnClosing)(
+        THIS_
+        IN IRecycleBinEnumList *prbel) PURE;
 
-    HRESULT (STDMETHODCALLTYPE *OnClosing)(
-        IN IRecycleBin5 *This,
-        IN IRecycleBinEnumList *prbel);
-} IRecycleBin5Vtbl;
-
-interface IRecycleBin5
-{
-    CONST_VTBL struct IRecycleBin5Vtbl *lpVtbl;
+    END_INTERFACE
 };
+#undef INTERFACE
 
 #ifdef COBJMACROS
 #define IRecycleBin5_QueryInterface(This, riid, ppvObject) \