February 2020 - Wine-Commits

Alistair Leslie-Hughes : oledb32: Add page for ODBC connections to datalink dialog.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 9d98733baa68a194ba6ea35c48047b1fa3cd7e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d98733baa68a194ba6ea35c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 3 04:30:13 2020 +0000 oledb32: Add page for ODBC connections to datalink dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 113 +++++++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/resource.h | 19 ++++++++ dlls/oledb32/version.rc | 26 +++++++++++ po/ar.po | 76 ++++++++++++++++++++++++++++++- po/ast.po | 70 ++++++++++++++++++++++++++++- po/bg.po | 69 ++++++++++++++++++++++++++++- po/ca.po | 76 ++++++++++++++++++++++++++++++- po/cs.po | 76 ++++++++++++++++++++++++++++++- po/da.po | 76 ++++++++++++++++++++++++++++++- po/de.po | 76 ++++++++++++++++++++++++++++++- po/el.po | 62 +++++++++++++++++++++++++- po/en.po | 56 ++++++++++++++++++++++- po/en_US.po | 56 ++++++++++++++++++++++- po/eo.po | 72 +++++++++++++++++++++++++++++- po/es.po | 76 ++++++++++++++++++++++++++++++- po/fa.po | 61 ++++++++++++++++++++++++- po/fi.po | 76 ++++++++++++++++++++++++++++++- po/fr.po | 76 ++++++++++++++++++++++++++++++- po/he.po | 73 +++++++++++++++++++++++++++++- po/hi.po | 56 ++++++++++++++++++++++- po/hr.po | 76 ++++++++++++++++++++++++++++++- po/hu.po | 76 ++++++++++++++++++++++++++++++- po/it.po | 76 ++++++++++++++++++++++++++++++- po/ja.po | 76 ++++++++++++++++++++++++++++++- po/ko.po | 76 ++++++++++++++++++++++++++++++- po/lt.po | 76 ++++++++++++++++++++++++++++++- po/ml.po | 56 ++++++++++++++++++++++- po/nb_NO.po | 76 ++++++++++++++++++++++++++++++- po/nl.po | 76 ++++++++++++++++++++++++++++++- po/or.po | 56 ++++++++++++++++++++++- po/pa.po | 56 ++++++++++++++++++++++- po/pl.po | 76 ++++++++++++++++++++++++++++++- po/pt_BR.po | 76 ++++++++++++++++++++++++++++++- po/pt_PT.po | 76 ++++++++++++++++++++++++++++++- po/rm.po | 59 ++++++++++++++++++++++++- po/ro.po | 76 ++++++++++++++++++++++++++++++- po/ru.po | 76 ++++++++++++++++++++++++++++++- po/si.po | 76 ++++++++++++++++++++++++++++++- po/sk.po | 74 ++++++++++++++++++++++++++++++- po/sl.po | 76 ++++++++++++++++++++++++++++++- po/sr_RS(a)cyrillic.po | 68 +++++++++++++++++++++++++++- po/sr_RS(a)latin.po | 70 ++++++++++++++++++++++++++++- po/sv.po | 76 ++++++++++++++++++++++++++++++- po/ta.po | 56 ++++++++++++++++++++++- po/te.po | 56 ++++++++++++++++++++++- po/th.po | 61 ++++++++++++++++++++++++- po/tr.po | 76 ++++++++++++++++++++++++++++++- po/uk.po | 76 ++++++++++++++++++++++++++++++- po/wa.po | 65 ++++++++++++++++++++++++++- po/wine.pot | 56 ++++++++++++++++++++++- po/zh_CN.po | 76 ++++++++++++++++++++++++++++++- po/zh_TW.po | 76 ++++++++++++++++++++++++++++++- 52 files changed, 3488 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98733baa68a194ba6e…

1 0

