January 2013 - Wine-commits

Piotr Caban : msvcp90: std::_Fabs(complex) tests.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 2e4eb12219b3154ab3ca9a012090229cc500c88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4eb12219b3154ab3ca9a012… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:28:08 2013 +0100 msvcp90: std::_Fabs(complex) tests. --- dlls/msvcp90/tests/misc.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index d0a41c5..b1e3c0b 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -111,6 +111,7 @@ static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const float*, const float*); static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); +static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -249,6 +250,8 @@ static BOOL init(void) "??$?HM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); SET(p_complex_float_div, "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); + SET(p_complex_float__Fabs, + "??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -293,6 +296,8 @@ static BOOL init(void) "??$?HM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); SET(p_complex_float_div, "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); + SET(p_complex_float__Fabs, + "??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z"); } init_thiscall_thunk(); @@ -587,6 +592,7 @@ static void test_complex(void) { complex_float c1, c2, c3; float f1, f2; + int scale; f1 = 1; f2 = 2; @@ -594,20 +600,36 @@ static void test_complex(void) ok(c1.real == 1, "c1.real = %f\n", c1.real); ok(c1.imag == 2, "c1.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c1, &scale); + ok(almost_eq(f1, 0.559017), "abs(1+2i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + f1 = -1; f2 = 1; call_func3(p_complex_float_ctor, &c2, &f1, &f2); ok(c2.real == -1, "c2.real = %f\n", c1.real); ok(c2.imag == 1, "c2.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c2, &scale); + ok(almost_eq(f1, 0.353553), "abs(1-1i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + p_complex_float_add(&c3, &c1, &c2); ok(c3.real == 0, "c3.real = %f\n", c3.real); ok(c3.imag == 3, "c3.imag = %f\n", c3.imag); + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.75), "abs(0+3i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + p_complex_float_add(&c2, &c1, &c3); ok(c2.real == 1, "c2.real = %f\n", c1.real); ok(c2.imag == 5, "c2.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.75), "abs(1+5i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + /* (1+5i) / (0+3i) */ p_complex_float_div(&c1, &c2, &c3); ok(almost_eq(c1.real, 1.666667), "c1.real = %f\n", c1.real); @@ -620,12 +642,20 @@ static void test_complex(void) ok(almost_eq(c1.real, 0.5), "c1.real = %f\n", c1.real); ok(almost_eq(c1.imag, 2.5), "c1.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c1, &scale); + ok(almost_eq(f1, 0.637377), "abs(0.5+2.5i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + /* (1+5i) / 0 */ c3.real = 0; p_complex_float_div(&c1, &c2, &c3); ok(_isnan(c1.real), "c1.real = %f\n", c1.real); ok(_isnan(c1.imag), "c1.imag = %f\n", c1.imag); + f1 = p_complex_float__Fabs(&c1, &scale); + ok(_isnan(f1), "abs(NaN+NaNi) = %f\n", f1); + ok(scale == 0, "scale = %d\n", scale); + /* (1+5i) / (NaN-2i) */ c1.imag = -2; p_complex_float_div(&c3, &c2, &c1); @@ -642,6 +672,39 @@ static void test_complex(void) p_complex_float_add(&c3, &c2, &c1); ok(_isnan(c3.real), "c3.real = %f\n", c3.real); ok(c3.imag == -2, "c3.imag = %f\n", c3.imag); + + f1 = p_complex_float__Fabs(&c3, &scale); + ok(_isnan(f1), "abs(NaN-2i) = %f\n", f1); + ok(scale == 0, "scale = %d\n", scale); + + c3.real = 1000; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 250.000504), "abs(1000-2i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + + c3.real = 0.1; + c3.imag = 0.1; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.565685), "abs(0.1+0.1i) = %f\n", f1); + ok(scale == -2, "scale = %d\n", scale); + + c3.real = 1; + c3.imag = 0; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 0.25), "abs(1+0i) = %f\n", f1); + ok(scale == 2, "scale = %d\n", scale); + + c3.real = 0.99; + c3.imag = 0; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(almost_eq(f1, 3.96), "abs(0.99+0i) = %f\n", f1); + ok(scale == -2, "scale = %d\n", scale); + + c3.real = 0; + c3.imag = 0; + f1 = p_complex_float__Fabs(&c3, &scale); + ok(f1 == 0, "abs(0+0i) = %f\n", f1); + ok(scale == 0, "scale = %d\n", scale); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added std::conj(complex) implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 94da034364630ffd7814269d9df27088379aac27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94da034364630ffd7814269d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:28:19 2013 +0100 msvcp90: Added std::conj(complex) implementation. --- dlls/msvcp90/math.c | 20 ++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 37dc3f7..9f75cd4 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1303,6 +1303,15 @@ float __cdecl complex_float_abs(const complex_float *c) return hypotf(c->real, c->imag); } +/* ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_float *c) +{ + ret->real = c->real; + ret->imag = -c->imag; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1800,3 +1809,14 @@ double __cdecl complex_double_abs(const complex_double *c) { return hypot(c->real, c->imag); } + +/* ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_double *c) +{ + ret->real = c->real; + ret->imag = -c->imag; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ef4726d..5e53c6d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -362,12 +362,12 @@ @ cdecl -arch=win64 ??$arg(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_arg @ cdecl -arch=win32 ??$arg(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_arg @ cdecl -arch=win64 ??$arg(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_arg -@ stub -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_conj +@ cdecl -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_conj +@ cdecl -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_conj +@ cdecl -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_conj +@ cdecl -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_conj +@ cdecl -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_conj @ stub -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z

1 0

Piotr Caban : msvcp90: Added complex trigonometric functions implementation .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: ed0e16ae3dfaa0e68f00a345f41661ca3267b40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0e16ae3dfaa0e68f00a345f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:28:47 2013 +0100 msvcp90: Added complex trigonometric functions implementation. --- dlls/msvcp90/math.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 +++++++++++++------------- 2 files changed, 80 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9f75cd4..c13fd3c 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1312,6 +1312,34 @@ complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_floa return ret; } +/* ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_cos(complex_float *ret, const complex_float *c) +{ + ret->real = cos(c->real)*cosh(c->imag); + ret->imag = -sin(c->real)*sinh(c->imag); + return ret; +} + +/* ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_sin(complex_float *ret, const complex_float *c) +{ + ret->real = sin(c->real)*cosh(c->imag); + ret->imag = cos(c->real)*sinh(c->imag); + return ret; +} + +/* ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_tan(complex_float *ret, const complex_float *c) +{ + double denom = cos(2*c->real) + cosh(2*c->imag); + ret->real = sin(2*c->real) / denom; + ret->imag = sinh(2*c->imag) / denom; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1820,3 +1848,37 @@ complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_d ret->imag = -c->imag; return ret; } + +/* ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_cos(complex_double *ret, const complex_double *c) +{ + ret->real = cos(c->real)*cosh(c->imag); + ret->imag = -sin(c->real)*sinh(c->imag); + return ret; +} + +/* ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_sin(complex_double *ret, const complex_double *c) +{ + ret->real = sin(c->real)*cosh(c->imag); + ret->imag = cos(c->real)*sinh(c->imag); + return ret; +} + +/* ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_tan(complex_double *ret, const complex_double *c) +{ + double denom = cos(2*c->real) + cosh(2*c->imag); + ret->real = sin(2*c->real) / denom; + ret->imag = sinh(2*c->imag) / denom; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5e53c6d..3022505 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -368,12 +368,12 @@ @ cdecl -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_conj @ cdecl -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_conj @ cdecl -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_conj -@ stub -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_cos +@ cdecl -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_cos +@ cdecl -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cos @ stub -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -464,12 +464,12 @@ @ cdecl -arch=win64 ??$real(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_real @ cdecl -arch=win32 ??$real(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_real @ cdecl -arch=win64 ??$real(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_real -@ stub -arch=win32 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_sin +@ cdecl -arch=win64 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_sin +@ cdecl -arch=win32 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sin @ stub -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -482,12 +482,12 @@ @ stub -arch=win64 ??$sqrt(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z @ stub -arch=win32 ??$sqrt(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z @ stub -arch=win64 ??$sqrt(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_tan +@ cdecl -arch=win64 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_tan +@ cdecl -arch=win32 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tan @ stub -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z

1 0

Piotr Caban : msvcp90: Added std::tan(complex) tests.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 66ee663e0c063d5f3f04ca659ac091d7b47d8e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ee663e0c063d5f3f04ca659… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:29:12 2013 +0100 msvcp90: Added std::tan(complex) tests. --- dlls/msvcp90/tests/misc.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index b1e3c0b..0f1b27e 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -112,6 +112,7 @@ static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const f static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); +static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -252,6 +253,8 @@ static BOOL init(void) "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); SET(p_complex_float__Fabs, "??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z"); + SET(p_complex_float_tan, + "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -298,6 +301,8 @@ static BOOL init(void) "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); SET(p_complex_float__Fabs, "??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z"); + SET(p_complex_float_tan, + "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); } init_thiscall_thunk(); @@ -705,6 +710,24 @@ static void test_complex(void) f1 = p_complex_float__Fabs(&c3, &scale); ok(f1 == 0, "abs(0+0i) = %f\n", f1); ok(scale == 0, "scale = %d\n", scale); + + c1.real = 0; + c1.imag = 0; + p_complex_float_tan(&c2, &c1); + ok(c2.real == 0, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + + c1.real = 3.14159/2; + c1.imag = 0; + p_complex_float_tan(&c2, &c1); + ok(almost_eq(c2.real, 788906.062500), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + + c1.real = 7.12; + c1.imag = 0.17; + p_complex_float_tan(&c2, &c1); + ok(almost_eq(c2.real, 1.040818), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.362651), "c2.imag = %f\n", c2.imag); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added complex hyperbolic functions implementation.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: b0cb2ead335dc024057f605f2297ce673e56420b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cb2ead335dc024057f605f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:29:21 2013 +0100 msvcp90: Added complex hyperbolic functions implementation. --- dlls/msvcp90/math.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 +++++++++++----------- 2 files changed, 88 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index c13fd3c..72a8922 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1340,6 +1340,38 @@ complex_float* __cdecl complex_float_tan(complex_float *ret, const complex_float return ret; } +/* ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_cosh(complex_float *ret, const complex_float *c) +{ + ret->real = cosh(c->real)*cos(c->imag); + ret->imag = sinh(c->real)*sin(c->imag); + return ret; +} + +/* ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_sinh(complex_float *ret, const complex_float *c) +{ + ret->real = sinh(c->real)*cos(c->imag); + ret->imag = cosh(c->real)*sin(c->imag); + return ret; +} + +/* ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_tanh(complex_float *ret, const complex_float *c) +{ + complex_float tmp; + + ret->real = -c->imag; + ret->imag = c->real; + complex_float_tan(&tmp, ret); + ret->real = tmp.imag; + ret->imag = -tmp.real; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1882,3 +1914,41 @@ complex_double* __cdecl complex_double_tan(complex_double *ret, const complex_do ret->imag = sinh(2*c->imag) / denom; return ret; } + +/* ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_cosh(complex_double *ret, const complex_double *c) +{ + ret->real = cosh(c->real)*cos(c->imag); + ret->imag = sinh(c->real)*sin(c->imag); + return ret; +} + +/* ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_sinh(complex_double *ret, const complex_double *c) +{ + ret->real = sinh(c->real)*cos(c->imag); + ret->imag = cosh(c->real)*sin(c->imag); + return ret; +} + +/* ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_tanh(complex_double *ret, const complex_double *c) +{ + complex_double tmp; + + ret->real = -c->imag; + ret->imag = c->real; + complex_double_tan(&tmp, ret); + ret->real = tmp.imag; + ret->imag = -tmp.real; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3022505..b77fcf5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -374,12 +374,12 @@ @ cdecl -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cos @ cdecl -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cos @ cdecl -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cos -@ stub -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_cosh +@ cdecl -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_cosh +@ cdecl -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_cosh +@ cdecl -arch=win64 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cosh +@ cdecl -arch=win32 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cosh +@ cdecl -arch=win64 ??$cosh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cosh @ stub -arch=win32 ??$exp(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$exp(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$exp(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -470,12 +470,12 @@ @ cdecl -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sin @ cdecl -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sin @ cdecl -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sin -@ stub -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_sinh +@ cdecl -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_sinh +@ cdecl -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_sinh +@ cdecl -arch=win64 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sinh +@ cdecl -arch=win32 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sinh +@ cdecl -arch=win64 ??$sinh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sinh @ stub -arch=win32 ??$sqrt(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$sqrt(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$sqrt(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -488,12 +488,12 @@ @ cdecl -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tan @ cdecl -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tan @ cdecl -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tan -@ stub -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_tanh +@ cdecl -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_tanh +@ cdecl -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_tanh +@ cdecl -arch=win64 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tanh +@ cdecl -arch=win32 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tanh +@ cdecl -arch=win64 ??$tanh(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tanh @ thiscall -arch=win32 ??0?$_Complex_base(a)MU_C_float_complex@@@std@@QAE(a)ABM0@Z(ptr ptr ptr) complex_float_ctor @ cdecl -arch=win64 ??0?$_Complex_base(a)MU_C_float_complex@@@std@@QEAA(a)AEBM0@Z(ptr ptr ptr) complex_float_ctor @ thiscall -arch=win32 ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z(ptr ptr ptr) complex_double_ctor

1 0

Piotr Caban : msvcp90: Added std::tanh(complex) tests.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: ec5e51d8935c28aeaee348a3c9226a997473759a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5e51d8935c28aeaee348a3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:39:28 2013 +0100 msvcp90: Added std::tanh(complex) tests. --- dlls/msvcp90/tests/misc.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 0f1b27e..9f0b14b 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -113,6 +113,7 @@ static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const compl static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); +static complex_float* (__cdecl *p_complex_float_tanh)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -255,6 +256,8 @@ static BOOL init(void) "??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z"); SET(p_complex_float_tan, "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); + SET(p_complex_float_tanh, + "??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -303,6 +306,8 @@ static BOOL init(void) "??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z"); SET(p_complex_float_tan, "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); + SET(p_complex_float_tanh, + "??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); } init_thiscall_thunk(); @@ -716,18 +721,36 @@ static void test_complex(void) p_complex_float_tan(&c2, &c1); ok(c2.real == 0, "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(c2.real == 0, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); c1.real = 3.14159/2; c1.imag = 0; p_complex_float_tan(&c2, &c1); ok(almost_eq(c2.real, 788906.062500), "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(almost_eq(c2.real, 0.917152), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); c1.real = 7.12; c1.imag = 0.17; p_complex_float_tan(&c2, &c1); ok(almost_eq(c2.real, 1.040818), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.362651), "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(almost_eq(c2.real, 0.999999), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 4.3627e-7), "c2.imag = %g\n", c2.imag); + + c1.real = 0.14; + c1.imag = 0.19; + p_complex_float_tan(&c2, &c1); + ok(almost_eq(c2.real, 0.135859), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.191341), "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(almost_eq(c2.real, 0.144134), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.188464), "c2.imag = %f\n", c2.imag); } START_TEST(misc)

1 0

Alexandre Julliard : rpcrt4: Fix wrap-around bug in tick count comparison.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: af734f9623d2b03730356a33829b5ebefe59f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af734f9623d2b03730356a338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:15:16 2013 +0100 rpcrt4: Fix wrap-around bug in tick count comparison. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index aebb05e..54f0faa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1990,7 +1990,7 @@ static DWORD CALLBACK rpcrt4_http_timer_thread(PVOID param) timeout = rpcrt4_http_timer_calc_timeout(data.last_sent_time)) { /* are we too soon after last send? */ - if (GetTickCount() - HTTP_IDLE_TIME < *data.last_sent_time) + if (GetTickCount() - *data.last_sent_time < HTTP_IDLE_TIME) continue; rpcrt4_http_keep_connection_active_timer_proc(data.timer_param, TRUE); }

1 0

Alexandre Julliard : ole32: Fix wrap-around bug in tick count comparison.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: e089295f75cf9db2557418d644c72bc9ba55e70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e089295f75cf9db2557418d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:15:25 2013 +0100 ole32: Fix wrap-around bug in tick count comparison. --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 630e016..dc2a02b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -813,14 +813,17 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) real_delay = 0; } - if (!real_delay || (entry->unload_time && (entry->unload_time < GetTickCount()))) + if (!real_delay || (entry->unload_time && ((int)(GetTickCount() - entry->unload_time) > 0))) { list_remove(&entry->entry); COMPOBJ_DllList_ReleaseRef(entry->dll, TRUE); HeapFree(GetProcessHeap(), 0, entry); } else + { entry->unload_time = GetTickCount() + real_delay; + if (!entry->unload_time) entry->unload_time = 1; + } } else if (entry->unload_time) entry->unload_time = 0;

