March 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : xmllite/reader: Fix prefix returned after moving back to element.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 3fe5f25b17525f7bb43c37b1746260f3d80f62ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5f25b17525f7bb43c37b17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:57 2017 +0300 xmllite/reader: Fix prefix returned after moving back to element. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 84f38d5..7aaaebf 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2890,12 +2890,14 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) /* FIXME: support other node types with 'attributes' like DTD */ if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_Prefix, &This->empty_element.prefix); reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); } else { struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); if (element) { + reader_set_strvalue(This, StringValue_Prefix, &element->prefix); reader_set_strvalue(This, StringValue_LocalName, &element->localname); reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 84316e4..8a736bf 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2034,6 +2034,17 @@ static void test_prefix(void) wine_dbgstr_w(expected)); free_str(expected); + /* back to the element, check prefix */ + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr); + + expected = a2w(prefix_tests[i].prefix1); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + IStream_Release(stream); }

1 0

Nikolay Sivov : xmllite/reader: Return empty value for elements.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 70028b7d0a9bcd3d2e871e9364e4a588e6bc0882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70028b7d0a9bcd3d2e871e936… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 7 06:50:56 2017 +0300 xmllite/reader: Return empty value for elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9e0d11e..84f38d5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2244,6 +2244,7 @@ static HRESULT reader_parse_element(xmlreader *reader) reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); break; } default: @@ -2899,6 +2900,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } } + reader_set_strvalue(This, StringValue_Value, &strval_empty); return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7153474..84316e4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -909,7 +909,6 @@ todo_wine { hr = IXmlReader_GetValue(reader, &val, NULL); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); -todo_wine ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); hr = IXmlReader_GetLocalName(reader, &val, NULL); @@ -1473,9 +1472,17 @@ static void test_read_element(void) /* moving to attributes increases depth */ if (count) { + const WCHAR *value; + + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value == 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value != 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + depth = 123; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr); @@ -1484,6 +1491,9 @@ static void test_read_element(void) hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(*value == 0, "Unexpected value %s\n", wine_dbgstr_w(value)); + depth = 123; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetShader().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 948463ad37f8d3a14271628fd743b76a83bd4c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948463ad37f8d3a14271628fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:13 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetShader(). 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 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 958dcfe..5e5c7a4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2002,8 +2002,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews( static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext *iface, ID3D11ComputeShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_compute_shader *shader_impl; + struct wined3d_shader *wined3d_shader; + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances || class_instance_count) + FIXME("Dynamic linking not implemented yet.\n"); + + wined3d_mutex_lock(); + if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + ID3D11ComputeShader_AddRef(*shader = &shader_impl->ID3D11ComputeShader_iface); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11DeviceContext *iface,

1 0

Alexandre Julliard : patches: Add a patch status for missing authorship information.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: tools Branch: master Commit: 34dd20b4de6c0971813b930b718ebe33ee086f31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=34dd20b4de6c0971813b930b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 10:49:32 2017 +0100 patches: Add a patch status for missing authorship information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 15 +++++++++++---- patches/patches.css | 1 + patches/update | 5 +++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/patches/expire b/patches/expire index 6bbd5c8..fd5ba22 100755 --- a/patches/expire +++ b/patches/expire @@ -31,6 +31,7 @@ my %status_expiry = "applyfail" => 7, "buildfail" => 7, "deferred" => 7, + "authorship" => 7, "formatting" => 7, "other" => 7, "nopatch" => 3, @@ -54,6 +55,7 @@ my %status_descr = "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", + "authorship" => "Authorship", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -98,12 +100,17 @@ mode implies -Werror). You need to resend a fixed patch.", upcoming release. You need to either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.", + "authorship" => +"This means that there are some authorship issues with your patch. The +author's full name, email address, or Signed-off-by headers are +missing or incorrectly formatted. You need to resend a patch with +corrected author information.", "formatting" => "This means that there are some formatting issues with your -patch. Either the author's full name, email address, or Signed-off-by -headers are missing, indentation is messed up (usually from editing -with a non-standard tab size), or there are gratuitous formatting -changes to the code. You need to resend a fixed patch.", +patch. Either the indentation is messed up (usually from editing with +a non-standard tab size), some characters got mangled in transit, or +there are gratuitous formatting changes to the code. You need to +resend a fixed patch.", "other" => "This means that the patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.", diff --git a/patches/patches.css b/patches/patches.css index 020d48c..2799827 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -162,6 +162,7 @@ tr.odd { background-color: #f8e8e8; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } +.authorship, .authorship :link, .authorship :visited { color: red; } .formatting, .formatting :link, .formatting :visited { color: red; } .nopatch, .nopatch :link, .nopatch :visited { color: red; } .rejected, .rejected :link, .rejected :visited { color: red; } diff --git a/patches/update b/patches/update index ddf1396..ad2b82a 100755 --- a/patches/update +++ b/patches/update @@ -31,6 +31,7 @@ my %status_descr = "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", + "authorship" => "Authorship", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -66,8 +67,8 @@ my @legend = [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], - [ "formatting", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li>" . - "<li>Whitespace got mangled in transit.</li>" . + [ "authorship", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li></ul>" ], + [ "formatting", "<ul><li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . "<li>8-bit chars got mangled in transit (usually when sending patches to translation files).</li>" . "<li>You are making gratuitous formatting changes to the code.</li>" .

1 0

Józef Kucia : d3d11/tests: Accept additional value as expected result in test_tgsm().
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 784953a5bee0631899e76c1b512a51a868af3ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784953a5bee0631899e76c1b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:38 2017 +0100 d3d11/tests: Accept additional value as expected result in test_tgsm(). This result is not very likely but still possible. 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/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2d9d07a..e0184a8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15309,7 +15309,7 @@ static void test_tgsm(void) data = get_readback_color(&rb, i, 0); ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); data = get_readback_color(&rb2, i, 0); - ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); + ok(data == expected || !data, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); release_resource_readback(&rb2);

