November 2018 - Wine-commits

Brendan McGrath : winebus.sys: Use JoystickNumButtons for button_count.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 9736a36fe60f611558774fcb4bbef32e2706f4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9736a36fe60f611558774fcb… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Tue Nov 20 11:17:10 2018 +1100 winebus.sys: Use JoystickNumButtons for button_count. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e..4f0f685 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -857,7 +857,7 @@ static void try_add_device(SDL_JoystickID index) id, vid, pid, version, debugstr_w(serial)); axis_count = pSDL_JoystickNumAxes(joystick); - button_count = pSDL_JoystickNumAxes(joystick); + button_count = pSDL_JoystickNumButtons(joystick); is_xbox_gamepad = (axis_count == 6 && button_count >= 14); }

1 0

Roberto Pungartnik : po: Update Portuguese (Brazil) translation.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 01e59824ca7fc03d0e80e3b3e7cdd334d361a4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01e59824ca7fc03d0e80e3b3… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Tue Nov 20 16:35:55 2018 -0200 po: Update Portuguese (Brazil) translation. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 554 +++++++++++++----------------------------------------------- 1 file changed, 120 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01e59824ca7fc03d0e80…

1 0

Piotr Caban : msvcp90: Add time_get<char>::do_get_date implementation.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 74d0c97383139b13c732f1d95ae559bb0aeb2733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d0c97383139b13c732f1d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:30 2018 +0100 msvcp90: Add time_get<char>::do_get_date implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 173 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 143 insertions(+), 30 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 83fa3de..a5bcae2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10060,36 +10060,6 @@ istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char * return NULL; } -/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ -/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_do_get_date, 36) /* virtual */ -#if _MSVCP_VER <= 100 -#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 12, istreambuf_iterator_char*, \ - (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ - (this, ret, s, e, base, err, t)) -#else -#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 20, istreambuf_iterator_char*, \ - (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ - (this, ret, s, e, base, err, t)) -#endif -istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_char *this, - istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, - ios_base *base, int *err, struct tm *t) -{ - FIXME("(%p %p %p %p %p) stub\n", this, ret, base, err, t); - return NULL; -} - -/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ -/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_get_date, 36) -istreambuf_iterator_char* __thiscall time_get_char_get_date(const time_get_char *this, - istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, - ios_base *base, int *err, struct tm *t) -{ - return call_time_get_char_do_get_date(this, ret, s, e, base, err, t); -} - static int find_longest_match(istreambuf_iterator_char *iter, const char *str) { int i, len = 0, last_match = -1, match = -1; @@ -10310,6 +10280,149 @@ istreambuf_iterator_char* __thiscall time_get_char_get_year(const time_get_char return call_time_get_char_do_get_year(this, ret, s, e, base, err, t); } +static void skip_date_delim(ctype_char *ctype, istreambuf_iterator_char *iter) +{ + istreambuf_iterator_char_val(iter); + while(iter->strbuf && ctype_char_is_ch(ctype, _SPACE, iter->val)) + istreambuf_iterator_char_inc(iter); + + if(iter->strbuf && (iter->val == '/' || iter->val == ':')) + istreambuf_iterator_char_inc(iter); + + while(iter->strbuf && ctype_char_is_ch(ctype, _SPACE, iter->val)) + istreambuf_iterator_char_inc(iter); +} + +/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ +/* ?do_get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_do_get_date, 36) /* virtual */ +#if _MSVCP_VER <= 100 +#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 12, istreambuf_iterator_char*, \ + (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ + (this, ret, s, e, base, err, t)) +#else +#define call_time_get_char_do_get_date(this, ret, s, e, base, err, t) CALL_VTBL_FUNC(this, 20, istreambuf_iterator_char*, \ + (const time_get_char*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, struct tm*), \ + (this, ret, s, e, base, err, t)) +#endif +istreambuf_iterator_char* __thiscall time_get_char_do_get_date(const time_get_char *this, + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, + ios_base *base, int *err, struct tm *t) +{ + ctype_char *ctype; + dateorder order; + + TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); + + ctype = ctype_char_use_facet(IOS_LOCALE(base)); + + order = time_get_char_date_order(this); + if(order == DATEORDER_no_order) + order = DATEORDER_mdy; + + switch(order) { + case DATEORDER_dmy: + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + if(s.strbuf && ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + time_get_char_get_year(this, &s, s, e, base, err, t); + break; + case DATEORDER_mdy: + istreambuf_iterator_char_val(&s); + if(s.strbuf && ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + time_get_char_get_year(this, &s, s, e, base, err, t); + break; + case DATEORDER_ymd: + time_get_char_get_year(this, &s, s, e, base, err, t); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + if(ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + break; + case DATEORDER_ydm: + time_get_char_get_year(this, &s, s, e, base, err, t); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + *err |= time_get_char__Getint(this, &s, &e, 1, 31, &t->tm_mday); + skip_date_delim(ctype, &s); + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + if(ctype_char_is_ch(ctype, _DIGIT, s.val)) { + *err |= time_get_char__Getint(this, &s, &e, 1, 12, &t->tm_mon); + t->tm_mon--; + } else { + time_get_char_get_monthname(this, &s, s, e, base, err, t); + } + break; + default: + ERR("incorrect order value: %d\n", order); + break; + } + + if(!s.strbuf) + *err |= IOSTATE_eofbit; + *ret = s; + return ret; +} + +/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ +/* ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_get_date, 36) +istreambuf_iterator_char* __thiscall time_get_char_get_date(const time_get_char *this, + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, + ios_base *base, int *err, struct tm *t) +{ + return call_time_get_char_do_get_date(this, ret, s, e, base, err, t); +} + /* ??_7_Locimp(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale__Locimp_vtable;

