Fixed an issue where the 'Empty Recycle Bin' context menu was always grayed out (#2191)

Author: gave92

Files.Launcher/Program.cs

@@ -492,9 +492,9 @@ private static async Task parseRecycleBinAction(AppServiceRequestReceivedEventAr
 
                 case "Query":
                     var responseQuery = new ValueSet();
-                    Shell32.SHQUERYRBINFO queryBinInfo = new Shell32.SHQUERYRBINFO();
-                    queryBinInfo.cbSize = (uint)Marshal.SizeOf(queryBinInfo);
-                    var res = Shell32.SHQueryRecycleBin("", ref queryBinInfo);
+                    Win32API.SHQUERYRBINFO queryBinInfo = new Win32API.SHQUERYRBINFO();
+                    queryBinInfo.cbSize = Marshal.SizeOf(queryBinInfo);
+                    var res = Win32API.SHQueryRecycleBin("", ref queryBinInfo);
                     if (res == HRESULT.S_OK)
                     {
                         var numItems = queryBinInfo.i64NumItems;

Files.Launcher/Win32API.cs

@@ -133,9 +133,22 @@ public static (string icon, bool isCustom) GetFileOverlayIcon(string path)
             byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(image, typeof(byte[]));
             return (Convert.ToBase64String(bitmapData, 0, bitmapData.Length), isCustom);
         }
-    }
 
-    // There is usually no need to define Win32 COM interfaces/P-Invoke methods here.
-    // The Vanara library contains the definitions for all members of Shell32.dll, User32.dll and more
-    // The ones below are due to bugs in the current version of the library and can be removed once fixed
+        // There is usually no need to define Win32 COM interfaces/P-Invoke methods here.
+        // The Vanara library contains the definitions for all members of Shell32.dll, User32.dll and more
+        // The ones below are due to bugs in the current version of the library and can be removed once fixed
+        // Structure used by SHQueryRecycleBin.
+        [StructLayout(LayoutKind.Sequential, Pack = 0)]
+        public struct SHQUERYRBINFO
+        {
+            public int cbSize;
+            public long i64Size;
+            public long i64NumItems;
+        }
+
+        // Get information from recycle bin.
+        [DllImport(Lib.Shell32, SetLastError = false, CharSet = CharSet.Auto)]
+        public static extern int SHQueryRecycleBin(string pszRootPath,
+            ref SHQUERYRBINFO pSHQueryRBInfo);
+    }
 }

Files.Launcher/Win32API_ContextMenu.cs

@@ -455,8 +455,4 @@ public void Dispose()
             }
         }
     }
-
-    // There is usually no need to define Win32 COM interfaces/P-Invoke methods here.
-    // The Vanara library contains the definitions for all members of Shell32.dll, User32.dll and more
-    // The ones below are due to bugs in the current version of the library and can be removed once fixed
 }