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

Owen Rudge : wsdapi/tests: Add initial tests for WSDCreateDiscoveryPublisher.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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

Michael Stefaniuc : dwrite: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5a4cb67db9fe566ea1692a8053c6aa5e8bad36ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4cb67db9fe566ea1692a805… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 12 13:20:29 2017 +0200 dwrite: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/freetype.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8bf8753..b665161 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4875,12 +4875,12 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal TRACE("(%p)->(%d %p)\n", This, type, bounds); if ((UINT32)type > DWRITE_TEXTURE_CLEARTYPE_3x1) { - memset(bounds, 0, sizeof(*bounds)); + SetRectEmpty(bounds); return E_INVALIDARG; } if (type != This->texture_type) { - memset(bounds, 0, sizeof(*bounds)); + SetRectEmpty(bounds); return S_OK; } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2a926d7..2ad513e 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -986,12 +986,12 @@ INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace4 *fontface, UINT16 le void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) { - memset(&bitmap->bbox, 0, sizeof(bitmap->bbox)); + SetRectEmpty(&bitmap->bbox); } void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) { - memset(bbox, 0, sizeof(*bbox)); + SetRectEmpty(bbox); } BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap)

1 0

Michael Stefaniuc : dbghelp: Use debugstr_a() to trace a string that can be NULL.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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

Józef Kucia : wined3d: Use ARB_explicit_attrib_location for fragment shader outputs.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: f9f75d251a5702557872069035381c3b188638dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f75d251a570255787206903… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:26 2017 +0200 wined3d: Use ARB_explicit_attrib_location for fragment shader 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/glsl_shader.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a4221e0..1631768 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2676,7 +2676,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform float alpha_test_ref;\n"); if (!needs_legacy_glsl_syntax(gl_info)) + { + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = 0) "); shader_addline(buffer, "out vec4 ps_out[%u];\n", gl_info->limits.buffers); + } if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) FIXME("Insufficient uniforms to run this shader.\n"); @@ -7141,6 +7145,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) @@ -7297,7 +7303,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); - if (gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]) + if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); memset(&priv_ctx, 0, sizeof(priv_ctx)); @@ -8461,13 +8467,19 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_add_version_declaration(buffer, gl_info, NULL); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); if (!needs_legacy_glsl_syntax(gl_info)) + { + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = 0) "); shader_addline(buffer, "out vec4 ps_out[1];\n"); + } shader_addline(buffer, "vec4 tmp0, tmp1;\n"); shader_addline(buffer, "vec4 ret;\n");

1 0

Józef Kucia : wined3d: Explicitly bind frag data location for fragment shader outputs.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 9ddc01e0c156cf7c27d395564334b69cefd37b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ddc01e0c156cf7c27d395564… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:27 2017 +0200 wined3d: Explicitly bind frag data location for fragment shader 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 | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0aaa35e..319805b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3172,6 +3172,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */ USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */ USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */ + USE_GL_FUNC(glBindFragDataLocation) /* OpenGL 3.0 */ USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ @@ -3305,6 +3306,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glBeginQuery, glBeginQueryARB); MAP_GL_FUNCTION(glBindAttribLocation, glBindAttribLocationARB); MAP_GL_FUNCTION(glBindBuffer, glBindBufferARB); + MAP_GL_FUNCTION(glBindFragDataLocation, glBindFragDataLocationEXT); MAP_GL_FUNCTION(glBlendColor, glBlendColorEXT); MAP_GL_FUNCTION(glBlendEquation, glBlendEquationEXT); MAP_GL_FUNCTION(glBlendEquationSeparate, glBlendEquationSeparateEXT); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1631768..2eba072 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9254,7 +9254,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { /* Bind vertex attributes to a corresponding index number to match * the same index numbers as ARB_vertex_programs (makes loading - * vertex attributes simpler). With this method, we can use the + * vertex attributes simpler). With this method, we can use the * exact same code to load the attributes later for both ARB and * GLSL shaders. * @@ -9279,6 +9279,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } checkGLcall("glBindAttribLocation"); string_buffer_release(&priv->string_buffers, tmp_name); + + if (!needs_legacy_glsl_syntax(gl_info)) + { + GL_EXTCALL(glBindFragDataLocation(program_id, 0, "ps_out")); + checkGLcall("glBindFragDataLocation"); + } } if (gshader)

1 0

Józef Kucia : wined3d: Use GLSL 1.30 for all shaders if available.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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

Józef Kucia : wined3d: Avoid using deprecated built-in shader inputs/outputs.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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: Avoid using deprecated gl_ClipVertex.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: f5de978a9cc658628ecd11d5c99ffdedc4908492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5de978a9cc658628ecd11d5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:30 2017 +0200 wined3d: Avoid using deprecated gl_ClipVertex. 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 | 165 +++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5de978a9cc658628ecd1…

1 0

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

12 Apr '17

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

Hans Leidekker : winhttp: Always drain content before sending the next request.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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