November 2019 - Wine-Commits

Hans Leidekker : winhttp: Use wide character string literals.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 5bf055a62d63bee2ab63f9f0359e129247965af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf055a62d63bee2ab63f9f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 22 16:32:24 2019 +0100 winhttp: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/request.c | 333 +++++++++++++++-------------------------- dlls/winhttp/session.c | 67 +++------ dlls/winhttp/url.c | 26 ++-- dlls/winhttp/winhttp_private.h | 8 - 5 files changed, 155 insertions(+), 285 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bf055a62d63bee2ab63…

1 0

Conor McCarthy : winedbg: Add support for x86_64 indirect function call targets.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 26df43d8ca8b38203bd52d6cabeb6c53bbf9c3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26df43d8ca8b38203bd52d6c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Nov 23 01:15:56 2019 +1000 winedbg: Add support for x86_64 indirect function call targets. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_x86_64.c | 95 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 5b95cefa36..83cbb3c05c 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -269,6 +269,9 @@ static struct dbg_internal_var be_x86_64_ctx[] = #define f_mod(b) ((b)>>6) #define f_reg(b) (((b)>>3)&0x7) #define f_rm(b) ((b)&0x7) +#define f_sib_b(b) ((b)&0x7) +#define f_sib_i(b) (((b)>>3)&0x7) +#define f_sib_s(b) ((b)>>6) static BOOL be_x86_64_is_step_over_insn(const void* insn) { @@ -371,6 +374,81 @@ static BOOL fetch_value(const char* addr, unsigned sz, int* value) return TRUE; } +static BOOL add_fixed_displacement(const void* insn, BYTE mod, DWORD64* addr) +{ + LONG delta = 0; + + if (mod == 1) + { + if (!fetch_value(insn, 1, &delta)) + return FALSE; + } + else if (mod == 2) + { + if (!fetch_value(insn, sizeof(delta), &delta)) + return FALSE; + } + *addr += delta; + return TRUE; +} + +static BOOL evaluate_sib_address(const void* insn, BYTE mod, DWORD64* addr) +{ + BYTE ch; + BYTE scale; + DWORD64 loc; + + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + + switch (f_sib_b(ch)) + { + case 0x00: loc = dbg_context.ctx.Rax; break; + case 0x01: loc = dbg_context.ctx.Rcx; break; + case 0x02: loc = dbg_context.ctx.Rdx; break; + case 0x03: loc = dbg_context.ctx.Rbx; break; + case 0x04: loc = dbg_context.ctx.Rsp; break; + case 0x05: + loc = dbg_context.ctx.Rbp; + if (mod == 0) + { + loc = 0; + mod = 2; + } + break; + case 0x06: loc = dbg_context.ctx.Rsi; break; + case 0x07: loc = dbg_context.ctx.Rdi; break; + } + + scale = f_sib_s(ch); + switch (f_sib_i(ch)) + { + case 0x00: loc += dbg_context.ctx.Rax << scale; break; + case 0x01: loc += dbg_context.ctx.Rcx << scale; break; + case 0x02: loc += dbg_context.ctx.Rdx << scale; break; + case 0x03: loc += dbg_context.ctx.Rbx << scale; break; + case 0x04: break; + case 0x05: loc += dbg_context.ctx.Rbp << scale; break; + case 0x06: loc += dbg_context.ctx.Rsi << scale; break; + case 0x07: loc += dbg_context.ctx.Rdi << scale; break; + } + + if (!add_fixed_displacement((const char*)insn + 1, mod, &loc)) + return FALSE; + + *addr = loc; + return TRUE; +} + +static BOOL load_indirect_target(DWORD64* dst) +{ + ADDRESS64 addr; + + addr.Mode = AddrModeFlat; + addr.Segment = dbg_context.ctx.SegDs; + addr.Offset = *dst; + return dbg_read_memory(memory_to_linear_addr(&addr), &dst, sizeof(dst)); +} + static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) { BYTE ch; @@ -418,8 +496,12 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) case 0x04: case 0x44: case 0x84: - WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (SIB bytes) at %p\n", ch, insn); - return FALSE; + { + evaluate_sib_address((const char*)insn + 2, f_mod(ch), &dst); + if (!load_indirect_target(&dst)) return FALSE; + callee->Offset = dst; + return TRUE; + } case 0x05: /* addr32 */ if (f_reg(ch) == 0x2) { @@ -446,12 +528,13 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) case 0x07: dst = dbg_context.ctx.Rdi; break; } if (f_mod(ch) != 0x03) - WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) at %p\n", ch, insn); - else { - callee->Offset = dst; + if (!add_fixed_displacement((const char*)insn + 2, f_mod(ch), &dst)) + return FALSE; + if (!load_indirect_target(&dst)) return FALSE; } - break; + callee->Offset = dst; + return TRUE; } else WINE_FIXME("Unsupported yet call insn (rex=0x%02x 0xFF 0x%02x) at %p\n", rex, ch, insn);

