August 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Remove redundant 'break' statement.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 51afeca5aa2f9bc0b78d7cc69799587ca6a1d678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51afeca5aa2f9bc0b78d7cc69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:23 2016 +0200 d3d11: Remove redundant 'break' statement. 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/d3d11/shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index dab2b9b..1da1293 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -108,7 +108,6 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * else { TRACE("Skipping feature level 9 shader code on feature level %#x.\n", ctx->feature_level); - break; } break;

1 0

Józef Kucia : dxgi: Properly switch to fullscreen mode when creating fullscreen swapchains.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 0d92a9a7a429f5727c997d814155acdd8f4095fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d92a9a7a429f5727c997d814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:21 2016 +0200 dxgi: Properly switch to fullscreen mode when creating fullscreen swapchains. 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/dxgi/swapchain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 172b0f4..0057aa2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -485,6 +485,8 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); + swapchain->fullscreen = !desc->windowed; + desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { @@ -492,10 +494,10 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device goto cleanup; } - swapchain->fullscreen = !desc->windowed; swapchain->target = NULL; if (swapchain->fullscreen) { + desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, desc, NULL))) {

1 0

Józef Kucia : dxgi/tests: Also test IDXGISwapChain_ResizeTarget() in fullscreen with disabled mode switch.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 2c67e1c9c305d95375f2c3b22d885088457a1314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c67e1c9c305d95375f2c3b22… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:20 2016 +0200 dxgi/tests: Also test IDXGISwapChain_ResizeTarget() in fullscreen with disabled mode switch. 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/dxgi/tests/device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index a0f5e24..a29c13c 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1503,6 +1503,11 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, expected_state = *initial_state; for (i = 0; i < min(mode_count, 20); ++i) { + /* FIXME: Modes with scaling aren't fully tested. */ + if (!(swapchain_desc.Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + && modes[i].Scaling != DXGI_MODE_SCALING_UNSPECIFIED) + continue; + hr = IDXGIOutput_GetDesc(target, &output_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); @@ -1546,6 +1551,8 @@ static void test_resize_target(void) } tests[] = { + {{ 0, 0}, TRUE, FALSE, 0}, + {{10, 10}, TRUE, FALSE, 0}, {{ 0, 0}, TRUE, FALSE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, {{10, 10}, TRUE, FALSE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, {{ 0, 0}, FALSE, FALSE, 0},

1 0

Józef Kucia : d3d9/tests: Add test for regression in IDirect3DDevice9_Reset().
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 7d836b3f138c4cf7a46608165c031362db3a5dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d836b3f138c4cf7a46608165… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:17 2016 +0200 d3d9/tests: Add test for regression in IDirect3DDevice9_Reset(). This adds a test for regression introduced in cad279449c62a965a70a712a91b11ba52c4ff4f7. 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/d3d9/tests/d3d9ex.c | 68 +++++++++++++++++++++++++-- dlls/d3d9/tests/device.c | 116 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 144 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d836b3f138c4cf7a4660…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMFrame*::GetScene.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: be90480c3ce1f128168e7bd01c49434ca9bec675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90480c3ce1f128168e7bd01… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Aug 16 01:38:15 2016 +0530 d3drm: Implement IDirect3DRMFrame*::GetScene. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 42 ++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 24 ++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 2ff0241..d79a8e3 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1339,23 +1339,53 @@ static HRESULT WINAPI d3drm_frame1_GetRotation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_GetScene(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, scene %p.\n", iface, scene); + + if (!scene) + return D3DRMERR_BADVALUE; + + while (frame->parent) + frame = frame->parent; + + *scene = &frame->IDirect3DRMFrame3_iface; + IDirect3DRMFrame3_AddRef(*scene); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_GetScene(IDirect3DRMFrame2 *iface, IDirect3DRMFrame **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrame3 *frame3; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, scene %p.\n", iface, scene); + + if (!scene) + return D3DRMERR_BADVALUE; + + hr = IDirect3DRMFrame3_GetScene(&frame->IDirect3DRMFrame3_iface, &frame3); + if (FAILED(hr) || !frame3) + { + *scene = NULL; + return hr; + } + + hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IDirect3DRMFrame, (void **)scene); + IDirect3DRMFrame3_Release(frame3); + + return hr; } static HRESULT WINAPI d3drm_frame1_GetScene(IDirect3DRMFrame *iface, IDirect3DRMFrame **scene) { - FIXME("iface %p, scene %p stub!\n", iface, scene); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, scene %p.\n", iface, scene); + + return d3drm_frame2_GetScene(&frame->IDirect3DRMFrame2_iface, scene); } static D3DRMSORTMODE WINAPI d3drm_frame3_GetSortMode(IDirect3DRMFrame3 *iface) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1abaed5..d86477d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -885,6 +885,7 @@ static void test_Frame(void) IDirect3DRMFrame *pFrameP1; IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameTmp; + IDirect3DRMFrame *scene_frame; IDirect3DRMFrameArray *frame_array; IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; @@ -967,6 +968,19 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 1); CHECK_REFCOUNT(pFrameC, 2); + hr = IDirect3DRMFrame_GetScene(pFrameC, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame); + CHECK_REFCOUNT(pFrameP1, 2); + IDirect3DRMFrame_Release(scene_frame); + hr = IDirect3DRMFrame_GetScene(pFrameP1, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP1, "Expected scene frame == %p, got %p.\n", pFrameP1, scene_frame); + CHECK_REFCOUNT(pFrameP1, 2); + IDirect3DRMFrame_Release(scene_frame); + frame_array = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array); ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); @@ -1032,6 +1046,16 @@ static void test_Frame(void) ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); IDirect3DRMFrameArray_Release(frame_array); } + hr = IDirect3DRMFrame_GetScene(pFrameC, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame); + CHECK_REFCOUNT(pFrameP2, 2); + IDirect3DRMFrame_Release(scene_frame); + hr = IDirect3DRMFrame_GetScene(pFrameP2, &scene_frame); + ok(SUCCEEDED(hr), "Cannot get scene (hr == %#x).\n", hr); + ok(scene_frame == pFrameP2, "Expected scene frame == %p, got %p.\n", pFrameP2, scene_frame); + CHECK_REFCOUNT(pFrameP2, 2); + IDirect3DRMFrame_Release(scene_frame); pFrameTmp = (void*)0xdeadbeef; hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp);

1 0

Hans Leidekker : webservices: Support WS_STRING values in WsSetHeader.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: b89f7d944382f4d398759482fcbbb69dd0f3e6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89f7d944382f4d398759482f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:33 2016 +0200 webservices: Support WS_STRING values in WsSetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 904d490..487222e 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -598,6 +598,24 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O memcpy( header->text.value.bytes, str->bytes, str->length ); break; } + case WS_STRING_TYPE: + { + int len; + const WS_STRING *str = value; + + if (option != WS_WRITE_REQUIRED_VALUE) + { + FIXME( "unhandled write option %u\n", option ); + return E_NOTIMPL; + } + if (size != sizeof(*str)) return E_INVALIDARG; + len = WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, NULL, 0, NULL, NULL ); + if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + set_utf8_text( &header->text, (BYTE *)(header + 1), len ); + WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, (char *)header->text.value.bytes, + len, NULL, NULL ); + break; + } default: FIXME( "unhandled type %u\n", value_type ); return E_NOTIMPL;

1 0

Bruno Jesus : winmm/tests: Enumerate all joystick devices during the test.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: f2fa2448aa946e79431a965b3a9608a35ce48f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fa2448aa946e79431a965b3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 15 19:11:38 2016 -0300 winmm/tests: Enumerate all joystick devices during the test. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 2f230f5..5714001 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -82,7 +82,9 @@ static void test_api(void) ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc)); if (ret == JOYERR_NOERROR) { - joyid = JOYSTICKID1 + i; + if (joyid == -1) /* Cache the first found joystick to run advanced tests below */ + joyid = JOYSTICKID1 + i; + trace("Joystick[%d] - name: '%s', axes: %d, buttons: %d, period range: %d - %d\n", JOYSTICKID1 + i, jc.szPname, jc.wNumAxes, jc.wNumButtons, jc.wPeriodMin, jc.wPeriodMax); ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw)); @@ -93,7 +95,6 @@ static void test_api(void) ok(jc.wNumButtons == jcw.wNumButtons, "Expected %d == %d\n", jc.wNumButtons, jcw.wNumButtons); } else win98++; - break; } else {

1 0

Hans Leidekker : webservices: Implement WS_ADDRESSING_VERSION_TRANSPORT.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 0f227b2244fa1b83d95f18ab4d6ee81da178c7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f227b2244fa1b83d95f18ab4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:36 2016 +0200 webservices: Implement WS_ADDRESSING_VERSION_TRANSPORT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 21 +++++++++++++++------ dlls/webservices/tests/msg.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 2bac6e0..9a19622 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -349,6 +349,11 @@ static HRESULT get_addr_namespace( WS_ADDRESSING_VERSION ver, WS_XML_STRING *str str->length = sizeof(ns_addr_1_0)/sizeof(ns_addr_1_0[0]) - 1; return S_OK; + case WS_ADDRESSING_VERSION_TRANSPORT: + str->bytes = NULL; + str->length = 0; + return S_OK; + default: ERR( "unhandled addressing version %u\n", ver ); return E_NOTIMPL; @@ -409,14 +414,18 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) if ((hr = get_addr_namespace( msg->version_addr, &ns_addr )) != S_OK) return hr; if ((hr = WsWriteStartElement( writer, &prefix_s, &envelope, &ns_env, NULL )) != S_OK) return hr; - if ((hr = WsWriteXmlnsAttribute( writer, &prefix_a, &ns_addr, FALSE, NULL )) != S_OK) return hr; + if (msg->version_addr < WS_ADDRESSING_VERSION_TRANSPORT && + (hr = WsWriteXmlnsAttribute( writer, &prefix_a, &ns_addr, FALSE, NULL )) != S_OK) return hr; if ((hr = WsWriteStartElement( writer, &prefix_s, &header, &ns_env, NULL )) != S_OK) return hr; - if ((hr = WsWriteStartElement( writer, &prefix_a, &msgid, &ns_addr, NULL )) != S_OK) return hr; - urn.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; - memcpy( &urn.value, &msg->id, sizeof(msg->id) ); - if ((hr = WsWriteText( writer, &urn.text, NULL )) != S_OK) return hr; - if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:MessageID> */ + if (msg->version_addr < WS_ADDRESSING_VERSION_TRANSPORT) + { + if ((hr = WsWriteStartElement( writer, &prefix_a, &msgid, &ns_addr, NULL )) != S_OK) return hr; + urn.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; + memcpy( &urn.value, &msg->id, sizeof(msg->id) ); + if ((hr = WsWriteText( writer, &urn.text, NULL )) != S_OK) return hr; + if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:MessageID> */ + } for (i = 0; i < msg->header_count; i++) { diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index a42d369..5a0e8b2 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -339,6 +339,8 @@ static void test_WsWriteEnvelopeStart(void) "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "<a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address>" "</a:ReplyTo></s:Header><s:Body/></s:Envelope>"; + static const char expected3[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header/><s:Body/></s:Envelope>"; HRESULT hr; WS_MESSAGE *msg; WS_XML_WRITER *writer; @@ -375,6 +377,21 @@ static void test_WsWriteEnvelopeStart(void) hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( state == WS_MESSAGE_STATE_WRITING, "got %u\n", state ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected3, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); WsFreeWriter( writer );

1 0

Hans Leidekker : webservices: Add missing channel properties.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: ac42d70121023b7ddaa47ff65e460f2dd4e85fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac42d70121023b7ddaa47ff65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:35 2016 +0200 webservices: Add missing channel properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 60 +++++++++++++++++++++++++++++----- dlls/webservices/webservices_private.h | 2 +- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9081d95..aba87c0 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winsock2.h" #include "webservices.h" #include "wine/debug.h" @@ -31,15 +32,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(webservices); static const struct prop_desc channel_props[] = { - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE */ - { sizeof(UINT64), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_MESSAGE_SIZE */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_START_SIZE */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_FLUSH_SIZE */ - { sizeof(WS_ENCODING), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODING */ - { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ - { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ - { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE */ + { sizeof(UINT64), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_MESSAGE_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_START_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_FLUSH_SIZE */ + { sizeof(WS_ENCODING), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODING */ + { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ + { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ + { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ + { sizeof(WS_CALLBACK_MODEL), FALSE }, /* WS_CHANNEL_PROPERTY_ASYNC_CALLBACK_MODEL */ + { sizeof(WS_IP_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_IP_VERSION */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_CONNECT_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_SEND_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_RECEIVE_RESPONSE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_RECEIVE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_CLOSE_TIMEOUT */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_ENABLE_TIMEOUTS */ + { sizeof(WS_TRANSFER_MODE), FALSE }, /* WS_CHANNEL_PROPERTY_TRANSFER_MODE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MULTICAST_INTERFACE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MULTICAST_HOPS */ + { sizeof(WS_ENDPOINT_ADDRESS), TRUE }, /* WS_CHANNEL_PROPERTY_REMOTE_ADDRESS */ + { sizeof(SOCKADDR_STORAGE), TRUE }, /* WS_CHANNEL_PROPERTY_REMOTE_IP_ADDRESS */ + { sizeof(ULONGLONG), TRUE }, /* WS_CHANNEL_PROPERTY_HTTP_CONNECTION_ID */ + { sizeof(WS_CUSTOM_CHANNEL_CALLBACKS), FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_CHANNEL_CALLBACKS */ + { 0, FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_CHANNEL_PARAMETERS */ + { sizeof(void *), FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_CHANNEL_INSTANCE */ + { sizeof(WS_STRING), TRUE }, /* WS_CHANNEL_PROPERTY_TRANSPORT_URL */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_NO_DELAY */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_SEND_KEEP_ALIVES */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_KEEP_ALIVE_TIME */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_KEEP_ALIVE_INTERVAL */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_HTTP_SERVER_CONNECTIONS */ + { sizeof(BOOL), TRUE }, /* WS_CHANNEL_PROPERTY_IS_SESSION_SHUT_DOWN */ + { sizeof(WS_CHANNEL_TYPE), TRUE }, /* WS_CHANNEL_PROPERTY_CHANNEL_TYPE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_TRIM_BUFFERED_MESSAGE_SIZE */ + { sizeof(WS_CHANNEL_ENCODER), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODER */ + { sizeof(WS_CHANNEL_DECODER), FALSE }, /* WS_CHANNEL_PROPERTY_DECODER */ + { sizeof(WS_PROTECTION_LEVEL), TRUE }, /* WS_CHANNEL_PROPERTY_PROTECTION_LEVEL */ + { sizeof(WS_COOKIE_MODE), FALSE }, /* WS_CHANNEL_PROPERTY_COOKIE_MODE */ + { sizeof(WS_HTTP_PROXY_SETTING_MODE), FALSE }, /* WS_CHANNEL_PROPERTY_HTTP_PROXY_SETTING_MODE */ + { sizeof(WS_CUSTOM_HTTP_PROXY), FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_HTTP_PROXY */ + { sizeof(WS_HTTP_MESSAGE_MAPPING), FALSE }, /* WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_ENABLE_HTTP_REDIRECT */ + { sizeof(WS_HTTP_REDIRECT_CALLBACK_CONTEXT), FALSE }, /* WS_CHANNEL_PROPERTY_HTTP_REDIRECT_CALLBACK_CONTEXT */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_FAULTS_AS_ERRORS */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_ALLOW_UNSECURED_FAULTS */ + { sizeof(WCHAR *), TRUE }, /* WS_CHANNEL_PROPERTY_HTTP_SERVER_SPN */ + { sizeof(WCHAR *), TRUE }, /* WS_CHANNEL_PROPERTY_HTTP_PROXY_SPN */ + { sizeof(ULONG), FALSE } /* WS_CHANNEL_PROPERTY_MAX_HTTP_REQUEST_HEADERS_BUFFER_SIZE */ }; static struct channel *alloc_channel(void) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 26cba38..fee0015 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -95,7 +95,7 @@ struct channel WS_CHANNEL_BINDING binding; WS_CHANNEL_STATE state; ULONG prop_count; - struct prop prop[9]; + struct prop prop[50]; }; HRESULT create_channel( WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY *,

1 0

Hans Leidekker : webservices: Implement WsRemoveHeader.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: b2829c4b66d49ce72abe69e07b08908635e236d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2829c4b66d49ce72abe69e07… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:34 2016 +0200 webservices: Implement WsRemoveHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 32 ++++++++++++++++++++ dlls/webservices/tests/msg.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 487222e..2bac6e0 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -671,3 +671,35 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val msg->header[i] = header; return write_envelope( msg ); } + +/************************************************************************** + * WsRemoveHeader [webservices.@] + */ +HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + BOOL removed = FALSE; + ULONG i; + + TRACE( "%p %u %p\n", handle, type, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + if (type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type == type) + { + heap_free( msg->header[i] ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + msg->header_count--; + removed = TRUE; + break; + } + } + + if (removed) return write_envelope( msg ); + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index ea44c07..a42d369 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -591,6 +591,67 @@ static void test_WsSetHeader(void) WsFreeWriter( writer ); } +static void test_WsRemoveHeader(void) +{ + static const char expected[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:Action s:mustUnderstand=\"1\">action</a:Action></s:Header>" + "<s:Body/></s:Envelope>"; + static const char expected2[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "</s:Header><s:Body/></s:Envelope>"; + static const WS_XML_STRING action = {6, (BYTE *)"action"}; + HRESULT hr; + WS_MESSAGE *msg; + + hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsRemoveHeader( NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveHeader( msg, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + hr = WsRemoveHeader( msg, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &action, + sizeof(action), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + /* again */ + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -601,4 +662,5 @@ START_TEST(msg) test_WsWriteEnvelopeEnd(); test_WsWriteBody(); test_WsSetHeader(); + test_WsRemoveHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 477f236..59f9856 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -128,7 +128,7 @@ @ stub WsReceiveMessage @ stub WsRegisterOperationForCancel @ stub WsRemoveCustomHeader -@ stub WsRemoveHeader +@ stdcall WsRemoveHeader(ptr long ptr) @ stub WsRemoveMappedHeader @ stub WsRemoveNode @ stub WsRequestReply diff --git a/include/webservices.h b/include/webservices.h index c227a17..cd30e4fc 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1420,6 +1420,7 @@ HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*);

1 0