Brendan Shanks : wbemuuid: Add library.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 829dff0ee770f720ee90976faac3cbd6bb2afc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=829dff0ee770f720ee90976f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 4 12:11:44 2020 -0800 wbemuuid: Add library. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wbemuuid/Makefile.in | 4 ++++ dlls/wbemuuid/wbemuuid.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index c7e8f5ef1f..80235dd995 100755 --- a/configure +++ b/configure @@ -1617,6 +1617,7 @@ enable_vssapi enable_vulkan_1 enable_wbemdisp enable_wbemprox +enable_wbemuuid enable_wdscore enable_webservices enable_wer @@ -20930,6 +20931,7 @@ wine_fn_config_makefile dlls/wbemdisp enable_wbemdisp wine_fn_config_makefile dlls/wbemdisp/tests enable_tests wine_fn_config_makefile dlls/wbemprox enable_wbemprox wine_fn_config_makefile dlls/wbemprox/tests enable_tests +wine_fn_config_makefile dlls/wbemuuid enable_wbemuuid wine_fn_config_makefile dlls/wdscore enable_wdscore wine_fn_config_makefile dlls/webservices enable_webservices wine_fn_config_makefile dlls/webservices/tests enable_tests diff --git a/configure.ac b/configure.ac index f9ca95ce49..40374210bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3739,6 +3739,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp) WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) +WINE_CONFIG_MAKEFILE(dlls/wbemuuid) WINE_CONFIG_MAKEFILE(dlls/wdscore) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in new file mode 100644 index 0000000000..449a0e68a8 --- /dev/null +++ b/dlls/wbemuuid/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libwbemuuid.a + +C_SRCS = \ + wbemuuid.c diff --git a/dlls/wbemuuid/wbemuuid.c b/dlls/wbemuuid/wbemuuid.c new file mode 100644 index 0000000000..8fc3314d8d --- /dev/null +++ b/dlls/wbemuuid/wbemuuid.c @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "dispex.h" +#include "objbase.h" +#include "oleauto.h" +#include "olectl.h" + +#include "initguid.h" + +#include "wbemcli.h" +#include "wbemprov.h" +#include "wbemdisp.h"

1 0

Alexandre Julliard : wmc: Directly implement UTF-8 conversions.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: c2f6714970728914ec0dfc7892f200394b8fa25b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f6714970728914ec0dfc78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:39:48 2020 +0100 wmc: Directly implement UTF-8 conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 2 - tools/wmc/mcl.c | 15 +++++-- tools/wmc/po.c | 18 ++------ tools/wmc/utils.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/wmc/utils.h | 2 + tools/wmc/write.c | 36 ++++++++-------- 6 files changed, 155 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2f6714970728914ec0d…

1 0

Jacek Caban : mshtml/tests: Get rid of is_prefix_wa.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: a98179c0ab7cd7aced1a317177b87af761050842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a98179c0ab7cd7aced1a3171… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 20:32:32 2020 +0100 mshtml/tests: Get rid of is_prefix_wa. 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, 5 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2b0a5cde95..c758fb2907 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -563,20 +563,6 @@ static const elem_type_info_t elem_type_infos[] = { {L"tspan", tspan_iids, NULL} }; -static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) -{ - int len, prefix_len; - CHAR buf[512]; - - len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, ARRAY_SIZE(buf), NULL, NULL)-1; - prefix_len = lstrlenA(prefix); - if(len < prefix_len) - return FALSE; - - buf[prefix_len] = 0; - return !lstrcmpA(buf, prefix); -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -8255,7 +8241,7 @@ static void test_iframe_elem(IHTMLElement *elem) } #define test_stylesheet_csstext(a,b,c) _test_stylesheet_csstext(__LINE__,a,b,c) -static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *exstr, BOOL is_todo) +static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const WCHAR *exstr, BOOL is_todo) { BSTR str; HRESULT hres; @@ -8264,7 +8250,7 @@ static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); todo_wine_if(is_todo) { if(exstr) - ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + ok_(__FILE__,line)(str && !wcsncmp(str, exstr, lstrlenW(exstr)), "cssText = %s\n", wine_dbgstr_w(str)); else ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); } @@ -8310,13 +8296,13 @@ static void test_stylesheet(IDispatch *disp) ok(href == NULL, "got href != NULL\n"); SysFreeString(href); - test_stylesheet_csstext(stylesheet, ".body {", FALSE); + test_stylesheet_csstext(stylesheet, L".body {", FALSE); set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); - test_stylesheet_csstext(stylesheet, ".div {", TRUE); + test_stylesheet_csstext(stylesheet, L".div {", TRUE); set_stylesheet_csstext(stylesheet, "", FALSE); test_stylesheet_csstext(stylesheet, NULL, FALSE); set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }", FALSE); - test_stylesheet_csstext(stylesheet, ".div {", FALSE); + test_stylesheet_csstext(stylesheet, L".div {", FALSE); hres = IHTMLStyleSheet_get_rules(stylesheet, &col); ok(hres == S_OK, "get_rules failed: %08x\n", hres);