1 0

Vijay Kiran Kamuju : tapi/tests: Add initial tests for lineInitialize.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 15e30b9c02cc9c031d5fe83c600aaf7999d2a339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e30b9c02cc9c031d5fe83c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 16 22:52:28 2019 +0100 tapi/tests: Add initial tests for lineInitialize. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/tapi32/tests/Makefile.in | 5 ++++ dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++++++++++ include/tapi.h | 2 +- 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 22e0932b00..dc23826900 100755 --- a/configure +++ b/configure @@ -20841,6 +20841,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16 wine_fn_config_makefile dlls/t2embed enable_t2embed wine_fn_config_makefile dlls/t2embed/tests enable_tests wine_fn_config_makefile dlls/tapi32 enable_tapi32 +wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests wine_fn_config_makefile dlls/tdh enable_tdh diff --git a/configure.ac b/configure.ac index bbea41416a..fe2816ca7b 100644 --- a/configure.ac +++ b/configure.ac @@ -3696,6 +3696,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/t2embed) WINE_CONFIG_MAKEFILE(dlls/t2embed/tests) WINE_CONFIG_MAKEFILE(dlls/tapi32) +WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) WINE_CONFIG_MAKEFILE(dlls/tdh) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in new file mode 100644 index 0000000000..126eed1c85 --- /dev/null +++ b/dlls/tapi32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = tapi32.dll +IMPORTS = tapi32 + +C_SRCS = \ + tapi.c diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c new file mode 100644 index 0000000000..13772c8c7d --- /dev/null +++ b/dlls/tapi32/tests/tapi.c @@ -0,0 +1,62 @@ +/* + * TAPI32 API tests + * + * Copyright 2019 Vijay Kiran Kamuju + * + * 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 "tapi.h" + +#include "wine/test.h" + +static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3) +{ +} + +static void test_lineInitialize(void) +{ + ULONG ret; + DWORD dev; + HLINEAPP lnApp; + + ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); + ok(!ret, "unexpected return value, got %u.\n", ret); + + ret = lineShutdown(NULL); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + + ret = lineShutdown(lnApp); + ok(!ret, "unexpected return value, got %u.\n", ret); +} + +START_TEST(tapi) +{ + test_lineInitialize(); +} diff --git a/include/tapi.h b/include/tapi.h index 52ec619aef..535ca67a42 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -761,7 +761,7 @@ typedef struct linemessage_tag { DWORD_PTR dwParam3; } LINEMESSAGE, *LPLINEMESSAGE; -typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); +typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR); typedef struct _PHONEAPP { int dummy;

1 0

Jeff Smith : ucrtbase: Correct day-of-week range for strftime.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: bb3c3e8fec616c31a8b7731c61a1ddff4379a77e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb3c3e8fec616c31a8b7731c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 18:28:10 2019 -0600 ucrtbase: Correct day-of-week range for strftime. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 2 ++ dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 127a2164b8..84e725747f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1405,6 +1405,8 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; case 'u': + if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6)) + goto einval_error; tmp = mstm->tm_wday ? mstm->tm_wday : 7; if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c242546a80..93a78a5de7 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -959,11 +959,11 @@ static void test_strftime(void) {"%#R", "0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%T", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#T", "0:0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }, FALSE, TRUE}, + {"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }}, {"%u", "7", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, {"%u", "1", { 0, 0, 0, 1, 0, 117, 1, 0, 0 }}, {"%u", "6", { 0, 0, 0, 1, 0, 117, 6, 0, 0 }}, - {"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }, TRUE}, + {"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }}, {"%h", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, -1, 1, 0, 70, 4, 0, 0 }}, {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},

1 0

Piotr Caban : ucrtbase: Fix hexadecimal floats parsing in strtod.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: c953c36d11ee6f83b8b33e9ec1d7664ff5e680ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c953c36d11ee6f83b8b33e9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 16:41:30 2019 +0100 ucrtbase: Fix hexadecimal floats parsing in strtod. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++------ dlls/ucrtbase/tests/string.c | 15 ++- 2 files changed, 239 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 10249592bb..fa5f7022c1 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -325,6 +325,221 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } } +#if _MSVCR_VER >= 140 + +enum round { + ROUND_ZERO, /* only used when dropped part contains only zeros */ + ROUND_DOWN, + ROUND_EVEN, + ROUND_UP +}; + +static double make_double(int sign, int exp, ULONGLONG m, enum round round, int *err) +{ +#define EXP_BITS 11 +#define MANT_BITS 53 + ULONGLONG bits = 0; + + TRACE("%c %s *2^%d (round %d)\n", sign == -1 ? '-' : '+', wine_dbgstr_longlong(m), exp, round); + if (!m) return sign * 0.0; + + /* make sure that we don't overflow modifying exponent */ + if (exp > 1<<EXP_BITS) + { + if (err) *err = MSVCRT_ERANGE; + return sign * INFINITY; + } + if (exp < -(1<<EXP_BITS)) + { + if (err) *err = MSVCRT_ERANGE; + return sign * 0.0; + } + exp += MANT_BITS - 1; + + /* normalize mantissa */ + while(m < (ULONGLONG)1 << (MANT_BITS-1)) + { + m <<= 1; + exp--; + } + while(m >= (ULONGLONG)1 << MANT_BITS) + { + if (m & 1 || round != ROUND_ZERO) + { + if (!(m & 1)) round = ROUND_DOWN; + else if(round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + m >>= 1; + exp++; + } + + /* handle subnormal that falls into regular range due to rounding */ + exp += (1 << (EXP_BITS-1)) - 1; + if (!exp && (round == ROUND_UP || (round == ROUND_EVEN && m & 1))) + { + if (m + 1 >= (ULONGLONG)1 << MANT_BITS) + { + m++; + m >>= 1; + exp++; + round = ROUND_DOWN; + } + } + + /* handle subnormals */ + if (exp <= 0) + m >>= 1; + while(m && exp<0) + { + m >>= 1; + exp++; + } + + /* round mantissa */ + if (round == ROUND_UP || (round == ROUND_EVEN && m & 1)) + { + m++; + if (m >= (ULONGLONG)1 << MANT_BITS) + { + exp++; + m >>= 1; + } + } + + if (exp >= 1<<EXP_BITS) + { + if (err) *err = MSVCRT_ERANGE; + return sign * INFINITY; + } + if (!m || exp < 0) + { + if (err) *err = MSVCRT_ERANGE; + return sign * 0.0; + } + + if (sign == -1) bits |= (ULONGLONG)1 << (MANT_BITS + EXP_BITS - 1); + bits |= (ULONGLONG)exp << (MANT_BITS - 1); + bits |= m & (((ULONGLONG)1 << (MANT_BITS - 1)) - 1); + + TRACE("returning %s\n", wine_dbgstr_longlong(bits)); + return *((double*)&bits); +} + +static inline int hex2int(char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + else if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + return -1; +} + +static double strtod16(int sign, const char *p, char **end, + MSVCRT_pthreadlocinfo locinfo, int *err) +{ + enum round round = ROUND_ZERO; + BOOL found_digit = FALSE; + ULONGLONG m = 0; + int val, exp = 0; + + while(m < MSVCRT_UI64_MAX/16) + { + val = hex2int(*p); + if (val == -1) break; + found_digit = TRUE; + p++; + + m = m*16 + val; + } + while(1) + { + val = hex2int(*p); + if (val == -1) break; + p++; + exp += 4; + + if (val || round != ROUND_ZERO) + { + if (val < 8) round = ROUND_DOWN; + else if (val == 8 && round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + } + + if(*p == *locinfo->lconv->decimal_point) + p++; + else if (!found_digit) + { + if(end) *end = (char*)p - 1; + return 0.0; + } + + while(m <= MSVCRT_UI64_MAX/16) + { + val = hex2int(*p); + if (val == -1) break; + found_digit = TRUE; + p++; + + m = m*16 + val; + exp -= 4; + } + while(1) + { + val = hex2int(*p); + if (val == -1) break; + p++; + + if (val || round != ROUND_ZERO) + { + if (val < 8) round = ROUND_DOWN; + else if (val == 8 && round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + } + + if (!found_digit) + { + if(end) *end = (char*)p - 2; + return 0.0; + } + + if(*p=='p' || *p=='P') { + int e=0, s=1; + + p++; + if(*p == '-') { + s = -1; + p++; + } else if(*p == '+') + p++; + + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { + if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) + e = INT_MAX; + p++; + } + e *= s; + + if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; + } else { + if(*p=='-' || *p=='+') + p--; + p--; + } + } + + if (end) *end = (char*)p; + return make_double(sign, exp, m, round, err); +} +#endif + static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { MSVCRT_pthreadlocinfo locinfo; @@ -335,7 +550,6 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale double ret; long double lret=1, expcnt = 10; BOOL found_digit = FALSE, negexp; - int base = 10; if(err) *err = 0; @@ -379,33 +593,22 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return NAN; } - if(p[0] == '0' && MSVCRT__tolower_l(p[1], locale) == 'x') { - base = 16; - expcnt = 2; + if(p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { p += 2; + return strtod16(sign, p, end, locinfo, err); } #endif - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { - char c = *p++; - int val; + while(*p>='0' && *p<='9') { found_digit = TRUE; - if (c>='0' && c<='9') - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = 10 + c - 'a'; - else - val = 10 + c - 'A'; - hlp = d*base+val; - if(d>MSVCRT_UI64_MAX/base || hlp<d) { + hlp = d * 10 + *p++ - '0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; break; } else d = hlp; } - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { + while(*p>='0' && *p<='9') { exp++; p++; } @@ -413,25 +616,15 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(*p == *locinfo->lconv->decimal_point) p++; - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { - char c = *p++; - int val; + while(*p>='0' && *p<='9') { found_digit = TRUE; - if (c>='0' && c<='9') - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = 10 + c - 'a'; - else - val = 10 + c - 'A'; - hlp = d*base+val; - if(d>MSVCRT_UI64_MAX/base || hlp<d) + hlp = d * 10 + *p++ - '0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; d = hlp; exp--; } - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) + while(*p>='0' && *p<='9') p++; if(!found_digit) { @@ -440,11 +633,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return 0.0; } - if(base == 16) - exp *= 4; - - if((base == 10 && (*p=='e' || *p=='E' || *p=='d' || *p=='D')) || - (base == 16 && (*p=='p' || *p=='P'))) { + if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { int e=0, s=1; p++; diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index e4146c6fc4..bfa602c538 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -125,9 +125,9 @@ static void _test_strtod_str(int line, const char* string, double value, int len double d; d = p_strtod(string, &end); if (local_isnan(value)) - ok_(__FILE__, line)(local_isnan(d), "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); else - ok_(__FILE__, line)(d == value, "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(d == value, "d = %.16le (\"%s\")\n", d, string); ok_(__FILE__, line)(end == string + length, "incorrect end (%d, \"%s\")\n", (int)(end - string), string); } @@ -162,6 +162,17 @@ static void test_strtod(void) test_strtod_str("0x1.1p1", 2.125, 7); test_strtod_str("0x1.A", 1.625, 5); test_strtod_str("0x1p1a", 2, 5); + test_strtod_str("0xp3", 0, 1); + test_strtod_str("0x.", 0, 1); + test_strtod_str("0x.8", 0.5, 4); + test_strtod_str("0x.8p", 0.5, 4); + test_strtod_str("0x0p10000000000000000000000000", 0, 30); + test_strtod_str("0x1p-1026", 1.3906711615670009e-309, 9); + + test_strtod_str("0x1ffffffffffffe.80000000000000000000", 9007199254740990.0, 37); + test_strtod_str("0x1ffffffffffffe.80000000000000000001", 9007199254740991.0, 37); + test_strtod_str("0x1fffffffffffff.80000000000000000000", 9007199254740992.0, 37); + test_strtod_str("0x1fffffffffffff.80000000000000000001", 9007199254740992.0, 37); } static void test__memicmp(void)

1 0

Jeff Smith : msvcrt: Correct hour range for strftime.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: bcb1aee8c7b9f2ff35d5dcf90599b871dec4d243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcb1aee8c7b9f2ff35d5dcf9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 18:28:09 2019 -0600 msvcrt: Correct hour range for strftime. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 10 ++++------ dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 288b4d5cda..127a2164b8 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1344,12 +1344,10 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; case 'I': - tmp = mstm->tm_hour; - if(tmp > 12) - tmp -= 12; - else if(!tmp) - tmp = 12; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 1, 12)) + if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) + goto einval_error; + if(!strftime_int(str, &ret, max, (mstm->tm_hour + 11) % 12 + 1, + alternate ? 0 : 2, 1, 12)) return 0; break; case 'j': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 6700b4bdf1..c242546a80 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -965,14 +965,14 @@ static void test_strftime(void) {"%u", "6", { 0, 0, 0, 1, 0, 117, 6, 0, 0 }}, {"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }, TRUE}, {"%h", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%I", "", { 0, 0, -1, 1, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%I", "", { 0, 0, -1, 1, 0, 70, 4, 0, 0 }}, {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%I", "01", { 0, 0, 1, 1, 0, 70, 4, 0, 0 }}, {"%I", "11", { 0, 0, 11, 1, 0, 70, 4, 0, 0 }}, {"%I", "12", { 0, 0, 12, 1, 0, 70, 4, 0, 0 }}, {"%I", "01", { 0, 0, 13, 1, 0, 70, 4, 0, 0 }}, {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, - {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }, TRUE}, + {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE},

1 0

Zebediah Figura : quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 608acdc83ad44db1ec9301d48695d3ce24fcfd91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608acdc83ad44db1ec9301d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:22 2019 -0600 quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible. We already rejected any other format types when connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b71d15a5d2..e38a773239 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,7 +134,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) +static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; @@ -150,11 +150,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } - else - { - FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); - return VFW_E_RUNTIME_ERROR; - } TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); @@ -165,8 +160,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); - - return S_OK; } static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter,

