Rebase against 5a8dcb062793fbb68997e1b54ebc2666a2b2834d.

2025-01-28 22:04:43 -08:00 · 2021-10-05 08:55:24 +11:00 · 2021-10-05 08:55:24 +11:00 · e41287e81a
commit e41287e81a
parent 4d66e1bf6b
3 changed files with 3 additions and 3 deletions
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "a87abdbe85779adf6a2a7897bd88984587880693"
+	echo "5a8dcb062793fbb68997e1b54ebc2666a2b2834d"
 }

 # Show version information
--- a/patches/shell32-Context_Menu/0003-shell32-Implement-insert-paste-for-item-context-menu.patch
+++ b/patches/shell32-Context_Menu/0003-shell32-Implement-insert-paste-for-item-context-menu.patch
@ -28,7 +28,7 @@ index 43cbea2ec87..047fe00e39d 100644
     BOOL desktop;
 } ContextMenu;
 
-+static BOOL DoPaste(ContextMenu *This);
+static HRESULT DoPaste(ContextMenu *This);
 +
 static inline ContextMenu *impl_from_IContextMenu3(IContextMenu3 *iface)
 {
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@ -1 +1 @@
-a87abdbe85779adf6a2a7897bd88984587880693
+5a8dcb062793fbb68997e1b54ebc2666a2b2834d