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

Nikolay Sivov : d3drm: Use existing helper to manage mesh groups.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 2d9089d8aae5ab6ffa1bff5813f4047988130b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9089d8aae5ab6ffa1bff581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 13:40:49 2017 +0300 d3drm: Use existing helper to manage mesh groups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 4 ++-- dlls/d3drm/meshbuilder.c | 24 ++---------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 861c3ab..65e0016 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -168,8 +168,8 @@ struct d3drm_mesh IDirect3DRMMesh IDirect3DRMMesh_iface; LONG ref; IDirect3DRM *d3drm; - DWORD groups_capacity; - DWORD nb_groups; + SIZE_T nb_groups; + SIZE_T groups_size; struct mesh_group *groups; }; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bb37678..c95cb46 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2532,28 +2532,8 @@ static HRESULT WINAPI d3drm_mesh_AddGroup(IDirect3DRMMesh *iface, unsigned verte if (!face_data || !id) return E_POINTER; - if ((mesh->nb_groups + 1) > mesh->groups_capacity) - { - struct mesh_group *groups; - ULONG new_capacity; - - if (!mesh->groups_capacity) - { - new_capacity = 16; - groups = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(*groups)); - } - else - { - new_capacity = mesh->groups_capacity * 2; - groups = HeapReAlloc(GetProcessHeap(), 0, mesh->groups, new_capacity * sizeof(*groups)); - } - - if (!groups) - return E_OUTOFMEMORY; - - mesh->groups_capacity = new_capacity; - mesh->groups = groups; - } + if (!d3drm_array_reserve((void **)&mesh->groups, &mesh->groups_size, mesh->nb_groups + 1, sizeof(*mesh->groups))) + return E_OUTOFMEMORY; group = mesh->groups + mesh->nb_groups;

1 0

Francois Gouget : gdiplus: Remove a duplicate word in a comment.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 01c9fb96add077ba2b9f8ea16ec99643818f50db URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c9fb96add077ba2b9f8ea16… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:23:04 2017 +0200 gdiplus: Remove a duplicate word in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5d82a77..458019f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -188,8 +188,8 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R * NOTES * This functions takes the newfigure value of the given path into account, * i.e. the arc is connected to the end of the given path if it was set to - * FALSE, otherwise the arc's first point gets the the PathPointTypeStart - * value. In both cases, the value of newfigure of the given path is FALSE + * FALSE, otherwise the arc's first point gets the PathPointTypeStart value. + * In both cases, the value of newfigure of the given path is FALSE * afterwards. */ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: d997c3315cb5f2ad9913fc3fa69e4c2c53370747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d997c3315cb5f2ad9913fc3fa… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jul 7 23:09:12 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/lt.po b/po/lt.po index abe5e82..bf92adf 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-28 09:40+0300\n" +"PO-Revision-Date: 2017-07-07 23:08+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6921,6 +6921,8 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Diegimo programa susidūrė su netikėta problema diegiant šį paketą. Tai gali " +"būti problema su paketu. Klaidos kodas [1]. {{Argumentai: [2], [3], [4]}}" #: msi.rc:88 msgid "Allocating registry space"

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 2547cc5b96e604773f3e137860c978351d8f64ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2547cc5b96e604773f3e13786… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 10 22:21:30 2017 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 462 ++++++++++++++++++++++----------------------------------------- 1 file changed, 163 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2547cc5b96e604773f3e1…

1 0

Hans Leidekker : webservices: Store byte records as WS_XML_BASE64_TEXT.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 95308f22d4773755afe5b1b03fc4384177e37d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95308f22d4773755afe5b1b03… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:28 2017 +0200 webservices: Store byte records as WS_XML_BASE64_TEXT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 141 ++++++++++++++++++++-------------------- dlls/webservices/tests/reader.c | 107 ++++++++++++++++++++++++------ 2 files changed, 158 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95308f22d4773755afe5b…

1 0

Hans Leidekker : webservices: Add support for union types in the writer.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: c51ab4cd14930ccefe4eb16bfdc36dc3bf319fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51ab4cd14930ccefe4eb16bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:29 2017 +0200 webservices: Add support for union types in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 +++-- dlls/webservices/tests/writer.c | 117 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 2 +- dlls/webservices/writer.c | 56 ++++++++++++++-- include/webservices.h | 15 +++++ 5 files changed, 194 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51ab4cd14930ccefe4eb…

1 0

Hans Leidekker : webservices: Add support for union types in the reader.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: c41e66fe01410ae9e9dff78be63926e8404c32ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41e66fe01410ae9e9dff78be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:30 2017 +0200 webservices: Add support for union types 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 | 76 +++++++++++++++++++++--- dlls/webservices/tests/reader.c | 128 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 193 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c41e66fe01410ae9e9dff…

1 0

Hans Leidekker : webservices: Add support for appending byte records in the reader.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: ede77edb448810908b3a31887b936d7bd2318c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede77edb448810908b3a31887… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:31 2017 +0200 webservices: Add support for appending byte records 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 | 428 +++++++++++++++++++++++++++------------- dlls/webservices/tests/reader.c | 75 ++++--- 2 files changed, 322 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ede77edb448810908b3a3…

