December 2016 - Wine-Commits

Hans Leidekker : dpnet/tests: Merge peer.c into client.c.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

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

Nikolay Sivov : xmllite: Fix setting local name when parsing QName.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

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: Use a helper to move to first attribute to avoid extra traces.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 0575a4b2bb28318eb763088bddb159fc03775418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0575a4b2bb28318eb763088bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:26 2016 +0300 xmllite: Use a helper to move to first attribute to avoid extra traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 351f872..874de75 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2790,18 +2790,26 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static HRESULT reader_move_to_first_attribute(xmlreader *reader) +{ + if (!reader->attr_count) + return S_FALSE; + + reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); + reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); + reader_set_strvalue(reader, StringValue_LocalName, &reader->attr->localname); + reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); + + return S_OK; +} + static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)\n", This); - if (!This->attr_count) return S_FALSE; - This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); - reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - - return S_OK; + return reader_move_to_first_attribute(This); } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) @@ -2814,7 +2822,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) if (!This->attr_count) return S_FALSE; if (!This->attr) - return IXmlReader_MoveToFirstAttribute(iface); + return reader_move_to_first_attribute(This); next = list_next(&This->attrs, &This->attr->entry); if (next)

1 0

Nikolay Sivov : xmllite: Store prefix for elements.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 635c40912601589224e2c60be714c5b5a27597f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635c40912601589224e2c60be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:23 2016 +0300 xmllite: Store prefix for elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 68 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c3b68d2..8978d97 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -228,8 +228,9 @@ struct attribute struct element { struct list entry; - strval qname; + strval prefix; strval localname; + strval qname; }; typedef struct @@ -282,6 +283,14 @@ static inline void *reader_alloc(xmlreader *reader, size_t len) return m_alloc(reader->imalloc, len); } +static inline void *reader_alloc_zero(xmlreader *reader, size_t len) +{ + void *ret = reader_alloc(reader, len); + if (ret) + memset(ret, 0, len); + return ret; +} + static inline void reader_free(xmlreader *reader, void *mem) { m_free(reader->imalloc, mem); @@ -448,39 +457,44 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } -static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) +static void reader_free_element(xmlreader *reader, struct element *element) { - struct element *elem; - HRESULT hr; - - elem = reader_alloc(reader, sizeof(*elem)); - if (!elem) return E_OUTOFMEMORY; - - hr = reader_strvaldup(reader, qname, &elem->qname); - if (FAILED(hr)) { - reader_free(reader, elem); - return hr; - } + reader_free_strvalued(reader, &element->prefix); + reader_free_strvalued(reader, &element->localname); + reader_free_strvalued(reader, &element->qname); + reader_free(reader, element); +} - hr = reader_strvaldup(reader, localname, &elem->localname); - if (FAILED(hr)) - { - reader_free_strvalued(reader, &elem->qname); - reader_free(reader, elem); - return hr; - } +static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *localname, + strval *qname) +{ + struct element *element; + HRESULT hr; if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); - if (FAILED(hr)) { - reader_free(reader, elem); + if (FAILED(hr)) return hr; - } } - list_add_head(&reader->elements, &elem->entry); + element = reader_alloc_zero(reader, sizeof(*element)); + if (!element) + goto failed; + + if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || + (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK || + (hr = reader_strvaldup(reader, qname, &element->qname)) != S_OK) + { + reader_free_element(reader, element); + goto failed; + } + + list_add_head(&reader->elements, &element->entry); reader->is_empty_element = FALSE; + +failed: + reader_dec_depth(reader); return hr; } @@ -2077,6 +2091,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* skip '/>' */ reader_skipn(reader, 2); reader->is_empty_element = TRUE; + reader->empty_element.prefix = *prefix; reader->empty_element.localname = *local; reader->empty_element.qname = *qname; return S_OK; @@ -2087,7 +2102,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '>' */ reader_skipn(reader, 1); - return reader_push_element(reader, qname, local); + return reader_push_element(reader, prefix, local, qname); } hr = reader_parse_attribute(reader); @@ -2134,8 +2149,8 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_Prefix, &prefix); + reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -2178,6 +2193,7 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader->instate = XmlReadInState_MiscEnd; reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname);

1 0

Tag wine-2.0-rc1 : Alexandre Julliard : Release 2.0-rc1
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: refs/tags/wine-2.0-rc1 Tag: bdcc805088ebcf676e16c83fb163c2dd80936ce5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=bdcc805088ebcf676e16c83fb163… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:35:07 2016 +0100 Release 2.0-rc1

1 0

Alexandre Julliard : Release 2.0-rc1.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 4c7f3f8af856888f5ab020b2a32d0b01db0c82f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f3f8af856888f5ab020b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:35:07 2016 +0100 Release 2.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 578 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 340 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7f3f8af856888f5ab02…

1 0

Hans Leidekker : dpnet/tests: Register firewall exceptions for the server test.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

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

Hans Leidekker : dpnet/tests: Register a firewall exception for the client test.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

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

Brock York : msctf: Remove incorrect dereference of double pointer.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

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

Nikolay Sivov : xmllite/tests: Some tests for returned namespace prefixes and uris.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

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