Release 1.9.21.

Added patch to ignore queued xaudio2 AL buffers after Stop.
Added patch for initial implementation of GIF encoder in windowscodecs.
2025-04-13 14:42:51 -07:00 · 2016-10-16 18:33:26 +02:00 · 2016-10-16 17:01:08 +02:00 · 2016-10-16 16:01:02 +02:00 · 2016-10-16 15:36:30 +02:00 · 2016-10-16 15:28:18 +02:00
79 changed files with 4734 additions and 1078 deletions
--- a/patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch
+++ b/patches/Compiler_Warnings/0001-include-Avoid-duplicate-definition-of-PEVENT_FILTER_.patch
@@ -0,0 +1,39 @@
+From 0cd3973a47317aff488c63eeb33ddedb2cba2b50 Mon Sep 17 00:00:00 2001
+From: Hans Leidekker <hans@codeweavers.com>
+Date: Sat, 15 Oct 2016 17:27:41 +0200
+Subject: include: Avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.
+
+---
+ include/evntrace.h | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/include/evntrace.h b/include/evntrace.h
+index b54cd11..bb1ce03 100644
+--- a/include/evntrace.h
+++ b/include/evntrace.h
+@@ -248,16 +248,14 @@ typedef struct _EVENT_TRACE_PROPERTIES
+     ULONG LoggerNameOffset;
+ } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;
+ 
+-typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR;
+-
+ typedef struct _ENABLE_TRACE_PARAMETERS
+ {
+-    ULONG                    Version;
+-    ULONG                    EnableProperty;
+-    ULONG                    ControlFlags;
+-    GUID                     SourceId;
+-    PEVENT_FILTER_DESCRIPTOR EnableFilterDesc;
+-    ULONG                    FilterDescCount;
+    ULONG                            Version;
+    ULONG                            EnableProperty;
+    ULONG                            ControlFlags;
+    GUID                             SourceId;
+    struct _EVENT_FILTER_DESCRIPTOR *EnableFilterDesc;
+    ULONG                            FilterDescCount;
+ } ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS;
+ 
+ #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)
+-- 
+2.9.0
+
--- a/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch
@@ -1,90 +0,0 @@
-From e08bd12d12e5e3159ce9efa848cad6118951ff5e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 15 Jan 2016 13:37:26 +0100
-Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
-
---
- configure.ac                                       |  1 +
- .../api-ms-win-appmodel-runtime-l1-1-1/Makefile.in |  1 +
- .../api-ms-win-appmodel-runtime-l1-1-1.spec        | 36 ++++++++++++++++++++++
- tools/make_specfiles                               |  1 +
- 4 files changed, 39 insertions(+)
- create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
- create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
-
-diff --git a/configure.ac b/configure.ac
-index 6d51b3f..9be829f 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
- WINE_CONFIG_TEST(dlls/advpack/tests)
- WINE_CONFIG_DLL(amstream,,[clean])
- WINE_CONFIG_TEST(dlls/amstream/tests)
-+WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0)
-diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
-new file mode 100644
-index 0000000..289d96f
--- /dev/null
-+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-appmodel-runtime-l1-1-1.dll
-diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
-new file mode 100644
-index 0000000..2e5fbf1
--- /dev/null
-+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
-@@ -0,0 +1,36 @@
-+@ stub ClosePackageInfo
-+@ stub FindPackagesByPackageFamily
-+@ stub FormatApplicationUserModelId
-+@ stub GetApplicationUserModelId
-+@ stub GetApplicationUserModelIdFromToken
-+@ stub GetCurrentApplicationUserModelId
-+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
-+@ stub GetCurrentPackageFullName
-+@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
-+@ stub GetCurrentPackageInfo
-+@ stub GetCurrentPackagePath
-+@ stub GetPackageApplicationIds
-+@ stub GetPackageFamilyName
-+@ stub GetPackageFamilyNameFromToken
-+@ stub GetPackageFullName
-+@ stub GetPackageFullNameFromToken
-+@ stub GetPackageId
-+@ stub GetPackageInfo
-+@ stub GetPackagePath
-+@ stub GetPackagePathByFullName
-+@ stub GetPackagesByPackageFamily
-+@ stub GetStagedPackageOrigin
-+@ stub GetStagedPackagePathByFullName
-+@ stub OpenPackageInfoByFullName
-+@ stub OpenPackageInfoByFullNameForUser
-+@ stub PackageFamilyNameFromFullName
-+@ stub PackageFamilyNameFromId
-+@ stub PackageFullNameFromId
-+@ stub PackageIdFromFullName
-+@ stub PackageNameAndPublisherIdFromFamilyName
-+@ stub ParseApplicationUserModelId
-+@ stub VerifyApplicationUserModelId
-+@ stub VerifyPackageFamilyName
-+@ stub VerifyPackageFullName
-+@ stub VerifyPackageId
-+@ stub VerifyPackageRelativeApplicationId
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 3316f76..5a58eed 100755
--- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -137,6 +137,7 @@ my @dll_groups =
-  ],
-  [
-   "kernel32",
-+  "api-ms-win-appmodel-runtime-l1-1-1",
-   "api-ms-win-downlevel-normaliz-l1-1-0",
-   "api-ms-win-core-processthreads-l1-1-0",
-   "api-ms-win-core-appcompat-l1-1-1",
-- 
-2.9.0
-
--- a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
+++ b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
@@ -1,4 +1,4 @@
-From 26c9cf2b9b71306ebb6c19c6b0838a8ca91f3613 Mon Sep 17 00:00:00 2001
+From faddf206cfe8bb34fb7f56c881723229b0d3e8e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:07:35 +0100
 Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
@@ -15,13 +15,13 @@ Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
 create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c

 diff --git a/configure.ac b/configure.ac
-index 1ac07ff..049de86 100644
+index 999a457..d099029 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2929,6 +2929,7 @@ WINE_CONFIG_DLL(evr)
- WINE_CONFIG_DLL(explorerframe,,[clean])
+@@ -3008,6 +3008,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
 WINE_CONFIG_TEST(dlls/explorerframe/tests)
 WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
 WINE_CONFIG_DLL(faultrep,,[implib])
 WINE_CONFIG_TEST(dlls/faultrep/tests)
@@ -90,5 +90,5 @@ index 0000000..3e28275
 +    return TRUE;
 +}
 -- 
