mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 04:53:31 +08:00
[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
This commit is contained in:
parent
c6b07cf471
commit
b78d31eea4
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user