December 2016 - Wine-commits

Nikolay Sivov : xmllite: Fix setting local name when parsing QName.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 9b98d69e06709aaa6f0bae816b5207ce646ce05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b98d69e06709aaa6f0bae816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:31 2016 +0300 xmllite: Fix setting local name when parsing QName. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 47649f5..ef535e6 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1916,8 +1916,6 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc } } - reader_init_strvalue(start, reader_get_cur(reader)-start, local); - if (prefix->len) TRACE("qname %s:%s\n", debug_strval(reader, prefix), debug_strval(reader, local)); else

1 0

Nikolay Sivov : xmllite: Allow prefixed element names.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 682d4f147ccb2f7b2e77f09ed4e85deaa6c45d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=682d4f147ccb2f7b2e77f09ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:32 2016 +0300 xmllite: Allow prefixed element names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +--- dlls/xmllite/tests/reader.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ef535e6..2dadfa2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2233,9 +2233,7 @@ static HRESULT reader_parse_element(xmlreader *reader) hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); if (FAILED(hr)) return hr; - /* FIXME: need to check for defined namespace to reject invalid prefix, - currently reject all prefixes */ - if (prefix.len) return NC_E_UNDECLAREDPREFIX; + /* FIXME: need to check for defined namespace to reject invalid prefix */ /* if we got empty element and stack is empty go straight to Misc */ if (empty && list_empty(&reader->elements)) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 3658d52..f9d4821 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1362,7 +1362,8 @@ static void test_read_element(void) if (test->hr_broken) ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX) + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str;

1 0

