August 2016 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Set referer HTTP header in nsIHttpChannel:: SetReferrerWithPolicy.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 0ff1b0c382f6e5cd9f63a64d5dabcd8dfcec261a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff1b0c382f6e5cd9f63a64d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 15:53:20 2016 +0200 mshtml: Set referer HTTP header in nsIHttpChannel::SetReferrerWithPolicy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cd6c21f..88164d0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1303,7 +1303,11 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI nsChannel *This = impl_from_nsIHttpChannel(iface); DWORD channel_scheme, referrer_scheme; nsWineURI *referrer; + BSTR referrer_uri; nsresult nsres; + HRESULT hres; + + static const WCHAR refererW[] = {'R','e','f','e','r','e','r'}; TRACE("(%p)->(%p %d)\n", This, aReferrer, aReferrerPolicy); @@ -1338,6 +1342,10 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI return NS_OK; } + hres = IUri_GetDisplayUri(referrer->uri, &referrer_uri); + if(SUCCEEDED(hres) ) + set_http_header(&This->request_headers, refererW, sizeof(refererW)/sizeof(WCHAR), referrer_uri, SysStringLen(referrer_uri)); + This->referrer = (nsIURI*)&referrer->nsIFileURL_iface; return NS_OK; }

1 0

Jacek Caban : mshtml: Use correct principal to create in create_nsxhr.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 3d4dbd3c143fde871f5a433b24cd5c422f91ad61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4dbd3c143fde871f5a433b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 15:53:28 2016 +0200 mshtml: Use correct principal to create in create_nsxhr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 62 ++++++++++++++++++++++++------------------------- dlls/mshtml/nsiface.idl | 46 ++++++++---------------------------- 2 files changed, 41 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 22f37af..958b619 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -49,7 +49,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" #define NS_CATEGORYMANAGER_CONTRACTID "@mozilla.org/categorymanager;1" #define NS_XMLHTTPREQUEST_CONTRACTID "@mozilla.org/xmlextras/xmlhttprequest;1" -#define NS_SCRIPTSECURITYMANAGER_CONTRACTID "@mozilla.org/scriptsecuritymanager;1" #define PR_UINT32_MAX 0xffffffff @@ -2159,34 +2158,33 @@ void NSContainer_Release(NSContainer *This) nsIWebBrowserChrome_Release(&This->nsIWebBrowserChrome_iface); } +/* + * FIXME: nsIScriptObjectPrincipal uses thiscall calling convention, so we need this hack on i386. + * This will be removed after the next Gecko update, that will change calling convention on Gecko side. + */ +#ifdef __i386__ +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") +#define nsIScriptObjectPrincipal_GetPrincipal(this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)((this)->lpVtbl->GetPrincipal,this) +#endif + nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) { + nsIScriptObjectPrincipal *sop; mozIDOMWindow *inner_window; - nsIScriptSecurityManager *secman; - nsIPrincipal *nspri; - nsIGlobalObject *nsglo; - nsIXMLHttpRequest *nsxhr; - nsresult nsres; - - nsres = nsIServiceManager_GetServiceByContractID(pServMgr, - NS_SCRIPTSECURITYMANAGER_CONTRACTID, - &IID_nsIScriptSecurityManager, (void**)&secman); - if(NS_FAILED(nsres)) { - ERR("Could not get sec manager service: %08x\n", nsres); - return NULL; - } - - nsres = nsIScriptSecurityManager_GetSystemPrincipal(secman, &nspri); - nsIScriptSecurityManager_Release(secman); - if(NS_FAILED(nsres)) { - ERR("GetSystemPrincipal failed: %08x\n", nsres); - return NULL; - } + nsIPrincipal *nspri; + nsIGlobalObject *nsglo; + nsIXMLHttpRequest *nsxhr; + nsresult nsres; nsres = nsIDOMWindow_GetInnerWindow(nswindow, &inner_window); if(NS_FAILED(nsres)) { ERR("Could not get inner window: %08x\n", nsres); - nsISupports_Release(nspri); return NULL; } @@ -2194,24 +2192,26 @@ nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) mozIDOMWindow_Release(inner_window); assert(nsres == NS_OK); + nsres = nsIGlobalObject_QueryInterface(nsglo, &IID_nsIScriptObjectPrincipal, (void**)&sop); + assert(nsres == NS_OK); + + nspri = nsIScriptObjectPrincipal_GetPrincipal(sop); + nsIScriptObjectPrincipal_Release(sop); + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_XMLHTTPREQUEST_CONTRACTID, NULL, &IID_nsIXMLHttpRequest, (void**)&nsxhr); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIXMLHttpRequest: %08x\n", nsres); - nsISupports_Release(nspri); - nsIGlobalObject_Release(nsglo); - return NULL; + if(NS_SUCCEEDED(nsres)) { + nsres = nsIXMLHttpRequest_Init(nsxhr, nspri, NULL, nsglo, NULL, NULL); + if(NS_FAILED(nsres)) + nsIXMLHttpRequest_Release(nsxhr); } - - nsres = nsIXMLHttpRequest_Init(nsxhr, nspri, NULL, nsglo, NULL, NULL); - nsISupports_Release(nspri); nsIGlobalObject_Release(nsglo); if(NS_FAILED(nsres)) { ERR("nsIXMLHttpRequest_Init failed: %08x\n", nsres); - nsIXMLHttpRequest_Release(nsxhr); return NULL; } + return nsxhr; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index e9c717d..83b91a7 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -4146,6 +4146,16 @@ interface nsIGlobalObject : nsISupports [ object, + uuid(3eedba38-8d22-41e1-817a-0e43e165b664), + local +] +interface nsIScriptObjectPrincipal : nsISupports +{ + nsIPrincipal* /* thiscall */ GetPrincipal(); +} + +[ + object, uuid(6f54214c-7175-498d-9d2d-0429e38c2869), local ] @@ -4181,40 +4191,4 @@ interface nsIXMLHttpRequest : nsISupports nsresult GetMozSystem(bool *aMozSystem); } -[ - object, - uuid(b7ae2310-576e-11e5-a837-0800200c9a66), - local -] -interface nsIScriptSecurityManager : nsISupports { - nsresult CanCreateWrapper(JSContext *aJSContext, const nsIID *aIID, nsISupports *aObj, nsIClassInfo *aClassInfo); - nsresult CanCreateInstance(JSContext *aJSContext, const nsCID *aCID); - nsresult CanGetService(JSContext *aJSContext, const nsCID *aCID); - nsresult CheckLoadURIFromScript(JSContext *cx, nsIURI *uri); - nsresult CheckLoadURIWithPrincipal(nsIPrincipal *aPrincipal, nsIURI *uri, uint32_t flags); - nsresult CheckLoadURIStrWithPrincipal(nsIPrincipal *aPrincipal, const nsACString *uri, uint32_t flags); - bool ScriptAllowed(JSObject *aGlobal); - nsresult GetSystemPrincipal(nsIPrincipal **_retval); - nsresult GetSimpleCodebasePrincipal(nsIURI *aURI, nsIPrincipal **_retval); - nsresult GetAppCodebasePrincipal(nsIURI *uri, uint32_t appId, bool inMozBrowser, nsIPrincipal **_retval); - nsresult GetLoadContextCodebasePrincipal(nsIURI *uri, nsILoadContext *loadContext, nsIPrincipal **_retval); - nsresult GetDocShellCodebasePrincipal(nsIURI *uri, nsIDocShell *docShell, nsIPrincipal **_retval); - nsresult GetNoAppCodebasePrincipal(nsIURI *uri, nsIPrincipal **_retval); - nsresult GetCodebasePrincipal(nsIURI *uri, nsIPrincipal **_retval); - nsresult CreateCodebasePrincipal(nsIURI *uri, int /*JS::HandleValue*/ originAttributes, JSContext* cx, nsIPrincipal **_retval); - nsresult CreateCodebasePrincipalFromOrigin(const nsACString *origin, nsIPrincipal **_retval); - nsresult CreateNullPrincipal(int /*JS::HandleValue*/ originAttributes, JSContext *cx, nsIPrincipal **_retval); - nsresult CreateExpandedPrincipal(nsIPrincipal **aPrincipalArray, uint32_t aLength, nsIPrincipal **_retval); - nsresult CheckSameOriginURI(nsIURI *aSourceURI, nsIURI *aTargetURI, bool reportError); - nsresult GetChannelResultPrincipal(nsIChannel *aChannel, nsIPrincipal **_retval); - nsresult GetChannelURIPrincipal(nsIChannel *aChannel, nsIPrincipal **_retval); - nsresult IsSystemPrincipal(nsIPrincipal *aPrincipal, bool *_retval); - nsresult GetJarPrefix(uint32_t appId, bool inMozBrowser, nsACString *_retval); - nsresult ActivateDomainPolicy(nsIDomainPolicy **_retval); - nsresult GetDomainPolicyActive(bool *aDomainPolicyActive); - nsresult ActivateDomainPolicyInternal(nsIDomainPolicy **_retval); - void CloneDomainPolicy(int /*mozilla::dom::DomainPolicyClone*/ *aClone); - nsresult PolicyAllowsScript(nsIURI *aDomain, bool *_retval); -} - cpp_quote("DEFINE_GUID(IID_nsCycleCollectionISupports, 0xc61eac14,0x5f7a,0x4481,0x96,0x5e,0x7e,0xaa,0x6e,0xff,0xa8,0x5f);")

