wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Piotr Caban : msvcrt: Fix rounding of numbers smaller than minimal subnormal.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 29288c0bc0ea724bf27ffa1e731e4d4b5b45643b URL: https://source.winehq.org/git/wine.git/?a=commit;h=29288c0bc0ea724bf27ffa1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:46 2020 +0200 msvcrt: Fix rounding of numbers smaller than minimal subnormal. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 28 +++++++++++++++------------- dlls/ucrtbase/tests/string.c | 2 ++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5b6d73626a..ab6747db5c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -413,25 +413,21 @@ int fpnum_double(struct fpnum *fp, double *d) fp->m >>= 1; fp->exp++; } - - /* handle subnormal that falls into regular range due to rounding */ fp->exp += (1 << (EXP_BITS-1)) - 1; - if (!fp->exp && (fp->mod == FP_ROUND_UP || (fp->mod == FP_ROUND_EVEN && fp->m & 1))) - { - if (fp->m + 1 >= (ULONGLONG)1 << MANT_BITS) - { - fp->m++; - fp->m >>= 1; - fp->exp++; - fp->mod = FP_ROUND_DOWN; - } - } /* handle subnormals */ if (fp->exp <= 0) + { + if (fp->m & 1 && fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else if (fp->m & 1) fp->mod = FP_ROUND_UP; + else if (fp->mod != FP_ROUND_ZERO) fp->mod = FP_ROUND_DOWN; fp->m >>= 1; + } while(fp->m && fp->exp<0) { + if (fp->m & 1 && fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else if (fp->m & 1) fp->mod = FP_ROUND_UP; + else if (fp->mod != FP_ROUND_ZERO) fp->mod = FP_ROUND_DOWN; fp->m >>= 1; fp->exp++; } @@ -440,7 +436,13 @@ int fpnum_double(struct fpnum *fp, double *d) if (fp->mod == FP_ROUND_UP || (fp->mod == FP_ROUND_EVEN && fp->m & 1)) { fp->m++; - if (fp->m >= (ULONGLONG)1 << MANT_BITS) + + /* handle subnormal that falls into regular range due to rounding */ + if (fp->m == (ULONGLONG)1 << (MANT_BITS - 1)) + { + fp->exp++; + } + else if (fp->m >= (ULONGLONG)1 << MANT_BITS) { fp->exp++; fp->m >>= 1; diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 5857a02773..3a4b8b9f04 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -148,6 +148,8 @@ static void test_strtod(void) test_strtod_str("1.7976931348623158e+308", 1.7976931348623158e+308, 23); test_strtod_str("2.2250738585072014e-308", 2.2250738585072014e-308, 23); test_strtod_str("4.9406564584124654e-324", 4.9406564584124654e-324, 23); + test_strtod_str("2.48e-324", 4.9406564584124654e-324, 9); + test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } static void test__memicmp(void)

1 0

Piotr Caban : msvcrt: Add __STRINGTOLD tests.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 4fe481db95350c381f1c2545745afae52f4cefc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe481db95350c381f1c2545… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:42 2020 +0200 msvcrt: Add __STRINGTOLD tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index ad41ad4d24..8e23f9cffe 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -115,6 +115,8 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +int CDECL __STRINGTOLD(_LDOUBLE*, char**, const char*, int); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -4230,6 +4232,63 @@ static void test_wcscmp(void) ok(!r, "wcscmp returned %d\n", r); } +static const char* debugstr_ldouble(_LDOUBLE *v) +{ + static char buf[2 * ARRAY_SIZE(v->ld) + 1]; + int i; + + for(i=0; i<ARRAY_SIZE(v->ld); i++) + { + buf[2*i] = v->ld[i] / 16 + '0'; + if(buf[2*i] > '9') buf[2*i] -= 10 + '0' - 'a'; + buf[2*i+1] = v->ld[i] % 16 + '0'; + if(buf[2*i+1] > '9') buf[2*i+1] -= 10 + '0' - 'a'; + } + buf[2 * ARRAY_SIZE(v->ld)] = 0; + return buf; +} + +static void test___STRINGTOLD(void) +{ + static const struct { + const char *str; + int endptr; + int r; + _LDOUBLE v; + BOOL todo; + } tests[] = { + { "0", 1 }, + { "nan", 0, 4 }, + { "inf", 0, 4 }, + { "-0.0", 4, 0, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 }} }, + { "1e0", 3, 0, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x3f }} }, + { "1.7976931348623158e+308", 23, 0, {{ 0xaf, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x43 }} }, + { "1.7976931348623159e+308", 23, 0, {{ 0xb1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x43 }} }, + { "3.65e-4951", 10, 0, {{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} }, + { "1.82e-4951", 10, 0, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}, TRUE }, + { "1e-99999", 8, 1, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }} }, + { "1.18e+4932", 10, 0, {{ 0x25, 0x75, 0x06, 0x68, 0x8a, 0xf1, 0xe7, 0xfd, 0xfe, 0x7f }} }, + { "1.19e+4932", 10, 2, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f }} }, + { "1e+99999", 8, 2, {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f }} }, + }; + + char *endptr; + _LDOUBLE v; + int i, r; + + for(i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + r = __STRINGTOLD(&v, &endptr, tests[i].str, 0); + todo_wine_if(tests[i].todo) + ok(r == tests[i].r, "%d) r = %d\n", i, r); + ok(endptr == tests[i].str + tests[i].endptr, "%d) endptr = %p, expected %p\n", + i, endptr, tests[i].str+tests[i].endptr); + ok(!memcmp(&v, &tests[i].v, sizeof(v)), "%d) v = %s\n", i, debugstr_ldouble(&v)); + ok(errno == 0xdeadbeef, "%d) errno = %x\n", i, errno); + } +} + START_TEST(string) { char mem[100]; @@ -4380,4 +4439,5 @@ START_TEST(string) test_strstr(); test_iswdigit(); test_wcscmp(); + test___STRINGTOLD(); }

