September 2017 - Wine-Commits

Matteo Bruni : wined3d: Accept creation flags for 3D textures.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: e4365e5ba32773282ecd0c9a65f0f53720cc29f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4365e5ba32773282ecd0c9a6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 20 19:53:42 2017 +0200 wined3d: Accept creation flags for 3D textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 230f94c..ef8545d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2547,7 +2547,7 @@ static const struct wined3d_texture_ops texture3d_ops = }; static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, struct wined3d_device *device, void *parent, + UINT layer_count, UINT level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { struct wined3d_device_parent *device_parent = device->device_parent; @@ -2627,7 +2627,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, level_count, desc, - 0, device, parent, parent_ops, &texture_resource_ops))) + flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -2967,7 +2967,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct break; case WINED3D_RTYPE_TEXTURE_3D: - hr = volumetexture_init(object, desc, layer_count, level_count, device, parent, parent_ops); + hr = volumetexture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); break; default:

1 0

Matteo Bruni : d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: cc7c6928da9ee7a0335abf76801a9cb5fcbabc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7c6928da9ee7a0335abf768… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:06 2017 +0200 d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb737e2..1d8b8a9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6921,6 +6921,18 @@ static void test_cube_textures(void) static void test_mipmap_gen(void) { + static const D3DFORMAT formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_A1R5G5B5, + D3DFMT_A4R4G4B4, + D3DFMT_A8, + D3DFMT_L8, + D3DFMT_A8L8, + D3DFMT_V8U8, + D3DFMT_DXT5, + }; D3DTEXTUREFILTERTYPE filter_type; IDirect3DTexture9 *texture; IDirect3DSurface9 *surface; @@ -6928,6 +6940,7 @@ static void test_mipmap_gen(void) D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; + BOOL renderable; ULONG refcount; unsigned int i; DWORD levels; @@ -6937,6 +6950,25 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, formats[i]); + if (FAILED(hr)) + { + skip("Skipping unsupported format %#x.\n", formats[i]); + continue; + } + renderable = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i])); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + todo_wine_if (!renderable && hr == D3D_OK) + ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN, + "Got unexpected hr %#x for %srenderable format %#x.\n", + hr, renderable ? "" : "non", formats[i]); + } + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) {

1 0

Matteo Bruni : d3d9/tests: Properly check for mipmap autogeneration support.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 9480e817198d7ca5f636e98cbb6f6632a852fc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9480e817198d7ca5f636e98cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:05 2017 +0200 d3d9/tests: Properly check for mipmap autogeneration support. CheckDeviceFormat() returns D3DOK_NOAUTOGEN if the texture format is otherwise supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fb30636..cb737e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6801,7 +6801,7 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device) hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_CUBETEXTURE, D3DFMT_X8R8G8B8); IDirect3D9_Release(d3d); - if (FAILED(hr)) + if (hr != D3D_OK) { skip("No cube mipmap generation support, skipping tests.\n"); return; @@ -6937,8 +6937,8 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8))) + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) { skip("No mipmap generation support, skipping tests.\n"); IDirect3D9_Release(d3d);

1 0

Alexandre Julliard : kernel32/tests: Add some more tests for write watches.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 2b0725f95a2c77074743fdeb74f45f28c01128db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0725f95a2c77074743fdeb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 19:50:09 2017 +0200 kernel32/tests: Add some more tests for write watches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 206 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 169 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0725f95a2c77074743f…

1 0

Hans Leidekker : webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the reader.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: ca13227ebc7deb00c39f74f4b133fae4d5db3540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca13227ebc7deb00c39f74f4b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:17 2017 +0200 webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 128 +++++++++++++++++----------------- dlls/webservices/tests/reader.c | 148 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca13227ebc7deb00c39f7…

1 0

Hans Leidekker : webservices: Read the string table in all sized envelopes.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 049d8cfc7d2cf5fc047bd8c1aef1519139e759d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=049d8cfc7d2cf5fc047bd8c1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:13 2017 +0200 webservices: Read the string table in all sized envelopes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 16a8b84..a8ad012 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1547,12 +1547,10 @@ static HRESULT send_preamble_ack( struct channel *channel ) return S_OK; } -static HRESULT receive_message_session_setup( struct channel *channel ) +static HRESULT receive_message_session( struct channel *channel ) { HRESULT hr; - if ((hr = receive_preamble( channel )) != S_OK) return hr; - if ((hr = send_preamble_ack( channel )) != S_OK) return hr; if ((hr = receive_sized_envelope( channel )) != S_OK) return hr; if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1) { @@ -1566,13 +1564,6 @@ static HRESULT receive_message_session_setup( struct channel *channel ) return init_reader( channel ); } -static HRESULT receive_message_session( struct channel *channel ) -{ - HRESULT hr; - if ((hr = receive_sized_envelope( channel )) != S_OK) return hr; - return init_reader( channel ); -} - static HRESULT receive_message_sock( struct channel *channel, SOCKET socket ) { HRESULT hr; @@ -1596,7 +1587,9 @@ static HRESULT receive_message( struct channel *channel ) switch (channel->session_state) { case SESSION_STATE_UNINITIALIZED: - return receive_message_session_setup( channel ); + if ((hr = receive_preamble( channel )) != S_OK) return hr; + if ((hr = send_preamble_ack( channel )) != S_OK) return hr; + /* fall through */ case SESSION_STATE_SETUP_COMPLETE: return receive_message_session( channel );

1 0

Nikolay Sivov : dwrite: Added custom IDWriteFontFallback stub.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: c3252c37743eb813d2cc928fd3f57d00ebdfa28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3252c37743eb813d2cc928fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 21 14:41:25 2017 +0300 dwrite: Added custom IDWriteFontFallback stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 64 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/layout.c | 57 ++++++++++++++++++++++++++--------------- 2 files changed, 98 insertions(+), 23 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 23c2c0e..db488a0 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -209,6 +209,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { struct dwrite_fontfallback { IDWriteFontFallback IDWriteFontFallback_iface; + LONG ref; IDWriteFactory5 *factory; IDWriteFontCollection1 *systemcollection; const struct fallback_mapping *mappings; @@ -2178,6 +2179,50 @@ void release_system_fontfallback(IDWriteFontFallback *iface) heap_free(fallback); } +static ULONG WINAPI customfontfallback_AddRef(IDWriteFontFallback *iface) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + ULONG ref = InterlockedIncrement(&fallback->ref); + TRACE("(%p)->(%d)\n", fallback, ref); + return ref; +} + +static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback *iface) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + ULONG ref = InterlockedDecrement(&fallback->ref); + + TRACE("(%p)->(%d)\n", fallback, ref); + + if (!ref) { + IDWriteFactory5_Release(fallback->factory); + heap_free(fallback); + } + + return ref; +} + +static HRESULT WINAPI customfontfallback_MapCharacters(IDWriteFontFallback *iface, IDWriteTextAnalysisSource *source, + UINT32 position, UINT32 length, IDWriteFontCollection *basecollection, const WCHAR *basefamily, + DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, UINT32 *mapped_length, + IDWriteFont **ret_font, FLOAT *scale) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + + FIXME("(%p)->(%p %u %u %p, %s, %u, %u, %u, %p, %p, %p)\n", fallback, source, position, length, + basecollection, debugstr_w(basefamily), weight, style, stretch, mapped_length, ret_font, scale); + + return E_NOTIMPL; +} + +static const IDWriteFontFallbackVtbl customfontfallbackvtbl = +{ + fontfallback_QueryInterface, + customfontfallback_AddRef, + customfontfallback_Release, + customfontfallback_MapCharacters, +}; + static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuilder *iface, REFIID riid, void **obj) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); @@ -2239,13 +2284,26 @@ static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder } static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallbackBuilder *iface, - IDWriteFontFallback **fallback) + IDWriteFontFallback **ret) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); + struct dwrite_fontfallback *fallback; - FIXME("(%p)->(%p): stub\n", fallbackbuilder, fallback); + FIXME("(%p)->(%p): stub\n", fallbackbuilder, ret); - return E_NOTIMPL; + *ret = NULL; + + fallback = heap_alloc(sizeof(*fallback)); + if (!fallback) + return E_OUTOFMEMORY; + + fallback->IDWriteFontFallback_iface.lpVtbl = &customfontfallbackvtbl; + fallback->ref = 1; + fallback->factory = fallbackbuilder->factory; + IDWriteFactory5_AddRef(fallback->factory); + + *ret = &fallback->IDWriteFontFallback_iface; + return S_OK; } static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl = diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d606b8e..ba3e852 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4655,8 +4655,8 @@ static void test_FontFallbackBuilder(void) { static const WCHAR localeW[] = {'l','o','c','a','l','e',0}; static const WCHAR strW[] = {'A',0}; + IDWriteFontFallback *fallback, *fallback2; IDWriteFontFallbackBuilder *builder; - IDWriteFontFallback *fallback; DWRITE_UNICODE_RANGE range; IDWriteFactory2 *factory2; IDWriteFactory *factory; @@ -4684,10 +4684,27 @@ static void test_FontFallbackBuilder(void) } fallback = NULL; + EXPECT_REF(factory2, 2); + EXPECT_REF(builder, 1); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory2, 3); + EXPECT_REF(fallback, 1); + EXPECT_REF(builder, 1); + + IDWriteFontFallback_AddRef(fallback); + EXPECT_REF(builder, 1); + EXPECT_REF(fallback, 2); + EXPECT_REF(factory2, 3); + IDWriteFontFallback_Release(fallback); + /* New instance is created every time, even if mappings have not changed. */ + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback2); + ok(hr == S_OK, "Failed to create fallback object, hr %#x.\n", hr); + ok(fallback != fallback2, "Unexpected fallback instance.\n"); + IDWriteFontFallback_Release(fallback2); + +todo_wine { hr = IDWriteFontFallbackBuilder_AddMapping(builder, NULL, 0, NULL, 0, NULL, NULL, NULL, 0.0f); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -4724,17 +4741,14 @@ todo_wine { hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 4.0f); ok(hr == S_OK, "got 0x%08x\n", hr); } - if (fallback) - IDWriteFontFallback_Release(fallback); + IDWriteFontFallback_Release(fallback); if (0) /* crashes on native */ hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { /* fallback font missing from system collection */ g_source = strW; mappedlength = 0; @@ -4742,13 +4756,14 @@ if (hr == S_OK) { font = (void*)0xdeadbeef; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); ok(font == NULL, "got %p\n", font); - - IDWriteFontFallback_Release(fallback); } + IDWriteFontFallback_Release(fallback); + /* remap with custom collection */ range.first = range.last = 'A'; hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 5.0f); @@ -4756,24 +4771,25 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} + range.first = 'B'; range.last = 'A'; hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 6.0f); @@ -4781,24 +4797,25 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} + /* explicit locale */ range.first = 'A'; range.last = 'B'; @@ -4807,24 +4824,24 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} IDWriteFontFallbackBuilder_Release(builder); ref = IDWriteFactory2_Release(factory2);

