wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Zhiyi Zhang : user32: Specify enumerator when calling SetupDiGetClassDevsW.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: d4115033ef5cd875850b07074bcb483e7a34c632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4115033ef5cd875850b0707… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 1 20:13:13 2019 +0800 user32: Specify enumerator when calling SetupDiGetClassDevsW. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 12225a6..83450ee 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -283,7 +283,8 @@ static const WCHAR BACKSLASH[] = {'\\',0}; static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; -static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR ADAPTER_PREFIX[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -3748,7 +3749,7 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Use SetupAPI to get monitors */ mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) { SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, @@ -3892,7 +3893,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) { mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) { /* Inactive monitors don't get enumerated */ @@ -4062,10 +4063,10 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i else { /* Check adapter name */ - if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) + if (strncmpiW( device, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX) )) goto done; - adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); + adapter_index = strtolW( device + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW);

1 0

Zhiyi Zhang : winex11.drv: Specify enumerator when calling SetupDiGetClassDevsW.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: cb350fc9798e86bb747f6716c5d0bd35b0df7694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb350fc9798e86bb747f6716… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 1 20:12:30 2019 +0800 winex11.drv: Specify enumerator when calling SetupDiGetClassDevsW. This reduces some search time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f5ef65f..7ddaf1c 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -46,6 +46,8 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; @@ -309,7 +311,7 @@ static void prepare_devices(HKEY video_hkey) DWORD i = 0; /* Remove all monitors */ - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiRemoveDevice(devinfo, &device_data)) @@ -326,7 +328,7 @@ static void prepare_devices(HKEY video_hkey) * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain * the same GUID for the same GPU. */ i = 0; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, @@ -344,7 +346,7 @@ static void cleanup_devices(void) DWORD i = 0; BOOL present; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { present = FALSE;

1 0

Jacek Caban : mshtml: Include URL pathname and query in test traces.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 3ea7ef409821ebbc015e33e3dcd420e1822d295f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea7ef409821ebbc015e33e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:30:49 2019 +0200 mshtml: Include URL pathname and query in test traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 22 +++++++++++----------- dlls/mshtml/tests/winetest.js | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b2a9746..3704d39 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3405,7 +3405,7 @@ static void run_from_path(const char *path, const char *opt) strcat(buf, path); if(opt) - strcat(buf, opt); + sprintf(buf + strlen(buf), "?%s", opt); url = a2bstr(buf); hres = CreateURLMoniker(NULL, url, &mon); SysFreeString(url); @@ -3437,7 +3437,7 @@ static void run_script_as_http_with_mode(const char *script, const char *opt, co document_mode ? "\">" : "", script); - run_from_path("/index.html", opt); + run_from_path("/index.html", opt ? opt : script); } static void init_protocol_handler(void) @@ -3481,15 +3481,15 @@ static void run_js_tests(void) run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11"); - run_script_as_http_with_mode("documentmode.js", "?0", NULL); - run_script_as_http_with_mode("documentmode.js", "?5", "5"); - run_script_as_http_with_mode("documentmode.js", "?5", "6"); - run_script_as_http_with_mode("documentmode.js", "?7", "7"); - run_script_as_http_with_mode("documentmode.js", "?8", "8"); - run_script_as_http_with_mode("documentmode.js", "?9", "9"); - run_script_as_http_with_mode("documentmode.js", "?10", "10"); - run_script_as_http_with_mode("documentmode.js", "?11", "11"); - run_script_as_http_with_mode("documentmode.js", "?11", "edge"); + run_script_as_http_with_mode("documentmode.js", "0", NULL); + run_script_as_http_with_mode("documentmode.js", "5", "5"); + run_script_as_http_with_mode("documentmode.js", "5", "6"); + run_script_as_http_with_mode("documentmode.js", "7", "7"); + run_script_as_http_with_mode("documentmode.js", "8", "8"); + run_script_as_http_with_mode("documentmode.js", "9", "9"); + run_script_as_http_with_mode("documentmode.js", "10", "10"); + run_script_as_http_with_mode("documentmode.js", "11", "11"); + run_script_as_http_with_mode("documentmode.js", "11", "edge"); run_script_as_http_with_mode("asyncscriptload.js", NULL, "9"); } diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 0d4e6e4..2af1b33 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -42,11 +42,11 @@ function run_tests() { } function ok(b,m) { - return external.ok(b, m); + return external.ok(b, format_message(m)); } function trace(m) { - external.trace(m); + external.trace(format_message(m)); } function win_skip(m) { @@ -59,10 +59,19 @@ function reportSuccess() { var todo_wine = { ok: function(b,m) { - return external.todo_wine_ok(b,m); + return external.todo_wine_ok(b, format_message(m)); } }; function todo_wine_if(expr) { return expr ? todo_wine : { ok: ok }; } + +var file_prefix = document.location.pathname; +if(document.location.search) + file_prefix += document.location.search; +file_prefix += ": "; + +function format_message(msg) { + return file_prefix + msg; +}

