wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSGetConstantBuffers().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: ee5fbded64b364a3d3724a3eff75a0f18a0b9e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5fbded64b364a3d3724a3ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:58 2017 +0200 d3d11: Implement d3d11_immediate_context_DSGetConstantBuffers(). 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/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7b21981..d80b635 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2132,8 +2132,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_ds_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_ds_cb().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 349e4611264d3e9450c563cbafc1d903b8a1e2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349e4611264d3e9450c563cba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:57 2017 +0200 wined3d: Introduce wined3d_device_get_ds_cb(). 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/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9fd195a..0985d62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2739,6 +2739,13 @@ void CDECL wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_DOMAIN, idx, buffer); } +struct wined3d_buffer * CDECL wined3d_device_get_ds_cb(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_DOMAIN, idx); +} + void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a3c8f21..c8c00c0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -61,6 +61,7 @@ @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_domain_shader(ptr) +@ cdecl wined3d_device_get_ds_cb(ptr long) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9e34661..70ec52f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,6 +2215,7 @@ HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_ds_cb(const struct wined3d_device *device, unsigned int idx); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetConstantBuffers().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 1f0f162fa7acf8fa342cf906923164b5276c2d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0f162fa7acf8fa342cf9069… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:56 2017 +0200 d3d11: Implement d3d11_immediate_context_HSGetConstantBuffers(). 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/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 259f189..7b21981 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2065,8 +2065,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_hs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_hs_cb().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 70055cd4509d9b39a0dc46a7fd07613ec256419b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70055cd4509d9b39a0dc46a7f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:55 2017 +0200 wined3d: Introduce wined3d_device_get_hs_cb(). 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/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9499f6e..9fd195a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2685,6 +2685,13 @@ void CDECL wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_HULL, idx, buffer); } +struct wined3d_buffer * CDECL wined3d_device_get_hs_cb(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_HULL, idx); +} + void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e1fc2ac..a3c8f21 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -66,6 +66,7 @@ @ cdecl wined3d_device_get_gs_cb(ptr long) @ cdecl wined3d_device_get_gs_resource_view(ptr long) @ cdecl wined3d_device_get_gs_sampler(ptr long) +@ cdecl wined3d_device_get_hs_cb(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c8b790e..9e34661 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2222,6 +2222,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_de struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); +struct wined3d_buffer * __cdecl wined3d_device_get_hs_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset);

1 0

Józef Kucia : dxgi: Return iface instead of object pointer.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: d3a67bc334f0e0ccae4e0b217ff43b45f9ed8bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a67bc334f0e0ccae4e0b217… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:54 2017 +0200 dxgi: Return iface instead of object pointer. 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/dxgi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 30f8abf..60ff3c1 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -195,7 +195,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I } TRACE("Created device %p.\n", dxgi_device); - *device = dxgi_device; + *device = &dxgi_device->IWineDXGIDevice_iface; return S_OK; }

1 0

Józef Kucia : dxgi: Fix HMODULE leak in register_d3d10core_layers().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: cb7c0b72bb5ad677dffe8faf4e2ac4a5ac13b7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7c0b72bb5ad677dffe8faf4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 28 09:42:53 2017 +0200 dxgi: Fix HMODULE leak in register_d3d10core_layers(). 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/dxgi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 8a39d93..30f8abf 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -111,7 +111,8 @@ static HRESULT register_d3d10core_layers(HMODULE d3d10core) hr = d3d11core_register_layers(); if (FAILED(hr)) { - ERR("Failed to register d3d11 layers, returning %#x\n", hr); + ERR("Failed to register d3d11 layers, returning %#x.\n", hr); + FreeLibrary(mod); wined3d_mutex_unlock(); return hr; }

1 0

