February 2017 - Wine-Commits

Hans Leidekker : webservices/tests: Add helpers to set various description structures.
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: a0ea3bd74130920b5086e23ced878d4bb9cf30a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ea3bd74130920b5086e23ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:10 2017 +0100 webservices/tests: Add helpers to set various description structures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 201 ++++++++++++++++++++--------------------- 1 file changed, 96 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0ea3bd74130920b5086e…

1 0

Michael Stefaniuc : strmbase: Remove an always true if condition ( coccinellery).
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 37d8f36de6c131729da114deed04f83b7cd09c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d8f36de6c131729da114dee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:52:26 2017 +0100 strmbase: Remove an always true if condition (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 0f05d63..a03ba55 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -569,8 +569,7 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L if (!pRetrieved || !pPalette) return E_POINTER; - if (pRetrieved) - *pRetrieved = 0; + *pRetrieved = 0; return VFW_E_NO_PALETTE_AVAILABLE; }

1 0

Henri Verbeet : wined3d: Use wined3d_device_delete_opengl_contexts() in wined3d_device_uninit_3d().
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: b64d5474de2e442d2fe11cd64c86adb6f2d75c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64d5474de2e442d2fe11cd64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:14 2017 +0100 wined3d: Use wined3d_device_delete_opengl_contexts() in wined3d_device_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 191 ++++++++++++++++++++++---------------------------- 1 file changed, 83 insertions(+), 108 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1271363..22a13a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -942,6 +942,87 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +{ + struct wined3d_resource *resource, *cursor; + struct wined3d_context *context; + struct wined3d_shader *shader; + + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) + { + device->shader_backend->shader_destroy(shader); + } + + context = context_acquire(device, NULL); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + destroy_dummy_textures(device, context); + destroy_default_samplers(device, context); + context_release(context); + + while (device->context_count) + { + if (device->contexts[0]->swapchain) + swapchain_destroy_contexts(device->contexts[0]->swapchain); + else + context_destroy(device, device->contexts[0]); + } +} + +static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +{ + struct wined3d_context *context; + struct wined3d_texture *target; + HRESULT hr; + + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, + device->adapter->vertex_pipe, device->adapter->fragment_pipe))) + { + ERR("Failed to allocate shader private data, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = device->blitter->alloc_private(device))) + { + ERR("Failed to allocate blitter private data, hr %#x.\n", hr); + device->shader_backend->shader_free_private(device); + return hr; + } + + /* Recreate the primary swapchain's context. */ + if (!(swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)))) + { + ERR("Failed to allocate memory for swapchain context array.\n"); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + return E_OUTOFMEMORY; + } + + target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; + if (!(context = context_create(swapchain, target, swapchain->ds_format))) + { + WARN("Failed to create context.\n"); + HeapFree(GetProcessHeap(), 0, swapchain->context); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + return E_FAIL; + } + + swapchain->context[0] = context; + swapchain->num_contexts = 1; + create_dummy_textures(device, context); + create_default_samplers(device, context); + context_release(context); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { @@ -1094,9 +1175,6 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { - struct wined3d_resource *resource, *cursor; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; UINT i; TRACE("device %p.\n", device); @@ -1104,12 +1182,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - /* I don't think that the interface guarantees that the device is destroyed from the same thread - * it was created. Thus make sure a context is active for the glDelete* calls - */ - context = context_acquire(device, NULL); - gl_info = context->gl_info; - if (device->logo_texture) wined3d_texture_decref(device->logo_texture); if (device->cursor_texture) @@ -1117,22 +1189,9 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) state_unbind_resources(&device->state); - /* Unload resources */ - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - wine_rb_clear(&device->samplers, device_free_sampler, NULL); - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, context); - destroy_default_samplers(device, context); - - context_release(context); + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1153,7 +1212,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4528,90 +4587,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } -static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) -{ - struct wined3d_resource *resource, *cursor; - struct wined3d_context *context; - struct wined3d_shader *shader; - - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - - LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) - { - device->shader_backend->shader_destroy(shader); - } - - context = context_acquire(device, NULL); - - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, context); - destroy_default_samplers(device, context); - - context_release(context); - - while (device->context_count) - { - if (device->contexts[0]->swapchain) - swapchain_destroy_contexts(device->contexts[0]->swapchain); - else - context_destroy(device, device->contexts[0]); - } -} - -static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) -{ - struct wined3d_context *context; - struct wined3d_texture *target; - HRESULT hr; - - if (FAILED(hr = device->shader_backend->shader_alloc_private(device, - device->adapter->vertex_pipe, device->adapter->fragment_pipe))) - { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); - return hr; - } - - if (FAILED(hr = device->blitter->alloc_private(device))) - { - ERR("Failed to allocate blitter private data, hr %#x.\n", hr); - device->shader_backend->shader_free_private(device); - return hr; - } - - /* Recreate the primary swapchain's context */ - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); - if (!swapchain->context) - { - ERR("Failed to allocate memory for swapchain context array.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_OUTOFMEMORY; - } - - target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; - if (!(context = context_create(swapchain, target, swapchain->ds_format))) - { - WARN("Failed to create context.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - HeapFree(GetProcessHeap(), 0, swapchain->context); - return E_FAIL; - } - - swapchain->context[0] = context; - swapchain->num_contexts = 1; - create_dummy_textures(device, context); - create_default_samplers(device, context); - context_release(context); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state)

1 0

Michael Stefaniuc : ddraw/tests: Fix double assigment to the same lvalue ( coccinellery).
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 427c607a6c976a09ffcb7d28171d54e14d032a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=427c607a6c976a09ffcb7d281… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:50:28 2017 +0100 ddraw/tests: Fix double assigment to the same lvalue (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 278b9c6..c682466 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9579,7 +9579,7 @@ static void test_transform_vertices(void) * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; - vp_data.dwX = 0; + vp_data.dwY = 0; vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 5.0f; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index db09e5d..d6491ea 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10954,7 +10954,7 @@ static void test_transform_vertices(void) * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; - vp_data.dwX = 0; + vp_data.dwY = 0; vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 5.0f; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 830da89..bda2ebf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12252,7 +12252,7 @@ static void test_transform_vertices(void) * y as ((y + 0) * 2 + 1) * 5. The 5 comes from dvScaleX/Y, 2 from * the view matrix and the +1's from the world and projection matrix. */ vp_data.dwX = 0; - vp_data.dwX = 0; + vp_data.dwY = 0; vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 5.0f;

1 0

Sebastian Lackner : wined3d: Add a missing call to context_release.
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: f9c6488394a53fbac160c613a61215d15068542d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c6488394a53fbac160c613a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 14 23:15:30 2017 +0100 wined3d: Add a missing call to context_release. Spotted by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 37cb819..a7ee5bc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4138,6 +4138,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) { ERR("Failed to load buffer location.\n"); + context_release(context); return; }

1 0

Henri Verbeet : wined3d: Use context_acquire() in create_primary_opengl_context().
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: ef6e838298338b87ee384d6d3b9f8871509ffd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6e838298338b87ee384d6d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:16 2017 +0100 wined3d: Use context_acquire() in create_primary_opengl_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 487c870..37cb819 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -998,27 +998,8 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru return hr; } - /* Recreate the primary swapchain's context. */ - if (!(swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)))) - { - ERR("Failed to allocate memory for swapchain context array.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_OUTOFMEMORY; - } - target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; - if (!(context = context_create(swapchain, target, swapchain->ds_format))) - { - WARN("Failed to create context.\n"); - HeapFree(GetProcessHeap(), 0, swapchain->context); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_FAIL; - } - - swapchain->context[0] = context; - swapchain->num_contexts = 1; + context = context_acquire(device, target, 0); create_dummy_textures(device, context); create_default_samplers(device, context); context_release(context);

1 0

Michael Stefaniuc : dplayx: Fix multiple assigments to the same lvalue ( coccinellery).
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 7ae50b230d0b49693470ee06244970c4393eb119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae50b230d0b49693470ee062… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:53:01 2017 +0100 dplayx: Fix multiple assigments to the same lvalue (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplayx_messages.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 95cc15f..6f6636c 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -301,10 +301,10 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer ) lpMsgBody->dpidAppServer2 = dpidServer; lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x20; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; + lpMsgBody->unknown3[1] = 0x0; + lpMsgBody->unknown3[2] = 0x20; + lpMsgBody->unknown3[3] = 0x0; + lpMsgBody->unknown3[4] = 0x0; lpMsgBody->dpidAppServer3 = dpidServer; lpMsgBody->unknown4[0] = 0x30;

1 0

Hans Leidekker : webservices/tests: Add an empty response message test.
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: e231ee53b49f510717e2b58b7c9a08d6d213b77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e231ee53b49f510717e2b58b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:12 2017 +0100 webservices/tests: Add an empty response message test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 100 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index 80ac40b..79f6444 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -42,7 +42,7 @@ static inline void set_field_desc( WS_FIELD_DESCRIPTION *desc, WS_FIELD_MAPPING static inline void set_struct_desc( WS_STRUCT_DESCRIPTION *desc, ULONG size, ULONG alignment, WS_FIELD_DESCRIPTION **fields, ULONG count, WS_XML_STRING *localname, - WS_XML_STRING *ns ) + WS_XML_STRING *ns, ULONG options ) { memset( desc, 0, sizeof(*desc) ); desc->size = size; @@ -51,6 +51,7 @@ static inline void set_struct_desc( WS_STRUCT_DESCRIPTION *desc, ULONG size, ULO desc->fieldCount = count; desc->typeLocalName = localname; desc->typeNs = ns; + desc->structOptions = options; } static inline void set_elem_desc( WS_ELEMENT_DESCRIPTION *desc, WS_XML_STRING *localname, WS_XML_STRING *ns, @@ -412,7 +413,7 @@ static void test_WsCall( int port ) fields[0] = &f; fields[1] = &f4; - set_struct_desc( &input_struct, sizeof(struct input), TYPE_ALIGNMENT(struct input), fields, 2, &req, &ns ); + set_struct_desc( &input_struct, sizeof(struct input), TYPE_ALIGNMENT(struct input), fields, 2, &req, &ns, 0 ); set_elem_desc( &input_elem, &req_elem, &ns, WS_STRUCT_TYPE, &input_struct ); set_msg_desc( &input_msg, &req_action, &input_elem ); @@ -423,7 +424,7 @@ static void test_WsCall( int port ) fields2[0] = &f2; fields2[1] = &f3; - set_struct_desc( &output_struct, sizeof(struct output), TYPE_ALIGNMENT(struct output), fields2, 2, &resp, &ns ); + set_struct_desc( &output_struct, sizeof(struct output), TYPE_ALIGNMENT(struct output), fields2, 2, &resp, &ns, 0 ); set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, &output_struct ); set_msg_desc( &output_msg, &resp_action, &output_elem ); @@ -473,31 +474,105 @@ static void test_WsCall( int port ) WsFreeHeap( heap ); } +static const char req_test3[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<req_test3 xmlns=\"ns\"><val>1</val></req_test3>" + "</s:Body></s:Envelope>"; + +static const char resp_test3[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body/></s:Envelope>"; + +static void test_empty_response( int port ) +{ + WS_XML_STRING req = {3, (BYTE *)"req"}; + WS_XML_STRING resp = {4, (BYTE *)"resp"}; + WS_XML_STRING req_action = {9, (BYTE *)"req_test3"}; + WS_XML_STRING resp_action = {10, (BYTE *)"resp_test3"}; + WS_XML_STRING req_elem = {9, (BYTE *)"req_test3"}; + WS_XML_STRING resp_elem = {10, (BYTE *)"resp_test3"}; + WS_XML_STRING ns = {2, (BYTE *)"ns"}; + WS_XML_STRING ns2 = {0, (BYTE *)""}; + WS_XML_STRING val = {3, (BYTE *)"val"}; + HRESULT hr; + WS_SERVICE_PROXY *proxy; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION input_struct, output_struct; + WS_ELEMENT_DESCRIPTION input_elem, output_elem; + WS_MESSAGE_DESCRIPTION input_msg, output_msg; + WS_PARAMETER_DESCRIPTION param[1]; + WS_OPERATION_DESCRIPTION op; + const void *args[1]; + WS_HEAP *heap; + struct input + { + INT32 val; + } in; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = create_proxy( port, &proxy ); + ok( hr == S_OK, "got %08x\n", hr ); + + set_field_desc( &f, WS_ELEMENT_FIELD_MAPPING, &val, &ns, WS_INT32_TYPE, NULL, 0, 0, 0, NULL, NULL ); + fields[0] = &f; + + set_struct_desc( &input_struct, sizeof(struct input), TYPE_ALIGNMENT(struct input), fields, 1, &req, &ns, 0 ); + set_elem_desc( &input_elem, &req_elem, &ns, WS_STRUCT_TYPE, &input_struct ); + set_msg_desc( &input_msg, &req_action, &input_elem ); + + set_struct_desc( &output_struct, 0, 1, NULL, 0, &resp, &ns2, 0x6 ); + set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, NULL ); + set_msg_desc( &output_msg, &resp_action, &output_elem ); + + set_param_desc( param, WS_PARAMETER_TYPE_NORMAL, 0, 0xffff ); + set_op_desc( &op, &input_msg, &output_msg, 1, param ); + + in.val = 1; + args[0] = &in.val; + hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + set_elem_desc( &output_elem, &resp_elem, &ns, WS_STRUCT_TYPE, &output_struct ); + hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = WsCloseServiceProxy( proxy, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeServiceProxy( proxy ); + WsFreeHeap( heap ); +} + +static const char status_200[] = "HTTP/1.1 200 OK\r\n"; + static const struct { const char *req_action; const char *req_data; unsigned int req_len; - const char *resp_action; + const char *resp_status; const char *resp_data; unsigned int resp_len; } tests[] = { - { "req_test1", req_test1, sizeof(req_test1)-1, "resp_test1", resp_test1, sizeof(resp_test1)-1 }, - { "req_test2", req_test2, sizeof(req_test2)-1, "resp_test2", resp_test2, sizeof(resp_test2)-1 }, + { "req_test1", req_test1, sizeof(req_test1)-1, status_200, resp_test1, sizeof(resp_test1)-1 }, + { "req_test2", req_test2, sizeof(req_test2)-1, status_200, resp_test2, sizeof(resp_test2)-1 }, + { "req_test3", req_test3, sizeof(req_test3)-1, status_200, resp_test3, sizeof(resp_test3)-1 }, }; -static void send_response( int c, const char *action, const char *data, unsigned int len ) +static void send_response( int c, const char *status, const char *data, unsigned int len ) { static const char headers[] = - "HTTP/1.1 200 OK\r\nContent-Type: text/xml; charset=utf-8\r\nConnection: close\r\n"; + "Content-Type: text/xml; charset=utf-8\r\nConnection: close\r\n"; static const char fmt[] = - "SOAPAction: \"%s\"\r\nContent-Length: %u\r\n\r\n"; + "Content-Length: %u\r\n\r\n"; char buf[128]; + send( c, status, strlen(status), 0 ); send( c, headers, sizeof(headers) - 1, 0 ); - sprintf( buf, fmt, action, len ); + sprintf( buf, fmt, len ); send( c, buf, strlen(buf), 0 ); send( c, data, len, 0 ); } @@ -571,9 +646,9 @@ static DWORD CALLBACK server_proc( void *arg ) ok( tests[j].req_len == data_len, "%u: unexpected data length %u %u\n", j, data_len, tests[j].req_len ); if (tests[j].req_len == data_len) - ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), "%u: unexpected data\n", j ); + ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), "%u: unexpected data %s\n", j, buf ); } - send_response( c, tests[j].resp_action, tests[j].resp_data, tests[j].resp_len ); + send_response( c, tests[j].resp_status, tests[j].resp_data, tests[j].resp_len ); break; } } @@ -610,6 +685,7 @@ START_TEST(proxy) test_WsSendMessage( info.port, &test1 ); test_WsReceiveMessage( info.port ); test_WsCall( info.port ); + test_empty_response( info.port ); test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 );