1 0

Alexandre Julliard : wrc: Directly implement UTF-8 conversions.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 88abd7cb984f80b4f8788582361236ce331346f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88abd7cb984f80b4f8788582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:39:42 2020 +0100 wrc: Directly implement UTF-8 conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/utils.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 156 insertions(+), 27 deletions(-) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index a1e07b85b2..15bbde9d74 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -296,12 +296,12 @@ int is_valid_codepage(int id) return IsValidCodePage( id ); } -int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +static int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); } -int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +static int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { return WideCharToMultiByte( codepage, flags, src, srclen, dst, dstlen, NULL, NULL ); } @@ -315,25 +315,145 @@ int is_valid_codepage(int cp) return cp == CP_UTF8 || wine_cp_get_table(cp); } -int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +static int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { - if (codepage == CP_UTF8) return wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); } -int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +static int wrc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { - if (codepage == CP_UTF8) return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); return wine_cp_wcstombs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen, NULL, NULL ); } #endif /* _WIN32 */ +static WCHAR *utf8_to_unicode( const char *src, int srclen, int *dstlen ) +{ + static const char utf8_length[128] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x80-0x8f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90-0x9f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xa0-0xaf */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xb0-0xbf */ + 0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xc0-0xcf */ + 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 0xd0-0xdf */ + 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 0xe0-0xef */ + 3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0 /* 0xf0-0xff */ + }; + static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; + + const char *srcend = src + srclen; + int len, res; + WCHAR *ret, *dst; + + dst = ret = xmalloc( (srclen + 1) * sizeof(WCHAR) ); + while (src < srcend) + { + unsigned char ch = *src++; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + *dst++ = ch; + continue; + } + len = utf8_length[ch - 0x80]; + if (len && src + len <= srcend) + { + res = ch & utf8_mask[len]; + switch (len) + { + case 3: + if ((ch = *src ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + src++; + if (res < 0x10) break; + case 2: + if ((ch = *src ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + if (res >= 0x110000 >> 6) break; + src++; + if (res < 0x20) break; + if (res >= 0xd800 >> 6 && res <= 0xdfff >> 6) break; + case 1: + if ((ch = *src ^ 0x80) >= 0x40) break; + res = (res << 6) | ch; + src++; + if (res < 0x80) break; + if (res <= 0xffff) *dst++ = res; + else + { + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + *dst++ = 0xdc00 | (res & 0x3ff); + } + continue; + } + } + *dst++ = 0xfffd; + } + *dst = 0; + *dstlen = dst - ret; + return ret; +} + +static char *unicode_to_utf8( const WCHAR *src, int srclen, int *dstlen ) +{ + char *ret, *dst; + + dst = ret = xmalloc( srclen * 3 + 1 ); + for ( ; srclen; srclen--, src++) + { + unsigned int ch = *src; + + if (ch < 0x80) /* 0x00-0x7f: 1 byte */ + { + *dst++ = ch; + continue; + } + if (ch < 0x800) /* 0x80-0x7ff: 2 bytes */ + { + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xc0 | ch; + dst += 2; + continue; + } + if (ch >= 0xd800 && ch <= 0xdbff && srclen > 1 && src[1] >= 0xdc00 && src[1] <= 0xdfff) + { + /* 0x10000-0x10ffff: 4 bytes */ + ch = 0x10000 + ((ch & 0x3ff) << 10) + (src[1] & 0x3ff); + dst[3] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[2] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xf0 | ch; + dst += 4; + src++; + srclen--; + continue; + } + if (ch >= 0xd800 && ch <= 0xdfff) ch = 0xfffd; /* invalid surrogate pair */ + + /* 0x800-0xffff: 3 bytes */ + dst[2] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[1] = 0x80 | (ch & 0x3f); + ch >>= 6; + dst[0] = 0xe0 | ch; + dst += 3; + } + *dst = 0; + *dstlen = dst - ret; + return ret; +} + string_t *convert_string(const string_t *str, enum str_e type, int codepage) { string_t *ret = xmalloc(sizeof(*ret)); int res; + ret->type = type; ret->loc = str->loc; if (!codepage && str->type != type) @@ -341,27 +461,33 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) if((str->type == str_char) && (type == str_unicode)) { - ret->type = str_unicode; - ret->size = wrc_mbstowcs( codepage, 0, str->str.cstr, str->size, NULL, 0 ); - ret->str.wstr = xmalloc( (ret->size+1) * sizeof(WCHAR) ); - res = wrc_mbstowcs( codepage, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, - ret->str.wstr, ret->size ); - if (res == -2) - parser_error( "Invalid character in string '%.*s' for codepage %u", - str->size, str->str.cstr, codepage ); - ret->str.wstr[ret->size] = 0; + if (codepage == CP_UTF8) + ret->str.wstr = utf8_to_unicode( str->str.cstr, str->size, &ret->size ); + else + { + ret->str.wstr = xmalloc( (str->size + 1) * sizeof(WCHAR) ); + res = wrc_mbstowcs( codepage, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, + ret->str.wstr, str->size ); + if (res == -2) + parser_error( "Invalid character in string '%.*s' for codepage %u", + str->size, str->str.cstr, codepage ); + ret->size = res; + ret->str.wstr[ret->size] = 0; + } } else if((str->type == str_unicode) && (type == str_char)) { - ret->type = str_char; - ret->size = wrc_wcstombs( codepage, 0, str->str.wstr, str->size, NULL, 0 ); - ret->str.cstr = xmalloc( ret->size + 1 ); - wrc_wcstombs( codepage, 0, str->str.wstr, str->size, ret->str.cstr, ret->size ); - ret->str.cstr[ret->size] = 0; + if (codepage == CP_UTF8) + ret->str.cstr = unicode_to_utf8( str->str.wstr, str->size, &ret->size ); + else + { + ret->str.cstr = xmalloc( str->size * 2 + 1 ); + ret->size = wrc_wcstombs( codepage, 0, str->str.wstr, str->size, ret->str.cstr, str->size * 2 ); + ret->str.cstr[ret->size] = 0; + } } else if(str->type == str_unicode) { - ret->type = str_unicode; ret->size = str->size; ret->str.wstr = xmalloc(sizeof(WCHAR)*(ret->size+1)); memcpy( ret->str.wstr, str->str.wstr, ret->size * sizeof(WCHAR) ); @@ -369,7 +495,6 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) } else /* str->type == str_char */ { - ret->type = str_char; ret->size = str->size; ret->str.cstr = xmalloc( ret->size + 1 ); memcpy( ret->str.cstr, str->str.cstr, ret->size ); @@ -389,22 +514,26 @@ void free_string(string_t *str) /* check if the string is valid utf8 despite a different codepage being in use */ int check_valid_utf8( const string_t *str, int codepage ) { - unsigned int i; + int i, count; + WCHAR *wstr; if (!check_utf8) return 0; if (!codepage) return 0; if (codepage == CP_UTF8) return 0; if (!is_valid_codepage( codepage )) return 0; - for (i = 0; i < str->size; i++) + for (i = count = 0; i < str->size; i++) { if ((unsigned char)str->str.cstr[i] >= 0xf5) goto done; - if ((unsigned char)str->str.cstr[i] >= 0xc2) break; + if ((unsigned char)str->str.cstr[i] >= 0xc2) { count++; continue; } if ((unsigned char)str->str.cstr[i] >= 0x80) goto done; } - if (i == str->size) return 0; /* no 8-bit chars at all */ + if (!count) return 0; /* no 8-bit chars at all */ - if (wrc_mbstowcs( CP_UTF8, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, NULL, 0 ) >= 0) return 1; + wstr = utf8_to_unicode( str->str.cstr, str->size, &count ); + for (i = 0; i < count; i++) if (wstr[i] == 0xfffd) break; + free( wstr ); + return (i == count); done: check_utf8 = 0; /* at least one 8-bit non-utf8 string found, stop checking */