1 0

Jacek Caban : mshtml/tests: Improve tests exception handling.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 2eb40fab19e17f6edc4f0fb2dbda7eec9d4b16d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb40fab19e17f6edc4f0fb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:30:40 2019 +0200 mshtml/tests: Improve tests exception handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/winetest.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index e5fe867..0d4e6e4 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -21,7 +21,12 @@ function guard(f) { try { f(); }catch(e) { - ok(false, "Got exception " + ("message" in e ? e.message : e)); + var msg = "Got exception "; + if(e && typeof(e) == "object" && "message") + msg += e.msg; + else + msg += e; + ok(false, msg); } }; }

1 0

Jacek Caban : mshtml/tests: Rename elements.js to dom.js.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 9adb62cf8b141287c9911ac3d2741d04189e4ca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9adb62cf8b141287c9911ac3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:30:27 2019 +0200 mshtml/tests: Rename elements.js to dom.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/{elements.js => dom.js} | 0 dlls/mshtml/tests/rsrc.rc | 4 ++-- dlls/mshtml/tests/script.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/dom.js similarity index 100% rename from dlls/mshtml/tests/elements.js rename to dlls/mshtml/tests/dom.js diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 3ce867e..05bc836 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -49,8 +49,8 @@ navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" -/* @makedep: elements.js */ -elements.js HTML "elements.js" +/* @makedep: dom.js */ +dom.js HTML "dom.js" /* @makedep: es5.js */ es5.js HTML "es5.js" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index e546649..b2a9746 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3475,7 +3475,7 @@ static void run_js_tests(void) run_script_as_http_with_mode("xhr.js", NULL, "9"); run_script_as_http_with_mode("xhr.js", NULL, "11"); - run_script_as_http_with_mode("elements.js", NULL, "11"); + run_script_as_http_with_mode("dom.js", NULL, "11"); run_script_as_http_with_mode("es5.js", NULL, "11"); run_script_as_http_with_mode("events.js", NULL, "9"); run_script_as_http_with_mode("navigation.js", NULL, NULL);

1 0

Nikolay Sivov : mshtml: Add IHTMLDOMRange stub.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: c5d3ff58c637783e3e0ca1c0313de543bc1dce3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d3ff58c637783e3e0ca1c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 15:30:17 2019 +0200 mshtml: Add IHTMLDOMRange stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 27 ++- include/mshtml.idl | 88 +++++++++ 6 files changed, 483 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5d3ff58c637783e3e0c…

1 0

Jacek Caban : mshtml/tests: Merge text range tests.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: daf62df9ecf6c73e421c55bfd41ebf3090879efe URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf62df9ecf6c73e421c55bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:28:16 2019 +0200 mshtml/tests: Merge text range tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8c6efd3..7b02700 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -62,10 +62,6 @@ static const char doc_blank_ie9[] = "</html>"; static const char doc_str1[] = "<html><body>test</body></html>"; -static const char range_test_str[] = - "<html><body>test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br /></body></html>"; -static const char range_test2_str[] = - "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style id=\"styleid\">.body { margin-right: 0px; }</style>" "<meta id=\"metaid\" name=\"meta name\" http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" @@ -5675,6 +5671,8 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLElement *body; HRESULT hres; + set_body_html(doc, "test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br />"); + body_range = test_create_body_range(doc); test_disp((IUnknown*)body_range, &IID_IHTMLTxtRange, NULL, "[object]"); @@ -5914,11 +5912,7 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(body_range); IHTMLElement_Release(body); -} - -static void test_txtrange2(IHTMLDocument2 *doc) -{ - IHTMLTxtRange *range; + set_body_html(doc, "<html><body>abc<hr />123<br /><hr />def</body></html>"); range = test_create_body_range(doc); @@ -11066,8 +11060,7 @@ START_TEST(dom) run_domtest(doc_str1, test_doc_elem); run_domtest(doc_str1, test_get_set_attr); - run_domtest(range_test_str, test_txtrange); - run_domtest(range_test2_str, test_txtrange2); + run_domtest(doc_blank, test_txtrange); if (winetest_interactive || ! is_ie_hardened()) { run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2);

1 0

Jacek Caban : mshtml/tests: Introduce set_body_html helper.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: a91ed60f4342aeaa9bc4262650d4f8c4e35b769e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a91ed60f4342aeaa9bc42626… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:28:08 2019 +0200 mshtml/tests: Introduce set_body_html helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b615eb7..8c6efd3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5092,6 +5092,14 @@ static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) return elem; } +static void set_body_html(IHTMLDocument2 *doc, const char *html) +{ + IHTMLElement *body; + body = doc_get_body(doc); + test_elem_set_innerhtml((IUnknown*)body, html); + IHTMLElement_Release(body); +} + #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) { @@ -9453,16 +9461,12 @@ static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocume static void test_elem_names(IHTMLDocument2 *doc) { IHTMLElementCollection *col; - IHTMLElement *body; LONG len; HRESULT hres; static const elem_type_t test1_types[] = {ET_INPUT, ET_A, ET_DIV}; - body = doc_get_body(doc); - - test_elem_set_innerhtml((IUnknown*)body, - "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); + set_body_html(doc, "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); col = doc_get_elems_by_name(doc, "test"); test_elem_collection((IUnknown*)col, test1_types, ARRAY_SIZE(test1_types)); IHTMLElementCollection_Release(col); @@ -9477,8 +9481,6 @@ static void test_elem_names(IHTMLDocument2 *doc) ok(hres == S_OK, "get_length failed: %08x\n", hres); todo_wine ok(len == 1, "len = %d\n", len); IHTMLElementCollection_Release(col); - - IHTMLElement_Release(body); } static void test_elems2(IHTMLDocument2 *doc) @@ -9714,17 +9716,15 @@ static void test_svg_element(IHTMLDocument2 *doc, IHTMLElement *parent) static void test_dom_elements(IHTMLDocument2 *doc) { - IHTMLElement *body, *div; + IHTMLElement *div; - body = doc_get_body(doc); - test_elem_set_innerhtml((IUnknown*)body, "<div id=\"parentdiv\"></div>"); + set_body_html(doc, "<div id=\"parentdiv\"></div>"); div = get_doc_elem_by_id(doc, "parentdiv"); test_textarea_element(doc, div); test_form_element(doc, div); test_svg_element(doc, div); - IHTMLElement_Release(body); IHTMLElement_Release(div); }

