September 2017 - Wine-Commits

Alexandre Julliard : Wine release 2.18
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: website Branch: master Commit: feaa178d7a6d4ce4a39cf1548fa4281e5f4ef78d URL: http://source.winehq.org/git/website.git/?a=commit;h=feaa178d7a6d4ce4a39cf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 20:32:46 2017 +0200 Wine release 2.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017092901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017092901.xml b/news/en/2017092901.xml new file mode 100644 index 0000000..a51e0b6 --- /dev/null +++ b/news/en/2017092901.xml @@ -0,0 +1,16 @@ +<news> +<date>September 29, 2017</date> +<title>Wine 2.18 Released</title> +<body> + The Wine development release 2.18 is now available. + <a href="{$root}/announce/2.18">What's new</a> in this release: +<ul> + <li>Radial gradients in Direct2D.</li> + <li>Asynchronous message support in WebServices.</li> + <li>Virtual memory write watches improvements.</li> + <li>FreeType 2.8.1 compatibility fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : mshtml/tests: Run events tests in IE9 mode.
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: master Commit: 5a9209d7e9752c6b0206bed1c8e3206bad678076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9209d7e9752c6b0206bed1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 29 19:57:30 2017 +0200 mshtml/tests: Run events tests in IE9 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 139 +++++++++++++++++++++++++++++++++------------ 1 file changed, 104 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a9209d7e9752c6b0206b…

1 0

Tag wine-2.18 : Alexandre Julliard : Release 2.18
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: refs/tags/wine-2.18 Tag: 93ffc3a40caa71a7a3fc1cce6e9e2b7c7af93661 URL: http://source.winehq.org/git/wine.git/?a=tag;h=93ffc3a40caa71a7a3fc1cce6e9e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 20:30:17 2017 +0200 Release 2.18

1 0

Alexandre Julliard : Release 2.18.
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: master Commit: 4a2505a93a699baf9668af2cdfdd7b662d13c976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2505a93a699baf9668af2cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 20:30:17 2017 +0200 Release 2.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 573 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 336 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a2505a93a699baf9668a…

1 0

