Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

svn path=/trunk/; revision=75882
This commit is contained in:
Amine Khaldi 2017-09-17 22:54:24 +00:00
parent c6b07cf471
commit b78d31eea4
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/jscript/compile.c
View file

@ -1736,7 +1736,7 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat)
if(stat->finally_statement) { if(stat->finally_statement) {
/* /*
* finally block expects two elements on the stack, which may be: * 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 * - (false, exception_value) set when unwinding an exception, which OP_end_finally rethrows
*/ */
finally_off = ctx->code_off; finally_off = ctx->code_off;

3
reactos/dll/win32/jscript/jsutils.c
View file

@ -293,6 +293,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r)
case VT_UI4: case VT_UI4:
*r = jsval_number(V_UI4(var)); *r = jsval_number(V_UI4(var));
return S_OK; return S_OK;
case VT_R4:
*r = jsval_number(V_R4(var));
return S_OK;
case VT_UNKNOWN: case VT_UNKNOWN:
if(V_UNKNOWN(var)) { if(V_UNKNOWN(var)) {
IDispatch *disp; IDispatch *disp;

2
reactos/media/doc/README.WINE
View file

@ -85,7 +85,7 @@ reactos/dll/win32/inseng # Synced to WineStaging-2.9
reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/iphlpapi # Out of sync
reactos/dll/win32/itircl # Synced to WineStaging-2.9 reactos/dll/win32/itircl # Synced to WineStaging-2.9
reactos/dll/win32/itss # 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/jsproxy # Synced to WineStaging-2.9
reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/loadperf # Synced to WineStaging-2.9
reactos/dll/win32/lz32 # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9