1 0

Nikolay Sivov : gdi32: Fix its vs it's typo.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 41fa3f02ef69075c51af3f3756b20986356022fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fa3f02ef69075c51af3f375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:01 2016 +0300 gdi32: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 9bf79e4..c5b9682 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -161,7 +161,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) emr->emr.iType = EMR_CREATEMONOBRUSH; usage = DIB_PAL_MONO; /* FIXME: There is an extra DWORD written by native before the BMI. - * Not sure what its meant to contain. + * Not sure what it's meant to contain. */ emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); emr->cbBmi = sizeof( BITMAPINFOHEADER );

1 0

Nikolay Sivov : dinput: Fix its vs it's typo.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: b610e422b381da3ecb83fcf93f64f60ee5ea80e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b610e422b381da3ecb83fcf93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:02 2016 +0300 dinput: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 0b08e15..db4507d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -526,7 +526,7 @@ failed: return DIERR_OUTOFMEMORY; } -/* find an object by it's offset in a data format */ +/* find an object by its offset in a data format */ static int offset_to_object(const DataFormat *df, int offset) { int i;

1 0

Nikolay Sivov : dplayx: Fix its vs it's typo.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 6d4a07077df1f17abf940251f8deddf9449a45cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4a07077df1f17abf940251f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:03 2016 +0300 dplayx: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplayx_global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 8351f66..14c53a0 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -182,7 +182,7 @@ static void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData ) } /* NOTE: This must be called with the semaphore acquired. - * TRUE/FALSE with a pointer to it's data returned. Pointer data is + * TRUE/FALSE with a pointer to its data returned. Pointer data is * is only valid if TRUE is returned. */ static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplData )

1 0

Nikolay Sivov : krnl386: Fix its vs it's typo.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: ccce887eb2b4fdd7dc26f21edb1e577a4f69d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccce887eb2b4fdd7dc26f21ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:04 2016 +0300 krnl386: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/local.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index a39316a..46a336e 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -814,7 +814,7 @@ static UINT16 LOCAL_Compact( HANDLE16 ds, UINT16 minfree, UINT16 flags ) size = pFinalArena->size; LOCAL_RemoveFreeBlock(ptr, finalarena); LOCAL_ShrinkArena( ds, finalarena, movesize ); - /* Copy the arena to it's new location */ + /* Copy the arena to its new location */ memcpy((char *)pFinalArena + ARENA_HEADER_SIZE, (char *)pMoveArena + ARENA_HEADER_SIZE, movesize - ARENA_HEADER_SIZE );

1 0

Nikolay Sivov : mmsystem: Fix its vs it's typo.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 515065f6ce12786d6c834634bed81dea9f69bdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=515065f6ce12786d6c834634b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 14:19:05 2016 +0300 mmsystem: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmsystem.dll16/mmsystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index d90240d..083ec2d 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -1694,7 +1694,7 @@ DWORD WINAPI waveInMessage16(HWAVEIN16 hWaveIn, UINT16 uMessage, /************************************************************************** * mmTaskCreate [MMSYSTEM.900] * - * Creates a 16 bit MM task. It's entry point is lpFunc, and it should be + * Creates a 16 bit MM task. Its entry point is lpFunc, and it should be * called upon creation with dwPmt as parameter. */ HINSTANCE16 WINAPI mmTaskCreate16(SEGPTR spProc, HINSTANCE16 *lphMmTask, DWORD dwPmt)

1 0

Nikolay Sivov : gdiplus: Fix its vs it's typos.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 668fe2030d8de658bf8034eca0bf691a4cdd38f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668fe2030d8de658bf8034eca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 01:10:10 2016 +0300 gdiplus: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 2 +- dlls/gdiplus/tests/font.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 7d909d2..35fef8b 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -821,7 +821,7 @@ static void write_element(const region_element* element, DWORD *buffer, * their code followed by a second header for the path followed by the actual * path data. Followed by the flags for each point. The pathheader contains * the size of the data to follow, a version number again, followed by a count - * of how many points, and any special flags which may apply. 0x4000 means its + * of how many points, and any special flags which may apply. 0x4000 means it's * a path of shorts instead of FLOAT. * * Combining Ops are stored in reverse order from when they were constructed; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1b442cc..827ef2a 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -74,7 +74,7 @@ static void test_createfont(void) stat = GdipDeleteFontFamily(fontfamily2); expect(Ok, stat); - /* Test to see if returned size is based on unit (its not) */ + /* Test to see if returned size is based on unit (it's not) */ GdipGetFontSize(font, &size); ok (size == 12, "Expected 12, got %f\n", size); GdipDeleteFont(font);