1 0

Jacek Caban : jscript: Add GetSourceLineText implementation.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 150b7391b878aed21e13116d7628adddabf13c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=150b7391b878aed21e13116d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 20:28:38 2020 +0100 jscript: Add GetSourceLineText implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 3 ++- dlls/jscript/error.c | 4 +++- dlls/jscript/jscript.c | 15 ++++++++++++--- dlls/jscript/parser.y | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 9 +++++++-- 7 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2be5f24fae..61db10cd41 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2521,7 +2521,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte if(FAILED(hres)) { if(hres != DISP_E_EXCEPTION) throw_error(ctx, hres, NULL); - set_error_location(ctx->ei, compiler.code, compiler.loc, IDS_COMPILATION_ERROR); + set_error_location(ctx->ei, compiler.code, compiler.loc, IDS_COMPILATION_ERROR, NULL); release_bytecode(compiler.code); return DISP_E_EXCEPTION; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 054b0c7602..f94cfd1e80 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2779,7 +2779,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) frame = ctx->call_ctx; if(exception_hres != DISP_E_EXCEPTION) throw_error(ctx, exception_hres, NULL); - set_error_location(ei, frame->bytecode, frame->bytecode->instrs[frame->ip].loc, IDS_RUNTIME_ERROR); + set_error_location(ei, frame->bytecode, frame->bytecode->instrs[frame->ip].loc, IDS_RUNTIME_ERROR, NULL); while(!frame->except_frame) { DWORD flags; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bb991c442e..cad46e12c5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -229,6 +229,7 @@ struct _jsexcept_t { jsstr_t *source; jsstr_t *message; + jsstr_t *line; bytecode_t *code; unsigned loc; @@ -240,7 +241,7 @@ struct _jsexcept_t { void enter_script(script_ctx_t*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT leave_script(script_ctx_t*,HRESULT) DECLSPEC_HIDDEN; void reset_ei(jsexcept_t*) DECLSPEC_HIDDEN; -void set_error_location(jsexcept_t*,bytecode_t*,unsigned,unsigned) DECLSPEC_HIDDEN; +void set_error_location(jsexcept_t*,bytecode_t*,unsigned,unsigned,jsstr_t*) DECLSPEC_HIDDEN; typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index eca6c90138..4d54d74f6c 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -420,7 +420,7 @@ HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) return DISP_E_EXCEPTION; } -void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned source_id) +void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned source_id, jsstr_t *line) { if(is_jscript_error(ei->error)) { if(!ei->source) { @@ -438,6 +438,8 @@ void set_error_location(jsexcept_t *ei, bytecode_t *code, unsigned loc, unsigned ei->code = bytecode_addref(code); ei->loc = loc; + if(line) + ei->line = jsstr_addref(line); } jsdisp_t *create_builtin_error(script_ctx_t *ctx) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 860fb01cf5..8f97fa818d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -211,12 +211,17 @@ static HRESULT WINAPI JScriptError_GetSourceLineText(IActiveScriptError *iface, { JScriptError *This = impl_from_IActiveScriptError(iface); - FIXME("(%p)->(%p)\n", This, source); + TRACE("(%p)->(%p)\n", This, source); if(!source) return E_POINTER; - *source = NULL; - return E_FAIL; + + if(!This->ei.line) { + *source = NULL; + return E_FAIL; + } + + return jsstr_to_bstr(This->ei.line, source); } static const IActiveScriptErrorVtbl JScriptErrorVtbl = { @@ -248,6 +253,10 @@ void reset_ei(jsexcept_t *ei) jsstr_release(ei->message); ei->message = NULL; } + if(ei->line) { + jsstr_release(ei->line); + ei->line = NULL; + } } void enter_script(script_ctx_t *ctx, jsexcept_t *ei) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5a71a84ffa..507369ca20 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1598,12 +1598,24 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco heap_pool_clear(mark); hres = parser_ctx->hres; if(FAILED(hres)) { - WARN("parser failed around %s\n", - debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20)); + const WCHAR *line_start = code->source + parser_ctx->error_loc, *line_end = line_start; + jsstr_t *line_str; + + while(line_start > code->source && line_start[-1] != '\n') + line_start--; + while(*line_end && *line_end != '\n') + line_end++; + line_str = jsstr_alloc_len(line_start, line_end - line_start); + + WARN("parser failed around %s in line %s\n", + debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20), + debugstr_jsstr(line_str)); throw_error(ctx, hres, NULL); - set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR); + set_error_location(ctx->ei, code, parser_ctx->error_loc, IDS_COMPILATION_ERROR, line_str); parser_release(parser_ctx); + if(line_str) + jsstr_release(line_str); return DISP_E_EXCEPTION; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 6e2250882d..675bd819ee 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2232,6 +2232,13 @@ static void test_error_reports(void) NULL, ERROR_TODO_SCODE | ERROR_TODO_DESCRIPTION }, + { + L"f(1\n,\n2,\n ,,3\n);\n", + JS_E_SYNTAX, 3, 1, + L"Microsoft JScript compilation error", + L"Syntax error", + L" ,,3" + }, }; if (!is_lang_english()) @@ -2304,9 +2311,7 @@ static void test_error_reports(void) hres = IActiveScriptError_GetSourceLineText(script_error, &line_text); if (tests[i].line_text) { - todo_wine ok(hres == S_OK, "GetSourceLineText failed: %08x\n", hres); - todo_wine ok(line_text != NULL && !lstrcmpW(line_text, tests[i].line_text), "[%u] GetSourceLineText returned %s expected %s\n", i, wine_dbgstr_w(line_text), wine_dbgstr_w(tests[i].line_text)); }

