Author: akhaldi Date: Sun Feb 26 17:39:01 2017 New Revision: 73953
URL: http://svn.reactos.org/svn/reactos?rev=73953&view=rev Log: [JSCRIPT] Sync with Wine Staging 2.2. CORE-12823
493659e jscript: Make scope_push() static.
Modified: trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c?... ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Sun Feb 26 17:39:01 2017 @@ -384,7 +384,7 @@ jsval_release(steal_ret(frame)); }
-HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) +static HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) { scope_chain_t *new_scope;
Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h?... ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] Sun Feb 26 17:39:01 2017 @@ -199,7 +199,6 @@ struct _scope_chain_t *next; } scope_chain_t;
-HRESULT scope_push(scope_chain_t*,jsdisp_t*,IDispatch*,scope_chain_t**) DECLSPEC_HIDDEN; void scope_release(scope_chain_t*) DECLSPEC_HIDDEN;
static inline scope_chain_t *scope_addref(scope_chain_t *scope)
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 17:39:01 2017 @@ -85,7 +85,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-2.2 -reactos/dll/win32/jscript # Synced to WineStaging-1.9.23 +reactos/dll/win32/jscript # Synced to WineStaging-2.2 reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11