1 0

Jacek Caban : jscript: Build local references map in compiler and use it to search the scope.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: b652a9787ca7d1e7d441cfe8754ef1c24ad83f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b652a9787ca7d1e7d441cfe87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:27:35 2016 +0200 jscript: Build local references map in compiler and use it to search the scope. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 99 +++++++++++++++++++++++++++++++++++++++----------- dlls/jscript/engine.c | 19 ++++++---- dlls/jscript/engine.h | 8 ++++ 3 files changed, 97 insertions(+), 29 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 77bbc89..7b844b7 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -54,6 +54,10 @@ typedef struct { unsigned labels_size; unsigned labels_cnt; + local_ref_t *locals_buf; + unsigned locals_buf_size; + unsigned locals_cnt; + statement_ctx_t *stat_ctx; function_code_t *func; @@ -1782,6 +1786,46 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, return hres; } +static int local_cmp(const void *key, const void *ref) +{ + return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); +} + +static inline local_ref_t *find_local(compiler_ctx_t *ctx, BSTR name) +{ + return bsearch(name, ctx->locals_buf, ctx->locals_cnt, sizeof(*ctx->locals_buf), local_cmp); +} + +static BOOL alloc_local(compiler_ctx_t *ctx, BSTR name, int ref) +{ + unsigned i; + + if(!ctx->locals_buf_size) { + ctx->locals_buf = heap_alloc(4 * sizeof(*ctx->locals_buf)); + if(!ctx->locals_buf) + return FALSE; + ctx->locals_buf_size = 4; + }else if(ctx->locals_buf_size == ctx->locals_cnt) { + local_ref_t *new_buf = heap_realloc(ctx->locals_buf, ctx->locals_buf_size * 2 * sizeof(*ctx->locals_buf)); + if(!new_buf) + return FALSE; + ctx->locals_buf = new_buf; + ctx->locals_buf_size *= 2; + } + + for(i = 0; i < ctx->locals_cnt; i++) { + if(strcmpW(ctx->locals_buf[i].name, name) > 0) { + memmove(ctx->locals_buf + i+1, ctx->locals_buf + i, (ctx->locals_cnt - i) * sizeof(*ctx->locals_buf)); + break; + } + } + + ctx->locals_buf[i].name = name; + ctx->locals_buf[i].ref = ref; + ctx->locals_cnt++; + return TRUE; +} + static void resolve_labels(compiler_ctx_t *ctx, unsigned off) { instr_t *instr; @@ -1856,9 +1900,35 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, ctx->var_head = ctx->var_tail = NULL; ctx->func_head = ctx->func_tail = NULL; ctx->from_eval = from_eval; + ctx->func = func; + ctx->locals_cnt = 0; + + if(func_expr) { + parameter_t *param_iter; + + func->source = func_expr->src_str; + func->source_len = func_expr->src_len; + + for(param_iter = func_expr->parameter_list; param_iter; param_iter = param_iter->next) + func->param_cnt++; + + func->params = compiler_alloc(ctx->code, func->param_cnt * sizeof(*func->params)); + if(!func->params) + return E_OUTOFMEMORY; + + for(param_iter = func_expr->parameter_list, i=0; param_iter; param_iter = param_iter->next, i++) { + func->params[i] = compiler_alloc_bstr(ctx, param_iter->identifier); + if(!func->params[i]) + return E_OUTOFMEMORY; + } + } + + for(i = 0; i < func->param_cnt; i++) { + if(!find_local(ctx, func->params[i]) && !alloc_local(ctx, func->params[i], -i-1)) + return E_OUTOFMEMORY; + } off = ctx->code_off; - ctx->func = func; hres = compile_block_statement(ctx, source->statement); if(FAILED(hres)) return hres; @@ -1888,26 +1958,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, } } - if(func_expr) { - parameter_t *param_iter; - - func->source = func_expr->src_str; - func->source_len = func_expr->src_len; - - for(param_iter = func_expr->parameter_list; param_iter; param_iter = param_iter->next) - func->param_cnt++; - - func->params = compiler_alloc(ctx->code, func->param_cnt * sizeof(*func->params)); - if(!func->params) - return E_OUTOFMEMORY; - - for(param_iter = func_expr->parameter_list, i=0; param_iter; param_iter = param_iter->next, i++) { - func->params[i] = compiler_alloc_bstr(ctx, param_iter->identifier); - if(!func->params[i]) - return E_OUTOFMEMORY; - } - } - func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) return E_OUTOFMEMORY; @@ -1920,6 +1970,12 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, assert(i == func->var_cnt); + func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); + if(!func->locals) + return E_OUTOFMEMORY; + func->locals_cnt = ctx->locals_cnt; + memcpy(func->locals, ctx->locals_buf, func->locals_cnt * sizeof(*func->locals)); + func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) return E_OUTOFMEMORY; @@ -2038,6 +2094,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *args, hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code); parser_release(compiler.parser); + heap_free(compiler.locals_buf); if(FAILED(hres)) { release_bytecode(compiler.code); return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 11b5618..187a8b7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -589,6 +589,11 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } +static int local_ref_cmp(const void *key, const void *ref) +{ + return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); +} + /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) { @@ -603,14 +608,12 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re for(scope = ctx->call_ctx->scope; scope; scope = scope->next) { if(scope->frame) { function_code_t *func = scope->frame->function; - int i; - - for(i = 0; i < func->param_cnt; i++) { - if(!strcmpW(identifier, func->params[i])) { - ret->type = EXPRVAL_STACK_REF; - ret->u.off = scope->frame->arguments_off+i; - return S_OK; - } + local_ref_t *ref = bsearch(identifier, func->locals, func->locals_cnt, sizeof(*func->locals), local_ref_cmp); + + if(ref) { + ret->type = EXPRVAL_STACK_REF; + ret->u.off = scope->frame->arguments_off - ref->ref - 1; + return S_OK; } } if(scope->jsobj) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3a3f37b..1aebfd7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -126,6 +126,11 @@ typedef struct { } u; } instr_t; +typedef struct { + BSTR name; + int ref; +} local_ref_t; + typedef struct _function_code_t { BSTR name; BSTR event_target; @@ -142,6 +147,9 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; + + unsigned locals_cnt; + local_ref_t *locals; } function_code_t; typedef struct _bytecode_t {

1 0

Jacek Caban : jscript: Access arguments directly from stack in arguments object if possible.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 9daafa87bc94364d9401b40286d2104c9b4ad29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9daafa87bc94364d9401b4028… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:27:49 2016 +0200 jscript: Access arguments directly from stack in arguments object if possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 -- dlls/jscript/function.c | 33 ++++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 187a8b7..2c6a9a3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -545,7 +545,7 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. */ -HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) +static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) { unsigned i; HRESULT hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1aebfd7..89a09fa 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -226,8 +226,6 @@ typedef struct _call_frame_t { struct _call_frame_t *prev_frame; } call_frame_t; -HRESULT detach_variable_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; - #define EXEC_GLOBAL 0x0001 #define EXEC_CONSTRUCTOR 0x0002 #define EXEC_RETURN_TO_INTERP 0x0004 diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 006ec39..191976d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -89,34 +89,45 @@ static unsigned Arguments_idx_length(jsdisp_t *jsdisp) return arguments->function->length; } -static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *res) +static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx) +{ + call_frame_t *frame = arguments->scope->frame; + return frame + ? arguments->jsdisp.ctx->stack + frame->arguments_off + idx + : NULL; +} + +static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) { ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + jsval_t *ref; TRACE("%p[%u]\n", arguments, idx); - if(arguments->scope->frame) { - HRESULT hres; - hres = detach_variable_object(jsdisp->ctx, arguments->scope->frame); - if(FAILED(hres)) - return hres; - } + if((ref = get_argument_ref(arguments, idx))) + return jsval_copy(*ref, r); /* FIXME: Accessing by name won't work for duplicated argument names */ - return jsdisp_propget_name(arguments->scope->jsobj, arguments->function->func_code->params[idx], res); + return jsdisp_propget_name(arguments->scope->jsobj, arguments->function->func_code->params[idx], r); } static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val) { ArgumentsInstance *arguments = (ArgumentsInstance*)jsdisp; + jsval_t *ref; + HRESULT hres; TRACE("%p[%u] = %s\n", arguments, idx, debugstr_jsval(val)); - if(arguments->scope->frame) { - HRESULT hres; - hres = detach_variable_object(jsdisp->ctx, arguments->scope->frame); + if((ref = get_argument_ref(arguments, idx))) { + jsval_t copy; + hres = jsval_copy(val, &copy); if(FAILED(hres)) return hres; + + jsval_release(*ref); + *ref = copy; + return S_OK; } /* FIXME: Accessing by name won't work for duplicated argument names */

1 0