[JSCRIPT] Sync with Wine Staging 2.16. CORE-13762

c25208f jscript: Added support for VT_R4 VARIANT types.
5c8c4d9 jscript: A spelling fix in a comment.

svn path=/trunk/; revision=75882

diff --git a/reactos/dll/win32/jscript/compile.c b/reactos/dll/win32/jscript/compile.c
index bdaa60e..7afbf01 100644 (file)
--- a/reactos/dll/win32/jscript/compile.c
+++ b/reactos/dll/win32/jscript/compile.c
@@ -1736,7 +1736,7 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat)
     if(stat->finally_statement) {
         /*
          * finally block expects two elements on the stack, which may be:
-         * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed addres
+         * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed address
          * - (false, exception_value) set when unwinding an exception, which OP_end_finally rethrows
          */
         finally_off = ctx->code_off;

diff --git a/reactos/dll/win32/jscript/jsutils.c b/reactos/dll/win32/jscript/jsutils.c
index 3fbee0c..20b30f0 100644 (file)
--- a/reactos/dll/win32/jscript/jsutils.c
+++ b/reactos/dll/win32/jscript/jsutils.c
@@ -293,6 +293,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r)
     case VT_UI4:
         *r = jsval_number(V_UI4(var));
         return S_OK;
+    case VT_R4:
+        *r = jsval_number(V_R4(var));
+        return S_OK;
     case VT_UNKNOWN:
         if(V_UNKNOWN(var)) {
             IDispatch *disp;

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 8a299a7..c7abd29 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -85,7 +85,7 @@ reactos/dll/win32/inseng              # Synced to WineStaging-2.9
 reactos/dll/win32/iphlpapi            # Out of sync
 reactos/dll/win32/itircl              # Synced to WineStaging-2.9
 reactos/dll/win32/itss                # Synced to WineStaging-2.9
-reactos/dll/win32/jscript             # Synced to WineStaging-2.9
+reactos/dll/win32/jscript             # Synced to WineStaging-2.16
 reactos/dll/win32/jsproxy             # Synced to WineStaging-2.9
 reactos/dll/win32/loadperf            # Synced to WineStaging-2.9
 reactos/dll/win32/lz32                # Synced to WineStaging-2.9