Rebase against 6d323d81b2a604b89c612928a573b290c945df75.

patches/kernel32-GetSystemTimes/0001-kernel32-Add-tests-for-GetSystemTimes.patch

@@ -1,4 +1,4 @@
-From 15dc0e88f4fcd63c876d9037204074ed7506dd51 Mon Sep 17 00:00:00 2001
+From 599947d1aaf88c78ed5affe2609c431db14bccd4 Mon Sep 17 00:00:00 2001
 From: Louis Lenders <xerox_xerox2000@yahoo.co.uk>
 Date: Sun, 27 Jul 2014 11:42:28 -0600
 Subject: kernel32: Add tests for GetSystemTimes.
@@ -8,7 +8,7 @@ Subject: kernel32: Add tests for GetSystemTimes.
  1 file changed, 76 insertions(+)
 
 diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
-index 55d4be9..c524343 100644
+index 378941d..1937e65 100644
 --- a/dlls/kernel32/tests/time.c
 +++ b/dlls/kernel32/tests/time.c
 @@ -22,9 +22,11 @@
@@ -22,10 +22,10 @@ index 55d4be9..c524343 100644
 +static BOOL (WINAPI *pGetSystemTimes)(LPFILETIME, LPFILETIME, LPFILETIME);
  static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD);
  static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD);
- 
-@@ -732,12 +734,85 @@ static void test_GetCalendarInfo(void)
-     ok( ret == ret2, "got %d, expected %d\n", ret, ret2 );
- 
+ static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*);
+@@ -760,12 +762,85 @@ static void test_GetDynamicTimeZoneInformation(void)
+     ok(dyninfo.TimeZoneKeyName[0] != 0, "got empty tz keyname\n");
+     trace("Dyn TimeZoneKeyName %s\n", wine_dbgstr_w(dyninfo.TimeZoneKeyName));
  }
 +static void test_GetSystemTimes(void)
 +{
@@ -108,15 +108,15 @@ index 55d4be9..c524343 100644
 +    pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes");
      pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA");
      pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW");
- 
-@@ -747,6 +822,7 @@ START_TEST(time)
+     pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation");
+@@ -776,6 +851,7 @@ START_TEST(time)
      test_FileTimeToSystemTime();
      test_FileTimeToLocalFileTime();
      test_TzSpecificLocalTimeToSystemTime();
 +    test_GetSystemTimes();
      test_FileTimeToDosDateTime();
      test_GetCalendarInfo();
- }
+     test_GetDynamicTimeZoneInformation();
 -- 
-2.1.0
+2.4.0
 

patches/patchinstall.sh

@@ -55,7 +55,7 @@ version()
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
-	echo "  commit 3ec3fa5eb7d4eefd3157dfce31dbe561a6cda474"
+	echo "  commit 6d323d81b2a604b89c612928a573b290c945df75"
 	echo ""
 }
 
@@ -197,7 +197,6 @@ patch_enable_all ()
 	enable_secur32_ANSI_NTLM_Credentials="$1"
 	enable_server_ACL_Compat="$1"
 	enable_server_Address_List_Change="$1"
-	enable_server_Async_Leak="$1"
 	enable_server_ClipCursor="$1"
 	enable_server_CreateProcess_ACLs="$1"
 	enable_server_Delete_On_Close="$1"
@@ -652,9 +651,6 @@ patch_enable ()
 		server-Address_List_Change)
 			enable_server_Address_List_Change="$2"
 			;;
-		server-Async_Leak)
-			enable_server_Async_Leak="$2"
-			;;
 		server-ClipCursor)
 			enable_server_ClipCursor="$2"
 			;;
@@ -4414,18 +4410,6 @@ if test "$enable_server_Address_List_Change" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset server-Async_Leak
-# |
-# | Modified files:
-# |   *	server/named_pipe.c
-# |
-if test "$enable_server_Async_Leak" -eq 1; then
-	patch_apply server-Async_Leak/0001-server-Fix-leak-of-async-handle-in-pipe_server_flush.patch
-	(
-		echo '+    { "Sebastian Lackner", "server: Fix leak of async handle in pipe_server_flush.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset server-ClipCursor
 # |
 # | This patchset fixes the following Wine bugs:

patches/server-Async_Leak/0001-server-Fix-leak-of-async-handle-in-pipe_server_flush.patch

@@ -1,24 +0,0 @@
-From fb7b3dde4dc3687643cbf9d66c0e0e3da27d1ad2 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 8 May 2015 18:02:20 +0200
-Subject: server: Fix leak of async handle in pipe_server_flush.
-
----
- server/named_pipe.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/server/named_pipe.c b/server/named_pipe.c
-index c698a87..f5e536c 100644
---- a/server/named_pipe.c
-+++ b/server/named_pipe.c
-@@ -563,6 +563,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_
-         if (!server->flush_poll)
-             server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server );
-         if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 );
-+        release_object( async );
-         set_error( STATUS_PENDING );
-     }
-     return handle;
--- 
-2.4.0
-