1 0

Henri Verbeet : usp10: Properly determine the glyph run direction when shaping Script_Arabic.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: f13dea5684f2fe3d93981d98a761995a44bce7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13dea5684f2fe3d93981d98a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:42 2017 +0100 usp10: Properly determine the glyph run direction when shaping Script_Arabic. In particular, if fLogicalOrder and fRTL are both set, the glyph order is swapped compared to the character order. In all other cases it's the same. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index aa98366..ce19465 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1055,15 +1055,15 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p return; } - if (!psa->fLogicalOrder && psa->fRTL) + if (psa->fLogicalOrder && psa->fRTL) { - dirR = 1; - dirL = -1; + dirR = -1; + dirL = 1; } else { - dirR = -1; - dirL = 1; + dirR = 1; + dirL = -1; } load_ot_tables(hdc, psc); @@ -2946,20 +2946,20 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI spaces = HeapAlloc(GetProcessHeap(),0,cGlyphs); memset(spaces,0,cGlyphs); - if (!psa->fLogicalOrder && psa->fRTL) - { - initGlyph = cGlyphs-1; - finaGlyph = 0; - dirR = 1; - dirL = -1; - } - else + if (psa->fLogicalOrder && psa->fRTL) { initGlyph = 0; finaGlyph = cGlyphs-1; dirR = -1; dirL = 1; } + else + { + initGlyph = cGlyphs-1; + finaGlyph = 0; + dirR = 1; + dirL = -1; + } for (i = 0; i < cGlyphs; i++) {

1 0

Henri Verbeet : usp10: Take the script direction into account when applying OpenType features.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: c94a5fd28c1a0009f4f6e968fc3bec624549e4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94a5fd28c1a0009f4f6e968f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:41 2017 +0100 usp10: Take the script direction into account when applying OpenType features. As opposed to just looking at the run direction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9e0addc..aa98366 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -751,6 +751,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch return; else { + int cluster_dir = pwLogClust[0] < pwLogClust[chars-1] ? 1 : -1; int i; int target_glyph = nextIndex - write_dir; int target_index = -1; @@ -775,7 +776,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch if (changeCount < 0) { /* merge glyphs */ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] == target_glyph) continue; @@ -794,8 +795,8 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } } - /* renumber trailing indexes*/ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + /* renumber trailing indexes */ + for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] != target_glyph) pwLogClust[i] += changeCount; @@ -803,8 +804,8 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } else { - for(i = target_index; i < chars && i >= 0; i+=write_dir) - pwLogClust[i] += changeCount; + for (i = target_index; i < chars && i >= 0; i += cluster_dir) + pwLogClust[i] += changeCount; } } } @@ -3382,7 +3383,7 @@ static void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS if (!psc->GSUB_Table) return; - if (!psa->fLogicalOrder && psa->fRTL) + if (scriptInformation[psa->eScript].a.fRTL && (!psa->fLogicalOrder || !psa->fRTL)) dirL = -1; else dirL = 1;

1 0

Henri Verbeet : usp10/tests: Add shaping tests for fLogicalOrder and fRTL.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 9db12225f47e8fc9e0aabf8f4ee50e46337d358d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db12225f47e8fc9e0aabf8f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:43 2017 +0100 usp10/tests: Add shaping tests for fLogicalOrder and fRTL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 153 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 148 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9db12225f47e8fc9e0aab…

1 0

