wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Gerald Pfeifer : oleacc: Avoid two cases of shift overflow.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 92f9dd1942fb483844dd61c857e6ab539ed2e9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f9dd1942fb483844dd61c85… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 13 00:12:18 2015 +0200 oleacc: Avoid two cases of shift overflow. --- dlls/oleacc/tests/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 5f3f7da..7a0737c 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -445,7 +445,7 @@ static void test_GetStateText(void) ret = GetStateTextW(1<<i, buf, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextW(1<<31, buf, 1024); + ret = GetStateTextW(1u<<31, buf, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); ret = GetStateTextW(2, buf, 1024); @@ -478,7 +478,7 @@ static void test_GetStateText(void) ret = GetStateTextA(1<<i, bufa, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextA(1<<31, bufa, 1024); + ret = GetStateTextA(1u<<31, bufa, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); }

1 0

Piotr Caban : msvcp: Add _Dtest implementation.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 1e9402124d57dc982dc399f6e26a6662bc2f90a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9402124d57dc982dc399f6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 16:13:25 2015 +0200 msvcp: Add _Dtest implementation. --- dlls/msvcp100/msvcp100.spec | 6 ++--- dlls/msvcp110/msvcp110.spec | 6 ++--- dlls/msvcp120/msvcp120.spec | 6 ++--- dlls/msvcp120/tests/msvcp120.c | 45 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 6 ++--- dlls/msvcp60/msvcp60.spec | 6 ++--- dlls/msvcp70/msvcp70.spec | 6 ++--- dlls/msvcp71/msvcp71.spec | 6 ++--- dlls/msvcp80/msvcp80.spec | 6 ++--- dlls/msvcp90/math.c | 34 ++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 6 ++--- include/msvcrt/math.h | 6 +++++ 12 files changed, 112 insertions(+), 27 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 39c925c..6738979 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2892,14 +2892,14 @@ @ extern _Denorm @ stub _Dnorm @ stub _Dscale -@ stub _Dtest +@ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ stub _FDscale -@ stub _FDtest +@ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @ extern _FInf @@ -2920,7 +2920,7 @@ @ stub _LCosh @ extern _LDenorm @ stub _LDscale -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp @ extern _LInf diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ff4facb..f907c5b 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3745,7 +3745,7 @@ @ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento -@ stub _Dtest +@ cdecl _Dtest(ptr) @ stub _Dunscale @ extern _Eps @ stub _Exp @@ -3755,7 +3755,7 @@ @ stub _FDnorm @ stub _FDscale @ stub _FDtento -@ stub _FDtest +@ cdecl _FDtest(ptr) @ stub _FDunscale @ extern _FEps @ stub _FExp @@ -3791,7 +3791,7 @@ @ stub _LDint @ stub _LDscale @ stub _LDtento -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ stub _LDunscale @ extern _LEps @ stub _LExp diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 715703e..1f8601c 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3686,7 +3686,7 @@ @ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento -@ stub _Dtest +@ cdecl _Dtest(ptr) @ stub _Dunscale @ extern _Eps @ stub _Exp @@ -3696,7 +3696,7 @@ @ stub _FDnorm @ stub _FDscale @ stub _FDtento -@ stub _FDtest +@ cdecl _FDtest(ptr) @ stub _FDunscale @ extern _FEps @ stub _FExp @@ -3734,7 +3734,7 @@ @ stub _LDint @ stub _LDscale @ stub _LDtento -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ stub _LDunscale @ extern _LEps @ stub _LExp diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 10e0370..9255ff1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -18,10 +18,25 @@ #include <locale.h> #include <stdio.h> +#include <math.h> #include "wine/test.h" #include "winbase.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + typedef int MSVCRT_long; typedef unsigned char MSVCP_bool; @@ -70,6 +85,7 @@ static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static void (CDECL *p__Do_call)(void *this); +static short (__cdecl *p__Dtest)(double *d); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); @@ -119,6 +135,8 @@ static BOOL init(void) "_Call_onceEx"); SET(p__Do_call, "_Do_call"); + SET(p__Dtest, + "_Dtest"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_tr2_sys__File_size, "?_File_size@sys@tr2@std@@YA_KPEBD@Z"); @@ -407,6 +425,32 @@ static void test__Do_call(void) ok(cnt == 1, "func was not called\n"); } +static void test__Dtest(void) +{ + double d; + short ret; + + d = 0; + ret = p__Dtest(&d); + ok(ret == FP_ZERO, "_Dtest(0) returned %x\n", ret); + + d = 1; + ret = p__Dtest(&d); + ok(ret == FP_NORMAL, "_Dtest(1) returned %x\n", ret); + + d = -1; + ret = p__Dtest(&d); + ok(ret == FP_NORMAL, "_Dtest(-1) returned %x\n", ret); + + d = INFINITY; + ret = p__Dtest(&d); + ok(ret == FP_INFINITE, "_Dtest(INF) returned %x\n", ret); + + d = NAN; + ret = p__Dtest(&d); + ok(ret == FP_NAN, "_Dtest(NAN) returned %x\n", ret); +} + static void test_tr2_sys__File_size(void) { ULONGLONG val; @@ -910,6 +954,7 @@ START_TEST(msvcp120) test__Getcvt(); test__Call_once(); test__Do_call(); + test__Dtest(); test_tr2_sys__File_size(); test_tr2_sys__Equivalent(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 1e04e77..b689cb9 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3686,7 +3686,7 @@ @ cdecl _Do_call(ptr) msvcp120._Do_call @ stub _Dscale @ stub _Dtento -@ stub _Dtest +@ cdecl _Dtest(ptr) msvcp120._Dtest @ stub _Dunscale @ extern _Eps msvcp120._Eps @ stub _Exp @@ -3696,7 +3696,7 @@ @ stub _FDnorm @ stub _FDscale @ stub _FDtento -@ stub _FDtest +@ cdecl _FDtest(ptr) msvcp120._FDtest @ stub _FDunscale @ extern _FEps msvcp120._FEps @ stub _FExp @@ -3734,7 +3734,7 @@ @ stub _LDint @ stub _LDscale @ stub _LDtento -@ stub _LDtest +@ cdecl _LDtest(ptr) msvcp120._LDtest @ stub _LDunscale @ extern _LEps msvcp120._LEps @ stub _LExp diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 0aa3f1b..10d04e5 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4258,14 +4258,14 @@ @ extern _Denorm _Denorm @ stub _Dnorm @ stub _Dscale -@ stub _Dtest +@ cdecl _Dtest(ptr) @ extern _Eps _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm _FDenorm @ stub _FDnorm @ stub _FDscale -@ stub _FDtest +@ cdecl _FDtest(ptr) @ extern _FEps _FEps @ stub _FExp @ extern _FInf _FInf @@ -4282,7 +4282,7 @@ @ stub _LCosh @ extern _LDenorm _LDenorm @ stub _LDscale -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ extern _LEps _LEps @ stub _LExp @ extern _LInf _LInf diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index c9cdef4..f390d8a 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5044,14 +5044,14 @@ @ extern _Denorm @ stub _Dnorm @ stub _Dscale -@ stub _Dtest +@ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ stub _FDscale -@ stub _FDtest +@ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @ extern _FInf @@ -5069,7 +5069,7 @@ @ stub _LCosh @ extern _LDenorm @ stub _LDscale -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp @ extern _LInf diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 2946a12..2675c9a 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5098,14 +5098,14 @@ @ extern _Denorm @ stub _Dnorm @ stub _Dscale -@ stub _Dtest +@ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ stub _FDscale -@ stub _FDtest +@ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @ extern _FInf @@ -5125,7 +5125,7 @@ @ stub _LCosh @ extern _LDenorm @ stub _LDscale -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp @ extern _LInf diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 4e292c0..ed04def 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5705,7 +5705,7 @@ @ stub _Dnorm @ stub _Dscale @ stub _Dtentox -@ stub _Dtest +@ cdecl _Dtest(ptr) @ stub _Dunscale @ extern _Eps @ stub _Exp @@ -5714,7 +5714,7 @@ @ stub _FDnorm @ stub _FDscale @ stub _FDtentox -@ stub _FDtest +@ cdecl _FDtest(ptr) @ stub _FDunscale @ extern _FEps @ stub _FExp @@ -5736,7 +5736,7 @@ @ extern _LDenorm @ stub _LDscale @ stub _LDtentox -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ stub _LDunscale @ extern _LEps @ stub _LExp diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 439865a..9b827f3 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -2226,3 +2226,37 @@ complex_double* __cdecl complex_double_sqrt(complex_double *ret, const complex_d complex_double c = { 0.5, 0 }; return complex_double_pow(ret, l, &c); } + +static short dclass(double x) +{ + switch(_fpclass(x)) { + case _FPCLASS_SNAN: + case _FPCLASS_QNAN: + return FP_NAN; + case _FPCLASS_NINF: + case _FPCLASS_PINF: + return FP_INFINITE; + case _FPCLASS_ND: + case _FPCLASS_PD: + return FP_SUBNORMAL; + case _FPCLASS_NN: + case _FPCLASS_PN: + default: + return FP_NORMAL; + case _FPCLASS_NZ: + case _FPCLASS_PZ: + return FP_ZERO; + } +} + +/* _Dtest */ +short __cdecl _Dtest(double *x) +{ + return dclass(*x); +} + +/* _FDtest */ +short __cdecl _FDtest(float *x) +{ + return dclass(*x); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 98edb65..d3a314b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6480,14 +6480,14 @@ @ extern _Denorm @ stub _Dnorm @ stub _Dscale -@ stub _Dtest +@ cdecl _Dtest(ptr) @ extern _Eps @ stub _Exp @ stub _FCosh @ extern _FDenorm @ stub _FDnorm @ stub _FDscale -@ stub _FDtest +@ cdecl _FDtest(ptr) @ extern _FEps @ stub _FExp @ extern _FInf @@ -6507,7 +6507,7 @@ @ stub _LCosh @ extern _LDenorm @ stub _LDscale -@ stub _LDtest +@ cdecl _LDtest(ptr) _Dtest @ extern _LEps @ stub _LExp @ extern _LInf diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 34aa268..c1333d4 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -146,6 +146,12 @@ static const union { # endif #endif +#define FP_INFINITE 1 +#define FP_NAN 2 +#define FP_NORMAL -1 +#define FP_SUBNORMAL -2 +#define FP_ZERO 0 + #ifdef __cplusplus } #endif

1 0

Piotr Caban : msvcp60: Fix basic_string::operator[size_t] implementation.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 874c3f96f7559893a48bdc8ff1e9684a2a4c359d URL: http://source.winehq.org/git/wine.git/?a=commit;h=874c3f96f7559893a48bdc8ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 16:05:40 2015 +0200 msvcp60: Fix basic_string::operator[size_t] implementation. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp60/string.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 4ba1584..0aa3f1b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1535,12 +1535,12 @@ @ cdecl -arch=win64 ??9std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal_cstr_str @ thiscall -arch=win32 ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAADI@Z(ptr long) MSVCP_basic_string_char_operator_at @ cdecl -arch=win64 ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAD_K@Z(ptr long) MSVCP_basic_string_char_operator_at -@ thiscall -arch=win32 ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEABDI@Z(ptr long) MSVCP_basic_string_char_operator_at -@ cdecl -arch=win64 ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAAEBD_K@Z(ptr long) MSVCP_basic_string_char_operator_at +@ thiscall -arch=win32 ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEABDI@Z(ptr long) MSVCP_basic_string_char_operator_at_const +@ cdecl -arch=win64 ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAAEBD_K@Z(ptr long) MSVCP_basic_string_char_operator_at_const @ thiscall -arch=win32 ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAGI@Z(ptr long) MSVCP_basic_string_wchar_operator_at @ cdecl -arch=win64 ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAG_K@Z(ptr long) MSVCP_basic_string_wchar_operator_at -@ thiscall -arch=win32 ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEABGI@Z(ptr long) MSVCP_basic_string_wchar_operator_at -@ cdecl -arch=win64 ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAAEBG_K@Z(ptr long) MSVCP_basic_string_wchar_operator_at +@ thiscall -arch=win32 ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEABGI@Z(ptr long) MSVCP_basic_string_wchar_operator_at_const +@ cdecl -arch=win64 ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAAEBG_K@Z(ptr long) MSVCP_basic_string_wchar_operator_at_const @ thiscall -arch=win32 ??Bid@locale@std@@QAEIXZ(ptr) locale_id_operator_size_t @ cdecl -arch=win64 ??Bid@locale@std@@QEAA_KXZ(ptr) locale_id_operator_size_t @ thiscall -arch=win32 ??Bios_base@std@@QBEPAXXZ(ptr) ios_base_op_fail diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 76a0e02..09f9854 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -22,7 +22,6 @@ #include "msvcp.h" #include "stdio.h" -#include "assert.h" #include "windef.h" #include "winbase.h" @@ -1412,15 +1411,29 @@ basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_cstr_bstr(basic_s /* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAADI@Z */ /* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAD_K@Z */ -/* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEABDI@Z */ -/* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAAEBD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_operator_at, 8) char* __thiscall MSVCP_basic_string_char_operator_at( basic_string_char *this, MSVCP_size_t pos) { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); + if(!this->ptr || pos>this->size) + return (char*)basic_string_char__Nullstr(); + + basic_string_char__Freeze(this); + return this->ptr+pos; +} + +/* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEABDI@Z */ +/* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAAEBD_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_operator_at_const, 8) +const char* __thiscall MSVCP_basic_string_char_operator_at_const( + const basic_string_char *this, MSVCP_size_t pos) +{ + TRACE("%p %lu\n", this, pos); + + if(!this->ptr) + return basic_string_char__Nullstr(); return this->ptr+pos; } @@ -2935,15 +2948,29 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_cstr_bstr(basic /* ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAGI@Z */ /* ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAG_K@Z */ -/* ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEABGI@Z */ -/* ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAAEBG_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_operator_at, 8) wchar_t* __thiscall MSVCP_basic_string_wchar_operator_at( basic_string_wchar *this, MSVCP_size_t pos) { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); + if(!this->ptr || pos>this->size) + return (wchar_t*)basic_string_wchar__Nullstr(); + + basic_string_wchar__Freeze(this); + return this->ptr+pos; +} + +/* ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEABGI@Z */ +/* ??A?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAAEBG_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_operator_at_const, 8) +const wchar_t* __thiscall MSVCP_basic_string_wchar_operator_at_const( + const basic_string_wchar *this, MSVCP_size_t pos) +{ + TRACE("%p %lu\n", this, pos); + + if(!this->ptr) + return basic_string_wchar__Nullstr(); return this->ptr+pos; }

1 0

Piotr Caban : msvcr120: Add fmin implementation.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 09a727c33ca025b4b50172e872f04861df64213c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a727c33ca025b4b50172e87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 14:29:00 2015 +0200 msvcr120: Add fmin implementation. --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c2aacac..0eb7ade 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2167,9 +2167,9 @@ @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) MSVCR120_fmin +@ cdecl fminf(float float) MSVCR120_fminf +@ cdecl fminl(double double) MSVCR120_fmin @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 392c3f7..ec97ad7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1836,9 +1836,9 @@ @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf @ cdecl fmaxl(double double) msvcr120.fmaxl -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) msvcr120.fmin +@ cdecl fminf(float float) msvcr120.fminf +@ cdecl fminl(double double) msvcr120.fminl @ cdecl fmod(double double) msvcr120.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) msvcr120.fmodf @ cdecl fopen(str str) msvcr120.fopen diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 162dcfb..2459bf5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2683,3 +2683,31 @@ int CDECL MSVCR120__dsign(double x) { return signbit(x) ? 0x8000 : 0; } + +/********************************************************************* + * fminf (MSVCR120.@) + */ +float CDECL MSVCR120_fminf(float x, float y) +{ + if(isnanf(x)) + return y; + if(isnanf(y)) + return x; + if(x==0 && y==0) + return signbit(x) ? x : y; + return x<y ? x : y; +} + +/********************************************************************* + * fmin (MSVCR120.@) + */ +double CDECL MSVCR120_fmin(double x, double y) +{ + if(isnan(x)) + return y; + if(isnan(y)) + return x; + if(x==0 && y==0) + return signbit(x) ? x : y; + return x<y ? x : y; +}