1 0

Michael Stefaniuc : shell32/tests: Use the correct field for SW_SHOWNORMAL (coccinellery).
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: f20fa69c9bbffe182d23ead9408917f5e8c271da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20fa69c9bbffe182d23ead94… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:53:56 2017 +0100 shell32/tests: Use the correct field for SW_SHOWNORMAL (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3c757ec..3292c54 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -808,7 +808,7 @@ static void test_NonExistentPath(void) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.dwFlags = SW_SHOWNORMAL; + startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); winetest_wait_child_process( info.hProcess ); @@ -823,7 +823,7 @@ static void test_NonExistentPath(void) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.dwFlags = SW_SHOWNORMAL; + startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0,

1 0

Hans Leidekker : webservices/tests: Add more tests for WsReadEnvelopeStart.
by Alexandre Julliard Feb. 15, 2017

Feb. 15, 2017

Module: wine Branch: master Commit: 2c1ce1a02532bc896936ffdcd68675426e200491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1ce1a02532bc896936ffdcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 15 14:17:11 2017 +0100 webservices/tests: Add more tests for WsReadEnvelopeStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index f481948..b13a97e 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -912,6 +912,7 @@ static void test_WsReadEnvelopeStart(void) WS_MESSAGE *msg, *msg2; WS_XML_READER *reader; WS_MESSAGE_STATE state; + const WS_XML_NODE *node; HRESULT hr; hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); @@ -946,6 +947,24 @@ static void test_WsReadEnvelopeStart(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == WS_MESSAGE_STATE_READING, "got %u\n", state ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + WsFreeMessage( msg ); WsFreeMessage( msg2 ); WsFreeReader( reader );

1 0