-2.6.4
+2.9.0

--- a/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch
+++ b/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch
@@ -1,4 +1,4 @@
-From 16af0df00d70307dd90c7dd836de57376b185844 Mon Sep 17 00:00:00 2001
+From 84ff59cbefcd2a4c5c5625a99fdbf06ebee7bba6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:12:45 +0100
 Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
@@ -15,17 +15,17 @@ Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
 create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c

 diff --git a/configure.ac b/configure.ac
-index 049de86..36924eb 100644
+index d099029..e2d7b8e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2928,6 +2928,7 @@ WINE_CONFIG_DLL(esent)
+@@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(esent)
 WINE_CONFIG_DLL(evr)
 WINE_CONFIG_DLL(explorerframe,,[clean])
 WINE_CONFIG_TEST(dlls/explorerframe/tests)
 +WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
- WINE_CONFIG_DLL(faultrep,,[implib])
 diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..16eee75
@@ -87,5 +87,5 @@ index 0000000..7a9e75f
 +    return S_OK;
 +}
 -- 
-2.6.4
+2.9.0

--- a/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch
@@ -1,4 +1,4 @@
-From 75862379c05979ced69231fc1d69a6d7a750dfcb Mon Sep 17 00:00:00 2001
+From 275174ba45b57fa9f65d2199700cab3a5cfea397 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:00:39 +0100
 Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
@@ -13,13 +13,13 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
 create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec

 diff --git a/configure.ac b/configure.ac
-index c46edf6..ff6de50 100644
+index 4afa294..b4572d3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
- WINE_CONFIG_TEST(dlls/explorerframe/tests)
+@@ -3012,6 +3012,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
 WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
 WINE_CONFIG_DLL(faultrep,,[implib])
@@ -43,10 +43,10 @@ index 0000000..22128a2
 +@ stdcall SetCapture(long) user32.SetCapture
 +@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 1b2c0bf..6e39ccc 100755
+index 542e207..4b53feb 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -277,6 +277,7 @@ my @dll_groups =
+@@ -283,6 +283,7 @@ my @dll_groups =
   "api-ms-win-core-string-l2-1-0",
   "api-ms-win-downlevel-user32-l1-1-0",
   "api-ms-win-ntuser-dc-access-l1-1-0",
@@ -55,5 +55,5 @@ index 1b2c0bf..6e39ccc 100755
  [
   "version",
 -- 
-2.7.1
+2.9.0

--- a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
@@ -1,4 +1,4 @@
-From 1ee5402d4001e228e936b40ab7e3043c4e31c8b9 Mon Sep 17 00:00:00 2001
+From 4af99f6f4d4e56d5cc7adfa52263b71232807f2a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:02:52 +0100
 Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
@@ -13,12 +13,12 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
 create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec

 diff --git a/configure.ac b/configure.ac
-index 566b8f1..308f04e 100644
+index b4572d3..20d799a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2938,6 +2938,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
- WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
+@@ -3013,6 +3013,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
@@ -62,10 +62,10 @@ index 0000000..0a96983
 +@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
 +@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index f9aea98..52d6583 100755
+index 4b53feb..e7d6c74 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -300,6 +300,10 @@ my @dll_groups =
+@@ -312,6 +312,10 @@ my @dll_groups =
   "api-ms-win-core-winrt-string-l1-1-0",
  ],
  [
@@ -77,5 +77,5 @@ index f9aea98..52d6583 100755
   "irprops.cpl",
  ],
 -- 
-2.7.1
+2.9.0

--- a/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
@@ -1,4 +1,4 @@
-From 53a6d2753fe70e58d14e366c88dac1c8e65ea6aa Mon Sep 17 00:00:00 2001
+From b2c7de654c69a9d0aedb4c1d40cd4218df1869bb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:06:59 +0100
 Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
@@ -13,12 +13,12 @@ Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
 create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec

 diff --git a/configure.ac b/configure.ac
-index 9ee4464..f38d37a 100644
+index 9a621f7..99cf576 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2939,6 +2939,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
- WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
+@@ -3014,6 +3014,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
@@ -40,10 +40,10 @@ index 0000000..626c778
 +@ stdcall GetSysColor(long) user32.GetSysColor
 +@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index c88a32c..a602e5d 100755
+index 276e3b3..976dcb4 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -276,6 +276,7 @@ my @dll_groups =
+@@ -285,6 +285,7 @@ my @dll_groups =
   "api-ms-win-ntuser-dc-access-l1-1-0",
   "api-ms-win-rtcore-ntuser-window-l1-1-0",
   "ext-ms-win-ntuser-mouse-l1-1-0",
