April 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Avoid updating the swapchain swap interval from outside the command stream.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: c70486c53fb77a298f7140445308feb586238972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70486c53fb77a298f7140445… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:23 2017 +0200 wined3d: Avoid updating the swapchain swap interval from outside the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 84 ++++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 454a775..476259b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -674,6 +674,49 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } +static void wined3d_swapchain_update_swap_interval_cs(void *object) +{ + struct wined3d_swapchain *swapchain = object; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + int swap_interval; + + context = context_acquire(swapchain->device, swapchain->front_buffer, 0); + gl_info = context->gl_info; + + switch (swapchain->desc.swap_interval) + { + case WINED3DPRESENT_INTERVAL_IMMEDIATE: + swap_interval = 0; + break; + case WINED3DPRESENT_INTERVAL_DEFAULT: + case WINED3DPRESENT_INTERVAL_ONE: + swap_interval = 1; + break; + case WINED3DPRESENT_INTERVAL_TWO: + swap_interval = 2; + break; + case WINED3DPRESENT_INTERVAL_THREE: + swap_interval = 3; + break; + case WINED3DPRESENT_INTERVAL_FOUR: + swap_interval = 4; + break; + default: + FIXME("Unhandled present interval %#x.\n", swapchain->desc.swap_interval); + swap_interval = 1; + } + + if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) + { + if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) + ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", + swap_interval, context, GetLastError()); + } + + context_release(context); +} + static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; @@ -715,7 +758,7 @@ static void wined3d_swapchain_cs_init(void *object) context_release(swapchain->context[0]); - swapchain_update_swap_interval(swapchain); + wined3d_swapchain_update_swap_interval_cs(swapchain); } static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, @@ -1083,44 +1126,7 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void swapchain_update_swap_interval(struct wined3d_swapchain *swapchain) { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - int swap_interval; - - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); - gl_info = context->gl_info; - - switch (swapchain->desc.swap_interval) - { - case WINED3DPRESENT_INTERVAL_IMMEDIATE: - swap_interval = 0; - break; - case WINED3DPRESENT_INTERVAL_DEFAULT: - case WINED3DPRESENT_INTERVAL_ONE: - swap_interval = 1; - break; - case WINED3DPRESENT_INTERVAL_TWO: - swap_interval = 2; - break; - case WINED3DPRESENT_INTERVAL_THREE: - swap_interval = 3; - break; - case WINED3DPRESENT_INTERVAL_FOUR: - swap_interval = 4; - break; - default: - FIXME("Unhandled present interval %#x.\n", swapchain->desc.swap_interval); - swap_interval = 1; - } - - if (gl_info->supported[WGL_EXT_SWAP_CONTROL]) - { - if (!GL_EXTCALL(wglSwapIntervalEXT(swap_interval))) - ERR("wglSwapIntervalEXT failed to set swap interval %d for context %p, last error %#x\n", - swap_interval, context, GetLastError()); - } - - context_release(context); + wined3d_cs_init_object(swapchain->device->cs, wined3d_swapchain_update_swap_interval_cs, swapchain); } void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate)

1 0

Henri Verbeet : wined3d: The source texture is always non-NULL in surface_cpu_blt().
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 1b034f7fdb663d9681d1b623ce3782b7fba75c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b034f7fdb663d9681d1b623c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:22 2017 +0200 wined3d: The source texture is always non-NULL in surface_cpu_blt(). Since fills no longer go through the blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 543 ++++++++++++++++++++++++------------------------- 1 file changed, 263 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b034f7fdb663d9681d1b…

1 0

