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

Józef Kucia : dxgi/tests: Add test for IDXGISwapChain_SetFullscreenState().
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 476cbd2f8ab9922459392b0656337a22daacb28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476cbd2f8ab9922459392b065… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:45 2016 +0200 dxgi/tests: Add test for IDXGISwapChain_SetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 432 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 424 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476cbd2f8ab9922459392…

1 0

Nikolay Sivov : mmsystem: Fix its vs it's typo.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

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 Aug. 3, 2016

Aug. 3, 2016

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

Józef Kucia : dxgi: Return swapchain target output when available in dxgi_swapchain_GetContainingOutput ().
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 8b646aef63fda5916f4c14bef3d12be585d87b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b646aef63fda5916f4c14bef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:43 2016 +0200 dxgi: Return swapchain target output when available in dxgi_swapchain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3ea7d57..869c799 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -344,12 +344,19 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetContainingOutput(IDXGISwapChain *iface, IDXGIOutput **output) { + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; TRACE("iface %p, output %p.\n", iface, output); + if (swapchain->target) + { + IDXGIOutput_AddRef(*output = swapchain->target); + return S_OK; + } + if (FAILED(hr = dxgi_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) return hr;

1 0

Józef Kucia : dxgi: Switch display mode when creating fullscreen swapchains.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 005a6c6396c7db6a61e534290ce56454b3412de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005a6c6396c7db6a61e534290… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:42 2016 +0200 dxgi: Switch display mode when creating fullscreen swapchains. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cdb28e4..3ea7d57 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -443,8 +443,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device WARN("Failed to get adapter parent, hr %#x.\n", hr); return hr; } - swapchain->device = &device->IWineDXGIDevice_iface; - IWineDXGIDevice_AddRef(swapchain->device); + IWineDXGIDevice_AddRef(swapchain->device = &device->IWineDXGIDevice_iface); } else { @@ -454,8 +453,6 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; - swapchain->fullscreen = FALSE; - swapchain->target = NULL; wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); @@ -463,15 +460,39 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); - wined3d_private_store_cleanup(&swapchain->private_store); - wined3d_mutex_unlock(); - if (swapchain->factory) - IDXGIFactory_Release(swapchain->factory); - if (swapchain->device) - IWineDXGIDevice_Release(swapchain->device); - return hr; + goto cleanup; + } + + swapchain->fullscreen = !desc->windowed; + swapchain->target = NULL; + if (swapchain->fullscreen) + { + if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, + desc, NULL))) + { + WARN("Failed to set fullscreen state, hr %#x.\n", hr); + wined3d_swapchain_decref(swapchain->wined3d_swapchain); + goto cleanup; + } + + if (FAILED(hr = IDXGISwapChain_GetContainingOutput(&swapchain->IDXGISwapChain_iface, + &swapchain->target))) + { + WARN("Failed to get target output for fullscreen swapchain, hr %#x.\n", hr); + wined3d_swapchain_decref(swapchain->wined3d_swapchain); + goto cleanup; + } } wined3d_mutex_unlock(); return S_OK; + +cleanup: + wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_mutex_unlock(); + if (swapchain->factory) + IDXGIFactory_Release(swapchain->factory); + if (swapchain->device) + IWineDXGIDevice_Release(swapchain->device); + return hr; }

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetFullscreenState().
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: f586cc98a02b140678ceb59a3021bacdd90a36d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f586cc98a02b140678ceb59a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:40 2016 +0200 dxgi: Implement dxgi_swapchain_GetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 3 +++ dlls/dxgi/swapchain.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 680f835..7148811 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -160,6 +160,9 @@ struct dxgi_swapchain struct wined3d_swapchain *wined3d_swapchain; IWineDXGIDevice *device; IDXGIFactory *factory; + + BOOL fullscreen; + IDXGIOutput *target; }; HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 54bd52d..6b80ead 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -212,9 +212,21 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenS static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenState(IDXGISwapChain *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); + + if (fullscreen) + *fullscreen = swapchain->fullscreen; + + if (target) + { + *target = swapchain->target; + if (*target) + IDXGIOutput_AddRef(*target); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, DXGI_SWAP_CHAIN_DESC *desc) @@ -408,6 +420,8 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; + swapchain->fullscreen = FALSE; + swapchain->target = NULL; wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store);

1 0

Józef Kucia : wined3d: Add WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH flag.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 8d032351f23ff28a979501b1079fdc6d93f3eb20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d032351f23ff28a979501b10… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:38 2016 +0200 wined3d: Add WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH flag. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 8 +++-- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 8 +++-- dlls/ddraw/ddraw.c | 1 + dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 8 ++--- dlls/dxgi/swapchain.c | 4 +-- dlls/dxgi/utils.c | 32 +++++++++++++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/swapchain.c | 91 ++++++++++++++++++++++++++++++------------------ include/wine/wined3d.h | 13 +++---- 12 files changed, 122 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d032351f23ff28a97950…

1 0

Jacek Caban : jscript: Access arguments directly from stack in arguments object if possible.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

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

Jacek Caban : jscript: Build local references map in compiler and use it to search the scope.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

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

Nikolay Sivov : gdi32: Fix its vs it's typo.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

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