@@ -52,5 +52,5 @@ index c88a32c..a602e5d 100755
  [
   "version",
 -- 
-2.6.4
+2.9.0

--- a/patches/api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
@@ -1,4 +1,4 @@
-From 06fc57e35f3424d17d8e3cb61692d594691674f4 Mon Sep 17 00:00:00 2001
+From c8663fed050b92db5376d4b9892f783b3c3fa2de Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:10:37 +0100
 Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
@@ -13,11 +13,11 @@ Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
 create mode 100644 dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec

 diff --git a/configure.ac b/configure.ac
-index 4c803cc..bb63b0d 100644
+index 9ff6713..0436524 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
- WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+@@ -3016,6 +3016,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+ WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
 WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
@@ -58,10 +58,10 @@ index 0000000..ffb8f5b
 +@ stdcall SystemParametersInfoA(long long ptr long) user32.SystemParametersInfoA
 +@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 43b8dc2..af88f8b 100755
+index da114a5..758e4df 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -281,6 +281,7 @@ my @dll_groups =
+@@ -287,6 +287,7 @@ my @dll_groups =
   "api-ms-win-rtcore-ntuser-window-l1-1-0",
   "ext-ms-win-ntuser-mouse-l1-1-0",
   "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
@@ -70,5 +70,5 @@ index 43b8dc2..af88f8b 100755
  [
   "version",
 -- 
-2.7.1
+2.9.0

--- a/patches/api-ms-win-Stub_DLLs/0021-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0021-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch
@@ -1,56 +0,0 @@
-From 5989f92d5a873732acb8cb9af4011ce7e145bbb3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 23 Jan 2016 21:13:02 +0100
-Subject: ext-ms-win-kernel32-package-current-l1-1-0: Add dll.
-
---
- configure.ac                                                            | 1 +
- dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in             | 1 +
- .../ext-ms-win-kernel32-package-current-l1-1-0.spec                     | 2 ++
- tools/make_specfiles                                                    | 1 +
- 4 files changed, 5 insertions(+)
- create mode 100644 dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in
- create mode 100644 dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec
-
-diff --git a/configure.ac b/configure.ac
-index d2abe1d..dc1b078 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -2958,6 +2958,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
- WINE_CONFIG_TEST(dlls/explorerframe/tests)
- WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
- WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
-+WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
- WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
- WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
- WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
-diff --git a/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..c4699b1
--- /dev/null
-+++ b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE   = ext-ms-win-kernel32-package-current-l1-1-0.dll
-diff --git a/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec
-new file mode 100644
-index 0000000..2156c27
--- /dev/null
-+++ b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec
-@@ -0,0 +1,2 @@
-+@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
-+@ stub GetCurrentPackageInfo
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 1337fca..756ae00 100755
--- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -180,6 +180,7 @@ my @dll_groups =
-   "api-ms-win-core-xstate-l2-1-0",
-   "api-ms-win-core-errorhandling-l1-1-2",
-   "api-ms-win-core-util-l1-1-0",
-+  "ext-ms-win-kernel32-package-current-l1-1-0",
-  ],
-  [
-   "kernel32",
-- 
-2.9.0
-
--- a/patches/dmusic-SynthPort_IKsControl/0002-dmusic-Add-IKsControl-stub-subinterface-for-SynthPor.patch
+++ b/patches/dmusic-SynthPort_IKsControl/0002-dmusic-Add-IKsControl-stub-subinterface-for-SynthPor.patch
@@ -1,144 +0,0 @@
-From 8b845b6348b898f79e7fd401b045a46f9501e1e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 29 Apr 2016 16:41:04 +0200
-Subject: dmusic: Add IKsControl stub subinterface for SynthPort.
-
---
- dlls/dmusic/dmusic_private.h |  2 ++
- dlls/dmusic/port.c           | 79 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 81 insertions(+)
-
-diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
-index 44d5d57..110788c 100644
--- a/dlls/dmusic/dmusic_private.h
-+++ b/dlls/dmusic/dmusic_private.h
-@@ -41,6 +41,7 @@
- #include "dmusici.h"
- #include "dmusicf.h"
- #include "dmusics.h"
-+#include "dmksctrl.h"
- 
- /*****************************************************************************
-  * Interfaces
-@@ -167,6 +168,7 @@ struct SynthPortImpl {
-     IDirectMusicPort IDirectMusicPort_iface;
-     IDirectMusicPortDownload IDirectMusicPortDownload_iface;
-     IDirectMusicThru IDirectMusicThru_iface;
-+    IKsControl IKsControl_iface;
-     LONG ref;
- 
-     /* IDirectMusicPort fields */
-diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
-index f886d52..3d434e1 100644
--- a/dlls/dmusic/port.c
-+++ b/dlls/dmusic/port.c
-@@ -44,6 +44,11 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus
-     return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface);
- }
- 
-+static inline SynthPortImpl *impl_from_SynthPortImpl_IKsControl(IKsControl *iface)
-+{
-+    return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface);
-+}
-+
- /* IDirectMusicDownloadedInstrument IUnknown part follows: */
- static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface)
- {
-@@ -142,6 +147,10 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI
-         *ret_iface = &This->IDirectMusicThru_iface;
-         IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
-         return S_OK;
-+    } else if (IsEqualGUID(riid, &IID_IKsControl)) {
-+        *ret_iface = &This->IKsControl_iface;
-+        IKsControl_AddRef((IKsControl*)*ret_iface);
-+        return S_OK;
-     }
- 
-     WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
-@@ -672,6 +681,75 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = {
-     SynthPortImpl_IDirectMusicThru_ThruChannel
- };
- 
-+static HRESULT WINAPI SynthPortImpl_IKsControl_QueryInterface(IKsControl* iface, REFIID riid, LPVOID *ppobj)
-+{
-+    SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface);
-+
-+    return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ppobj);
-+}
-+
-+static ULONG WINAPI SynthPortImpl_IKsControl_AddRef(IKsControl* iface)
-+{
-+    SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface);
-+
-+    return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface);
-+}
-+
-+static ULONG WINAPI SynthPortImpl_IKsControl_Release(IKsControl* iface)
-+{
-+    SynthPortImpl *This = impl_from_SynthPortImpl_IKsControl(iface);
-+
-+    return IDirectMusicPort_Release(&This->IDirectMusicPort_iface);
-+}
-+
-+static HRESULT WINAPI SynthPortImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData,
-+                                                          ULONG DataLength, ULONG* BytesReturned)
-+{
-+    TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
-+
-+    TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags);
-+
-+    if (Property->Flags != KSPROPERTY_TYPE_GET)
-+    {
-+        FIXME("Property flags %u not yet supported\n", Property->Flags);
-+        return S_FALSE;
-+    }
-+
-+    if (DataLength <  sizeof(DWORD))
-+        return E_NOT_SUFFICIENT_BUFFER;
-+
-+    FIXME("Unknown property %s\n", debugstr_guid(&Property->Set));
-+    *(DWORD*)PropertyData = FALSE;
-+    *BytesReturned = sizeof(DWORD);
-+
-+    return S_OK;
-+}
-+
-+static HRESULT WINAPI SynthPortImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData,
-+                                                        ULONG DataLength, ULONG* BytesReturned)
-+{
-+    FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI SynthPortImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData,
-+                                                       ULONG DataLength, ULONG* BytesReturned)
-+{
-+    FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned);
-+
-+    return E_NOTIMPL;
-+}
-+
-+static const IKsControlVtbl SynthPortImpl_IKsControl_Vtbl = {
-+    SynthPortImpl_IKsControl_QueryInterface,
-+    SynthPortImpl_IKsControl_AddRef,
-+    SynthPortImpl_IKsControl_Release,
-+    SynthPortImpl_IKsControl_KsProperty,
-+    SynthPortImpl_IKsControl_KsMethod,
-+    SynthPortImpl_IKsControl_KsEvent
-+};
-+
- HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device)
- {
-     SynthPortImpl *obj;
-@@ -689,6 +767,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou
-     obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl;
-     obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl;
-     obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl;
-+    obj->IKsControl_iface.lpVtbl = &SynthPortImpl_IKsControl_Vtbl;
-     obj->ref = 0;  /* Will be inited by QueryInterface */
-     obj->fActive = FALSE;
-     obj->params = *port_params;
-- 
-2.8.0
-
--- a/patches/kernel32-GetCurrentPackageFamilyName/0001-kernel32-Add-stub-for-GetCurrentPackageFamilyName-an.patch
+++ b/patches/kernel32-GetCurrentPackageFamilyName/0001-kernel32-Add-stub-for-GetCurrentPackageFamilyName-an.patch
@@ -1,16 +1,30 @@
-From b94bb9fb468540cc3482c6009d92600b0c1e37ed Mon Sep 17 00:00:00 2001
+From 1696ec4c67d39495d63673137e25d11878c44c8c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 15 Jan 2016 13:23:02 +0100
 Subject: kernel32: Add stub for GetCurrentPackageFamilyName and add related
 functions to spec file.

 ---
- dlls/kernel32/kernel32.spec | 35 +++++++++++++++++++++++++++++++++++
- dlls/kernel32/version.c     |  9 +++++++++
- 2 files changed, 44 insertions(+)
+ .../api-ms-win-appmodel-runtime-l1-1-1.spec        |  2 +-
+ dlls/kernel32/kernel32.spec                        | 35 ++++++++++++++++++++++
+ dlls/kernel32/version.c                            |  9 ++++++
+ 3 files changed, 45 insertions(+), 1 deletion(-)

+diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
+index 1eb8327..af7774d 100644
+--- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
+@@ -3,7 +3,7 @@
+ @ stub FormatApplicationUserModelId
+ @ stub GetApplicationUserModelId
+ @ stub GetCurrentApplicationUserModelId
+-@ stub GetCurrentPackageFamilyName
+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
+ @ stub GetCurrentPackageFullName
+ @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
+ @ stub GetCurrentPackageInfo
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index a28f8e8..c368780 100644
+index 3c25286..3c1cb23 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
@@ -225,6 +225,7 @@
@@ -89,7 +103,7 @@ index a28f8e8..c368780 100644
 @ stdcall GetStartupInfoA(ptr)
 @ stdcall GetStartupInfoW(ptr)
 @ stdcall GetStdHandle(long)
-@@ -1117,6 +1139,8 @@
+@@ -1118,6 +1140,8 @@
 @ stdcall OpenJobObjectW(long long wstr)
 @ stdcall OpenMutexA(long long str)
 @ stdcall OpenMutexW(long long wstr)
@@ -98,7 +112,7 @@ index a28f8e8..c368780 100644
 # @ stub OpenPrivateNamespaceA
 # @ stub OpenPrivateNamespaceW
 @ stdcall OpenProcess(long long long)
-@@ -1131,6 +1155,12 @@
+@@ -1132,6 +1156,12 @@
 @ stdcall OpenWaitableTimerW(long long wstr)
 @ stdcall OutputDebugStringA(str)
 @ stdcall OutputDebugStringW(wstr)
@@ -111,7 +125,7 @@ index a28f8e8..c368780 100644
 @ stdcall PeekConsoleInputA(ptr ptr long ptr)
 @ stdcall PeekConsoleInputW(ptr ptr long ptr)
 @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr)