Alistair Leslie-Hughes : winhttp/tests: Test when large amount of data is returned from a 401.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: ae4ad49c75633633f3711a415badc8c68e1ea8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4ad49c75633633f3711a415… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 12 10:46:34 2017 +0200 winhttp/tests: Test when large amount of data is returned from a 401. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 80 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a5eff11..19be82c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2059,6 +2059,15 @@ static const char multiauth[] = "Content-Type: text/plain\r\n" "\r\n"; +static const char largeauth[] = +"HTTP/1.1 401 Unauthorized\r\n" +"Server: winetest\r\n" +"WWW-Authenticate: Basic realm=\"placebo\"\r\n" +"WWW-Authenticate: NTLM\r\n" +"Content-Length: 10240\r\n" +"Content-Type: text/plain\r\n" +"\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; @@ -2161,6 +2170,21 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, headmsg, sizeof headmsg - 1, 0); continue; } + if (strstr(buffer, "GET /multiauth")) + { + send(c, multiauth, sizeof multiauth - 1, 0); + } + if (strstr(buffer, "GET /largeauth")) + { + if (strstr(buffer, "Authorization: NTLM")) + send(c, okmsg, sizeof(okmsg) - 1, 0); + else + { + send(c, largeauth, sizeof largeauth - 1, 0); + for (i = 0; i < 10240; i++) send(c, "A", 1, 0); + continue; + } + } if (strstr(buffer, "GET /cookie5")) { if (strstr(buffer, "Cookie: name2=value\r\n")) @@ -2168,10 +2192,6 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } - if (strstr(buffer, "GET /multiauth")) - { - send(c, multiauth, sizeof multiauth - 1, 0); - } if (strstr(buffer, "GET /cookie4")) { send(c, cookiemsg2, sizeof(cookiemsg2) - 1, 0); @@ -2554,6 +2574,57 @@ static void test_multi_authentication(int port) WinHttpCloseHandle(ses); } +static void test_large_data_authentication(int port) +{ + static const WCHAR largeauthW[] = {'/','l','a','r','g','e','a','u','t','h',0}; + static const WCHAR getW[] = {'G','E','T',0}; + static WCHAR userW[] = {'u','s','e','r',0}; + static WCHAR passW[] = {'p','w','d',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, getW, largeauthW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); + ok(ret, "expected success\n"); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "expected success\n"); + + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, + &status, &size, NULL); + ok(ret, "expected success\n"); + ok(status == HTTP_STATUS_DENIED, "got %d\n", status); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, userW, passW, NULL); + ok(ret, "expected success\n"); + + ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); + ok(ret, "expected success %d\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + todo_wine ok(ret, "expected success\n"); + + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, + &status, &size, NULL); + todo_wine ok(ret, "expected success\n"); + todo_wine ok(status == HTTP_STATUS_OK, "got %d\n", status); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_no_headers(int port) { static const WCHAR no_headersW[] = {'/','n','o','_','h','e','a','d','e','r','s',0}; @@ -4354,6 +4425,7 @@ START_TEST (winhttp) test_not_modified(si.port); test_basic_authentication(si.port); test_multi_authentication(si.port); + test_large_data_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port); test_cookies(si.port);

1 0

Józef Kucia : wined3d: Avoid using deprecated built-in shader inputs/outputs.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 451f5835859b8494fb37d81b5f5b344c5a0c66bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=451f5835859b8494fb37d81b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:29 2017 +0200 wined3d: Avoid using deprecated built-in shader inputs/outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 + dlls/wined3d/glsl_shader.c | 110 ++++++++++++++++++++++----------------------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 56 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451f5835859b8494fb37d…

1 0

Józef Kucia : wined3d: Use GLSL 1.30 for all shaders if available.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: a830d7808f2f07e7efc8657134e0962642d94f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a830d7808f2f07e7efc865713… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:28 2017 +0200 wined3d: Use GLSL 1.30 for all shaders if available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2eba072..2a121dd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -357,7 +357,7 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || (version && version->type == WINED3D_SHADER_TYPE_COMPUTE)) return 150; - else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) return 130; else return 120; @@ -2017,7 +2017,7 @@ static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_in static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info) { - return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; + return gl_info->glsl_version < MAKEDWORD_VERSION(1, 30); } static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info)

1 0

Michael Stefaniuc : dbghelp: Use debugstr_a() to trace a string that can be NULL.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 329b1763cb1d8daa026d9377c39100c1f40a27c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329b1763cb1d8daa026d9377c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 12 13:20:30 2017 +0200 dbghelp: Use debugstr_a() to trace a string that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 3fd1920..a7954fd 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1920,7 +1920,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n", - name.u.string ? name.u.string : "(null)", inline_flags.u.uvalue); + debugstr_a(name.u.string), inline_flags.u.uvalue); return NULL; }

1 0

