From e3089157b4f6c3b4c1b756d0d6d7a0249e742f0d Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 23 Oct 2017 17:07:04 +0200 Subject: [PATCH] Rebase against 57ca6b90bb7337cb90465b3bf1f147e3d2564f2e. --- ...d11-tests-Add-some-basic-depth-tests.patch | 12 +++++----- patches/patchinstall.sh | 20 ++-------------- ...-double-free-in-build_shared_mapping.patch | 24 ------------------- staging/VERSION | 2 +- 4 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 patches/server-build_shared_mapping/0001-server-Fix-double-free-in-build_shared_mapping.patch diff --git a/patches/d3d11-Depth_Bias/0002-d3d11-tests-Add-some-basic-depth-tests.patch b/patches/d3d11-Depth_Bias/0002-d3d11-tests-Add-some-basic-depth-tests.patch index 39e7e205..fa6657bd 100644 --- a/patches/d3d11-Depth_Bias/0002-d3d11-tests-Add-some-basic-depth-tests.patch +++ b/patches/d3d11-Depth_Bias/0002-d3d11-tests-Add-some-basic-depth-tests.patch @@ -1,4 +1,4 @@ -From a2011b8504dd6c5634d5ea369d04287d9d5ee6e4 Mon Sep 17 00:00:00 2001 +From 0ec24dc6590e24a868190811b74bd457d75ad0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 7 Jul 2017 05:44:09 +0200 Subject: d3d11/tests: Add some basic depth tests. @@ -8,7 +8,7 @@ Subject: d3d11/tests: Add some basic depth tests. 1 file changed, 206 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index 22f5997896a..2552a6cc701 100644 +index 8df683ef1b8..77917f24769 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1346,8 +1346,9 @@ static void set_quad_color(struct d3d11_test_context *context, const struct vec4 @@ -32,7 +32,7 @@ index 22f5997896a..2552a6cc701 100644 } static void test_create_device(void) -@@ -15221,6 +15222,207 @@ static void test_stencil_separate(void) +@@ -15213,6 +15214,207 @@ static void test_stencil_separate(void) release_test_context(&test_context); } @@ -240,14 +240,14 @@ index 22f5997896a..2552a6cc701 100644 static void test_uav_load(void) { struct shader -@@ -21267,6 +21469,7 @@ START_TEST(d3d11) +@@ -21362,6 +21564,7 @@ START_TEST(d3d11) test_shader_input_registers_limits(); test_unbind_shader_resource_view(); test_stencil_separate(); + test_depth_separate(); test_uav_load(); test_cs_uav_store(); - test_ps_cs_uav_binding(); + test_uav_store_immediate_constant(); -- -2.14.1 +2.14.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 1c9f6df5..871f8651 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "cf5616ffbb39df7ad3ac0a41e55777ab6c1abab9" + echo "57ca6b90bb7337cb90465b3bf1f147e3d2564f2e" } # Show version information version() { - echo "Wine Staging 2.19" + echo "Wine Staging 2.20 (unreleased)" echo "Copyright (C) 2014-2017 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" @@ -351,7 +351,6 @@ patch_enable_all () enable_server_Signal_Thread="$1" enable_server_Stored_ACLs="$1" enable_server_Timestamp_Compat="$1" - enable_server_build_shared_mapping="$1" enable_server_device_manager_destroy="$1" enable_server_free_async_queue="$1" enable_server_send_hardware_message="$1" @@ -1337,9 +1336,6 @@ patch_enable () server-Timestamp_Compat) enable_server_Timestamp_Compat="$2" ;; - server-build_shared_mapping) - enable_server_build_shared_mapping="$2" - ;; server-device_manager_destroy) enable_server_device_manager_destroy="$2" ;; @@ -7976,18 +7972,6 @@ if test "$enable_server_Timestamp_Compat" -eq 1; then ) >> "$patchlist" fi -# Patchset server-build_shared_mapping -# | -# | Modified files: -# | * server/mapping.c -# | -if test "$enable_server_build_shared_mapping" -eq 1; then - patch_apply server-build_shared_mapping/0001-server-Fix-double-free-in-build_shared_mapping.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "server: Fix double-free in build_shared_mapping.", 1 },'; - ) >> "$patchlist" -fi - # Patchset server-device_manager_destroy # | # | Modified files: diff --git a/patches/server-build_shared_mapping/0001-server-Fix-double-free-in-build_shared_mapping.patch b/patches/server-build_shared_mapping/0001-server-Fix-double-free-in-build_shared_mapping.patch deleted file mode 100644 index 607be975..00000000 --- a/patches/server-build_shared_mapping/0001-server-Fix-double-free-in-build_shared_mapping.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 09c8ebbd33c38c40a769790e6ef028b035ad428a Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Mon, 16 Oct 2017 16:39:28 +0200 -Subject: server: Fix double-free in build_shared_mapping. - ---- - server/mapping.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/server/mapping.c b/server/mapping.c -index bfd34f2b983..b868b3cf15a 100644 ---- a/server/mapping.c -+++ b/server/mapping.c -@@ -585,6 +585,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, - if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; - } - free( buffer ); -+ buffer = NULL; - - if (!(shared = alloc_object( &shared_map_ops ))) goto error; - shared->fd = (struct fd *)grab_object( mapping->fd ); --- -2.14.1 - diff --git a/staging/VERSION b/staging/VERSION index fac994c4..5b28527a 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 2.19 +Wine Staging 2.20 (unreleased)