Author: akhaldi
Date: Sun Sep 17 22:54:24 2017
New Revision: 75882
URL:
http://svn.reactos.org/svn/reactos?rev=75882&view=rev
Log:
[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.
Modified:
trunk/reactos/dll/win32/jscript/compile.c
trunk/reactos/dll/win32/jscript/jsutils.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/jscript/compile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.…
==============================================================================
--- trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] Sun Sep 17 22:54:24 2017
@@ -1736,7 +1736,7 @@
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;
Modified: trunk/reactos/dll/win32/jscript/jsutils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.…
==============================================================================
--- trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] Sun Sep 17 22:54:24 2017
@@ -293,6 +293,9 @@
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;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 22:54:24 2017
@@ -85,7 +85,7 @@
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