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

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

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

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 : 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 : 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_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_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

Jacek Caban : secur32: Fixed compilation with prediluvian gnutls.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 855d73e927a059573582850565c3b6357cd89657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855d73e927a05957358285056… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 14:50:51 2017 +0200 secur32: Fixed compilation with prediluvian gnutls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index deefa8d..bc3bbaf 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -83,6 +83,8 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 +#define GNUTLS_MAC_AEAD 200 + #define GNUTLS_KX_ANON_ECDH 11 #define GNUTLS_KX_ECDHE_RSA 12 #define GNUTLS_KX_ECDHE_ECDSA 13

1 0

Nikolay Sivov : gdiplus/tests: Fix copy/paste error in format tests.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 8b649fe2f4ba9b5b5b1f5c016f70b67d3c8a0413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b649fe2f4ba9b5b5b1f5c016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 28 01:20:30 2017 +0300 gdiplus/tests: Fix copy/paste error in format tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/stringformat.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index f0fcff9..f7f7a8f 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -30,7 +30,7 @@ static void test_constructor(void) GpStringFormat *format; GpStatus stat; INT n, count; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -39,7 +39,7 @@ static void test_constructor(void) expect(Ok, stat); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -47,7 +47,7 @@ static void test_constructor(void) expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); @@ -144,7 +144,7 @@ static void test_getgenerictypographic(void) GpStatus stat; INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -159,7 +159,7 @@ static void test_getgenerictypographic(void) GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -169,7 +169,7 @@ static void test_getgenerictypographic(void) flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingNone, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); @@ -291,7 +291,7 @@ static void test_getgenericdefault(void) INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -306,7 +306,7 @@ static void test_getgenericdefault(void) GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -315,7 +315,7 @@ static void test_getgenericdefault(void) expect(0, flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang);

1 0