Louis Lenders : kernel32: Add stub for GetCurrentPackageFullName.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 3f50319ec384730360d16dd79d703adafaa953fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f50319ec384730360d16dd79… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 4 10:56:06 2017 +0100 kernel32: Add stub for GetCurrentPackageFullName. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 1eb8327..2c5cf9e 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -4,7 +4,7 @@ @ stub GetApplicationUserModelId @ stub GetCurrentApplicationUserModelId @ stub GetCurrentPackageFamilyName -@ stub GetCurrentPackageFullName +@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 388f7c0..59e39a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -629,6 +629,7 @@ @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentPackageId(ptr ptr) +@ stdcall GetCurrentPackageFullName(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index b9d13e4..cf783af 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -207,3 +207,12 @@ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) FIXME("(%p %p): stub\n", len, buffer); return APPMODEL_ERROR_NO_PACKAGE; } + +/*********************************************************************** + * GetCurrentPackageFullName (KERNEL32.@) + */ +LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name) +{ + FIXME("(%p %p): stub\n", length, name); + return APPMODEL_ERROR_NO_PACKAGE; +}

1 0

Alistair Leslie-Hughes : dplayx: Skip over unknown DataTypes guids in EnumAddressTypes.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 2bb3636a14d1d52f17ece4ece0d0df4f5cb4c1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb3636a14d1d52f17ece4ece… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 3 05:15:32 2017 +0000 dplayx: Skip over unknown DataTypes guids in EnumAddressTypes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 3 +-- dlls/dplayx/tests/dplayx.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 2cf342f..7f9c7a8 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1726,8 +1726,7 @@ HRESULT DPL_CreateCompoundAddress } else { - ERR( "Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); - return DPERR_INVALIDFLAGS; + WARN( "Skipping Unknown GUID %s\n", debugstr_guid(&lpElements->guidDataType) ); } } diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 4c68873..27dc9ee 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -64,6 +64,7 @@ static HRESULT (WINAPI *pDirectPlayCreate)( GUID *GUID, LPDIRECTPLAY *lplpDP, IU DEFINE_GUID(appGuid, 0xbdcfe03e, 0xf0ec, 0x415b, 0x82, 0x11, 0x6f, 0x86, 0xd8, 0x19, 0x7f, 0xe1); DEFINE_GUID(appGuid2, 0x93417d3f, 0x7d26, 0x46ba, 0xb5, 0x76, 0xfe, 0x4b, 0x20, 0xbb, 0xad, 0x70); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +DEFINE_GUID(invalid_guid, 0x7b48b707, 0x0034, 0xc000, 0x02, 0x00, 0x00, 0x00, 0xec, 0xf6, 0x32, 0x00); typedef struct tagCallbackData @@ -1128,6 +1129,53 @@ static void test_GetCaps(void) IDirectPlayX_Release( pDP ); } +static void test_EnumAddressTypes(void) +{ + IDirectPlay4 *pDP; + HRESULT hr; + DPCOMPOUNDADDRESSELEMENT addressElements[2]; + LPVOID pAddress = NULL; + DWORD dwAddressSize = 0; + IDirectPlayLobby3 *pDPL; + WORD port = 6001; + + hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP ); + ok( SUCCEEDED(hr), "CCI of CLSID_DirectPlay / IID_IDirectPlay4A failed\n" ); + if (FAILED(hr)) + return; + + hr = CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, + &IID_IDirectPlayLobby3A, (LPVOID*) &pDPL ); + ok (SUCCEEDED (hr), "CCI of CLSID_DirectPlayLobby / IID_IDirectPlayLobby3A failed\n"); + if (FAILED (hr)) return; + + addressElements[0].guidDataType = DPAID_ServiceProvider; + addressElements[0].dwDataSize = sizeof(GUID); + addressElements[0].lpData = (void*) &DPSPGUID_TCPIP; + + addressElements[1].guidDataType = invalid_guid; + addressElements[1].dwDataSize = sizeof(WORD); + addressElements[1].lpData = &port; + + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, NULL, &dwAddressSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + + if( hr == DPERR_BUFFERTOOSMALL ) + { + pAddress = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwAddressSize ); + hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, + pAddress, &dwAddressSize ); + checkHR( DP_OK, hr ); + } + + IDirectPlayX_Close(pDP); + IDirectPlayX_Release(pDP); + IDirectPlayLobby_Release(pDPL); + + HeapFree( GetProcessHeap(), 0, pAddress ); +} + /* Open */ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, @@ -6894,6 +6942,7 @@ START_TEST(dplayx) test_EnumConnections(); test_InitializeConnection(); test_GetCaps(); + test_EnumAddressTypes(); if (!winetest_interactive) {

1 0