Rebase against be0684dad50ffbc93b3ded4fbfebf1d1e4690589.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "3dbce69fd4cc8f4802479939d2cf50905b79f5a3"
+	echo "be0684dad50ffbc93b3ded4fbfebf1d1e4690589"
 }
 
 # Show version information
@@ -3106,7 +3106,7 @@ fi
 # Patchset stdole32.idl-Typelib
 # |
 # | Modified files:
-# |   *	dlls/stdole32.tlb/std_ole_v1.idl, include/Makefile.in, include/stdole32.idl
+# |   *	dlls/stdole32.tlb/std_ole_v1.idl
 # |
 if test "$enable_stdole32_idl_Typelib" -eq 1; then
 	patch_apply stdole32.idl-Typelib/0001-include-Make-stdole32.idl-a-public-component.patch

patches/stdole32.idl-Typelib/0001-include-Make-stdole32.idl-a-public-component.patch

@@ -1,18 +1,17 @@
-From 3566de68d0132c8c1df9dd0d2c820671b7605501 Mon Sep 17 00:00:00 2001
+From 1d1a3c94906ddd6501626ab5870735ab6ec6243b Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 22 Jan 2016 17:40:43 +0800
 Subject: [PATCH] include: Make stdole32.idl a public component.
 
 This makes it possible to import stdole32.tlb from other .idl files.
 ---
- dlls/stdole32.tlb/std_ole_v1.idl | 119 +-------------------------------
- include/Makefile.in              |   1 +
- include/stdole32.idl             | 143 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 145 insertions(+), 118 deletions(-)
+ dlls/stdole32.tlb/std_ole_v1.idl | 119 +------------------------
+ include/stdole32.idl             | 143 +++++++++++++++++++++++++++++++
+ 2 files changed, 144 insertions(+), 118 deletions(-)
  create mode 100644 include/stdole32.idl
 
 diff --git a/dlls/stdole32.tlb/std_ole_v1.idl b/dlls/stdole32.tlb/std_ole_v1.idl
-index 359a810..de053e9 100644
+index 359a81062ae..de053e98227 100644
 --- a/dlls/stdole32.tlb/std_ole_v1.idl
 +++ b/dlls/stdole32.tlb/std_ole_v1.idl
 @@ -20,121 +20,4 @@
@@ -138,21 +137,9 @@ index 359a810..de053e9 100644
 -    }
 -};
 +#include "stdole32.idl"
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 265f368..b2f30ad 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -595,6 +595,7 @@ SOURCES = \
- 	srrestoreptapi.h \
- 	sspi.h \
- 	stdole2.idl \
-+	stdole32.idl \
- 	stgprop.h \
- 	sti.h \
- 	storage.h \
 diff --git a/include/stdole32.idl b/include/stdole32.idl
 new file mode 100644
-index 0000000..107cee8
+index 00000000000..107cee84591
 --- /dev/null
 +++ b/include/stdole32.idl
 @@ -0,0 +1,143 @@
@@ -300,5 +287,5 @@ index 0000000..107cee8
 +    }
 +};
 -- 
-1.9.1
+2.33.0
 

staging/upstream-commit

@@ -1 +1 @@
-3dbce69fd4cc8f4802479939d2cf50905b79f5a3
+be0684dad50ffbc93b3ded4fbfebf1d1e4690589