1 0

Akihiro Sagawa : quartz: Use boolean constants for BOOL.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: e4823f9b276c6142a973c1f3714750b755d84c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4823f9b276c6142a973c1f37… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Sep 12 20:24:24 2015 +0900 quartz: Use boolean constants for BOOL. --- dlls/quartz/mpegsplit.c | 10 +++++----- dlls/quartz/pin.c | 8 ++++---- dlls/quartz/waveparser.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 273c77c..835eef6 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -204,9 +204,9 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) if (SUCCEEDED(hr)) { IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - IMediaSample_SetPreroll(sample, 0); - IMediaSample_SetDiscontinuity(sample, 0); - IMediaSample_SetSyncPoint(sample, 1); + IMediaSample_SetPreroll(sample, FALSE); + IMediaSample_SetDiscontinuity(sample, FALSE); + IMediaSample_SetSyncPoint(sample, TRUE); hr = IAsyncReader_Request(pin->pReader, sample, 0); if (SUCCEEDED(hr)) { @@ -710,7 +710,7 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); - This->seek = 0; + This->seek = FALSE; hr = IAsyncReader_Request(pin->pReader, sample, 0); if (SUCCEEDED(hr)) @@ -769,7 +769,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) CoTaskMemFree(This); return hr; } - This->seek = 1; + This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ *ppv = This; diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 52a3970..0a2c507 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -212,7 +212,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->dRate = 1.0; pPinImpl->state = Req_Die; pPinImpl->fnCustomRequest = pCustomRequest; - pPinImpl->stop_playback = 1; + pPinImpl->stop_playback = TRUE; InitializeCriticalSection(&pPinImpl->thread_lock); pPinImpl->thread_lock.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": PullPin.thread_lock"); @@ -638,7 +638,7 @@ HRESULT PullPin_StartProcessing(PullPin * This) /* Wake up! */ assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); This->state = Req_Run; - This->stop_playback = 0; + This->stop_playback = FALSE; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); } @@ -664,7 +664,7 @@ HRESULT PullPin_PauseProcessing(PullPin * This) assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); This->state = Req_Pause; - This->stop_playback = 1; + This->stop_playback = TRUE; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); @@ -700,7 +700,7 @@ static HRESULT PullPin_StopProcessing(PullPin * This) assert(This->state == Req_Pause || This->state == Req_Sleepy); - This->stop_playback = 1; + This->stop_playback = TRUE; This->state = Req_Die; assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); ResetEvent(This->hEventStateChanged); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 2ceb0fd..3f3846c 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -122,9 +122,9 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; - IMediaSample_SetPreroll(newsample, 0); - IMediaSample_SetDiscontinuity(newsample, 0); - IMediaSample_SetSyncPoint(newsample, 1); + IMediaSample_SetPreroll(newsample, FALSE); + IMediaSample_SetDiscontinuity(newsample, FALSE); + IMediaSample_SetSyncPoint(newsample, TRUE); hr = IAsyncReader_Request(pin->pReader, newsample, 0); }

