From 84b08ebde915171849ad682cbbfc458b37c86a33 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 23 Dec 2016 04:04:54 +0100 Subject: [PATCH] Rebase against 1bcd38f788bb5165cc65a830ea912ff4eda50b84. --- ...-test-failure-on-specific-Nvidia-gra.patch | 24 ---------------- patches/patchinstall.sh | 20 ++----------- ...the-case-that-a-full-driver-path-is-.patch | 16 +++++------ .../wined3d-CSMT_Main/9999-IfDefined.patch | 28 +++++++++---------- staging/VERSION | 2 +- 5 files changed, 25 insertions(+), 65 deletions(-) delete mode 100644 patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch diff --git a/patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch b/patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch deleted file mode 100644 index 85b3da9b..00000000 --- a/patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 46a3f35c38aa4dcb9ca3101fc346fe44fa0d240d Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 15 May 2016 17:30:35 +0200 -Subject: d2d1/tests: Avoid test failure on specific Nvidia graphic cards. - ---- - dlls/d2d1/tests/d2d1.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c -index 7f9632f..0961373 100644 ---- a/dlls/d2d1/tests/d2d1.c -+++ b/dlls/d2d1/tests/d2d1.c -@@ -1103,6 +1103,7 @@ static void test_bitmap_brush(void) - hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"); -+ todo_wine_if (compare_surface(surface, "f428a7d2f886e33a8be006a831fb38d88b235884")) - ok(match, "Surface does not match.\n"); - - ID2D1RenderTarget_BeginDraw(rt); --- -2.8.0 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0f3389bd..325700eb 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "56040acaa3f584150b3ab7fc644cd1a81e34fece" + echo "1bcd38f788bb5165cc65a830ea912ff4eda50b84" } # Show version information version() { - echo "Wine Staging 2.0-rc2" + echo "Wine Staging 2.0-rc3 (unreleased)" echo "Copyright (C) 2014-2016 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" @@ -109,7 +109,6 @@ patch_enable_all () enable_crypt32_CMS_Certificates="$1" enable_crypt32_Certificate_Check="$1" enable_crypt32_CryptUnprotectMemory="$1" - enable_d2d1_Tests="$1" enable_d3d10_1_Forwards="$1" enable_d3d11_ID3D11Texture1D="$1" enable_d3d9_DesktopWindow="$1" @@ -516,9 +515,6 @@ patch_enable () crypt32-CryptUnprotectMemory) enable_crypt32_CryptUnprotectMemory="$2" ;; - d2d1-Tests) - enable_d2d1_Tests="$2" - ;; d3d10_1-Forwards) enable_d3d10_1_Forwards="$2" ;; @@ -3051,18 +3047,6 @@ if test "$enable_crypt32_CryptUnprotectMemory" -eq 1; then ) >> "$patchlist" fi -# Patchset d2d1-Tests -# | -# | Modified files: -# | * dlls/d2d1/tests/d2d1.c -# | -if test "$enable_d2d1_Tests" -eq 1; then - patch_apply d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch - ( - echo '+ { "Sebastian Lackner", "d2d1/tests: Avoid test failure on specific Nvidia graphic cards.", 1 },'; - ) >> "$patchlist" -fi - # Patchset d3d10_1-Forwards # | # | Modified files: diff --git a/patches/setupapi-Display_Device/0002-setupapi-Handle-the-case-that-a-full-driver-path-is-.patch b/patches/setupapi-Display_Device/0002-setupapi-Handle-the-case-that-a-full-driver-path-is-.patch index d003a253..039a5bf0 100644 --- a/patches/setupapi-Display_Device/0002-setupapi-Handle-the-case-that-a-full-driver-path-is-.patch +++ b/patches/setupapi-Display_Device/0002-setupapi-Handle-the-case-that-a-full-driver-path-is-.patch @@ -1,4 +1,4 @@ -From cb319b87c1753f771771ced81be00fa0c5de06bd Mon Sep 17 00:00:00 2001 +From 29e1247c38bc714ea74e624821381091d4ea4bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 11 Feb 2016 03:20:33 +0100 Subject: setupapi: Handle the case that a full driver path is passed to @@ -10,10 +10,10 @@ Subject: setupapi: Handle the case that a full driver path is passed to 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c -index 744bcd6..3708de7 100644 +index e6a6272..e3cc257 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c -@@ -2366,8 +2366,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, +@@ -2376,8 +2376,30 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, &enumStrKey); if (!l) { @@ -47,10 +47,10 @@ index 744bcd6..3708de7 100644 } } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c -index 319bb31..a0aa531 100644 +index 6ca0e92..b1f1d04 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c -@@ -1542,6 +1542,28 @@ static void testSetupDiGetINFClassA(void) +@@ -1347,6 +1347,28 @@ static void testSetupDiGetINFClassA(void) } } @@ -78,13 +78,13 @@ index 319bb31..a0aa531 100644 + START_TEST(devinst) { - init_function_pointers(); -@@ -1570,4 +1592,5 @@ START_TEST(devinst) + HKEY hkey; +@@ -1384,4 +1406,5 @@ START_TEST(devinst) testDeviceRegistryPropertyA(); testDeviceRegistryPropertyW(); testSetupDiGetINFClassA(); + testSetupDiGetClassDevsA(); } -- -2.7.1 +2.9.0 diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 44bd2734..5eeb6060 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -1134,7 +1134,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c -@@ -1707,6 +1707,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, +@@ -1710,6 +1710,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } @@ -1148,7 +1148,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { -@@ -2028,6 +2035,9 @@ out: +@@ -2031,6 +2038,9 @@ out: if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); @@ -1158,7 +1158,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, ret->free_timestamp_queries); -@@ -2075,6 +2085,9 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont +@@ -2078,6 +2088,9 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); HeapFree(GetProcessHeap(), 0, context->fbo_key); @@ -1168,7 +1168,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c HeapFree(GetProcessHeap(), 0, context->draw_buffers); HeapFree(GetProcessHeap(), 0, context->blit_targets); device_context_remove(device, context); -@@ -2620,7 +2633,11 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge +@@ -2623,7 +2636,11 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge } /* Context activation is done by the caller. */ @@ -1180,7 +1180,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c UINT rt_count, const struct wined3d_fb_state *fb) { struct wined3d_rendertarget_view **rts = fb->render_targets; -@@ -2629,7 +2646,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win +@@ -2632,7 +2649,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win DWORD rt_mask = 0, *cur_mask; UINT i; @@ -1192,7 +1192,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c || rt_count != gl_info->limits.buffers) { if (!context_validate_rt_config(rt_count, rts, dsv)) -@@ -2674,6 +2695,10 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win +@@ -2677,6 +2698,10 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win rt_mask = context_generate_rt_mask_no_fbo(context, rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); } @@ -1203,7 +1203,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource))) -@@ -2714,7 +2739,12 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win +@@ -2717,7 +2742,12 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) { @@ -1216,7 +1216,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); -@@ -2731,7 +2761,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win +@@ -2734,7 +2764,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { @@ -1228,7 +1228,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; DWORD rt_mask, rt_mask_bits; unsigned int i; -@@ -2761,7 +2795,11 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const +@@ -2764,7 +2798,11 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD rt_mask = find_draw_buffers_mask(context, state); @@ -1240,7 +1240,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c DWORD *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) -@@ -3050,6 +3088,10 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d +@@ -3053,6 +3091,10 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d context_apply_draw_buffers(context, rt_mask); *cur_mask = rt_mask; } @@ -1251,7 +1251,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) -@@ -3234,7 +3276,11 @@ static void context_update_stream_info(struct wined3d_context *context, const st +@@ -3237,7 +3279,11 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { wined3d_buffer_load(buffer, context, state); @@ -1263,7 +1263,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } -@@ -3481,7 +3527,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, +@@ -3484,7 +3530,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; @@ -1275,7 +1275,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c unsigned int i; WORD map; -@@ -3514,8 +3564,17 @@ BOOL context_apply_draw_state(struct wined3d_context *context, +@@ -3517,8 +3567,17 @@ BOOL context_apply_draw_state(struct wined3d_context *context, for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) { if (map & 1) @@ -1293,7 +1293,7 @@ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c } if (state->index_buffer) { -@@ -3641,6 +3700,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str +@@ -3643,6 +3702,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str TRACE("device %p, target %p.\n", device, target); diff --git a/staging/VERSION b/staging/VERSION index 74121902..e0ba1113 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 2.0-rc2 +Wine Staging 2.0-rc3 (unreleased)