[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH 04/10] jscript: Directly return error code instead of using throw_range_error.
From:       Jacek Caban <jacek () codeweavers ! com>
Date:       2020-01-31 16:23:00
Message-ID: 57b7f702-462f-f5e6-aa7f-160163634966 () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
---
  dlls/jscript/array.c   |  4 ++--
  dlls/jscript/error.c   |  5 -----
  dlls/jscript/jscript.h |  1 -
  dlls/jscript/number.c  | 10 +++++-----
  dlls/jscript/vbarray.c |  8 ++++----
  5 files changed, 11 insertions(+), 17 deletions(-)



["0004-jscript-Directly-return-error-code-instead-of-using-th.txt" (text/x-patch)]

diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 51a4cf1d38..5e022bc929 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -149,7 +149,7 @@ static HRESULT Array_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t val
 
     len = floor(len);
     if(len!=(DWORD)len)
-        return throw_range_error(ctx, JS_E_INVALID_LENGTH, NULL);
+        return JS_E_INVALID_LENGTH;
 
     for(i=len; i < This->length; i++) {
         hres = jsdisp_delete_idx(&This->dispex, i);
@@ -1281,7 +1281,7 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
             double n = get_number(argv[0]);
 
             if(n < 0 || !is_int32(n))
-                return throw_range_error(ctx, JS_E_INVALID_LENGTH, NULL);
+                return JS_E_INVALID_LENGTH;
 
             hres = create_array(ctx, n, &obj);
             if(FAILED(hres))
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index e52310d473..13bc0e6ba4 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j
     return error;
 }
 
-HRESULT throw_range_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str)
-{
-    return throw_error(ctx, error, str, ctx->range_error_constr);
-}
-
 HRESULT throw_reference_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str)
 {
     return throw_error(ctx, error, str, ctx->reference_error_constr);
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 05dcfd01a1..fa7058d201 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -312,7 +312,6 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN;
 struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN;
 #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value}
 
-HRESULT throw_range_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
 HRESULT throw_reference_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
 HRESULT throw_regexp_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
 HRESULT throw_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c
index d78cc1e5a9..ff842134bb 100644
--- a/dlls/jscript/number.c
+++ b/dlls/jscript/number.c
@@ -375,8 +375,8 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
         if(FAILED(hres))
             return hres;
 
-        if(prec<0 || prec>20)
-            return throw_range_error(ctx, JS_E_FRACTION_DIGITS_OUT_OF_RANGE, NULL);
+        if(prec < 0 || prec > 20)
+            return JS_E_FRACTION_DIGITS_OUT_OF_RANGE;
     }
 
     val = number->value;
@@ -416,8 +416,8 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
         if(FAILED(hres))
             return hres;
 
-        if(prec<0 || prec>20)
-            return throw_range_error(ctx, JS_E_FRACTION_DIGITS_OUT_OF_RANGE, NULL);
+        if(prec < 0 || prec > 20)
+            return JS_E_FRACTION_DIGITS_OUT_OF_RANGE;
     }
 
     val = number->value;
@@ -458,7 +458,7 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags
             return hres;
 
         if(prec<1 || prec>21)
-            return throw_range_error(ctx, JS_E_PRECISION_OUT_OF_RANGE, NULL);
+            return JS_E_PRECISION_OUT_OF_RANGE;
     }
 
     val = number->value;
diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c
index 4bed5fb076..1a474d6ac0 100644
--- a/dlls/jscript/vbarray.c
+++ b/dlls/jscript/vbarray.c
@@ -80,7 +80,7 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un
         return throw_type_error(ctx, JS_E_VBARRAY_EXPECTED, NULL);
 
     if(argc < SafeArrayGetDim(vbarray->safearray))
-        return throw_range_error(ctx, JS_E_SUBSCRIPT_OUT_OF_RANGE, NULL);
+        return JS_E_SUBSCRIPT_OUT_OF_RANGE;
 
     indexes = heap_alloc(sizeof(int)*argc);
     if(!indexes)
@@ -97,7 +97,7 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un
     hres = SafeArrayGetElement(vbarray->safearray, indexes, (void*)&out);
     heap_free(indexes);
     if(hres == DISP_E_BADINDEX)
-        return throw_range_error(ctx, JS_E_SUBSCRIPT_OUT_OF_RANGE, NULL);
+        return JS_E_SUBSCRIPT_OUT_OF_RANGE;
     else if(FAILED(hres))
         return hres;
 
@@ -130,7 +130,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns
 
     hres = SafeArrayGetLBound(vbarray->safearray, dim, &dim);
     if(hres == DISP_E_BADINDEX)
-        return throw_range_error(ctx, JS_E_SUBSCRIPT_OUT_OF_RANGE, NULL);
+        return JS_E_SUBSCRIPT_OUT_OF_RANGE;
     else if(FAILED(hres))
         return hres;
 
@@ -216,7 +216,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, uns
 
     hres = SafeArrayGetUBound(vbarray->safearray, dim, &dim);
     if(hres == DISP_E_BADINDEX)
-        return throw_range_error(ctx, JS_E_SUBSCRIPT_OUT_OF_RANGE, NULL);
+        return JS_E_SUBSCRIPT_OUT_OF_RANGE;
     else if(FAILED(hres))
         return hres;
 



[prev in list] [next in list] [prev in thread] [next in thread]