1 0

Hans Leidekker : webservices: Add support for setting the channel encoding.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: b9a464f76dc702b3fac3156c373e25434be60f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a464f76dc702b3fac3156c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:32 2017 +0200 webservices: Add support for setting the channel encoding. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 49 ++++++++++++++++++++++++++++++---------- dlls/webservices/tests/channel.c | 45 ++++++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 1fa96a9..6326d60 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -37,7 +37,7 @@ static const struct prop_desc channel_props[] = { 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_ENCODING), TRUE }, /* 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 */ @@ -96,6 +96,7 @@ struct channel WS_XML_WRITER *writer; WS_XML_READER *reader; WS_MESSAGE *msg; + WS_ENCODING encoding; union { struct @@ -199,33 +200,52 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &msg_size, sizeof(msg_size) ); - for (i = 0; i < count; i++) - { - hr = prop_set( channel->prop, channel->prop_count, properties[i].id, properties[i].value, - properties[i].valueSize ); - if (hr != S_OK) - { - free_channel( channel ); - return hr; - } - } - channel->type = type; channel->binding = binding; switch (channel->binding) { + case WS_HTTP_CHANNEL_BINDING: + channel->encoding = WS_ENCODING_XML_UTF8; + break; + case WS_TCP_CHANNEL_BINDING: channel->u.tcp.socket = -1; + channel->encoding = WS_ENCODING_XML_BINARY_SESSION_1; break; case WS_UDP_CHANNEL_BINDING: channel->u.udp.socket = -1; + channel->encoding = WS_ENCODING_XML_UTF8; break; default: break; } + for (i = 0; i < count; i++) + { + switch (properties[i].id) + { + case WS_CHANNEL_PROPERTY_ENCODING: + if (!properties[i].value || properties[i].valueSize != sizeof(channel->encoding)) + { + free_channel( channel ); + return E_INVALIDARG; + } + channel->encoding = *(WS_ENCODING *)properties[i].value; + break; + + default: + if ((hr = prop_set( channel->prop, channel->prop_count, properties[i].id, properties[i].value, + properties[i].valueSize )) != S_OK) + { + free_channel( channel ); + return hr; + } + break; + } + } + *ret = channel; return S_OK; } @@ -380,6 +400,11 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID else *(WS_CHANNEL_TYPE *)buf = channel->type; break; + case WS_CHANNEL_PROPERTY_ENCODING: + if (!buf || size != sizeof(channel->encoding)) hr = E_INVALIDARG; + else *(WS_ENCODING *)buf = channel->encoding; + break; + default: hr = prop_get( channel->prop, channel->prop_count, id, buf, size ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 16f3ccf..ceefad9 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -26,7 +26,9 @@ static void test_WsCreateChannel(void) HRESULT hr; WS_CHANNEL *channel; WS_CHANNEL_STATE state; - ULONG size, value; + WS_CHANNEL_PROPERTY prop; + WS_ENCODING encoding; + ULONG size; hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -36,24 +38,49 @@ static void test_WsCreateChannel(void) ok( hr == S_OK, "got %08x\n", hr ); ok( channel != NULL, "channel not set\n" ); - value = 0xdeadbeef; - size = sizeof(value); - hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &value, size, NULL ); + size = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &size, sizeof(size), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( value == 65536, "got %u\n", value ); + ok( size == 65536, "got %u\n", size ); + + encoding = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( encoding == WS_ENCODING_XML_UTF8, "got %u\n", encoding ); /* read-only property */ state = 0xdeadbeef; - size = sizeof(state); - hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, size, NULL ); + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); state = WS_CHANNEL_STATE_CREATED; - size = sizeof(state); - hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, size, NULL ); + hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + encoding = WS_ENCODING_XML_UTF8; + hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeChannel( channel ); + encoding = WS_ENCODING_XML_UTF16LE; + prop.id = WS_CHANNEL_PROPERTY_ENCODING; + prop.value = &encoding; + prop.valueSize = sizeof(encoding); + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, &prop, 1, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + encoding = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( encoding == WS_ENCODING_XML_UTF16LE, "got %u\n", encoding ); + WsFreeChannel( channel ); + + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + encoding = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_ENCODING, &encoding, sizeof(encoding), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( encoding == WS_ENCODING_XML_BINARY_SESSION_1, "got %u\n", encoding ); WsFreeChannel( channel ); }

1 0

Hans Leidekker : webservices: Store all text in native format in binary mode.
by Alexandre Julliard 10 Jul '17

10 Jul '17

Module: wine Branch: master Commit: 387061881c31c8a8f382f19163cd22523d4a754b URL: http://source.winehq.org/git/wine.git/?a=commit;h=387061881c31c8a8f382f1916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:33 2017 +0200 webservices: Store all text in native format in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 517 ++++++++++++++++++++++++--------- dlls/webservices/webservices_private.h | 24 +- dlls/webservices/writer.c | 245 ++++++++++++++-- 3 files changed, 614 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387061881c31c8a8f382f…

1 0