Owen Rudge : wsdapi/tests: Add initial tests for WSDCreateDiscoveryPublisher.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 85f993ed932a173c362e344d95d2742aa7928ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f993ed932a173c362e344d9… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 11 21:20:09 2017 +0100 wsdapi/tests: Add initial tests for WSDCreateDiscoveryPublisher. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wsdapi/tests/Makefile.in | 5 +++ dlls/wsdapi/tests/discovery.c | 100 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/configure b/configure index 93fd7e5..e4b9dd2 100755 --- a/configure +++ b/configure @@ -18493,6 +18493,7 @@ wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test wine_fn_config_dll wsdapi enable_wsdapi implib +wine_fn_config_test dlls/wsdapi/tests wsdapi_test wine_fn_config_dll wshom.ocx enable_wshom_ocx clean wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test clean wine_fn_config_dll wsnmp32 enable_wsnmp32 implib diff --git a/configure.ac b/configure.ac index b231fe9..a2fc66d 100644 --- a/configure.ac +++ b/configure.ac @@ -3527,6 +3527,7 @@ WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wsdapi,,[implib]) +WINE_CONFIG_TEST(dlls/wsdapi/tests) WINE_CONFIG_DLL(wshom.ocx,,[clean]) WINE_CONFIG_TEST(dlls/wshom.ocx/tests,[clean]) WINE_CONFIG_DLL(wsnmp32,,[implib]) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in new file mode 100644 index 0000000..c351d10 --- /dev/null +++ b/dlls/wsdapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wsdapi.dll +IMPORTS = wsdapi ole32 user32 + +C_SRCS = \ + discovery.c diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c new file mode 100644 index 0000000..280b034 --- /dev/null +++ b/dlls/wsdapi/tests/discovery.c @@ -0,0 +1,100 @@ +/* + * Web Services on Devices + * Discovery tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "initguid.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateDiscoveryPublisher_tests(void) +{ + IWSDiscoveryPublisher *publisher = NULL; + IWSDiscoveryPublisher *publisher2; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateDiscoveryPublisher(NULL, NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateDiscoveryPublisher(NULL, NULL) failed: %08x\n", rc); + + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); + + /* Try to query for objects */ + rc = IWSDiscoveryPublisher_QueryInterface(publisher, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + rc = IWSDiscoveryPublisher_QueryInterface(publisher, &IID_IWSDiscoveryPublisher, (LPVOID*)&publisher2); + ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IWSDiscoveryPublisher) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDiscoveryPublisher_Release(publisher2); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); +} + +static void Publish_tests(void) +{ + IWSDiscoveryPublisher *publisher = NULL; + HRESULT rc; + ULONG ref; + + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); + + /* Test SetAddressFamily */ + rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, 12345); + ok(rc == E_INVALIDARG, "IWSDiscoveryPublisher_SetAddressFamily(12345) returned unexpected result: %08x\n", rc); + + rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV4); + ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); + + /* Try to update the address family after already setting it */ + rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV6); + ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08x\n", rc); + + /* TODO: Register notification sink */ + + /* TODO: Publish */ + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); +} + +START_TEST(discovery) +{ + CoInitialize(NULL); + + CreateDiscoveryPublisher_tests(); + Publish_tests(); + + CoUninitialize(); +}

1 0

Henri Verbeet : wined3d: Send texture dirty region updates through the command stream.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: d6557e812984e010a989a3360039453eb978bd12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6557e812984e010a989a3360… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 12 00:08:50 2017 +0200 wined3d: Send texture dirty region updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 45 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 17 +--------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0866a16..85594e4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -65,6 +65,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UNMAP, WINED3D_CS_OP_BLT_SUB_RESOURCE, WINED3D_CS_OP_UPDATE_SUB_RESOURCE, + WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, }; struct wined3d_cs_present @@ -372,6 +373,13 @@ struct wined3d_cs_update_sub_resource struct wined3d_sub_resource_data data; }; +struct wined3d_cs_add_dirty_texture_region +{ + enum wined3d_cs_op opcode; + struct wined3d_texture *texture; + unsigned int layer; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1957,6 +1965,42 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r cs->ops->submit(cs); } +static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_add_dirty_texture_region *op = data; + struct wined3d_texture *texture = op->texture; + unsigned int sub_resource_idx, i; + struct wined3d_context *context; + + context = context_acquire(cs->device, NULL, 0); + sub_resource_idx = op->layer * texture->level_count; + for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) + { + if (wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); + else + ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); + } + context_release(context); + + wined3d_resource_release(&texture->resource); +} + +void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, + struct wined3d_texture *texture, unsigned int layer) +{ + struct wined3d_cs_add_dirty_texture_region *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION; + op->texture = texture; + op->layer = layer; + + wined3d_resource_acquire(&texture->resource); + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1998,6 +2042,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, /* WINED3D_CS_OP_BLT_SUB_RESOURCE */ wined3d_cs_exec_blt_sub_resource, /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, + /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3219305..2419616 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1639,9 +1639,6 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { - unsigned int sub_resource_idx, i; - struct wined3d_context *context; - TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); if (layer >= texture->layer_count) @@ -1653,19 +1650,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, if (dirty_region) FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); - context = context_acquire(texture->resource.device, NULL, 0); - sub_resource_idx = layer * texture->level_count; - for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) - { - if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) - { - ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); - context_release(context); - return E_OUTOFMEMORY; - } - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - } - context_release(context); + wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 600fc04..b39bc2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3243,6 +3243,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, + struct wined3d_texture *texture, unsigned int layer) DECLSPEC_HIDDEN; void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags,