1 0

Piotr Caban : msvcrt: Don't use strtold in __STRINGTOLD_L.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: a22adf1893d510660d7eeea5ef290399ce21e8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22adf1893d510660d7eeea5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:40 2020 +0200 msvcrt: Don't use strtold in __STRINGTOLD_L. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 1 + dlls/msvcrt/msvcrt.h | 4 +- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/wcs.c | 2 +- 5 files changed, 179 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a22adf1893d510660d7e…

1 0

Piotr Caban : msvcrt: Don't depend on additional mantissa bits when rounding.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: b22ffa589145234d23d07602752dacf9f30b4e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22ffa589145234d23d07602… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:37 2020 +0200 msvcrt: Don't depend on additional mantissa bits when rounding. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a2ec9a91ac..802ae5f0af 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -831,12 +831,17 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c e2++; } - /* Check if fractional part is non-zero */ - /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ - for(i=b->e-4; i>=b->b; i--) { - if (!b->data[bnum_idx(b, b->b)]) continue; - round = FP_ROUND_DOWN; - break; + if(b->e-4 >= b->b && b->data[bnum_idx(b, b->e-4)]) { + if(b->data[bnum_idx(b, b->e-4)] > LIMB_MAX/2) round = FP_ROUND_UP; + else if(b->data[bnum_idx(b, b->e-4)] == LIMB_MAX/2) round = FP_ROUND_EVEN; + else round = FP_ROUND_DOWN; + } + if(round == FP_ROUND_ZERO || round == FP_ROUND_EVEN) { + for(i=b->e-5; i>=b->b; i--) { + if(!b->data[bnum_idx(b, b->b)]) continue; + if(round == FP_ROUND_EVEN) round = FP_ROUND_UP; + else round = FP_ROUND_DOWN; + } } return fpnum(sign, e2, m, round);

1 0

Piotr Caban : msvcrt: Create 64-bit mantissa in fpnum_parse.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 8fc48e8bc2507ae8123c749a09c0be60a26e397d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fc48e8bc2507ae8123c749a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:34 2020 +0200 msvcrt: Create 64-bit mantissa in fpnum_parse. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 11 ++--------- dlls/msvcrt/string.c | 31 ++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/bnum.h b/dlls/msvcrt/bnum.h index 5cc71c1e68..144db353fe 100644 --- a/dlls/msvcrt/bnum.h +++ b/dlls/msvcrt/bnum.h @@ -28,7 +28,8 @@ static const int p10s[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, #define LIMB_MAX 1000000000 /* 10^9 */ #define BNUM_PREC64 128 /* data size needed to store 64-bit double */ -/* bnum represents real number with fixed decimal point (after 2 limbs) */ + +/* bnum represents real number with fixed decimal point */ struct bnum { int b; /* least significant digit position */ int e; /* most significant digit position + 1 */ @@ -41,14 +42,6 @@ static inline int bnum_idx(struct bnum *b, int idx) return idx & (b->size - 1); } -/* Returns integral part of bnum */ -static inline ULONGLONG bnum_to_mant(struct bnum *b) -{ - ULONGLONG ret = (ULONGLONG)b->data[bnum_idx(b, b->e-1)] * LIMB_MAX; - if(b->b != b->e-1) ret += b->data[bnum_idx(b, b->e-2)]; - return ret; -} - /* Returns TRUE if new most significant limb was added */ static inline BOOL bnum_lshift(struct bnum *b, int shift) { diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5732d511fd..a2ec9a91ac 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -597,6 +597,21 @@ static struct fpnum fpnum_parse16(MSVCRT_wchar_t get(void *ctx), void unget(void } #endif +/* Converts first 3 limbs to ULONGLONG */ +/* Return FALSE on overflow */ +static inline BOOL bnum_to_mant(struct bnum *b, ULONGLONG *m) +{ + if(MSVCRT_UI64_MAX / LIMB_MAX / LIMB_MAX < b->data[bnum_idx(b, b->e-1)]) return FALSE; + *m = (ULONGLONG)b->data[bnum_idx(b, b->e-1)] * LIMB_MAX * LIMB_MAX; + if(b->b == b->e-1) return TRUE; + if(MSVCRT_UI64_MAX - *m < (ULONGLONG)b->data[bnum_idx(b, b->e-2)] * LIMB_MAX) return FALSE; + *m += (ULONGLONG)b->data[bnum_idx(b, b->e-2)] * LIMB_MAX; + if(b->b == b->e-2) return TRUE; + if(MSVCRT_UI64_MAX - *m < b->data[bnum_idx(b, b->e-3)]) return FALSE; + *m += b->data[bnum_idx(b, b->e-3)]; + return TRUE; +} + struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), void *ctx, MSVCRT_pthreadlocinfo locinfo) { @@ -612,6 +627,7 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c struct bnum *b = (struct bnum*)bnum_data; enum fpmod round = FP_ROUND_ZERO; MSVCRT_wchar_t nch; + ULONGLONG m; nch = get(ctx); if(nch == '-') { @@ -797,28 +813,33 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c if(dp-1 < MSVCRT_DBL_MIN_10_EXP-MSVCRT_DBL_DIG-18) return fpnum(sign, INT_MIN, 1, FP_ROUND_ZERO); - while(dp > 2*LIMB_DIGITS) { + while(dp > 3*LIMB_DIGITS) { if(bnum_rshift(b, 9)) dp -= LIMB_DIGITS; e2 += 9; } - while(dp <= LIMB_DIGITS) { + while(dp <= 2*LIMB_DIGITS) { if(bnum_lshift(b, 29)) dp += LIMB_DIGITS; e2 -= 29; } - while(b->data[bnum_idx(b, b->e-1)] < LIMB_MAX/10) { + /* Make sure most significant mantissa bit will be set */ + while(b->data[bnum_idx(b, b->e-1)] <= 9) { bnum_lshift(b, 1); e2--; } + while(!bnum_to_mant(b, &m)) { + bnum_rshift(b, 1); + e2++; + } /* Check if fractional part is non-zero */ /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ - for(i=b->e-3; i>=b->b; i--) { + for(i=b->e-4; i>=b->b; i--) { if (!b->data[bnum_idx(b, b->b)]) continue; round = FP_ROUND_DOWN; break; } - return fpnum(sign, e2, bnum_to_mant(b), round); + return fpnum(sign, e2, m, round); } static MSVCRT_wchar_t strtod_str_get(void *ctx)

1 0

Piotr Caban : msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 450015781e7ad45a79df01225ee75271563317ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=450015781e7ad45a79df0122… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:28 2020 +0200 msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 19 ++++- dlls/msvcrt/scanf.h | 6 +- dlls/msvcrt/string.c | 212 ++++++++++++++++++++++++++++++--------------------- dlls/msvcrt/wcs.c | 7 +- 4 files changed, 151 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=450015781e7ad45a79df…

1 0

Piotr Caban : msvcrt: Support arbitrary buffer size in bnum.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 74958219747843c0d260ca76dd046988909fccdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=74958219747843c0d260ca76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:25 2020 +0200 msvcrt: Support arbitrary buffer size in bnum. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 51 +++++++++++++++------------ dlls/msvcrt/printf.h | 99 +++++++++++++++++++++++++++------------------------- dlls/msvcrt/string.c | 62 ++++++++++++++++---------------- 3 files changed, 112 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74958219747843c0d260…

1 0

Piotr Caban : msvcrt: Add __STRINGTOLD_L and _atoldbl_l partial stubs.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 413e34df586ed172c964e1386ea9136fc8ec6e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=413e34df586ed172c964e138… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:21 2020 +0200 msvcrt: Add __STRINGTOLD_L and _atoldbl_l partial stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 52 ++++++++++++++-------- dlls/ucrtbase/ucrtbase.spec | 4 +- 11 files changed, 50 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=413e34df586ed172c964…

1 0

Zebediah Figura : winegstreamer: Check for failure from gst_video_info_set_format().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: ddd43e0a80bfd4c2e6f3ec650ed4b7d37890c46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd43e0a80bfd4c2e6f3ec65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:23 2020 -0500 winegstreamer: Check for failure from gst_video_info_set_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a32b0b0e41..1aa564f212 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -413,7 +413,11 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) return NULL; } - gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + if (!gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight)) + { + ERR("Failed to set format.\n"); + return NULL; + } if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */

1 0

Zebediah Figura : quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: ead0e8e5cfcfa3a56217c4f535e960ba99b2485b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead0e8e5cfcfa3a56217c4f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:22 2020 -0500 quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ac2cadc4b1..9e6a618a36 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2702,7 +2702,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 092ee87132..789c5e429a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3717,7 +3717,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index a5ff4979ef..07e042eccd 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -755,7 +755,7 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM TRACE("window %p, reftime %p.\n", window, reftime); - *reftime = get_video_format(window)->AvgTimePerFrame; + *reftime = (double)get_video_format(window)->AvgTimePerFrame / 1e7; return S_OK; }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020