1 0

Jacek Caban : widl: Check dispinterfaces for duplicated methods.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 26ad9a7ba316b36774ea77ca2af64144cea61b7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ad9a7ba316b36774ea77ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 19:58:51 2020 +0100 widl: Check dispinterfaces for duplicated methods. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 92b4f8ebd5..3ef8d89ba1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2701,6 +2701,25 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) static void check_functions(const type_t *iface, int is_inside_library) { const statement_t *stmt; + /* check for duplicates */ + if (is_attr(iface->attrs, ATTR_DISPINTERFACE)) + { + var_list_t *methods = type_dispiface_get_methods(iface); + var_t *func, *func_iter; + + if (methods) LIST_FOR_EACH_ENTRY( func, methods, var_t, entry ) + { + LIST_FOR_EACH_ENTRY( func_iter, methods, var_t, entry ) + { + if (func == func_iter) break; + if (strcmp(func->name, func_iter->name)) continue; + if (is_attr(func->attrs, ATTR_PROPGET) != is_attr(func_iter->attrs, ATTR_PROPGET)) continue; + if (is_attr(func->attrs, ATTR_PROPPUT) != is_attr(func_iter->attrs, ATTR_PROPPUT)) continue; + if (is_attr(func->attrs, ATTR_PROPPUTREF) != is_attr(func_iter->attrs, ATTR_PROPPUTREF)) continue; + error_loc_info(&func->loc_info, "duplicated function \'%s\'\n", func->name); + } + } + } if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE)) { STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) )