Hans Leidekker : webservices: Implement WsWriteCharsUtf8.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: ba014d9998c9e235f52b59abb67aff17d4647cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba014d9998c9e235f52b59abb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:51 2017 +0200 webservices: Implement WsWriteCharsUtf8. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 75 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 39 ++++++++++++++++++++ include/webservices.h | 1 + 4 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d0e5dee..1d1ed04 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3255,6 +3255,80 @@ static void test_WsWriteChars(void) WsFreeWriter( writer ); } +static void test_WsWriteCharsUtf8(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; + static const BYTE test[] = {'t','e','s','t'}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsWriteCharsUtf8( NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, NULL, 1, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* element */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>testtest</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* attribute */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteCharsUtf8( writer, test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t a=\"testtest\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3291,4 +3365,5 @@ START_TEST(writer) test_WsWriteQualifiedName(); test_WsWriteBytes(); test_WsWriteChars(); + test_WsWriteCharsUtf8(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index dbed698..728457c 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -169,7 +169,7 @@ @ stdcall WsWriteBody(ptr ptr long ptr long ptr) @ stdcall WsWriteBytes(ptr ptr long ptr) @ stdcall WsWriteChars(ptr ptr long ptr) -@ stub WsWriteCharsUtf8 +@ stdcall WsWriteCharsUtf8(ptr ptr long ptr) @ stdcall WsWriteElement(ptr ptr long ptr long ptr) @ stdcall WsWriteEndAttribute(ptr ptr) @ stdcall WsWriteEndCData(ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f094885..81e21e5 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1794,6 +1794,45 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co return hr; } +/************************************************************************** + * WsWriteCharsUtf8 [webservices.@] + */ +HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_UTF8_TEXT utf8; + HRESULT hr; + + TRACE( "%p %s %u %p\n", handle, debugstr_an((const char *)bytes, count), count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = (BYTE *)bytes; + utf8.value.length = count; + + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf8.text ); + else hr = write_text_node( writer, &utf8.text ); + + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_type_text( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_XML_TEXT *text ) { switch (mapping) diff --git a/include/webservices.h b/include/webservices.h index 64c8e35..c5aa3ec 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1667,6 +1667,7 @@ HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_ ULONG, WS_ERROR*); HRESULT WINAPI WsWriteBytes(WS_XML_WRITER*, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteChars(WS_XML_WRITER*, const WCHAR*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteCharsUtf8(WS_XML_WRITER*, const BYTE*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsWriteChars.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 1e187771da7dbadc8a89787b569da8ca735a28d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e187771da7dbadc8a89787b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:50 2017 +0200 webservices: Implement WsWriteChars. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 75 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 39 ++++++++++++++++++++ include/webservices.h | 1 + 4 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d53cb13..d0e5dee 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3181,6 +3181,80 @@ static void test_WsWriteBytes(void) WsFreeWriter( writer ); } +static void test_WsWriteChars(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; + static const WCHAR testW[] = {'t','e','s','t'}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsWriteChars( NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteChars( writer, NULL, 1, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* element */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>testtest</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* attribute */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t a=\"testtest\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3216,4 +3290,5 @@ START_TEST(writer) test_repeating_element(); test_WsWriteQualifiedName(); test_WsWriteBytes(); + test_WsWriteChars(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 304e917..dbed698 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -168,7 +168,7 @@ @ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) @ stdcall WsWriteBody(ptr ptr long ptr long ptr) @ stdcall WsWriteBytes(ptr ptr long ptr) -@ stub WsWriteChars +@ stdcall WsWriteChars(ptr ptr long ptr) @ stub WsWriteCharsUtf8 @ stdcall WsWriteElement(ptr ptr long ptr long ptr) @ stdcall WsWriteEndAttribute(ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 059acb0..f094885 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1755,6 +1755,45 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou return hr; } +/************************************************************************** + * WsWriteChars [webservices.@] + */ +HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_UTF16_TEXT utf16; + HRESULT hr; + + TRACE( "%p %s %u %p\n", handle, debugstr_wn(chars, count), count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16.bytes = (BYTE *)chars; + utf16.byteCount = count * sizeof(WCHAR); + + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf16.text ); + else hr = write_text_node( writer, &utf16.text ); + + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_type_text( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_XML_TEXT *text ) { switch (mapping) diff --git a/include/webservices.h b/include/webservices.h index 71b12ea..64c8e35 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1666,6 +1666,7 @@ HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteBytes(WS_XML_WRITER*, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteChars(WS_XML_WRITER*, const WCHAR*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsWriteBytes.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 86738d095df8d4a28e46cb115787e2eba7bf48f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86738d095df8d4a28e46cb115… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:49 2017 +0200 webservices: Implement WsWriteBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 68 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 40 +++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3d01245..d53cb13 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3114,6 +3114,73 @@ static void test_WsWriteQualifiedName(void) WsFreeWriter( writer ); } +static void test_WsWriteBytes(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsWriteBytes( NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, NULL, 1, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* element */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>dGVzdAA=</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* attribute */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t a=\"dGVzdAA=\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3148,4 +3215,5 @@ START_TEST(writer) test_datetime(); test_repeating_element(); test_WsWriteQualifiedName(); + test_WsWriteBytes(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1ef8aae..304e917 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -167,7 +167,7 @@ @ stdcall WsWriteArray(ptr ptr ptr long ptr long long long ptr) @ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) @ stdcall WsWriteBody(ptr ptr long ptr long ptr) -@ stub WsWriteBytes +@ stdcall WsWriteBytes(ptr ptr long ptr) @ stub WsWriteChars @ stub WsWriteCharsUtf8 @ stdcall WsWriteElement(ptr ptr long ptr long ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4fd1126..059acb0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1697,6 +1697,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E HRESULT hr; TRACE( "%p %p %p\n", handle, text, error ); + if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !text) return E_INVALIDARG; @@ -1715,6 +1716,45 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E return hr; } +/************************************************************************** + * WsWriteBytes [webservices.@] + */ +HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_BASE64_TEXT base64; + HRESULT hr; + + TRACE( "%p %p %u %p\n", handle, bytes, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + base64.text.textType = WS_XML_TEXT_TYPE_BASE64; + base64.bytes = (BYTE *)bytes; + base64.length = count; + + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &base64.text ); + else hr = write_text_node( writer, &base64.text ); + + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_type_text( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_XML_TEXT *text ) { switch (mapping)

1 0

Hans Leidekker : webservices: Implement WsReadQualifiedName.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: e61291479f9f5a3c85c8ce130c966d9e09b61d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61291479f9f5a3c85c8ce130… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:48 2017 +0200 webservices: Implement WsReadQualifiedName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 158 +++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 112 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 + 4 files changed, 262 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e61291479f9f5a3c85c8c…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017