1 0

Zebediah Figura : strmbase/renderer: Exit BaseRendererImpl_Receive() immediately if flush_event was signaled.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 6072c66c5a42800a8624ea550fe1308cb27cfa4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6072c66c5a42800a8624ea55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:23 2019 -0600 strmbase/renderer: Exit BaseRendererImpl_Receive() immediately if flush_event was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0c33b5ea84..aa134ba5da 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -394,15 +394,22 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa if (now - This->stream_start - start <= -10000) { HANDLE handles[2] = {This->advise_event, This->flush_event}; + DWORD ret; IReferenceClock_AdviseTime(This->filter.pClock, This->stream_start, start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); - WaitForMultipleObjects(2, handles, FALSE, INFINITE); + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(This->filter.pClock, cookie); + if (ret == 1) + { + TRACE("Flush signaled, discarding current sample.\n"); + return S_OK; + } + EnterCriticalSection(&This->csRenderLock); } }

1 0

Zebediah Figura : quartz/videorenderer: Remove some dead code.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: b78dcbf269eedf91bad53ff4dea23d2223748c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78dcbf269eedf91bad53ff4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:25 2019 -0600 quartz/videorenderer: Remove some dead code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bc5791dd5c..db889bb661 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -149,7 +149,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; BITMAPINFOHEADER *bih; - LONG cbSrcStream = 0; HRESULT hr; HDC dc; @@ -162,23 +161,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - cbSrcStream = IMediaSample_GetActualDataLength(pSample); - - TRACE("val %p %d\n", pbSrcStream, cbSrcStream); - -#if 0 /* For debugging purpose */ - { - int i; - for(i = 0; i < cbSrcStream; i++) - { - if ((i!=0) && !(i%16)) - TRACE("\n"); - TRACE("%02x ", pbSrcStream[i]); - } - TRACE("\n"); - } -#endif - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; else

1 0

Gabriel Ivăncescu : vbscript: Trace the pstrItemName parameter.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: d729df0bb8ff1a24802d5c4a1b6719a107048228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d729df0bb8ff1a24802d5c4a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 14 18:14:11 2019 +0200 vbscript: Trace the pstrItemName parameter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index fdade9f13a..803a54a694 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -673,7 +673,7 @@ static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR { VBScript *This = impl_from_IActiveScript(iface); - TRACE("(%p)->(%p)\n", This, ppdisp); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(pstrItemName), ppdisp); if(!ppdisp) return E_POINTER;

1 0