1 0

Alexandre Julliard : netapi32: Fix wrap-around bug in tick count comparison .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 2c70e08cf8d920bfcf5427ba1ee468f4fa5a8f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c70e08cf8d920bfcf5427ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:15:35 2013 +0100 netapi32: Fix wrap-around bug in tick count comparison. --- dlls/netapi32/nbt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 1bbcaf0..2a871de 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -297,7 +297,7 @@ static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd, if (fd == INVALID_SOCKET) return NRC_BADDR; if (!answerCallback) return NRC_BADDR; - while (!found && ret == NRC_GOODRET && (now = GetTickCount()) < waitUntil) + while (!found && ret == NRC_GOODRET && (int)((now = GetTickCount()) - waitUntil) < 0) { DWORD msToWait = waitUntil - now; struct fd_set fds;

1 0

Alexandre Julliard : wbemprox: Don' t rely on GetTicksCount to determine boot time.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 22b3a8251ffb54203a05486b42cd70fd0caf5c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b3a8251ffb54203a05486b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:24:31 2013 +0100 wbemprox: Don't rely on GetTicksCount to determine boot time. --- dlls/wbemprox/builtin.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 09da3f6..2e2e24b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -945,21 +945,15 @@ static WCHAR *get_lastbootuptime(void) static const WCHAR fmtW[] = {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', '.','%','0','6','u','+','0','0','0',0}; - SYSTEMTIME st; - FILETIME ft; - ULARGE_INTEGER ticks; + SYSTEM_TIMEOFDAY_INFORMATION ti; + TIME_FIELDS tf; WCHAR *ret; if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; - GetSystemTime( &st ); - SystemTimeToFileTime( &st, &ft ); - ticks.u.LowPart = ft.dwLowDateTime; - ticks.u.HighPart = ft.dwHighDateTime; - ticks.QuadPart -= GetTickCount64() * 10000; - ft.dwLowDateTime = ticks.u.LowPart; - ft.dwHighDateTime = ticks.u.HighPart; - FileTimeToSystemTime( &ft, &st ); - sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000 ); + + NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); + RtlTimeToTimeFields( &ti.liKeBootTime, &tf ); + sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } static const WCHAR *get_osarchitecture(void)

1 0