Nikolay Sivov : gdiplus: Fix generic string formats behavior.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 69b41e7cf3876f00048be036c00050f7bcd21e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b41e7cf3876f00048be036c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 28 01:20:31 2017 +0300 gdiplus: Fix generic string formats behavior. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.c | 2 ++ dlls/gdiplus/gdiplus_private.h | 5 +++ dlls/gdiplus/graphics.c | 12 +------ dlls/gdiplus/stringformat.c | 69 ++++++++++++++++++++++++++------------- dlls/gdiplus/tests/stringformat.c | 52 +++++++++++++++++++++++++++-- 5 files changed, 104 insertions(+), 36 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 1281455..d114ff7 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -63,11 +63,13 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); + init_generic_string_formats(); break; case DLL_PROCESS_DETACH: if (reserved) break; free_installed_fonts(); + free_generic_string_formats(); break; } return TRUE; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9b0151b..443370a 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -441,6 +441,8 @@ struct GpFont{ Unit unit; }; +extern const struct GpStringFormat default_drawstring_format DECLSPEC_HIDDEN; + struct GpStringFormat{ INT attr; LANGID lang; @@ -458,6 +460,9 @@ struct GpStringFormat{ BOOL generic_typographic; }; +extern void init_generic_string_formats(void) DECLSPEC_HIDDEN; +extern void free_generic_string_formats(void) DECLSPEC_HIDDEN; + struct GpFontCollection{ GpFontFamily **FontFamilies; INT count; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bd37d92..beedb9e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4909,7 +4909,6 @@ GpStatus gdip_format_string(HDC hdc, INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; BOOL seen_prefix = FALSE; - GpStringFormat *dyn_format=NULL; if(length == -1) length = lstrlenW(string); @@ -4917,15 +4916,7 @@ GpStatus gdip_format_string(HDC hdc, if(!stringdup) return OutOfMemory; if (!format) - { - stat = GdipStringFormatGetGenericDefault(&dyn_format); - if (stat != Ok) - { - heap_free(stringdup); - return stat; - } - format = dyn_format; - } + format = &default_drawstring_format; nwidth = rect->Width; nheight = rect->Height; @@ -5075,7 +5066,6 @@ GpStatus gdip_format_string(HDC hdc, heap_free(stringdup); heap_free(hotkeyprefix_offsets); - GdipDeleteStringFormat(dyn_format); return stat; } diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index b89458b..660731d 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -32,6 +32,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +const GpStringFormat default_drawstring_format = +{ + 0, + LANG_NEUTRAL, + LANG_NEUTRAL, + StringAlignmentNear, + StringTrimmingCharacter, + HotkeyPrefixNone, + StringAlignmentNear, + StringDigitSubstituteUser, + 0, + 0.0, + NULL, + NULL, + 0, + FALSE +}; + +static GpStringFormat generic_default_format; +static GpStringFormat generic_typographic_format; + +void init_generic_string_formats(void) +{ + memcpy(&generic_default_format, &default_drawstring_format, sizeof(generic_default_format)); + + memcpy(&generic_typographic_format, &default_drawstring_format, sizeof(generic_typographic_format)); + generic_typographic_format.attr = StringFormatFlagsNoFitBlackBox | StringFormatFlagsLineLimit | + StringFormatFlagsNoClip; + generic_typographic_format.trimming = StringTrimmingNone; + generic_typographic_format.generic_typographic = TRUE; +} + +void free_generic_string_formats(void) +{ + heap_free(generic_default_format.character_ranges); + heap_free(generic_default_format.tabs); + + heap_free(generic_typographic_format.character_ranges); + heap_free(generic_typographic_format.tabs); +} + GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) { @@ -66,6 +107,9 @@ GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) if(!format) return InvalidParameter; + if (format == &generic_default_format || format == &generic_typographic_format) + return Ok; + heap_free(format->character_ranges); heap_free(format->tabs); heap_free(format); @@ -75,17 +119,10 @@ GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **format) { - GpStatus stat; - if (!format) return InvalidParameter; - stat = GdipCreateStringFormat(0, LANG_NEUTRAL, format); - if(stat != Ok) - return stat; - - (*format)->align = StringAlignmentNear; - (*format)->vertalign = StringAlignmentNear; + *format = &generic_default_format; return Ok; } @@ -370,24 +407,10 @@ GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat *format, GpSt GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **format) { - GpStatus stat; - if(!format) return InvalidParameter; - stat = GdipCreateStringFormat(StringFormatFlagsNoFitBlackBox | - StringFormatFlagsLineLimit | - StringFormatFlagsNoClip, LANG_NEUTRAL, format); - if(stat != Ok) - return stat; - - (*format)->digitlang = LANG_NEUTRAL; - (*format)->digitsub = StringDigitSubstituteUser; - (*format)->trimming = StringTrimmingNone; - (*format)->hkprefix = HotkeyPrefixNone; - (*format)->align = StringAlignmentNear; - (*format)->vertalign = StringAlignmentNear; - (*format)->generic_typographic = TRUE; + *format = &generic_typographic_format; TRACE("%p => %p\n", format, *format); diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index f7f7a8f..0774e1b 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -140,7 +140,7 @@ static void test_digitsubstitution(void) static void test_getgenerictypographic(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; INT n; @@ -157,6 +157,12 @@ static void test_getgenerictypographic(void) stat = GdipStringFormatGetGenericTypographic(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericTypographic(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); GdipGetStringFormatLineAlign(format, &line_align); @@ -175,6 +181,24 @@ static void test_getgenerictypographic(void) expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + /* Change format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericTypographic(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); } @@ -286,7 +310,7 @@ static void test_tabstops(void) static void test_getgenericdefault(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; @@ -304,6 +328,12 @@ static void test_getgenericdefault(void) stat = GdipStringFormatGetGenericDefault(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericDefault(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); GdipGetStringFormatLineAlign(format, &line_align); @@ -321,6 +351,24 @@ static void test_getgenericdefault(void) expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + /* Change default format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericDefault(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); }

1 0