1 0

Akihiro Sagawa : msi: Feature treeview should have WS_TABSTOP style.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 6e51cfddfd722ef366fb2327b4ab84264aa19576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e51cfddfd722ef366fb2327b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Sep 12 20:24:22 2015 +0900 msi: Feature treeview should have WS_TABSTOP style. --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a79ce1f..64cbbbc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2691,7 +2691,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) /* create the treeview control */ style = TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT; - style |= WS_GROUP | WS_VSCROLL; + style |= WS_GROUP | WS_VSCROLL | WS_TABSTOP; control = msi_dialog_add_control( dialog, rec, WC_TREEVIEWW, style ); if (!control) {

1 0

Piotr Caban : msvcrt/tests: Fix tolower test failures.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: b408b5a9a47159a8d7a424e59fabd471f68b61ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b408b5a9a47159a8d7a424e59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 13:15:27 2015 +0200 msvcrt/tests: Fix tolower test failures. --- dlls/msvcrt/tests/string.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d247ba6..7733a7c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2608,6 +2608,7 @@ static void test_wctomb(void) static void test_tolower(void) { + WCHAR chw, lower; char ch, lch; int ret, len; @@ -2638,7 +2639,10 @@ static void test_tolower(void) ch = 0xF4; errno = 0xdeadbeef; ret = p_tolower(ch); - len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) || + LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 || + (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1) + len = 0; if(len) ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); else @@ -2649,7 +2653,10 @@ static void test_tolower(void) ch = 0xD0; errno = 0xdeadbeef; ret = p_tolower(ch); - len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) || + LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 || + (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1) + len = 0; if(len) ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); else