1 0

Piotr Caban : msvcp100: Add time_get<char>do_get implementation.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 2dfbfbd4cf968bb16c6e1c1c44b911d55b75e6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dfbfbd4cf968bb16c6e1c1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:40 2018 +0100 msvcp100: Add time_get<char>do_get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp110/msvcp110.spec | 6 +- dlls/msvcp120/msvcp120.spec | 6 +- dlls/msvcp120_app/msvcp120_app.spec | 6 +- dlls/msvcp140/msvcp140.spec | 6 +- dlls/msvcp90/locale.c | 238 ++++++++++++++++++++++++++++++------ 6 files changed, 217 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dfbfbd4cf968bb16c6e…

1 0

Piotr Caban : msvcp100: Add time_get<char>::get_fmt implementation.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: ba7cf8cf8fdbb279f2849f109fbe97f57ec2cc61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7cf8cf8fdbb279f2849f10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:46 2018 +0100 msvcp100: Add time_get<char>::get_fmt implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 58 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 64f7de2..7755ddf 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10019,16 +10019,6 @@ dateorder __thiscall time_get_char_date_order(const time_get_char *this) return call_time_get_char_do_date_order(this); } -/* ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@PEBD4(a)Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_get_fmt, 44) -istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *this, - istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, - ios_base *base, int *err, struct tm *t, const char *fmtstart, const char *fmtend) -{ - FIXME("(%p %p %p %p %p %p %p) stub\n", this, ret, base, err, t, fmtstart, fmtend); - return NULL; -} - static int find_longest_match(istreambuf_iterator_char *iter, const char *str) { int i, len = 0, last_match = -1, match = -1; @@ -10590,6 +10580,54 @@ istreambuf_iterator_char* __thiscall time_get_char_get(const time_get_char *this return call_time_get_char_do_get(this, ret, s, e, base, err, t, fmt, mod); } +/* ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@PEBD4(a)Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_get_fmt, 44) +istreambuf_iterator_char* __thiscall time_get_char_get_fmt(const time_get_char *this, + istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, + ios_base *base, int *err, struct tm *t, const char *fmtstart, const char *fmtend) +{ + ctype_char *ctype; + + TRACE("(%p %p %p %p %p %s)\n", this, ret, base, err, t, wine_dbgstr_an(fmtstart, fmtend-fmtstart)); + + ctype = ctype_char_use_facet(IOS_LOCALE(base)); + istreambuf_iterator_char_val(&s); + + while(fmtstart < fmtend) { + if(ctype_char_is_ch(ctype, _SPACE, *fmtstart)) { + skip_ws(ctype, &s); + fmtstart++; + continue; + } + + if(!s.strbuf) { + *err |= IOSTATE_failbit; + break; + } + + if(*fmtstart != '%' || fmtstart+1 >= fmtend || fmtstart[1] == '%') { + if(s.val != *fmtstart) + *err |= IOSTATE_failbit; + else + istreambuf_iterator_char_inc(&s); + if(*fmtstart == '%') + fmtstart++; + } else { + fmtstart++; + time_get_char_get(this, &s, s, e, base, err, t, *fmtstart, 0); + } + + if(*err & IOSTATE_failbit) + break; + fmtstart++; + } + + if(!s.strbuf) + *err |= IOSTATE_eofbit; + *ret = s; + return ret; +} + /* ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@PBD4(a)Z */ /* ??_7_Locimp(a)locale@std@@6B@ */ extern const vtable_ptr MSVCP_locale__Locimp_vtable;