1 0

Jacek Caban : mshtml/tests: Fix comment tests on recent IE versions.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 866880fb7601124e0aa7d681b1964e61dbbac7e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=866880fb7601124e0aa7d681… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:27:59 2019 +0200 mshtml/tests: Fix comment tests on recent IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 586df7d..b615eb7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -567,11 +567,16 @@ static const elem_type_info_t elem_type_infos[] = { {"tspan", tspan_iids, NULL} }; +static int strncmp_wa(LPCWSTR strw, const char *stra, size_t len) +{ + WCHAR buf[512]; + size_t wlen = MultiByteToWideChar(CP_ACP, 0, stra, len, buf, sizeof(buf)); + return wlen == len && memcmp(strw, buf, len * sizeof(WCHAR)); +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); + return strncmp_wa(strw, stra, strlen(stra)); } static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) @@ -2033,12 +2038,16 @@ static IHTMLFormElement *_get_textarea_form(unsigned line, IUnknown *unk) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { IHTMLCommentElement *comment = _get_comment_iface(__LINE__,unk); + const char *p; BSTR text; HRESULT hres; hres = IHTMLCommentElement_get_text(comment, &text); ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); - ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); + if((p = strstr(extext, "-->")) && SysStringLen(text) == p - extext) /* Some IEs drop comment ending */ + ok_(__FILE__,line)(!strncmp_wa(text, extext, p - extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); + else + ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); IHTMLCommentElement_Release(comment); SysFreeString(text); @@ -3050,12 +3059,17 @@ static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const char *o static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const char *outer_html) { IHTMLElement *elem = _get_elem_iface(line, unk); + const char *p; BSTR html; HRESULT hres; hres = IHTMLElement_get_outerHTML(elem, &html); ok_(__FILE__,line)(hres == S_OK, "get_outerHTML failed: %08x\n", hres); - ok_(__FILE__,line)(!strcmp_wa(html, outer_html), "outerHTML = '%s', expected '%s'\n", wine_dbgstr_w(html), outer_html); + if((p = strstr(outer_html, "-->")) && !p[3] && SysStringLen(html) == p - outer_html) /* Some IEs drop comment ending */ + ok_(__FILE__,line)(!strncmp_wa(html, outer_html, p - outer_html), "text = \"%s\", expected \"%s\"\n", + wine_dbgstr_w(html), outer_html); + else + ok_(__FILE__,line)(!strcmp_wa(html, outer_html), "outerHTML = '%s', expected '%s'\n", wine_dbgstr_w(html), outer_html); IHTMLElement_Release(elem); SysFreeString(html);

1 0

Alexandre Julliard : kernel32: Move wait functions to kernelbase.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: aa58676ae0cb1c5c48d772dadd1aa9c0e119fb76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa58676ae0cb1c5c48d772da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 17:44:38 2019 +0200 kernel32: Move wait functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 ++--- dlls/kernel32/kernel_private.h | 5 -- dlls/kernel32/process.c | 2 + dlls/kernel32/sync.c | 145 +------------------------------------ dlls/kernelbase/kernelbase.h | 5 ++ dlls/kernelbase/kernelbase.spec | 18 ++--- dlls/kernelbase/sync.c | 157 ++++++++++++++++++++++++++++++++++++++++ include/wincon.h | 9 ++- 8 files changed, 191 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa58676ae0cb1c5c48d7…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019