1 0

Donna Whisnant : mshtml.idl: Fix duplicated dispinterface functions.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: ec27f4838c6bef821deddf7d88d498b57f906c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec27f4838c6bef821deddf7d… Author: Donna Whisnant <WhisantDonnaE(a)JohnDeere.com> Date: Tue Feb 4 19:58:39 2020 +0100 mshtml.idl: Fix duplicated dispinterface functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 135 ----------------------------------------------------- 1 file changed, 135 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 0faa605482..67c3712fc4 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11992,18 +11992,6 @@ methods: [propget, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] BSTR type(); - [propput, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propget, id(DISPID_IHTMLLINKELEMENT_STYLESHEET)] IHTMLStyleSheet *styleSheet(); @@ -12534,18 +12522,6 @@ methods: [propget, id(DISPID_IHTMLFORMELEMENT_NAME)] BSTR name(); - [propput, id(DISPID_IHTMLFORMELEMENT_ONSUBMIT)] - void onsubmit(VARIANT v); - - [propget, id(DISPID_IHTMLFORMELEMENT_ONSUBMIT)] - VARIANT onsubmit(); - - [propput, id(DISPID_IHTMLFORMELEMENT_ONRESET)] - void onreset(VARIANT v); - - [propget, id(DISPID_IHTMLFORMELEMENT_ONRESET)] - VARIANT onreset(); - [id(DISPID_IHTMLFORMELEMENT_SUBMIT)] void submit(); @@ -13315,24 +13291,6 @@ methods: [propget, id(DISPID_IHTMLIMGELEMENT_ALIGN), displaybind, bindable] BSTR align(); - [propput, id(DISPID_IHTMLIMGELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLIMGELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLIMGELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLIMGELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - - [propput, id(DISPID_IHTMLIMGELEMENT_ONABORT), displaybind, bindable] - void onabort(VARIANT v); - - [propget, id(DISPID_IHTMLIMGELEMENT_ONABORT), displaybind, bindable] - VARIANT onabort(); - [propput, id(DISPID_IHTMLIMGELEMENT_NAME), displaybind, bindable] void name(BSTR v); @@ -13883,12 +13841,6 @@ methods: [propget, id(DISPID_IHTMLBODYELEMENT_ALINK), displaybind, bindable] VARIANT aLink(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLBODYELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONUNLOAD), displaybind, bindable] void onunload(VARIANT v); @@ -13901,12 +13853,6 @@ methods: [propget, id(DISPID_IHTMLBODYELEMENT_SCROLL), displaybind, bindable] BSTR scroll(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONSELECT), displaybind, bindable] - void onselect(VARIANT v); - - [propget, id(DISPID_IHTMLBODYELEMENT_ONSELECT), displaybind, bindable] - VARIANT onselect(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONBEFOREUNLOAD), displaybind, bindable] void onbeforeunload(VARIANT v); @@ -14382,9 +14328,6 @@ properties: methods: WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch* constructor(); - [propput, id(DISPID_IHTMLAREAELEMENT_SHAPE)] void shape(BSTR v); @@ -14777,12 +14720,6 @@ methods: [propget, id(DISPID_IHTMLSELECTELEMENT_OPTIONS)] IDispatch *options(); - [propput, id(DISPID_IHTMLSELECTELEMENT_ONCHANGE), displaybind, bindable] - void onchange(VARIANT v); - - [propget, id(DISPID_IHTMLSELECTELEMENT_ONCHANGE), displaybind, bindable] - VARIANT onchange(); - [propput, id(DISPID_IHTMLSELECTELEMENT_SELECTEDINDEX)] void selectedIndex(LONG v); @@ -15478,18 +15415,6 @@ methods: [id(DISPID_IHTMLINPUTELEMENT_SELECT)] void select(); - [propput, id(DISPID_IHTMLINPUTELEMENT_ONCHANGE), displaybind, bindable] - void onchange(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONCHANGE), displaybind, bindable] - VARIANT onchange(); - - [propput, id(DISPID_IHTMLINPUTELEMENT_ONSELECT), displaybind, bindable] - void onselect(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONSELECT), displaybind, bindable] - VARIANT onselect(); - [propput, id(DISPID_IHTMLINPUTELEMENT_DEFAULTVALUE), displaybind, bindable, hidden] void defaultValue(BSTR v); @@ -15586,24 +15511,6 @@ methods: [propget, id(DISPID_IHTMLINPUTELEMENT_ALIGN), displaybind, bindable] BSTR align(); - [propput, id(DISPID_IHTMLINPUTELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLINPUTELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - - [propput, id(DISPID_IHTMLINPUTELEMENT_ONABORT), displaybind, bindable] - void onabort(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONABORT), displaybind, bindable] - VARIANT onabort(); - [propput, id(DISPID_IHTMLINPUTELEMENT_WIDTH)] void width(LONG v); @@ -15815,18 +15722,6 @@ methods: [id(DISPID_IHTMLTEXTAREAELEMENT_SELECT)] void select(); - [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ONCHANGE), displaybind, bindable] - void onchange(VARIANT v); - - [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ONCHANGE), displaybind, bindable] - VARIANT onchange(); - - [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ONSELECT), displaybind, bindable] - void onselect(VARIANT v); - - [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ONSELECT), displaybind, bindable] - VARIANT onselect(); - [propput, id(DISPID_IHTMLTEXTAREAELEMENT_READONLY), displaybind, bindable] void readOnly(VARIANT_BOOL v); @@ -26333,12 +26228,6 @@ methods: [propget, id(DISPID_IHTMLSCRIPTELEMENT_DEFER), displaybind, bindable] VARIANT_BOOL defer(); - [propput, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propput, id(DISPID_IHTMLSCRIPTELEMENT_TYPE), displaybind, bindable] void type(BSTR v); @@ -26719,12 +26608,6 @@ methods: [propget, id(DISPID_IHTMLOBJECTELEMENT_HEIGHT)] VARIANT height(); - [propput, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propput, id(DISPID_IHTMLOBJECTELEMENT_ALTHTML)] void altHtml(BSTR v); @@ -27039,12 +26922,6 @@ interface IHTMLFrameBase2 : IDispatch [propget, id(DISPID_IHTMLFRAMEBASE2_CONTENTWINDOW)] \ IHTMLWindow2 *contentWindow(); \ \ - [propput, id(DISPID_IHTMLFRAMEBASE2_ONLOAD), displaybind, bindable] \ - void onload(VARIANT v); \ - \ - [propget, id(DISPID_IHTMLFRAMEBASE2_ONLOAD), displaybind, bindable] \ - VARIANT onload(); \ - \ [propput, id(DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY)] \ void allowTransparency(VARIANT_BOOL v); \ \ @@ -27422,18 +27299,6 @@ methods: [propget, id(DISPID_IHTMLSTYLEELEMENT_TYPE), displaybind, bindable] BSTR type(); - [propput, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propget, id(DISPID_IHTMLSTYLEELEMENT_STYLESHEET)] IHTMLStyleSheet *styleSheet();

