August 2014 - Wine-commits - list.winehq.org

Shuai Meng : vbscript: Implemented Atn.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: d7f4fa43eb51d48746cb56f47ad8cc97781704e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f4fa43eb51d48746cb56f47… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:12:23 2014 +0800 vbscript: Implemented Atn. --- dlls/vbscript/global.c | 14 ++++++++++---- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 968d4e2..a236d42 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -661,10 +661,16 @@ static HRESULT Global_IsObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, return S_OK; } -static HRESULT Global_Ant(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Atn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + return return_double(res, atan(d)); } static HRESULT Global_Cos(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -2027,7 +2033,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_ISNUMERIC, Global_IsNumeric, 0, 1}, {DISPID_GLOBAL_ISARRAY, Global_IsArray, 0, 1}, {DISPID_GLOBAL_ISOBJECT, Global_IsObject, 0, 1}, - {DISPID_GLOBAL_ATN, Global_Ant, 0, 1}, + {DISPID_GLOBAL_ATN, Global_Atn, 0, 1}, {DISPID_GLOBAL_COS, Global_Cos, 0, 1}, {DISPID_GLOBAL_SIN, Global_Sin, 0, 1}, {DISPID_GLOBAL_TAN, Global_Tan, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 18a5ad4..30dbee6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1166,4 +1166,26 @@ Call ok(Approch(Tan(True), -1.5574), "Tan(True) = " & Tan(True)) Call ok(getVT(Tan(True)) = "VT_R8", "getVT(Tan(True)) = " & getVT(Tan(True))) Call ok(Approch(Tan(CByte(255)), 0.5872), "Tan(CByte(255)) = " & Tan(CByte(255))) Call ok(getVT(Tan(CByte(255))) = "VT_R8", "getVT(Tan(CByte(255))) = " & getVT(Tan(CByte(255)))) + +Call ok(Approch(Atn(Empty), 0), "Atn(Empty) = " & Atn(Empty)) +Call ok(getVT(Atn(Empty)) = "VT_R8", "getVT(Atn(Empty)) = " & getVT(Atn(Empty))) +Call ok(Approch(Atn(Sqr(3) / 3), PI / 6), "Atn(Sqr(3) / 3) = " & Atn(Sqr(3) / 3)) +Call ok(getVT(Atn(Sqr(3) / 3)) = "VT_R8", "getVT(Atn(Sqr(3) / 3)) = " & getVT(Atn(Sqr(3) / 3))) +Call ok(Approch(Atn(CCur(1)), PI / 4), "Atn(CCur(1)) = " & Atn(CCur(1))) +Call ok(getVT(Atn(CCur(1))) = "VT_R8", "getVT(Atn(CCur(1))) = " & getVT(Atn(CCur(1)))) +Call ok(Approch(Atn(CSng(Sqr(3))), PI / 3), "Atn(CSng(Sqr(3))) = " & Atn(CSng(Sqr(3)))) +Call ok(getVT(Atn(CSng(Sqr(3)))) = "VT_R8", "getVT(Atn(CSng(PI))) = " & getVT(Atn(CSng(PI)))) +Call ok(Approch(Atn(0), 0), "Atn(0) = " & Atn(0)) +Call ok(getVT(Atn(0)) = "VT_R8", "getVT(Atn(0)) = " & getVT(Atn(0))) +Call ok(Approch(Atn(-1), -PI / 4), "Atn(-1) = " & Atn(-1)) +Call ok(getVT(Atn(-1)) = "VT_R8", "getVT(Atn(-1)) = " & getVT(Atn(-1))) +Call ok(Approch(Atn("-32768"), -1.5707), "Atn(""-32768"") = " & Atn("-32768")) +Call ok(getVT(Atn("-32768")) = "VT_R8", "getVT(Atn(""-32768"")) = " & getVT(Atn("-32768"))) +Call ok(Approch(Atn(False), 0), "Atn(False) = " & Atn(False)) +Call ok(getVT(Atn(False)) = "VT_R8", "getVT(Atn(False)) = " & getVT(Atn(False))) +Call ok(Approch(Atn(True), -0.7853), "Atn(True) = " & Atn(True)) +Call ok(getVT(Atn(True)) = "VT_R8", "getVT(Atn(True)) = " & getVT(Atn(True))) +Call ok(Approch(Atn(CByte(255)), 1.5668), "Atn(CByte(255)) = " & Atn(CByte(255))) +Call ok(getVT(Atn(CByte(255))) = "VT_R8", "getVT(Atn(CByte(255))) = " & getVT(Atn(CByte(255)))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Exp.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: b193c84485999e44c813524b0a423fd3ab793823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b193c84485999e44c813524b0… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:12:45 2014 +0800 vbscript: Implemented Exp. --- dlls/vbscript/global.c | 10 ++++++++-- dlls/vbscript/tests/api.vbs | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a236d42..0bb7ccc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -711,8 +711,14 @@ static HRESULT Global_Tan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Exp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + return return_double(res, exp(d)); } static HRESULT Global_Log(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 30dbee6..2899b97 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1188,4 +1188,23 @@ Call ok(getVT(Atn(True)) = "VT_R8", "getVT(Atn(True)) = " & getVT(Atn(True))) Call ok(Approch(Atn(CByte(255)), 1.5668), "Atn(CByte(255)) = " & Atn(CByte(255))) Call ok(getVT(Atn(CByte(255))) = "VT_R8", "getVT(Atn(CByte(255))) = " & getVT(Atn(CByte(255)))) +Call ok(Approch(Exp(Empty), 1), "Exp(Empty) = " & Exp(Empty)) +Call ok(getVT(Exp(Empty)) = "VT_R8", "getVT(Exp(Empty)) = " & getVT(Exp(Empty))) +Call ok(Approch(Exp(1), 2.7182), "Exp(1) = " & Exp(1)) +Call ok(getVT(Exp(1)) = "VT_R8", "getVT(Exp(1)) = " & getVT(Exp(1))) +Call ok(Approch(Exp(CCur(-1)), 0.3678), "Exp(CCur(-1)) = " & Exp(CCur(-1))) +Call ok(getVT(Exp(CCur(-1))) = "VT_R8", "getVT(Exp(CCur(-1))) = " & getVT(Exp(CCur(-1)))) +Call ok(Approch(Exp(CSng(0.5)), 1.6487), "Exp(CSng(0.5)) = " & Exp(CSng(0.5))) +Call ok(getVT(Exp(CSng(0.5))) = "VT_R8", "getVT(Exp(CSng(PI))) = " & getVT(Exp(CSng(PI)))) +Call ok(Approch(Exp(-0.5), 0.6065), "Exp(-0.5) = " & Exp(-0.5)) +Call ok(getVT(Exp(-0.5)) = "VT_R8", "getVT(Exp(-0.5)) = " & getVT(Exp(-0.5))) +Call ok(Approch(Exp("-2"), 0.1353), "Exp(""-2"") = " & Exp("-2")) +Call ok(getVT(Exp("-2")) = "VT_R8", "getVT(Exp(""-2"")) = " & getVT(Exp("-2"))) +Call ok(Approch(Exp(False), 1), "Exp(False) = " & Exp(False)) +Call ok(getVT(Exp(False)) = "VT_R8", "getVT(Exp(False)) = " & getVT(Exp(False))) +Call ok(Approch(Exp(True), 0.3678), "Exp(True) = " & Exp(True)) +Call ok(getVT(Exp(True)) = "VT_R8", "getVT(Exp(True)) = " & getVT(Exp(True))) +Call ok(Approch(Exp(CByte(2)), 7.389), "Exp(CByte(2)) = " & Exp(CByte(2))) +Call ok(getVT(Exp(CByte(2))) = "VT_R8", "getVT(Exp(CByte(2))) = " & getVT(Exp(CByte(2)))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Log.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 5528d728e1b99e7f80a4528980e2369b79237b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5528d728e1b99e7f80a452898… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:13:12 2014 +0800 vbscript: Implemented Log. --- dlls/vbscript/global.c | 13 +++++++++++-- dlls/vbscript/tests/api.vbs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0bb7ccc..6663343 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -723,8 +723,17 @@ static HRESULT Global_Exp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Log(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + if(d <= 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + else + return return_double(res, log(d)); } static HRESULT Global_Sqr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2899b97..44c80de 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1207,4 +1207,34 @@ Call ok(getVT(Exp(True)) = "VT_R8", "getVT(Exp(True)) = " & getVT(Exp(True))) Call ok(Approch(Exp(CByte(2)), 7.389), "Exp(CByte(2)) = " & Exp(CByte(2))) Call ok(getVT(Exp(CByte(2))) = "VT_R8", "getVT(Exp(CByte(2))) = " & getVT(Exp(CByte(2)))) +Sub testLogError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Log(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Log(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testLogError(0, 5, 5) +Call testLogError(-2, 5, 5) +Call testLogError(False, 5, 5) +Call testLogError(True, 5, 5) +Call ok(Approch(Log(1), 0), "Log(1) = " & Log(1)) +Call ok(getVT(Log(1)) = "VT_R8", "getVT(Log(1)) = " & getVT(Log(1))) +Call ok(Approch(Log(CCur(0.5)), -0.6931), "Log(CCur(0.5)) = " & Log(CCur(0.5))) +Call ok(getVT(Log(CCur(0.5))) = "VT_R8", "getVT(Log(CCur(0.5))) = " & getVT(Log(CCur(0.5)))) +Call ok(Approch(Log(CSng(2.7182)), 1), "Log(CSng(2.7182)) = " & Log(CSng(2.7182))) +Call ok(getVT(Log(CSng(2.7182))) = "VT_R8", "getVT(Log(CSng(PI))) = " & getVT(Log(CSng(PI)))) +Call ok(Approch(Log(32768), 10.3972), "Log(32768) = " & Log(32768)) +Call ok(getVT(Log(32768)) = "VT_R8", "getVT(Log(32768)) = " & getVT(Log(32768))) +Call ok(Approch(Log("10"), 2.3025), "Log(""10"") = " & Log("10")) +Call ok(getVT(Log("10")) = "VT_R8", "getVT(Log(""10"")) = " & getVT(Log("10"))) +Call ok(Approch(Log(CByte(2)), 0.6931), "Log(CByte(2)) = " & Log(CByte(2))) +Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CByte(2)))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Cos.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: f97491cfedc0182c24b346cece7e0a6b0ed8ae37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97491cfedc0182c24b346cec… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:11:00 2014 +0800 vbscript: Implemented Cos. --- dlls/vbscript/global.c | 10 ++++++++-- dlls/vbscript/tests/api.vbs | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 183cdaf..e0a8f7c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -669,8 +669,14 @@ static HRESULT Global_Ant(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Cos(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + return return_double(res, cos(d)); } static HRESULT Global_Sin(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 70268e7..8a829dc 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1078,4 +1078,41 @@ Call ok(getVT(Sqr(False)) = "VT_R8", "getVT(Sqr(False)) = " & getVT(Sqr(False))) Call ok(Sqr(CByte(225)) = 15, "Sqr(CByte(225)) = " & Sqr(CByte(225))) Call ok(getVT(Sqr(CByte(225))) = "VT_R8", "getVT(Sqr(CByte(225))) = " & getVT(Sqr(CByte(225)))) +Function Approch(func, res) + If Abs(func - res) < 0.001 Then + Approch = True + Else + Approch = False + End If +End Function + +Const PI = 3.1415926 + +Call ok(Approch(Cos(Empty), 1), "Cos(Empty) = " & Cos(Empty)) +Call ok(getVT(Cos(Empty)) = "VT_R8", "getVT(Cos(Empty)) = " & getVT(Cos(Empty))) +Call ok(Approch(Cos(PI / 6), Sqr(3) / 2), "Cos(PI / 6) = " & Cos(PI / 6)) +Call ok(getVT(Cos(PI / 6)) = "VT_R8", "getVT(Cos(PI / 6)) = " & getVT(Cos(PI / 6))) +Call ok(Approch(Cos(CCur(PI / 4)), Sqr(2) / 2), "Cos(CCur(PI / 4)) = " & Cos(CCur(PI / 4))) +Call ok(getVT(Cos(CCur(PI / 4))) = "VT_R8", "getVT(Cos(CCur(PI / 4))) = " & getVT(Cos(CCur(PI / 4)))) +Call ok(Approch(Cos(CSng(PI / 3)), 1 / 2), "Cos(CSng(PI / 3)) = " & Cos(CSng(PI / 3))) +Call ok(getVT(Cos(CSng(PI / 3))) = "VT_R8", "getVT(Cos(CSng(PI))) = " & getVT(Cos(CSng(PI)))) +Call ok(Approch(Cos(PI / 2), 0), "Cos(0) = " & Cos(PI / 2)) +Call ok(getVT(Cos(PI / 2)) = "VT_R8", "getVT(Cos(PI / 2)) = " & getVT(Cos(PI / 2))) +Call ok(Approch(Cos(PI), -1), "Cos(PI) = " & Cos(PI)) +Call ok(getVT(Cos(PI)) = "VT_R8", "getVT(Cos(PI)) = " & getVT(Cos(PI))) +Call ok(Approch(Cos(5 * PI / 4), -Sqr(2) / 2), "Cos(5 * PI / 4) = " & Cos(5 * PI / 4)) +Call ok(getVT(Cos(5 * PI / 4)) = "VT_R8", "getVT(Cos(5 * PI / 4)) = " & getVT(Cos(5 * PI / 4))) +Call ok(Approch(Cos(3 * PI / 2), 0), "Cos(3 * PI / 2) = " & Cos(3 * PI / 2)) +Call ok(getVT(Cos(3 * PI / 2)) = "VT_R8", "getVT(Cos(3 * PI / 2)) = " & getVT(Cos(3 * PI / 2))) +Call ok(Approch(Cos(2 * PI), 1), "Cos(2 * PI) = " & Cos(2 * PI)) +Call ok(getVT(Cos(2 * PI)) = "VT_R8", "getVT(Cos(2 * PI)) = " & getVT(Cos(2 * PI))) +Call ok(Approch(Cos("-32768"), 0.3729), "Cos(""-32768"") = " & Cos("-32768")) +Call ok(getVT(Cos("-32768")) = "VT_R8", "getVT(Cos(""-32768"")) = " & getVT(Cos("-32768"))) +Call ok(Approch(Cos(False), 1), "Cos(False) = " & Cos(False)) +Call ok(getVT(Cos(False)) = "VT_R8", "getVT(Cos(False)) = " & getVT(Cos(False))) +Call ok(Approch(Cos(True), 0.5403), "Cos(True) = " & Cos(True)) +Call ok(getVT(Cos(True)) = "VT_R8", "getVT(Cos(True)) = " & getVT(Cos(True))) +Call ok(Approch(Cos(CByte(255)), -0.8623), "Cos(CByte(255)) = " & Cos(CByte(255))) +Call ok(getVT(Cos(CByte(255))) = "VT_R8", "getVT(Cos(CByte(255))) = " & getVT(Cos(CByte(255)))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented Sin.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 77fe488a865aff64f3246b4c97f60a136519bc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fe488a865aff64f3246b4c9… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Aug 18 23:11:29 2014 +0800 vbscript: Implemented Sin. --- dlls/vbscript/global.c | 10 ++++++++-- dlls/vbscript/tests/api.vbs | 27 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e0a8f7c..df95cc3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -681,8 +681,14 @@ static HRESULT Global_Cos(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Sin(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + hres = to_double(arg, &d); + if(FAILED(hres)) + return hres; + + return return_double(res, sin(d)); } static HRESULT Global_Tan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8a829dc..22c5f33 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1115,4 +1115,31 @@ Call ok(getVT(Cos(True)) = "VT_R8", "getVT(Cos(True)) = " & getVT(Cos(True))) Call ok(Approch(Cos(CByte(255)), -0.8623), "Cos(CByte(255)) = " & Cos(CByte(255))) Call ok(getVT(Cos(CByte(255))) = "VT_R8", "getVT(Cos(CByte(255))) = " & getVT(Cos(CByte(255)))) +Call ok(Approch(Sin(Empty), 0), "Sin(Empty) = " & Sin(Empty)) +Call ok(getVT(Sin(Empty)) = "VT_R8", "getVT(Sin(Empty)) = " & getVT(Sin(Empty))) +Call ok(Approch(Sin(PI / 6), 1 / 2), "Sin(PI / 6) = " & Sin(PI / 6)) +Call ok(getVT(Sin(PI / 6)) = "VT_R8", "getVT(Sin(PI / 6)) = " & getVT(Sin(PI / 6))) +Call ok(Approch(Sin(CCur(PI / 4)), Sqr(2) / 2), "Sin(CCur(PI / 4)) = " & Sin(CCur(PI / 4))) +Call ok(getVT(Sin(CCur(PI / 4))) = "VT_R8", "getVT(Sin(CCur(PI / 4))) = " & getVT(Sin(CCur(PI / 4)))) +Call ok(Approch(Sin(CSng(PI / 3)), Sqr(3) / 2), "Sin(CSng(PI / 3)) = " & Sin(CSng(PI / 3))) +Call ok(getVT(Sin(CSng(PI / 3))) = "VT_R8", "getVT(Sin(CSng(PI))) = " & getVT(Sin(CSng(PI)))) +Call ok(Approch(Sin(PI / 2), 1), "Sin(0) = " & Sin(PI / 2)) +Call ok(getVT(Sin(PI / 2)) = "VT_R8", "getVT(Sin(PI / 2)) = " & getVT(Sin(PI / 2))) +Call ok(Approch(Sin(PI), 0), "Sin(PI) = " & Sin(PI)) +Call ok(getVT(Sin(PI)) = "VT_R8", "getVT(Sin(PI)) = " & getVT(Sin(PI))) +Call ok(Approch(Sin(5 * PI / 4), -Sqr(2) / 2), "Sin(5 * PI / 4) = " & Sin(5 * PI / 4)) +Call ok(getVT(Sin(5 * PI / 4)) = "VT_R8", "getVT(Sin(5 * PI / 4)) = " & getVT(Sin(5 * PI / 4))) +Call ok(Approch(Sin(3 * PI / 2), -1), "Sin(3 * PI / 2) = " & Sin(3 * PI / 2)) +Call ok(getVT(Sin(3 * PI / 2)) = "VT_R8", "getVT(Sin(3 * PI / 2)) = " & getVT(Sin(3 * PI / 2))) +Call ok(Approch(Sin(2 * PI), 0), "Sin(2 * PI) = " & Sin(2 * PI)) +Call ok(getVT(Sin(2 * PI)) = "VT_R8", "getVT(Sin(2 * PI)) = " & getVT(Sin(2 * PI))) +Call ok(Approch(Sin("-32768"), -0.9278), "Sin(""-32768"") = " & Sin("-32768")) +Call ok(getVT(Sin("-32768")) = "VT_R8", "getVT(Sin(""-32768"")) = " & getVT(Sin("-32768"))) +Call ok(Approch(Sin(False), 0), "Sin(False) = " & Sin(False)) +Call ok(getVT(Sin(False)) = "VT_R8", "getVT(Sin(False)) = " & getVT(Sin(False))) +Call ok(Approch(Sin(True), -0.84147), "Sin(True) = " & Sin(True)) +Call ok(getVT(Sin(True)) = "VT_R8", "getVT(Sin(True)) = " & getVT(Sin(True))) +Call ok(Approch(Sin(CByte(255)), -0.5063), "Sin(CByte(255)) = " & Sin(CByte(255))) +Call ok(getVT(Sin(CByte(255))) = "VT_R8", "getVT(Sin(CByte(255))) = " & getVT(Sin(CByte(255)))) + Call reportSuccess()

1 0

Stefan Dösinger : ddraw: Clear application-passed lpSurface pointers.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 61ee3323ad5eb9b01dc5415374d12d990b5ba500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ee3323ad5eb9b01dc541537… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 14:20:28 2014 +0200 ddraw: Clear application-passed lpSurface pointers. --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw1.c | 1 + dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + dlls/ddraw/tests/ddraw7.c | 1 + 5 files changed, 5 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fd2c1a4..afd98a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6224,6 +6224,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } } + desc->lpSurface = NULL; wined3d_surface_incref(wined3d_surface); surface->wined3d_surface = wined3d_surface; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ad60606..ccb65ac 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4576,6 +4576,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7e0e925..d8be62f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5652,6 +5652,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b96330c..9bcebc5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6649,6 +6649,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface4_Release(surface); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3e29164..4625b0f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6472,6 +6472,7 @@ static void test_create_surface_pitch(void) ok(U1(surface_desc).lPitch == test_data[i].pitch_out32, "Test %u: Got unexpected pitch %u, expected %u.\n", i, U1(surface_desc).lPitch, test_data[i].pitch_out32); + ok(!surface_desc.lpSurface, "Test %u: Got unexpected lpSurface %p.\n", i, surface_desc.lpSurface); IDirectDrawSurface7_Release(surface); }

1 0

Stefan Dösinger : ddraw: Do not set lpSurface in GetSurfaceDesc.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 9bb5b00dd5ee0c49fafeac044a31b86602804825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb5b00dd5ee0c49fafeac044… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 14:20:29 2014 +0200 ddraw: Do not set lpSurface in GetSurfaceDesc. This reverts a5c484cbf3948ec824e990503f798d3333ff55fb. The test included in a5c484cb is wrong and contains a typo that leads to incorrect assumptions. The Dungeon Keeper 2 crash that was the reason for patch a5c484cb is fixed properly by the previous patch. --- dlls/ddraw/surface.c | 15 ++++-------- dlls/ddraw/tests/ddraw1.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 16 +------------ 6 files changed, 233 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb5b00dd5ee0c49fafea…

1 0

André Hentschel : wpcap: Implement pcap_datalink_val_to_name.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 6284a3e2021f13122c83ad8c89917039b5fbf3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6284a3e2021f13122c83ad8c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:55:01 2014 +0200 wpcap: Implement pcap_datalink_val_to_name. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 81ff958..333079e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -45,6 +45,12 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +const char* CDECL wine_pcap_datalink_val_to_name(int dlt) +{ + TRACE("(%i)\n", dlt); + return pcap_datalink_val_to_name(dlt); +} + typedef struct { void (CALLBACK *pfn_cb)(u_char *, const struct pcap_pkthdr *, const u_char *); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2cdc6cd..04f309f 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -14,7 +14,7 @@ @ cdecl pcap_datalink(ptr) wine_pcap_datalink @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description -@ stub pcap_datalink_val_to_name +@ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch @ stub pcap_dump @ stub pcap_dump_close

1 0

André Hentschel : wpcap: Implement pcap_close.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 235bbd0f306228569b0145c1252e964d224b86ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=235bbd0f306228569b0145c12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:55:15 2014 +0200 wpcap: Implement pcap_close. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 333079e..be58102 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -32,6 +32,12 @@ void CDECL wine_pcap_breakloop(pcap_t *p) return pcap_breakloop(p); } +void CDECL wine_pcap_close(pcap_t *p) +{ + TRACE("(%p)\n", p); + pcap_close(p); +} + int CDECL wine_pcap_compile(pcap_t *p, struct bpf_program *program, const char *buf, int optimize, unsigned int mask) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 04f309f..835550a 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -7,7 +7,7 @@ @ stub getservent @ stub install_bpf_program @ cdecl pcap_breakloop(ptr) wine_pcap_breakloop -@ stub pcap_close +@ cdecl pcap_close(ptr) wine_pcap_close @ cdecl pcap_compile(ptr ptr str long long) wine_pcap_compile @ stub pcap_compile_nopcap @ stub pcap_createsrcstr

1 0

André Hentschel : wpcap: Implement pcap_datalink_name_to_val.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: ea18520e6c1ecd06336ab1e59c3e78a965790451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea18520e6c1ecd06336ab1e59… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:55:47 2014 +0200 wpcap: Implement pcap_datalink_name_to_val. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index be58102..19f79e3 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -51,6 +51,12 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +int CDECL wine_pcap_datalink_name_to_val(const char *name) +{ + TRACE("(%s)\n", debugstr_a(name)); + return pcap_datalink_name_to_val(name); +} + const char* CDECL wine_pcap_datalink_val_to_name(int dlt) { TRACE("(%i)\n", dlt); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 835550a..de90658 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -12,7 +12,7 @@ @ stub pcap_compile_nopcap @ stub pcap_createsrcstr @ cdecl pcap_datalink(ptr) wine_pcap_datalink -@ stub pcap_datalink_name_to_val +@ cdecl pcap_datalink_name_to_val(str) wine_pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch

1 0