-@@ -1547,7 +1577,12 @@
+@@ -1548,7 +1578,12 @@
 @ stdcall VerLanguageNameA(long str long)
 @ stdcall VerLanguageNameW(long wstr long)
 @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask
@@ -142,5 +156,5 @@ index b9d13e4..53f594e 100644
 +    return APPMODEL_ERROR_NO_PACKAGE;
 +}
 -- 
-2.6.4
+2.9.0

--- a/patches/kernel32-Named_Pipe/0014-kernel32-tests-Add-tests-for-PIPE_NOWAIT-in-message-.patch
+++ b/patches/kernel32-Named_Pipe/0014-kernel32-tests-Add-tests-for-PIPE_NOWAIT-in-message-.patch
@@ -1,4 +1,4 @@
-From ac80ddfb739fbe5d743c97715431d0f2e038830c Mon Sep 17 00:00:00 2001
+From c5fd5022f2e8a00a520f030919394f1b2b6559d4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 11 Aug 2014 04:19:49 +0200
 Subject: kernel32/tests: Add tests for PIPE_NOWAIT in message mode.
@@ -8,7 +8,7 @@ Subject: kernel32/tests: Add tests for PIPE_NOWAIT in message mode.
 1 file changed, 96 insertions(+)

 diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
-index 3388833..4d782bd 100644
+index 81d4d39..18b371c 100644
 --- a/dlls/kernel32/tests/pipe.c
 +++ b/dlls/kernel32/tests/pipe.c
@@ -2619,6 +2619,101 @@ static void test_overlapped_error(void)
@@ -113,14 +113,14 @@ index 3388833..4d782bd 100644
 static void test_NamedPipeHandleState(void)
 {
     HANDLE server, client;
-@@ -3043,6 +3138,7 @@ START_TEST(pipe)
+@@ -3114,6 +3209,7 @@ START_TEST(pipe)
     test_impersonation();
     test_overlapped();
     test_overlapped_error();
 +    test_nowait();
     test_NamedPipeHandleState();
+     test_GetNamedPipeInfo();
     test_readfileex_pending();
- }
 -- 