1 0

Piotr Caban : msvcp110: Export time_get functions on arm.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: d7a43259b11f2b4cece071bbe363bc0d034d8089 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7a43259b11f2b4cece071bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 18:30:53 2018 +0100 msvcp110: Export time_get functions on arm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 72 ++++++++++++++++++------------------- dlls/msvcp120/msvcp120.spec | 72 ++++++++++++++++++------------------- dlls/msvcp120_app/msvcp120_app.spec | 72 ++++++++++++++++++------------------- dlls/msvcp140/msvcp140.spec | 20 +++++------ 4 files changed, 118 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7a43259b11f2b4cece0…

1 0

Jacek Caban : schannel.h: Add TLS 1.3 defines.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 40c847d8074770681d1c6434fdaf7c015bca99f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c847d8074770681d1c6434… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 19:13:06 2018 +0100 schannel.h: Add TLS 1.3 defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 1 + include/schannel.h | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2bd0e01..ebdfcb6 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -202,6 +202,7 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client"); X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); + X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client"); #undef X if(protocols.grbitProtocol) diff --git a/include/schannel.h b/include/schannel.h index 2e1a9f6..6dac2e9 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -107,6 +107,8 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_ALL 0xffffffff #define SP_PROT_UNI_CLIENT 0x80000000 #define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_TLS1_3_SERVER 0x00001000 +#define SP_PROT_TLS1_3_CLIENT 0x00002000 #define SP_PROT_TLS1_2_CLIENT 0x00000800 #define SP_PROT_TLS1_2_SERVER 0x00000400 #define SP_PROT_TLS1_1_CLIENT 0x00000200 @@ -124,6 +126,7 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_NONE 0x00000000 #define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER) #define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) #define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) #define SP_PROT_TLS1_0 (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_0_SERVER) @@ -136,10 +139,20 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_SSL3TLS1_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_SERVER) #define SP_PROT_SSL3TLS1_X_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_X_CLIENT) #define SP_PROT_SSL3TLS1_X_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_X_SERVER) -#define SP_PROT_TLS1_X_CLIENT (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) -#define SP_PROT_TLS1_X_SERVER (SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) -#define SP_PROT_TLS1_1PLUS_CLIENT (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) -#define SP_PROT_TLS1_1PLUS_SERVER (SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_TLS1_X_CLIENT ( SP_PROT_TLS1_0_CLIENT \ + | SP_PROT_TLS1_1_CLIENT \ + | SP_PROT_TLS1_2_CLIENT \ + | SP_PROT_TLS1_3_CLIENT ) +#define SP_PROT_TLS1_X_SERVER ( SP_PROT_TLS1_0_SERVER \ + | SP_PROT_TLS1_1_SERVER \ + | SP_PROT_TLS1_2_SERVER \ + | SP_PROT_TLS1_3_SERVER ) +#define SP_PROT_TLS1_1PLUS_CLIENT ( SP_PROT_TLS1_1_CLIENT \ + | SP_PROT_TLS1_2_CLIENT \ + | SP_PROT_TLS1_3_CLIENT) +#define SP_PROT_TLS1_1PLUS_SERVER ( SP_PROT_TLS1_1_SERVER \ + | SP_PROT_TLS1_2_SERVER \ + | SP_PROT_TLS1_3_SERVER ) #define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) #define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \

1 0

Michael Stefaniuc : msxml3/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: c743b72d250b3ad273d4885e5ff8e5181e7c793c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c743b72d250b3ad273d4885e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:13 2018 +0100 msxml3/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index dc8ab7d..53eefcb 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -206,7 +206,7 @@ static void test_Load(void) BSTR source; lstrcpyW(buf, res); - GetModuleFileNameW(NULL, buf+lstrlenW(buf), (sizeof(buf)-sizeof(res))/sizeof(WCHAR)); + GetModuleFileNameW(NULL, buf+lstrlenW(buf), ARRAY_SIZE(buf)-ARRAY_SIZE(res)); lstrcatW(buf, xmlview_xmlW); if(!pCreateURLMoniker) {

1 0

Michael Stefaniuc : iphlpapi: Remove a redundant NULL check before HeapFree().
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 488432317206bc816432af0dd740e18979e37e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488432317206bc816432af0d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 20 20:47:20 2018 +0100 iphlpapi: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 84d28ee..c36f42a 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2787,8 +2787,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE break; } HeapFree( GetProcessHeap(), 0, map ); - if (addr_scopes) - HeapFree( GetProcessHeap(), 0, addr_scopes ); + HeapFree( GetProcessHeap(), 0, addr_scopes ); fclose( fp ); } else ret = ERROR_NOT_SUPPORTED;

1 0

Piotr Caban : ucrtbase: Fix wrong function calls in misc tests.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 78ef7515832fc266cbfbecc7a8048d1dad8584d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ef7515832fc266cbfbecc7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 01:00:36 2018 +0100 ucrtbase: Fix wrong function calls in misc tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2251863..65e308c 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -118,6 +118,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static int (WINAPIV *p__open)(const char*, int, ...); static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); @@ -134,6 +135,7 @@ static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); static void (__cdecl *p_quick_exit)(int exitcode); static int (__cdecl *p__stat32)(const char*, struct _stat32 *buf); +static int (__cdecl *p__close)(int); static void test__initialize_onexit_table(void) { @@ -476,6 +478,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p__open = (void*)GetProcAddress(module, "_open"); p_lldiv = (void*)GetProcAddress(module, "lldiv"); p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); @@ -492,6 +495,7 @@ static BOOL init(void) p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); p__stat32 = (void*)GetProcAddress(module, "_stat32"); + p__close = (void*)GetProcAddress(module, "_close"); return TRUE; } @@ -507,7 +511,7 @@ static void test__sopen_dispatch(void) ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 0); ok(!ret, "got %d\n", ret); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); p__set_invalid_parameter_handler(global_invalid_parameter_handler); @@ -520,7 +524,7 @@ static void test__sopen_dispatch(void) CHECK_CALLED(global_invalid_parameter_handler); if (fd > 0) { - _close(fd); + p__close(fd); unlink(tempf); } @@ -540,13 +544,13 @@ static void test__sopen_s(void) ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0); ok(!ret, "got %d\n", ret); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); /* _open() does not validate pmode */ - fd = _open(tempf, _O_CREAT, 0xff); + fd = p__open(tempf, _O_CREAT, 0xff); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); p__set_invalid_parameter_handler(global_invalid_parameter_handler);

1 0