Nikolay Sivov : msxml3/httpreq: Added ISupportErrorInfo stub.
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: master Commit: af07789cdc852109d8aba0df90dbf884af2929ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=af07789cdc852109d8aba0df9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 17:35:46 2017 +0300 msxml3/httpreq: Added ISupportErrorInfo stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 54 +++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/httpreq.c | 69 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 115 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index d9f3f98..72234ee 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -73,6 +73,7 @@ typedef struct IXMLHTTPRequest IXMLHTTPRequest_iface; IObjectWithSite IObjectWithSite_iface; IObjectSafety IObjectSafety_iface; + ISupportErrorInfo ISupportErrorInfo_iface; LONG ref; READYSTATE state; @@ -131,6 +132,11 @@ static inline httprequest *impl_from_IObjectSafety(IObjectSafety *iface) return CONTAINING_RECORD(iface, httprequest, IObjectSafety_iface); } +static inline httprequest *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) +{ + return CONTAINING_RECORD(iface, httprequest, ISupportErrorInfo_iface); +} + static inline serverhttp *impl_from_IServerXMLHTTPRequest(IServerXMLHTTPRequest *iface) { return CONTAINING_RECORD(iface, serverhttp, IServerXMLHTTPRequest_iface); @@ -1329,6 +1335,10 @@ static HRESULT WINAPI XMLHTTPRequest_QueryInterface(IXMLHTTPRequest *iface, REFI { *ppvObject = &This->IObjectSafety_iface; } + else if (IsEqualGUID(&IID_ISupportErrorInfo, riid)) + { + *ppvObject = &This->ISupportErrorInfo_iface; + } else { TRACE("Unsupported interface %s\n", debugstr_guid(riid)); @@ -1336,7 +1346,7 @@ static HRESULT WINAPI XMLHTTPRequest_QueryInterface(IXMLHTTPRequest *iface, REFI return E_NOINTERFACE; } - IXMLHTTPRequest_AddRef( iface ); + IUnknown_AddRef((IUnknown *)*ppvObject); return S_OK; } @@ -1709,6 +1719,41 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { httprequest_Safety_SetInterfaceSafetyOptions }; +static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **obj) +{ + httprequest *This = impl_from_ISupportErrorInfo(iface); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, obj); +} + +static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface) +{ + httprequest *This = impl_from_ISupportErrorInfo(iface); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); +} + +static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface) +{ + httprequest *This = impl_from_ISupportErrorInfo(iface); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); +} + +static HRESULT WINAPI SupportErrorInfo_InterfaceSupportsErrorInfo(ISupportErrorInfo *iface, REFIID riid) +{ + httprequest *This = impl_from_ISupportErrorInfo(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_guid(riid)); + + return E_NOTIMPL; +} + +static const ISupportErrorInfoVtbl SupportErrorInfoVtbl = +{ + SupportErrorInfo_QueryInterface, + SupportErrorInfo_AddRef, + SupportErrorInfo_Release, + SupportErrorInfo_InterfaceSupportsErrorInfo, +}; + /* IServerXMLHTTPRequest */ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest *iface, REFIID riid, void **obj) { @@ -1723,6 +1768,10 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest { *obj = iface; } + else if ( IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &This->req.ISupportErrorInfo_iface; + } else { TRACE("Unsupported interface %s\n", debugstr_guid(riid)); @@ -1730,7 +1779,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_QueryInterface(IServerXMLHTTPRequest return E_NOINTERFACE; } - IServerXMLHTTPRequest_AddRef( iface ); + IUnknown_AddRef( (IUnknown *)*obj ); return S_OK; } @@ -1987,6 +2036,7 @@ static void init_httprequest(httprequest *req) req->IXMLHTTPRequest_iface.lpVtbl = &XMLHTTPRequestVtbl; req->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; req->IObjectSafety_iface.lpVtbl = &ObjectSafetyVtbl; + req->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; req->ref = 1; req->async = FALSE; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index a744b95..538e23f 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1339,6 +1339,16 @@ static IXMLHttpRequest *create_xhr(void) return SUCCEEDED(hr) ? ret : NULL; } +static IServerXMLHTTPRequest *create_server_xhr(void) +{ + IServerXMLHTTPRequest *ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ServerXMLHTTP30, NULL, CLSCTX_INPROC_SERVER, &IID_IServerXMLHTTPRequest, (void **)&ret); + + return SUCCEEDED(hr) ? ret : NULL; +} + static void set_safety_opt(IUnknown *unk, DWORD mask, DWORD opts) { IObjectSafety *obj_safety; @@ -1777,20 +1787,67 @@ static void test_safe_httpreq(void) free_bstrs(); } +static void test_supporterrorinfo(void) +{ + HRESULT hr; + IXMLHttpRequest *xhr; + IServerXMLHTTPRequest *server_xhr; + ISupportErrorInfo *errorinfo, *errorinfo2; + + xhr = create_xhr(); + + EXPECT_REF(xhr, 1); + hr = IXMLHttpRequest_QueryInterface(xhr, &IID_ISupportErrorInfo, (void **)&errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo, hr %#x.\n", hr); + EXPECT_REF(xhr, 2); + + hr = IXMLHttpRequest_QueryInterface(xhr, &IID_ISupportErrorInfo, (void **)&errorinfo2); + ok(hr == S_OK, "Failed to get ISupportErrorInfo, hr %#x.\n", hr); + ok(errorinfo == errorinfo2, "Unexpected error info instance.\n"); + EXPECT_REF(xhr, 3); + + ISupportErrorInfo_Release(errorinfo2); + ISupportErrorInfo_Release(errorinfo); + + IXMLHttpRequest_Release(xhr); + + /* ServerXMLHTTP */ + server_xhr = create_server_xhr(); + + EXPECT_REF(server_xhr, 1); + hr = IServerXMLHTTPRequest_QueryInterface(server_xhr, &IID_ISupportErrorInfo, (void **)&errorinfo); + ok(hr == S_OK, "Failed to get ISupportErrorInfo, hr %#x.\n", hr); + EXPECT_REF(server_xhr, 2); + + hr = IServerXMLHTTPRequest_QueryInterface(server_xhr, &IID_ISupportErrorInfo, (void **)&errorinfo2); + ok(hr == S_OK, "Failed to get ISupportErrorInfo, hr %#x.\n", hr); + ok(errorinfo == errorinfo2, "Unexpected error info instance.\n"); + EXPECT_REF(server_xhr, 3); + + ISupportErrorInfo_Release(errorinfo2); + ISupportErrorInfo_Release(errorinfo); + + IServerXMLHTTPRequest_Release(server_xhr); +} + START_TEST(httpreq) { IXMLHttpRequest *xhr; CoInitialize(NULL); - if((xhr = create_xhr())) { - IXMLHttpRequest_Release(xhr); - - test_XMLHTTP(); - test_safe_httpreq(); - }else { + if (!(xhr = create_xhr())) + { win_skip("IXMLHTTPRequest is not available\n"); + CoUninitialize(); + return; } + IXMLHttpRequest_Release(xhr); + + test_XMLHTTP(); + test_safe_httpreq(); + test_supporterrorinfo(); + CoUninitialize(); }

1 0

Nikolay Sivov : include: Added IWinInetHttpTimeouts definition.
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: master Commit: a0cdab264fd775d4833a53f1808f1ea59d48f1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0cdab264fd775d4833a53f18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 10:02:32 2017 +0300 include: Added IWinInetHttpTimeouts definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/urlmon.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index d7e97ad..9a39a7c 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -558,6 +558,23 @@ interface IWinInetHttpInfo : IWinInetInfo } /***************************************************************************** + * IWinInetHttpTimeouts interface + */ +[ + local, + object, + uuid(f286fa56-c1fd-4270-8e67-b3eb790a81e8), + pointer_default(unique) +] +interface IWinInetHttpTimeouts : IUnknown +{ + HRESULT GetRequestTimeouts( + [out] DWORD *connect_timeout, + [out] DWORD *send_timeout, + [out] DWORD *receive_timeout); +} + +/***************************************************************************** * IWindowForBindingUI interface */ [

1 0

Jacek Caban : mshtml: Correctly handle VT_EMPTY in set_event_handler_disp in standard compliant mode.
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: master Commit: fd10004e31b834b5497f9dddf51aad2af6c9bc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd10004e31b834b5497f9dddf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 29 17:14:42 2017 +0200 mshtml: Correctly handle VT_EMPTY in set_event_handler_disp in standard compliant mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4372066..ebb901c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -185,6 +185,8 @@ static const event_info_t event_info[] = { EVENT_FIXME} }; +static BOOL use_event_quirks(EventTarget*); + eventid_t str_to_eid(LPCWSTR str) { int i; @@ -953,6 +955,9 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; + if(!use_event_quirks(event_target)) + FIXME("Event argument not supported\n"); + V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = this_obj; V_VT(&v) = VT_EMPTY; @@ -1381,6 +1386,12 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var) { switch(V_VT(var)) { + case VT_EMPTY: + if(use_event_quirks(event_target)) { + WARN("attempt to set to VT_EMPTY in quirks mode\n"); + return E_NOTIMPL; + } + /* fall through */ case VT_NULL: remove_event_handler(event_target, eid); return S_OK; @@ -1392,6 +1403,9 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var VARIANT *v; HRESULT hres; + if(!use_event_quirks(event_target)) + FIXME("Setting to string %s not supported\n", debugstr_w(V_BSTR(var))); + /* * Setting event handler to string is a rare case and we don't want to * complicate nor increase memory of handler_vector_t for that. Instead, @@ -1413,8 +1427,6 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var default: FIXME("not handler %s\n", debugstr_variant(var)); - /* fall through */ - case VT_EMPTY: return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Inherit document mode from parent document.
by Alexandre Julliard Sept. 29, 2017

Sept. 29, 2017

Module: wine Branch: master Commit: e6778fe0238e33b924c863105ca21940098ab5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6778fe0238e33b924c863105… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 29 17:14:36 2017 +0200 mshtml: Inherit document mode from parent document. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 +++++++++ dlls/mshtml/tests/documentmode.js | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f4ff2f7..e32385e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5044,6 +5044,15 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc) return E_OUTOFMEMORY; + if(window->base.outer_window->parent) { + compat_mode_t parent_mode = window->base.outer_window->parent->base.inner_window->doc->document_mode; + TRACE("parent mode %u\n", parent_mode); + if(parent_mode >= COMPAT_MODE_IE9) { + doc->document_mode_locked = TRUE; + doc->document_mode = parent_mode; + } + } + if(!doc_obj->basedoc.window || window->base.outer_window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 77f6993..aaf052b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -99,6 +99,22 @@ function test_doc_mode() { next_test(); } +function test_iframe_doc_mode() { + var iframe = document.createElement("iframe"); + + iframe.onload = function() { + var iframe_mode = iframe.contentWindow.document.documentMode; + if(document.documentMode < 9) + ok(iframe_mode === 5, "iframe_mode = " + iframe_mode); + else + ok(iframe_mode === document.documentMode, "iframe_mode = " + iframe_mode); + next_test(); + } + + iframe.src = "about:blank"; + document.body.appendChild(iframe); +} + function test_conditional_comments() { var div = document.createElement("div"); document.body.appendChild(div); @@ -137,6 +153,7 @@ function test_conditional_comments() { var tests = [ test_doc_mode, + test_iframe_doc_mode, test_elem_props, test_doc_props, test_elem_by_id,

1 0

Alistair Leslie-Hughes : advapi32/tests: Added GetTokenInformation TokenLogonSid test.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 2ae0574d8eac19db501a79ce2597f2fe30a770bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae0574d8eac19db501a79ce2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 28 05:48:22 2017 +0000 advapi32/tests: Added GetTokenInformation TokenLogonSid test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4121908..d41e42e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1835,6 +1835,36 @@ static void test_token_attr(void) LocalFree(SidString); HeapFree(GetProcessHeap(), 0, User); + /* logon */ + ret = GetTokenInformation(Token, TokenLogonSid, NULL, 0, &Size); + if (!ret && (GetLastError() == ERROR_INVALID_PARAMETER)) + todo_wine win_skip("TokenLogonSid not supported. Skipping tests\n"); + else + { + todo_wine ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); + Groups = HeapAlloc(GetProcessHeap(), 0, Size); + ret = GetTokenInformation(Token, TokenLogonSid, Groups, Size, &Size); + todo_wine ok(ret, + "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); + if (ret) + { + ok(Groups->GroupCount == 1, "got %d\n", Groups->GroupCount); + if(Groups->GroupCount == 1) + { + ConvertSidToStringSidA(Groups->Groups[0].Sid, &SidString); + trace("TokenLogon: %s\n", SidString); + LocalFree(SidString); + + /* S-1-5-5-0-XXXXXX */ + ret = IsWellKnownSid(Groups->Groups[0].Sid, WinLogonIdsSid); + ok(ret, "Unknown SID\n"); + } + } + + HeapFree(GetProcessHeap(), 0, Groups); + } + /* privileges */ ret = GetTokenInformation(Token, TokenPrivileges, NULL, 0, &Size); ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),

1 0

Hugh McMaster : reg/tests: Use todo_wine_if in the registry export tests.
by Alexandre Julliard Sept. 28, 2017

Sept. 28, 2017

Module: wine Branch: master Commit: 04d497c18a7e32175453c1ab5e724eb9b83bbcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d497c18a7e32175453c1ab5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Sep 28 12:56:39 2017 +0000 reg/tests: Use todo_wine_if in the registry export tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ea4bce6..7a70ebf 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -27,6 +27,7 @@ #define TODO_REG_TYPE (0x0001u) #define TODO_REG_SIZE (0x0002u) #define TODO_REG_DATA (0x0004u) +#define TODO_REG_COMPARE (0x0008u) #define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) static BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc) @@ -4241,8 +4242,8 @@ static void test_import_31(void) delete_key(HKEY_CLASSES_ROOT, KEY_BASE); } -#define compare_export(f,e) compare_export_(__LINE__,f,e) -static BOOL compare_export_(unsigned line, const char *filename, const char *expected) +#define compare_export(f,e,todo) compare_export_(__LINE__,f,e,todo) +static BOOL compare_export_(unsigned line, const char *filename, const char *expected, DWORD todo) { FILE *fp; long file_size; @@ -4270,7 +4271,8 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp if (!wstr) goto exit; MultiByteToWideChar(CP_UTF8, 0, expected, -1, wstr, len); - lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); ret = TRUE; exit: @@ -4397,7 +4399,7 @@ static void test_export(void) else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); - todo_wine ok(compare_export("file.reg", empty_key_test), "compare_export() failed\n"); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); @@ -4409,7 +4411,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", simple_test), "compare_export() failed\n"); + todo_wine ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); @@ -4450,7 +4452,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", complex_test), "compare_export() failed\n"); + todo_wine ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); @@ -4467,7 +4469,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", key_order_test), "compare_export() failed\n"); + todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); @@ -4485,7 +4487,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", value_order_test), "compare_export() failed\n"); + todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());

1 0