-2.7.1
+2.9.0

--- a/patches/kernel32-Named_Pipe/0015-ntdll-Allow-to-set-PIPE_NOWAIT-on-byte-mode-pipes.patch
+++ b/patches/kernel32-Named_Pipe/0015-ntdll-Allow-to-set-PIPE_NOWAIT-on-byte-mode-pipes.patch
@@ -1,4 +1,4 @@
-From 2a458a2f67321fb801ad6203b21e644123dc90fa Mon Sep 17 00:00:00 2001
+From 8ce5ed62d1e49a3e738a8287e4611fe9f63437e0 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 11 Aug 2014 05:34:19 +0200
 Subject: ntdll: Allow to set PIPE_NOWAIT on byte-mode pipes.
@@ -12,7 +12,7 @@ matches the native implementation.
 2 files changed, 31 insertions(+), 8 deletions(-)

 diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
-index 4d782bd..3cdbd93 100644
+index 18b371c..55f8d4f 100644
 --- a/dlls/kernel32/tests/pipe.c
 +++ b/dlls/kernel32/tests/pipe.c
@@ -2619,7 +2619,7 @@ static void test_overlapped_error(void)
@@ -84,7 +84,7 @@ index 4d782bd..3cdbd93 100644
 
         readden = 0xdeadbeef;
         SetLastError(0xdeadbeef);
-@@ -3138,7 +3158,8 @@ START_TEST(pipe)
+@@ -3209,7 +3229,8 @@ START_TEST(pipe)
     test_impersonation();
     test_overlapped();
     test_overlapped_error();
@@ -92,13 +92,13 @@ index 4d782bd..3cdbd93 100644
 +    test_nowait(PIPE_TYPE_BYTE);
 +    test_nowait(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE);
     test_NamedPipeHandleState();
+     test_GetNamedPipeInfo();
     test_readfileex_pending();
- }
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index ac4d69a..06e5e9b 100644
+index 622cc45..c27a13f 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -568,6 +568,8 @@ static NTSTATUS read_unix_fd(int fd, char *buf, ULONG *total, ULONG length,
+@@ -573,6 +573,8 @@ static NTSTATUS read_unix_fd(int fd, char *buf, ULONG *total, ULONG length,
                 if (ret < 0) ERR("dequeue message failed reason: %s\n", strerror(errno));
             }
         }
@@ -108,5 +108,5 @@ index ac4d69a..06e5e9b 100644
             result = read( fd, buf + *total, length - *total );
 
 -- 
-2.7.1
+2.9.0

--- a/patches/kernel32-Named_Pipe/definition
+++ b/patches/kernel32-Named_Pipe/definition
@@ -2,6 +2,5 @@ Fixes: [17195] Support for named pipe message mode (Linux only)
 Fixes: Improve ReadDataAvailable handling in FilePipeLocalInformation class
 Fixes: Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile
 FIxes: Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
-Depends: rpcrt4-Pipe_Transport
 Depends: server-Desktop_Refcount
 Category: stable
