From 0d38eb5ab050244011dd4819b89057abc0bf5000 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 18 Jan 2016 02:25:58 +0100
Subject: [PATCH] combase-RoApi: Add additional typedefs in roapi.h.

---
 ...vation.idl-with-IActivationFactory-i.patch | 14 +++---
 ...include-roapi.h-Add-further-typedefs.patch | 43 +++++++++++++++++++
 patches/patchinstall.sh                       |  4 +-
 3 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 patches/combase-RoApi/0002-include-roapi.h-Add-further-typedefs.patch

diff --git a/patches/combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch b/patches/combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch
index cb20df2b..cfd00190 100644
--- a/patches/combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch
+++ b/patches/combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch
@@ -1,12 +1,12 @@
-From b92b38bb3ad97ec7b8280c3b3bd694e48ff3e535 Mon Sep 17 00:00:00 2001
+From dd6fc285ffa83e8eb9dce0aa482df44288faa2ea Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 01:36:08 +0100
 Subject: include: Add activation.idl with IActivationFactory interface.
 
 ---
  include/Makefile.in    |  1 +
- include/activation.idl | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+)
+ include/activation.idl | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
  create mode 100644 include/activation.idl
 
 diff --git a/include/Makefile.in b/include/Makefile.in
@@ -22,10 +22,10 @@ index 129ff6d..14e934c 100644
  	activscp.idl \
 diff --git a/include/activation.idl b/include/activation.idl
 new file mode 100644
-index 0000000..92ec011
+index 0000000..b86c9f6
 --- /dev/null
 +++ b/include/activation.idl
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,31 @@
 +/*
 + * Copyright 2016 Michael Müller
 + *
@@ -44,10 +44,6 @@ index 0000000..92ec011
 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 + */
 +
-+#if 0
-+#pragma makedep install
-+#endif
-+
 +#ifndef DO_NO_IMPORTS
 +import "inspectable.idl";
 +#endif
diff --git a/patches/combase-RoApi/0002-include-roapi.h-Add-further-typedefs.patch b/patches/combase-RoApi/0002-include-roapi.h-Add-further-typedefs.patch
new file mode 100644
index 00000000..da5c494f
--- /dev/null
+++ b/patches/combase-RoApi/0002-include-roapi.h-Add-further-typedefs.patch
@@ -0,0 +1,43 @@
+From ab3de1775fa8321218d5712b7562b8575a222a31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 17 Jan 2016 01:37:09 +0100
+Subject: include/roapi.h: Add further typedefs.
+
+---
+ include/roapi.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/roapi.h b/include/roapi.h
+index 0421fe9..f4154f8 100644
+--- a/include/roapi.h
++++ b/include/roapi.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2014 Martin Storsjo
++ * Copyright (C) 2016 Michael Müller
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -20,6 +21,7 @@
+ #define __WINE_ROAPI_H
+ 
+ #include <windef.h>
++#include <activation.h>
+ 
+ typedef enum
+ {
+@@ -27,6 +29,11 @@ typedef enum
+     RO_INIT_MULTITHREADED  = 1,
+ } RO_INIT_TYPE;
+ 
++DECLARE_HANDLE(APARTMENT_SHUTDOWN_REGISTRATION_COOKIE);
++
++typedef struct {} *RO_REGISTRATION_COOKIE;
++typedef HRESULT (WINAPI *PFNGETACTIVATIONFACTORY)(HSTRING, IActivationFactory **);
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-- 
+2.6.4
+
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index b39922be..97271e1f 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -2605,12 +2605,14 @@ fi
 # Patchset combase-RoApi
 # |
 # | Modified files:
-# |   *	include/Makefile.in, include/activation.idl
+# |   *	include/Makefile.in, include/activation.idl, include/roapi.h
 # |
 if test "$enable_combase_RoApi" -eq 1; then
 	patch_apply combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch
+	patch_apply combase-RoApi/0002-include-roapi.h-Add-further-typedefs.patch
 	(
 		echo '+    { "Michael Müller", "include: Add activation.idl with IActivationFactory interface.", 1 },';
+		echo '+    { "Michael Müller", "include/roapi.h: Add further typedefs.", 1 },';
 	) >> "$patchlist"
 fi