Nikolay Sivov : xmllite/tests: Some tests for returned namespace prefixes and uris.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: dec0e471490758d2c79adaa89ea716ff89146498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec0e471490758d2c79adaa89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:33 2016 +0300 xmllite/tests: Some tests for returned namespace prefixes and uris. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f9d4821..8e50b13 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1906,6 +1906,139 @@ static void test_reader_properties(void) IXmlReader_Release(reader); } +static void test_prefix(void) +{ + static const struct + { + const char *xml; + const char *prefix1; + const char *prefix2; + const char *prefix3; + } prefix_tests[] = + { + { "", "", "", "xml" }, + }; + IXmlReader *reader; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { + const WCHAR *prefix; + XmlNodeType type; + WCHAR *expected; + IStream *stream; + + stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "Read() failed, %#x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); + + 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); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); + + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix2); + 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); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "MoveToNextAttribute() failed, %#x.\n", hr); + + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix3); + 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); + } + + IXmlReader_Release(reader); +} + +static void test_namespaceuri(void) +{ + struct uri_test + { + const char *xml; + const char *uri[5]; + } uri_tests[] = + { + { "<a xmlns=\"defns a\"><c xmlns=\"defns c\"/></a>", + { "defns a", "defns b", "defns c", "defns b", "defns a" }}, + { "<r:a xmlns=\"defns a\" xmlns:r=\"ns r\"/>", + { "ns r" }}, + { "<r:a xmlns=\"defns a\" xmlns:r=\"ns r\"></r:a>", + { "ns r", "defns a", "ns r" }}, + { "<a xmlns=\"defns a\" xmlns:r=\"ns r\"><r:b/></a>", + { "defns a", "ns r", "defns a" }}, + { "<a><c/></a>", + { "", "", "", "", "" }}, + }; + IXmlReader *reader; + XmlNodeType type; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { + IStream *stream = create_stream_on_data(uri_tests[i].xml, strlen(uri_tests[i].xml) + 1); + unsigned int j = 0; + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + while (IXmlReader_Read(reader, &type) == S_OK) { + const WCHAR *uri, *local; + WCHAR *uriW; + + ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement, "Unexpected node type %d.\n", type); + + hr = IXmlReader_GetLocalName(reader, &local, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + uriW = a2w(uri_tests[i].uri[j]); + ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri)); + free_str(uriW); + + j++; + } + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -1925,4 +2058,6 @@ START_TEST(reader) test_readvaluechunk(); test_read_xmldeclaration(); test_reader_properties(); + test_prefix(); + test_namespaceuri(); }

1 0

Nikolay Sivov : xmllite: Add maintainer entry.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 831c202c38e97730c5446b95c8a542714febd99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=831c202c38e97730c5446b95c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:34 2016 +0300 xmllite: Add maintainer entry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + dlls/xmllite/reader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 55a7834..cec6cdb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -265,6 +265,7 @@ F: dlls/winex11.drv/ XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ +F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2dadfa2..0fedd91 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Brock York : msctf: Remove incorrect dereference of double pointer.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: d7662881a52305045aa01e6dff8275331a67f70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7662881a52305045aa01e6df… Author: Brock York <twunknown(a)gmail.com> Date: Sat Dec 10 01:05:48 2016 +1100 msctf: Remove incorrect dereference of double pointer. Signed-off-by: Brock York <twunknown(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e1f56f1..62ddfd2 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1187,7 +1187,7 @@ static HRESULT WINAPI UIElementMgr_QueryInterface(ITfUIElementMgr *iface, REFIID { ThreadMgr *This = impl_from_ITfUIElementMgr(iface); - return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, *ppvOut); + return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut); } static ULONG WINAPI UIElementMgr_AddRef(ITfUIElementMgr *iface)

1 0

Michael Stefaniuc : dsound: Avoid casts from COM object to interface.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 48b32c78d29950443ee6f279f49b099a3960b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b32c78d29950443ee6f279f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 9 16:10:05 2016 +0100 dsound: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 43b252d..e8c10a7 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -452,8 +452,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( if (device->primary) { WARN("Primary Buffer already created\n"); - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); - *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); + IDirectSoundBuffer8_AddRef(&device->primary->IDirectSoundBuffer8_iface); + *ppdsb = (IDirectSoundBuffer *)&device->primary->IDirectSoundBuffer8_iface; } else { hres = primarybuffer_create(device, &device->primary, dsbd); if (device->primary) {

1 0

Hans Leidekker : dpnet/tests: Merge peer.c into client.c.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: a24b8b2b3dc1efac35a52d0c0334f1974a485742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24b8b2b3dc1efac35a52d0c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:03 2016 +0100 dpnet/tests: Merge peer.c into client.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 1 - dlls/dpnet/tests/client.c | 269 ++++++++++++++++++++++++++++++++++++- dlls/dpnet/tests/peer.c | 312 ------------------------------------------- 3 files changed, 268 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a24b8b2b3dc1efac35a52…

1 0

Hans Leidekker : dpnet/tests: Skip tests if dpnet is a stub dll.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: e017d9bcd4b34a45854ed43642b65b98c7cd920c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e017d9bcd4b34a45854ed4364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:04 2016 +0100 dpnet/tests: Skip tests if dpnet is a stub dll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/address.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dpnet/tests/client.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dpnet/tests/server.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 13eae44..d7f6d71 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dxguid uuid dpnet ole32 +IMPORTS = dxguid uuid dpnet ole32 version C_SRCS = \ address.c \ diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index dd0ef23..16ba6a7 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -353,10 +353,44 @@ static void address_duplicate(void) } } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(address) { HRESULT hr; + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + hr = CoInitialize(0); ok(hr == S_OK, "failed to init com\n"); if(hr != S_OK) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 68b3832..db08f73 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -606,8 +606,42 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(client) { + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + if(!test_init_dp()) return; diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 928c6a0..307167f 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -180,10 +180,44 @@ static void test_server_info(void) } } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(server) { HRESULT hr; + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + hr = CoInitialize(0); ok( hr == S_OK, "failed to init com\n"); if (hr != S_OK)

1 0

Hans Leidekker : dpnet/tests: Register a firewall exception for the client test.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 7e7ad5a79d0833ebdadc3b10bf9c3b3ef1ea7383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ad5a79d0833ebdadc3b10b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:05 2016 +0100 dpnet/tests: Register a firewall exception for the client test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/client.c | 146 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index d7f6d71..4b8cacd 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dxguid uuid dpnet ole32 version +IMPORTS = dxguid uuid dpnet ole32 oleaut32 version advapi32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index db08f73..a1817a4 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -22,6 +22,9 @@ #include <dplay8.h> #include <dplobby8.h> +#include <winver.h> +#define COBJMACROS +#include <netfw.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; @@ -606,6 +609,127 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'d','p','n','e','t','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + /* taken from programs/winetest/main.c */ static BOOL is_stub_dll(const char *filename) { @@ -634,6 +758,8 @@ static BOOL is_stub_dll(const char *filename) START_TEST(client) { + BOOL firewall_enabled; + if (!winetest_interactive && (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) @@ -642,8 +768,23 @@ START_TEST(client) return; } - if(!test_init_dp()) + if ((firewall_enabled = is_firewall_enabled()) && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); return; + } + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + + if (!test_init_dp()) goto done; test_enum_service_providers(); test_enum_hosts(); @@ -659,4 +800,7 @@ START_TEST(client) test_get_sp_caps_peer(); test_player_info_peer(); test_cleanup_dp_peer(); + +done: + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Hans Leidekker : dpnet/tests: Register firewall exceptions for the server test.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 0aaf1d9f6c9c6fa859cfac33645d27816909e669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aaf1d9f6c9c6fa859cfac336… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:06 2016 +0100 dpnet/tests: Register firewall exceptions for the server test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/server.c | 182 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 307167f..bfc21b0 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -20,6 +20,8 @@ #include <stdio.h> #include <dplay8.h> +#define COBJMACROS +#include <netfw.h> #include "wine/test.h" /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ @@ -180,6 +182,164 @@ static void test_server_info(void) } } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR dpnsvrW[] = + {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', + 'd','p','n','s','v','r','.','e','x','e',0}; + static const WCHAR dpnsvr_wow64W[] = + {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\', + 'd','p','n','s','v','r','.','e','x','e',0}; + static const WCHAR clientW[] = + {'d','p','n','e','t','_','c','l','i','e','n','t',0}; + static const WCHAR serverW[] = + {'d','p','n','e','t','_','s','e','r','v','e','r',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + BOOL is_wow64; + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( clientW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + if (hr != S_OK) goto done; + + INetFwAuthorizedApplication_Release( app ); + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + SysFreeString( image ); + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + image = is_wow64 ? SysAllocString( dpnsvr_wow64W ) : SysAllocString( dpnsvrW ); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( serverW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + /* taken from programs/winetest/main.c */ static BOOL is_stub_dll(const char *filename) { @@ -209,6 +369,7 @@ static BOOL is_stub_dll(const char *filename) START_TEST(server) { HRESULT hr; + BOOL firewall_enabled; if (!winetest_interactive && (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || @@ -218,13 +379,32 @@ START_TEST(server) return; } + if ((firewall_enabled = is_firewall_enabled()) && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + hr = CoInitialize(0); ok( hr == S_OK, "failed to init com\n"); if (hr != S_OK) - return; + goto done; create_server(); test_server_info(); CoUninitialize(); + +done: + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0