--- a/patches/kernel32-SetFileCompletionNotificationModes/0001-kernel32-Fake-success-in-SetFileCompletionNotificati.patch
+++ b/patches/kernel32-SetFileCompletionNotificationModes/0001-kernel32-Fake-success-in-SetFileCompletionNotificati.patch
@@ -1,26 +0,0 @@
-From 479993311ae3467ba359b76057744dec56fa2fea Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 26 Jul 2015 20:54:23 +0200
-Subject: kernel32: Fake success in SetFileCompletionNotificationModes.
-
---
- dlls/kernel32/file.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
-index e43829e..569ed22 100644
--- a/dlls/kernel32/file.c
-+++ b/dlls/kernel32/file.c
-@@ -1046,8 +1046,7 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile )
- BOOL WINAPI SetFileCompletionNotificationModes( HANDLE handle, UCHAR flags )
- {
-     FIXME("%p %x - stub\n", handle, flags);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-+    return TRUE;
- }
- 
- 
-- 
-2.4.5
-
--- a/patches/kernel32-SetFileCompletionNotificationModes/0001-ntdll-Implement-FileIoCompletionNotificationInformat.patch
+++ b/patches/kernel32-SetFileCompletionNotificationModes/0001-ntdll-Implement-FileIoCompletionNotificationInformat.patch
@@ -0,0 +1,312 @@
+From 542040171f936b56bc90f663cf6118a5998179af Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 15 Oct 2016 19:50:46 +0200
+Subject: ntdll: Implement FileIoCompletionNotificationInformation info class.
+
+FIXME: The tests do not seem to work on all testbots yet.
+FIXME: Could we use the existing wineserver call instead?
+---
+ dlls/kernel32/file.c    |  13 +++--
+ dlls/ntdll/file.c       |  17 +++++++
+ dlls/ntdll/tests/file.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++
+ include/winternl.h      |   8 +++
+ server/fd.c             |  21 +++++++-
+ server/protocol.def     |   8 +++
+ 6 files changed, 193 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
+index cc7ead1..5fe2268 100644
+--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
+@@ -1061,13 +1061,20 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile )
+     return FALSE;
+ }
+ 
+
+ /**************************************************************************
+  *           SetFileCompletionNotificationModes   (KERNEL32.@)
+  */
+-BOOL WINAPI SetFileCompletionNotificationModes( HANDLE handle, UCHAR flags )
+BOOL WINAPI SetFileCompletionNotificationModes( HANDLE file, UCHAR flags )
+ {
+-    FIXME("%p %x - stub\n", handle, flags);
+-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info;
+    IO_STATUS_BLOCK io;
+    NTSTATUS status;
+
+    info.Flags = flags;
+    status = NtSetInformationFile( file, &io, &info, sizeof(info), FileIoCompletionNotificationInformation );
+    if (status == STATUS_SUCCESS) return TRUE;
+    SetLastError( RtlNtStatusToDosError(status) );
+     return FALSE;
+ }
+ 
+diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
+index 7fbde50..14715b1 100644
+--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
+@@ -2788,6 +2788,23 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
+             io->u.Status = STATUS_INVALID_PARAMETER_3;
+         break;
+ 
+    case FileIoCompletionNotificationInformation:
+        if (len >= sizeof(FILE_IO_COMPLETION_NOTIFICATION_INFORMATION))
+        {
+            FILE_IO_COMPLETION_NOTIFICATION_INFORMATION *info = ptr;
+
+            SERVER_START_REQ( set_fd_compl_info )
+            {
+                req->handle   = wine_server_obj_handle( handle );
+                req->flags    = (info->Flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS) ?
+                                COMPLETION_SKIP_ON_SUCCESS : 0;
+                io->u.Status  = wine_server_call( req );
+            }
+            SERVER_END_REQ;
+        } else
+            io->u.Status = STATUS_INFO_LENGTH_MISMATCH;
+        break;
+
+     case FileAllInformation:
+         io->u.Status = STATUS_INVALID_INFO_CLASS;
+         break;
+diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
+index 586b2c9..dfaf4a5 100644
+--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
+@@ -3261,6 +3261,135 @@ static void test_file_all_name_information(void)
+     HeapFree( GetProcessHeap(), 0, file_name );
+ }
+ 
+static void test_file_completion_information(void)
+{
+    static const char buf[] = "testdata";
+    FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info;
+    OVERLAPPED ov, *pov;
+    IO_STATUS_BLOCK io;
+    NTSTATUS status;
+    DWORD num_bytes;
+    HANDLE port, h;
+    ULONG_PTR key;
+    BOOL ret;
+    int i;
+
+    if (!(h = create_temp_file(0))) return;
+
+    status = pNtSetInformationFile(h, &io, &info, sizeof(info) - 1, FileIoCompletionNotificationInformation);
+    ok(status == STATUS_INFO_LENGTH_MISMATCH || status == STATUS_INVALID_INFO_CLASS /* XP */,
+       "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
+    if (status == STATUS_INVALID_INFO_CLASS)
+    {
+        CloseHandle(h);
+        return;
+    }
+
+    info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
+    status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
+    ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %08x\n", status);
+
+    CloseHandle(h);
+    if (!(h = create_temp_file(FILE_FLAG_OVERLAPPED))) return;
+
+    info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE;
+    status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
+    ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+
+    info.Flags = FILE_SKIP_SET_USER_EVENT_ON_FAST_IO;
+    status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
+    ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+
+    CloseHandle(h);
+    if (!(h = create_temp_file(FILE_FLAG_OVERLAPPED))) return;
+
+    memset(&ov, 0, sizeof(ov));
+    ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
+    port = CreateIoCompletionPort(h, NULL, 0xdeadbeef, 0);
+    ok(port != NULL, "CreateIoCompletionPort failed, error %u\n", GetLastError());
+
+    for (i = 0; i < 10; i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov);
+        if (ret || GetLastError() != ERROR_IO_PENDING) break;
+        ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
+        ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError());
+        ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
+        ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError());
+        ret = FALSE;
+    }
+    if (ret)
+    {
+        ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+
+        key = 0;
+        pov = NULL;
+        ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
+        ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError());
+        ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key);
+        ok(pov == &ov, "expected %p, got %p\n", &ov, pov);
+    }
+    else
+        win_skip("WriteFile never returned TRUE\n");
+
+    info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS;
+    status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
+    ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+
+    for (i = 0; i < 10; i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov);
+        if (ret || GetLastError() != ERROR_IO_PENDING) break;
+        ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
+        ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError());
+        ret = FALSE;
+    }
+    if (ret)
+    {
+        ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+
+        pov = (void *)0xdeadbeef;
+        ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 500);
+        ok(!ret, "GetQueuedCompletionStatus succeeded\n");
+        ok(pov == NULL, "expected NULL, got %p\n", pov);
+    }
+    else
+        win_skip("WriteFile never returned TRUE\n");
+
+    info.Flags = 0;
+    status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
+    ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
+
+    for (i = 0; i < 10; i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov);
+        if (ret || GetLastError() != ERROR_IO_PENDING) break;
+        ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE);
+        ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError());
+        ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
+        ok(ret, "GetQueuedCompletionStatus failed, error %u\n", GetLastError());
+        ret = FALSE;
+    }
+    if (ret)
+    {
+        ok(num_bytes == sizeof(buf), "expected sizeof(buf), got %u\n", num_bytes);
+
+        pov = (void *)0xdeadbeef;
+        ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000);
+        ok(!ret, "GetQueuedCompletionStatus succeeded\n");
+        ok(pov == NULL, "expected NULL, got %p\n", pov);
+    }
+    else
+        win_skip("WriteFile never returned TRUE\n");
+
+    CloseHandle(ov.hEvent);
+    CloseHandle(port);
+    CloseHandle(h);
+}
+
+ static void test_query_volume_information_file(void)
+ {
+     NTSTATUS status;
+@@ -4214,6 +4343,7 @@ START_TEST(file)
+     test_file_rename_information();
+     test_file_link_information();
+     test_file_disposition_information();
+    test_file_completion_information();
+     test_query_volume_information_file();
+     test_query_attribute_information_file();
+ }
+diff --git a/include/winternl.h b/include/winternl.h
+index f35091c..7613d8b 100644
+--- a/include/winternl.h
+++ b/include/winternl.h
+@@ -725,6 +725,14 @@ typedef struct _FILE_ALL_INFORMATION {
+     FILE_NAME_INFORMATION      NameInformation;
+ } FILE_ALL_INFORMATION, *PFILE_ALL_INFORMATION;
+ 
+typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION {
+    ULONG Flags;
+} FILE_IO_COMPLETION_NOTIFICATION_INFORMATION, *PFILE_IO_COMPLETION_NOTIFICATION_INFORMATION;
+
+#define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1
+#define FILE_SKIP_SET_EVENT_ON_HANDLE        0x2
+#define FILE_SKIP_SET_USER_EVENT_ON_FAST_IO  0x4
+
+ typedef enum _FSINFOCLASS {
+     FileFsVolumeInformation = 1,
+     FileFsLabelInformation,
+diff --git a/server/fd.c b/server/fd.c
+index 17b1b66..0d5c7a2 100644
+--- a/server/fd.c
+++ b/server/fd.c
+@@ -194,6 +194,7 @@ struct fd
+     struct async_queue  *wait_q;      /* other async waiters of this fd */
+     struct completion   *completion;  /* completion object attached to this fd */
+     apc_param_t          comp_key;    /* completion key to set in completion events */
+    unsigned int         comp_flags;  /* completion flags */
+ };
+ 
+ static void fd_dump( struct object *obj, int verbose );
+@@ -1607,6 +1608,7 @@ static struct fd *alloc_fd_object(void)
+     fd->write_q    = NULL;
+     fd->wait_q     = NULL;
+     fd->completion = NULL;
+    fd->comp_flags = 0;
+     list_init( &fd->inode_entry );
+     list_init( &fd->locks );
+ 
+@@ -2556,12 +2558,29 @@ DECL_HANDLER(add_fd_completion)
+     struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 );
+     if (fd)
+     {
+-        if (fd->completion)
+        if (fd->completion && (!(fd->comp_flags & COMPLETION_SKIP_ON_SUCCESS) || req->status))
+             add_completion( fd->completion, fd->comp_key, req->cvalue, req->status, req->information );
+         release_object( fd );
+     }
+ }
+ 
+/* set fd completion information */
+DECL_HANDLER(set_fd_compl_info)
+{
+    struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 );
+    if (fd)
+    {
+        if (!(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)))
+        {
+            /* removing COMPLETION_SKIP_ON_SUCCESS is not allowed */
+            fd->comp_flags |= req->flags;
+        }
+        else
+            set_error( STATUS_INVALID_PARAMETER );
+        release_object( fd );
+    }
+}
+
+ /* set fd disposition information */
+ DECL_HANDLER(set_fd_disp_info)
+ {
+diff --git a/server/protocol.def b/server/protocol.def
+index 8d86737..229596a 100644
+--- a/server/protocol.def
+++ b/server/protocol.def
+@@ -3678,6 +3678,14 @@ struct handle_info
+ @END
+ 
+ 
+/* set fd completion information */
+@REQ(set_fd_compl_info)
+    obj_handle_t handle;          /* handle to a file or directory */
+    int          flags;           /* completion flags (see below) */
+@END
+#define COMPLETION_SKIP_ON_SUCCESS 0x01
+
+
+ /* set fd disposition information */
+ @REQ(set_fd_disp_info)
+     obj_handle_t handle;          /* handle to a file or directory */
+-- 
+2.9.0
+
--- a/patches/kernel32-SetFileCompletionNotificationModes/definition
+++ b/patches/kernel32-SetFileCompletionNotificationModes/definition
@@ -1 +1 @@
-Fixes: [38960] Fake success in kernel32.SetFileCompletionNotificationModes
+Fixes: [38960] Add support for kernel32.SetFileCompletionNotificationModes
--- a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch
+++ b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch
@@ -1,4 +1,4 @@
-From 4dfeafbe2c75253ecca37810fa7351e326e9e310 Mon Sep 17 00:00:00 2001
+From 608383e76cb10d836433a2a7355a1e8e790a63e1 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Tue, 15 Sep 2015 17:44:33 -0600
 Subject: msidb: Add stub tool for manipulating MSI databases.
@@ -13,16 +13,16 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
 create mode 100644 programs/msidb/main.c

 diff --git a/configure.ac b/configure.ac
-index ac75845..71a245d 100644
+index c624c9e..1bb859e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3522,6 +3522,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
+@@ -3552,6 +3552,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
 WINE_CONFIG_PROGRAM(lodctr,,[install])
 WINE_CONFIG_PROGRAM(mofcomp,,[install])
 WINE_CONFIG_PROGRAM(mshta,,[install])
 +WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
 WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
- WINE_CONFIG_PROGRAM(msinfo32,,[install])
+ WINE_CONFIG_PROGRAM(msinfo32,,[clean,install])
 WINE_CONFIG_PROGRAM(net,,[clean,install])
 diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
 new file mode 100644
--- a/patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch
+++ b/patches/ntdll-NtQueryEaFile/0001-ntdll-Improve-stub-of-NtQueryEaFile.patch
@@ -1,4 +1,4 @@
-From deef0e7d7fc154c8c10a07b5471775a639ac8596 Mon Sep 17 00:00:00 2001
+From c45a1755627f278008043315b5ef9a05b796cbec Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 6 Jun 2015 07:03:33 +0800
 Subject: ntdll: Improve stub of NtQueryEaFile.
@@ -10,10 +10,10 @@ Based on a patch by Qian Hong.
 2 files changed, 98 insertions(+), 4 deletions(-)

 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index b3bd9d6..d949388 100644
+index 14715b1..ae3219a 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -3319,14 +3319,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
+@@ -3367,14 +3367,25 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io
  *  Success: 0. Atrributes read into buffer
  *  Failure: An NTSTATUS error code describing the error.
  */
@@ -44,7 +44,7 @@ index b3bd9d6..d949388 100644
 
 
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 649b6b4..fcbf8df 100644
+index dfaf4a5..1dbaf30 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
@@ -79,6 +79,7 @@ static NTSTATUS (WINAPI *pNtQueryDirectoryFile)(HANDLE,HANDLE,PIO_APC_ROUTINE,PV
@@ -55,7 +55,7 @@ index 649b6b4..fcbf8df 100644
 
 static inline BOOL is_signaled( HANDLE obj )
 {
-@@ -4159,6 +4160,86 @@ static void test_read_write(void)
+@@ -4288,6 +4289,86 @@ static void test_read_write(void)
     CloseHandle(hfile);
 }
 
@@ -142,7 +142,7 @@ index 649b6b4..fcbf8df 100644
 START_TEST(file)
 {
     HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
-@@ -4195,6 +4276,7 @@ START_TEST(file)
+@@ -4324,6 +4405,7 @@ START_TEST(file)
     pNtQueryDirectoryFile   = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile");
     pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile");
     pNtQueryFullAttributesFile = (void *)GetProcAddress(hntdll, "NtQueryFullAttributesFile");
@@ -150,12 +150,12 @@ index 649b6b4..fcbf8df 100644
 
     test_read_write();
     test_NtCreateFile();
-@@ -4216,4 +4298,5 @@ START_TEST(file)
-     test_file_disposition_information();
+@@ -4346,4 +4428,5 @@ START_TEST(file)
+     test_file_completion_information();
     test_query_volume_information_file();
     test_query_attribute_information_file();
 +    test_query_ea();
 }
 -- 
-2.8.0
+2.9.0

--- a/patches/ntdll-NtQueryEaFile/definition
+++ b/patches/ntdll-NtQueryEaFile/definition
@@ -1,2 +1,3 @@
 Fixes: Improve stub for NtQueryEaFile
 # Depends: ntdll-Syscall_Wrappers
+Depends: kernel32-SetFileCompletionNotificationModes
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastian Lackner	a78a108cbd	Release 1.9.21.	2016-10-16 18:33:26 +02:00
Sebastian Lackner	99e7c1d29a	Added patch to ignore queued xaudio2 AL buffers after Stop.	2016-10-16 17:01:08 +02:00
Sebastian Lackner	97e7c4ffaa	Added patch for initial implementation of GIF encoder in windowscodecs.	2016-10-16 16:01:02 +02:00
Sebastian Lackner	36d0a71019	Added patch to recognize GTX 560M card with NVIDIA driver.	2016-10-16 15:36:30 +02:00
Sebastian Lackner	15a0c7553d	ntoskrnl-METHOD_OUT_DIRECT: Update patchset.	2016-10-16 15:28:18 +02:00
Sebastian Lackner	54cc9a694c	server-File_Permissions: Improve STATUS_CANNOT_DELETE checks for directory case.	2016-10-16 06:22:08 +02:00
Sebastian Lackner	8521ab33ad	server-Stored_ACLs: Fix some bugs related to mapping of MAXIMUM_ALLOWED.	2016-10-16 02:25:44 +02:00
Sebastian Lackner	dd324a1b34	Added patch to implement support for SetFileCompletionNotificationModes.	2016-10-15 19:59:16 +02:00
Sebastian Lackner	f176092a54	windowscodecs-Palette_Images: Update patches and add missing registration of new pixel formats.	2016-10-15 17:58:17 +02:00
Sebastian Lackner	f8de4c44e7	Added patch to avoid duplicate definition of PEVENT_FILTER_DESCRIPTOR.	2016-10-15 17:36:00 +02:00
Sebastian Lackner	9f39422b15	Added patches to implement support for METHOD_OUT_DIRECT ioctls.	2016-10-15 07:00:23 +02:00
Sebastian Lackner	07c920f32d	Added patch to revert changes to offset the pixel center in the ARB_clip_control case.	2016-10-15 05:55:42 +02:00
Sebastian Lackner	dd53426bfd	Rebase against eb5339edaca1c09d76b4afa32bdb07c1549e6650. [api-ms-win-Stub_DLLs] Removed some stub dlls (accepted upstream). [wmic-Query_Path] Removed patch to improve cmd line parser and add support for path command (accepted upstream).	2016-10-15 03:52:39 +02:00
Sebastian Lackner	70bc9a4e63	Rebase against 7ce384c4153112201aa263da6dee15fed21a4e06.	2016-10-14 23:49:07 +02:00
Sebastian Lackner	0f6b6615d9	Rebase against 86b5ec3fd1fb8c42f7e79b29647c59cd698aa236.	2016-10-13 21:48:43 +02:00
Sebastian Lackner	f7c96c2f6f	Rebase against 28cfa306b467abb026da1f9442bc247c4c9dc790.	2016-10-11 01:15:10 +02:00
Sebastian Lackner	6dd07ec3e7	vulkan-Vulkan_Implementation: Update to spec version 1.0.30 (no VK_EXT_debug_marker support yet).	2016-10-10 00:00:35 +02:00
Sebastian Lackner	3fe8a52e3c	vulkan-Vulkan_Implementation: Enumerate VK_KHR_win32_surface only once in vkEnumerateInstanceExtensionProperties.	2016-10-09 21:28:43 +02:00
Sebastian Lackner	84612d7ffd	windowscodecs-Palette_Images: Add some more tests and fixes for loading PNG images in various color formats.	2016-10-09 20:11:46 +02:00
Sebastian Lackner	92510a34ed	setupapi-SetupPromptForDisk: Added patch to determine path to system32 directory at runtime.	2016-10-09 19:13:25 +02:00
Sebastian Lackner	2b8aff1781	Rebase against 1dedd90e8c56ff61772915d575a43ad6c95813cd. [rpcrt4-Pipe_Transport] Removed patch to restore original error code when ReadFile fails with ERROR_MORE_DATA (fixed upstream).	2016-10-09 19:11:52 +02:00
Sebastian Lackner	2c7ec3747f	Rebase against eac56fbda547e21cf9f40d57c913b3b582fc5697.	2016-10-09 08:48:57 +02:00
Sebastian Lackner	8bfc3ca97f	Rebase against 7756d6ba9b0213d5533eb5248e62716e7e8409b8. [dmusic-SynthPort_IKsControl] Removed patch to add IKsControl stub subinterface for SynthPort (accepted upstream).	2016-10-09 03:07:13 +02:00
Sebastian Lackner	2d5e42b68c	Rebase against 5d96ef42a58e09a2d6cf47a685abb3f42b513ceb.	2016-10-08 22:07:10 +02:00
Sebastian Lackner	d33a3327ea	Rebase against 6372cd8e49a662942a80d2decd1f7eae3541c45b.	2016-10-08 21:10:41 +02:00