[PATCH 0/1] MR4569: vbscript: Handle numdecimalplaces argument in Round().

[Robert Wilhelm (＠sloper42)]

Patch is based on previous work by Jason Millard and Nikolay Sivov.
See Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55185 for details.

[PATCH 1/1] vbscript: Handle numdecimalplaces argument in Round().

[Robert Wilhelm]

From: Robert Wilhelm

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55185
---
 dlls/vbscript/global.c      | 31 +++++++++++++++++++++++--------
 dlls/vbscript/tests/api.vbs | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 0baab7e4420..a4e0fb12d5e 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -3151,32 +3151,47 @@ static HRESULT Global_MonthName(BuiltinDisp *This, VARIANT *args, unsigned args_
     return return_bstr(res, ret);
 }

-static HRESULT Global_Round(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
+static HRESULT Global_Round(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res)
 {
-    double n;
+    int decimal_places = 0;
+    double d;
     HRESULT hres;

-    TRACE("%s\n", debugstr_variant(arg));
+    TRACE("%s %s\n", debugstr_variant(args), args_cnt == 2 ? debugstr_variant(args + 1) : "0");
+
+    assert(args_cnt == 1 || args_cnt == 2);

if(!res)
         return S_OK;

-    switch(V_VT(arg)) {
+    if(args_cnt == 2) {
+       if (V_VT(args + 1) != VT_ERROR) {
+           hres = to_int(args + 1, &decimal_places);
+           if (FAILED(hres))
+              return hres;
+       }
+    }
+
+    switch(V_VT(args)) {
     case VT_I2:
     case VT_I4:
     case VT_BOOL:
-        *res = *arg;
+        *res = *args;
         return S_OK;
     case VT_R8:
-        n = V_R8(arg);
+        d = V_R8(args);
         break;
     default:
-        hres = to_double(arg, &n);
+        hres = to_double(args, &d);
         if(FAILED(hres))
             return hres;
     }

-    return return_double(res, round(n));
+    hres = VarR8Round(d, decimal_places, &d);
+    if(FAILED(hres))
+        return hres;
+
+    return return_double(res, d);
 }

static HRESULT Global_Escape(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs
index 842cce33f83..6fc0d428078 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -1090,6 +1090,29 @@ TestRound "2", 2, "VT_R8"
 TestRound true, true, "VT_BOOL"
 TestRound false, false, "VT_BOOL"

+Sub TestRound2(val, decnum, exval, vt)
+    Call ok(Round(val, decnum) = exval, "Round(" & val & " , " & decnum & ") = " & Round(val, decnum))
+    Call ok(getVT(Round(val, decnum)) = vt, "getVT(Round(" & val & " , " & decnum & ")) = " & getVT(Round(val, decnum)))
+End Sub
+
+TestRound2 3, 0, 3, "VT_I2"
+TestRound2 3, 1, 3, "VT_I2"
+TestRound2 3.3, 0, 3, "VT_R8"
+TestRound2 3.8, 0, 4, "VT_R8"
+TestRound2 3.5, 0, 4, "VT_R8"
+TestRound2 -3.3, 0, -3, "VT_R8"
+TestRound2 -3.5, 0, -4, "VT_R8"
+TestRound2 3.3, 1, 3.3, "VT_R8"
+TestRound2 3.8, 1, 3.8, "VT_R8"
+TestRound2 3.5, 1, 3.5, "VT_R8"
+TestRound2 -3.3, 1, -3.3, "VT_R8"
+TestRound2 -3.5, 1, -3.5, "VT_R8"
+TestRound2 "2", 1, 2, "VT_R8"
+TestRound2 true, 0, true, "VT_BOOL"
+TestRound2 false, 0, false, "VT_BOOL"
+TestRound2 true, 1, true, "VT_BOOL"
+TestRound2 false, 1, false, "VT_BOOL"
+
 if isEnglishLang then
     Call ok(WeekDayName(1) = "Sunday", "WeekDayName(1) = " & WeekDayName(1))
     Call ok(WeekDayName(3) = "Tuesday", "WeekDayName(3) = " & WeekDayName(3))

[PATCH 0/1] MR4569: vbscript: Handle numdecimalplaces argument in Round(). - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.