1 0

Gerald Pfeifer : netapi32: Avoid shift overflow for GENERIC_READ_ACCESS and friends. friends.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: a818d5cab2ebb7ff58b0aaf2ad39aa5374f40f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a818d5cab2ebb7ff58b0aaf2a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 11 21:31:12 2015 +0200 netapi32: Avoid shift overflow for GENERIC_READ_ACCESS and friends. friends. --- dlls/netapi32/netapi32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d7af2e0..bb61e7f 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -506,10 +506,10 @@ static unsigned char ace_flags_to_samba( BYTE flags ) return ret; } -#define GENERIC_ALL_ACCESS (1 << 28) -#define GENERIC_EXECUTE_ACCESS (1 << 29) -#define GENERIC_WRITE_ACCESS (1 << 30) -#define GENERIC_READ_ACCESS (1 << 31) +#define GENERIC_ALL_ACCESS (1u << 28) +#define GENERIC_EXECUTE_ACCESS (1u << 29) +#define GENERIC_WRITE_ACCESS (1u << 30) +#define GENERIC_READ_ACCESS (1u << 31) static unsigned int access_mask_to_samba( DWORD mask ) {

1 0

Bruno Jesus : quartz: Avoid audio header test code duplication.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 66694cc043a86c4d2a3d96f390b22b4d18e60d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66694cc043a86c4d2a3d96f39… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 12 17:16:44 2015 +0800 quartz: Avoid audio header test code duplication. The function MPEGSplitter_head_check does exactly the same test. --- dlls/quartz/mpegsplit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 1ed352b..273c77c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -114,9 +114,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; LONGLONG duration; - if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && - ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && - ((header[2]>>2)&0x3) != 0x3)) + if (MPEGSplitter_head_check(header) != MPEG_AUDIO_HEADER) { FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG;

1 0

Vincent Povirk : comdlg32: Implement radio button lists in item dialog.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 34d57e3621e08360b9d9306b15d55426cbad2cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d57e3621e08360b9d9306b1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 10 10:22:11 2015 -0500 comdlg32: Implement radio button lists in item dialog. --- dlls/comdlg32/itemdlg.c | 223 +++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 24 +++-- 2 files changed, 232 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34d57e3621e08360b9d93…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
32
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 September 2015