1 0

Hans Leidekker : webservices/tests: Add tests for asynchronous WsReceiveMessage.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 71121270ae3a5cf47f78ded0f0d23c630151da10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71121270ae3a5cf47f78ded0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:15 2017 +0200 webservices/tests: Add tests for asynchronous WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 236 ++++++++++++++++++++++++++++++++------- 1 file changed, 193 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71121270ae3a5cf47f78d…

1 0

Hans Leidekker : webservices: Add asynchronous support for WsReceiveMessage.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 97ccfe20784f88cd38284e230861c71a7c09f116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ccfe20784f88cd38284e230… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:14 2017 +0200 webservices: Add asynchronous support for WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 259 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 230 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97ccfe20784f88cd38284…

1 0

Hans Leidekker : webservices: Add traces.
by Alexandre Julliard Sept. 21, 2017

Sept. 21, 2017

Module: wine Branch: master Commit: 98a3892412e157010db8fd3e2f13c1a6dd7568cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a3892412e157010db8fd3e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:11 2017 +0200 webservices: Add traces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 2 ++ dlls/webservices/error.c | 1 + dlls/webservices/heap.c | 2 ++ dlls/webservices/listener.c | 1 + dlls/webservices/msg.c | 11 +++++++++-- dlls/webservices/proxy.c | 16 +++++++++++++--- dlls/webservices/reader.c | 1 + dlls/webservices/writer.c | 1 + 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 20d4f4c..775035b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -304,6 +304,7 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + TRACE( "created %p\n", channel ); *handle = (WS_CHANNEL *)channel; return S_OK; } @@ -332,6 +333,7 @@ HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const W if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + TRACE( "created %p\n", channel ); *handle = (WS_CHANNEL *)channel; return S_OK; } diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 3173735..747af2a 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -102,6 +102,7 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, } } + TRACE( "created %p\n", error ); *handle = (WS_ERROR *)error; return S_OK; } diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 1104cf0..080cc0d 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -208,6 +208,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR prop_set( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_MAX_SIZE, &max_size, sizeof(max_size) ); prop_set( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_TRIM_SIZE, &trim_size, sizeof(trim_size) ); + TRACE( "created %p\n", heap ); *handle = (WS_HEAP *)heap; return S_OK; } @@ -363,6 +364,7 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p return WS_E_QUOTA_EXCEEDED; } + TRACE( "created %p\n", xmlbuf ); *handle = (WS_XML_BUFFER *)xmlbuf; return S_OK; } diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a658ee7..41afb27 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -227,6 +227,7 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin if ((hr = create_listener( type, binding, properties, count, &listener )) != S_OK) return hr; + TRACE( "created %p\n", listener ); *handle = (WS_LISTENER *)listener; return S_OK; } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index fdbd672..f4d167f 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -214,6 +214,8 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle, WS_ERROR *error ) { + HRESULT hr; + TRACE( "%u %u %p %u %p %p\n", env_version, addr_version, properties, count, handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -222,7 +224,10 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V { return E_INVALIDARG; } - return create_msg( env_version, addr_version, properties, count, handle ); + + if ((hr = create_msg( env_version, addr_version, properties, count, handle )) != S_OK) return hr; + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** @@ -248,7 +253,9 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M sizeof(version_addr), NULL )) != S_OK || !version_addr) version_addr = WS_ADDRESSING_VERSION_1_0; - return create_msg( version_env, version_addr, properties, count, handle ); + if ((hr = create_msg( version_env, version_addr, properties, count, handle )) != S_OK) return hr; + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 3b3d2da..a4041fe 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -135,9 +135,13 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE NULL )) != S_OK) return hr; if ((hr = create_proxy( channel, proxy_props, proxy_props_count, handle )) != S_OK) + { WsFreeChannel( channel ); + return hr; + } - return hr; + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** @@ -194,8 +198,14 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, if ((hr = WsCreateChannel( channel_type, binding, channel_props, channel_props_count, NULL, &channel, NULL )) != S_OK) return hr; - if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) WsFreeChannel( channel ); - return hr; + if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) + { + WsFreeChannel( channel ); + return hr; + } + + TRACE( "created %p\n", *handle ); + return S_OK; } /************************************************************************** diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0e5cdd3..953af4c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -558,6 +558,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c return hr; } + TRACE( "created %p\n", reader ); *handle = (WS_XML_READER *)reader; return S_OK; } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index c3de82d..1baac07 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -236,6 +236,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c return hr; } + TRACE( "created %p\n", writer ); *handle = (WS_XML_WRITER *)writer; return S_OK; }

1 0