1 0

Alexandre Julliard : unicode: Move the combining class table to ntdll.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: 6346809302e5b8bd990d4b09d74c90e7d18741fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6346809302e5b8bd990d4b09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 16:29:34 2020 +0100 unicode: Move the combining class table to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + {libs/port => dlls/ntdll}/combclass.c | 0 libs/port/Makefile.in | 1 - tools/make_unicode | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 491cf5a707..94348d56a6 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ actctx.c \ atom.c \ cdrom.c \ + combclass.c \ critsection.c \ crypt.c \ debugbuffer.c \ diff --git a/libs/port/combclass.c b/dlls/ntdll/combclass.c similarity index 100% rename from libs/port/combclass.c rename to dlls/ntdll/combclass.c diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index f9e45035bd..3b70f82d6f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -76,7 +76,6 @@ C_SRCS = \ c_950.c \ casemap.c \ collation.c \ - combclass.c \ compose.c \ cpsymbol.c \ cptable.c \ diff --git a/tools/make_unicode b/tools/make_unicode index c500e68ee9..3f1d3e55a9 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2757,7 +2757,7 @@ dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_string_type_table( "dlls/kernelbase/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c", 1 ); dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 ); -dump_combining_class( "libs/port/combclass.c" ); +dump_combining_class( "dlls/ntdll/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" ); dump_bracket( "dlls/usp10/bracket.c" );

1 0

Kevin Puetz : mshtml.idl: Fix IHTMLComputedStyle declaration.
by Alexandre Julliard Feb. 4, 2020

Feb. 4, 2020

Module: wine Branch: master Commit: a727b6b98c2c7ea1bed2bdacd263ff5ae6c0de70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a727b6b98c2c7ea1bed2bdac… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Feb 4 19:58:45 2020 +0100 mshtml.idl: Fix IHTMLComputedStyle declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 67c3712fc4..cbef72e364 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28027,23 +28027,23 @@ interface ILineInfo : IUnknown ] interface IHTMLComputedStyle : IUnknown { - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT *preFormatted([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT preFormatted([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL *p); [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OL)] HRESULT OL([retval, out] VARIANT_BOOL *p); HRESULT IsEqual([in] IHTMLComputedStyle *pComputedStyle,[out] VARIANT_BOOL *pfEqual); };

1 0