Rebase against 5e6f35ffbd8795da71c6fd6cb8adc84bf8a36504.

[fontsub-CreateFontPackage]
Removed patch to improve fontsub.CreateFontPackage stub implementation
(accepted upstream).

[quartz-AsyncReader]
Removed patch to improve detection of MPEG2 streams (accepted upstream).

[user32-SetCoalescableTimer]
Removed patch to add stub for SetCoalescableTimer (implemented upstream).

patches/server-Desktop_Refcount/0004-server-Assign-random-name-when-no-name-was-passed-to.patch

@@ -1,4 +1,4 @@
-From ca6e61e6b9c6813d684eb60d074d3036f10d166e Mon Sep 17 00:00:00 2001
+From 5ae23a4a5d6c964035bdb8ecddb3fe7a74dc691d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 24 Feb 2016 19:18:52 +0100
 Subject: server: Assign random name when no name was passed to
@@ -10,17 +10,17 @@ Subject: server: Assign random name when no name was passed to
  2 files changed, 25 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
-index 4a553ca..b4a1a49 100644
+index 94be4c9..33f50d8 100644
 --- a/dlls/user32/tests/winstation.c
 +++ b/dlls/user32/tests/winstation.c
 @@ -220,8 +220,8 @@ static void test_handles(void)
-     memset(buffer, 0, sizeof(buffer));
+     memset( buffer, 0, sizeof(buffer) );
      ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
-     ok( ret, "GetUserObjectInformationA returned %x\n", ret );
--    todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected WindowStation name '%s'\n", buffer );
--    todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected WindowStation name '%s'\n", buffer );
-+    ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected WindowStation name '%s'\n", buffer );
-+    ok( buffer[strlen(buffer) - 1] == '$', "unexpected WindowStation name '%s'\n", buffer );
+     ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() );
+-    todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer );
+-    todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer );
++    ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer );
++    ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer );
  
      SetLastError( 0xdeadbeef );
      w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
@@ -69,5 +69,5 @@ index 0034343..39131d5 100644
  }
  
 -- 
-2.7.1
+2.8.0
 

patches/server-Desktop_Refcount/0004-user32-tests-Add-additional-tests-for-window-station.patch

@@ -1,38 +0,0 @@
-From 15e83e517e6b227a55ecee9541cca567b94701b8 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 24 Feb 2016 17:51:48 +0100
-Subject: user32/tests: Add additional tests for window station name.
-
----
- dlls/user32/tests/winstation.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
-index e49420b..4a553ca 100644
---- a/dlls/user32/tests/winstation.c
-+++ b/dlls/user32/tests/winstation.c
-@@ -114,6 +114,8 @@ static void test_handles(void)
-     DWORD id, flags, le;
-     ATOM atom;
-     char buffer[20];
-+    DWORD size;
-+    BOOL ret;
- 
-     /* win stations */
- 
-@@ -215,6 +217,12 @@ static void test_handles(void)
-     w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL );
-     ok( w2 != 0, "create station failed err %u\n", GetLastError() );
- 
-+    memset(buffer, 0, sizeof(buffer));
-+    ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
-+    ok( ret, "GetUserObjectInformationA returned %x\n", ret );
-+    todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected WindowStation name '%s'\n", buffer );
-+    todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected WindowStation name '%s'\n", buffer );
-+
-     SetLastError( 0xdeadbeef );
-     w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
-     todo_wine
--- 
-2.7.1
-