1 0

Piotr Caban : msvcrt: Don' t call unwind handlers when unwinding nested catch blocks.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: da8b706fdb1488344f91b2fcfba63d6ad8d8e673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8b706fdb1488344f91b2fcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 12 15:08:39 2017 +0200 msvcrt: Don't call unwind handlers when unwinding nested catch blocks. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 74 ++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 80780ae..d299608 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -334,7 +334,7 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, - cxx_exception_type *info) + cxx_exception_type *info, ULONG64 orig_frame) { ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), @@ -343,38 +343,8 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, EXCEPTION_RECORD catch_record; CONTEXT context; UINT i, j; - ULONG64 orig_frame = frame, throw_base; - DWORD throw_func_off; - void *throw_func; INT *unwind_help; - /* update orig_frame if it's a nested exception */ - throw_func_off = RtlLookupFunctionEntry(dispatch->ControlPc, &throw_base, NULL)->BeginAddress; - throw_func = rva_to_ptr(throw_func_off, throw_base); - TRACE("reconstructed handler pointer: %p\n", throw_func); - for (i=descr->tryblock_count; i>0; i--) - { - const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); - tryblock = &tryblock[i-1]; - - if (trylevel>tryblock->end_level && trylevel<=tryblock->catch_level) - { - for (j=0; j<tryblock->catchblock_count; j++) - { - /* TODO: is it possible to have the same handler for multiple catch blocks? */ - const catchblock_info *catchblock = rva_to_ptr(tryblock->catchblock, dispatch->ImageBase); - catchblock = &catchblock[j]; - - if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) - { - TRACE("nested exception detected\n"); - orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); - TRACE("setting orig_frame to %lx\n", orig_frame); - } - } - } - } - for (i=descr->tryblock_count; i>0; i--) { in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); @@ -457,7 +427,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) { + int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), + descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); cxx_exception_type *exc_type; + ULONG64 orig_frame = frame; + ULONG64 throw_base; + DWORD throw_func_off; + void *throw_func; + UINT i, j; if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { @@ -465,6 +442,32 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + /* update orig_frame if it's a nested exception */ + throw_func_off = RtlLookupFunctionEntry(dispatch->ControlPc, &throw_base, NULL)->BeginAddress; + throw_func = rva_to_ptr(throw_func_off, throw_base); + TRACE("reconstructed handler pointer: %p\n", throw_func); + for (i=descr->tryblock_count; i>0; i--) + { + const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); + tryblock = &tryblock[i-1]; + + if (trylevel>tryblock->end_level && trylevel<=tryblock->catch_level) + { + for (j=0; j<tryblock->catchblock_count; j++) + { + const catchblock_info *catchblock = rva_to_ptr(tryblock->catchblock, dispatch->ImageBase); + catchblock = &catchblock[j]; + + if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) + { + TRACE("nested exception detected\n"); + orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); + TRACE("setting orig_frame to %lx\n", orig_frame); + } + } + } + } + if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && @@ -476,13 +479,13 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & EH_TARGET_UNWIND) { - ULONG64 orig_frame = rec->ExceptionInformation[1]; const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; int end_level = rec->ExceptionInformation[3]; + orig_frame = rec->ExceptionInformation[1]; cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); } - else + else if(frame == orig_frame) cxx_local_unwind(frame, dispatch, descr, -1); /* FIXME: we should only unregister frames registered by call_catch_block here */ @@ -499,7 +502,8 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } - cxx_local_unwind(frame, dispatch, descr, -1); + if (frame == orig_frame) + cxx_local_unwind(frame, dispatch, descr, -1); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch; @@ -545,7 +549,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } } - find_catch_block(rec, frame, dispatch, descr, exc_type); + find_catch_block(rec, frame, dispatch, descr, exc_type, orig_frame); return ExceptionContinueSearch; }

1 0

Hans Leidekker : winhttp: Always drain content before sending the next request.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 2fa86fd6616e1671dd3ecfa3d2d6eaccf10be994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa86fd6616e1671dd3ecfa3d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 12 10:46:35 2017 +0200 winhttp: Always drain content before sending the next request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 402 +++++++++++++++++++++---------------------- dlls/winhttp/tests/winhttp.c | 6 +- 2 files changed, 203 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fa86fd6616e1671dd3ec…

1 0