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

Jacek Caban : jscript: Store stack base in call_frame_t.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 0e32c0990143469c8578a86f0c1ce8b748c67365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e32c0990143469c8578a86f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:55 2016 +0100 jscript: Store stack base in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 17 +++++++++-------- dlls/jscript/engine.h | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f622233..db6c2ae 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2471,7 +2471,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - unsigned prev_top; scope_chain_t *prev_scope; call_frame_t *frame; jsop_t op; @@ -2480,7 +2479,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t TRACE("\n"); frame = ctx->call_ctx; - prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; while(frame->ip != -1) { @@ -2501,19 +2499,21 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t } assert(ctx->call_ctx == frame); - ctx->call_ctx = frame->prev_frame; - release_call_frame(frame); if(FAILED(hres)) { while(exec_ctx->scope_chain != prev_scope) scope_pop(&exec_ctx->scope_chain); - stack_popn(exec_ctx, exec_ctx->top-prev_top); - return hres; + stack_popn(exec_ctx, exec_ctx->top-frame->stack_base); } - assert(exec_ctx->top == prev_top+1 || exec_ctx->top == prev_top); + assert(exec_ctx->top == frame->stack_base); + ctx->call_ctx = frame->prev_frame; + release_call_frame(frame); + + if(FAILED(hres)) + return hres; + assert(exec_ctx->scope_chain == prev_scope); - assert(exec_ctx->top == prev_top); *ret = exec_ctx->ret; exec_ctx->ret = jsval_undefined(); @@ -2568,6 +2568,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; frame->ip = function->instr_off; + frame->stack_base = ctx->top; frame->exec_ctx = ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ddbea50..e803047 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -193,6 +193,7 @@ struct _parser_ctx_t; typedef struct _call_frame_t { unsigned ip; except_frame_t *except_frame; + unsigned stack_base; bytecode_t *bytecode; function_code_t *function;

1 0

Jacek Caban : jscript: Store instruction pointer in call_frame_t.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: a120ecbefc5b23c3d6167f50ebf76dd2699d4c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a120ecbefc5b23c3d6167f50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:45 2016 +0100 jscript: Store instruction pointer in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 35 +++++++++++++++++++---------------- dlls/jscript/engine.h | 3 +-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8688d4f..f622233 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -568,33 +568,38 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } static inline BSTR get_op_bstr(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].bstr; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].bstr; } static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].uint; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].uint; } static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].lng; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].lng; } static inline jsstr_t *get_op_str(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].str; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].str; } static inline double get_op_double(exec_ctx_t *ctx){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.dbl; } static inline void jmp_next(exec_ctx_t *ctx) { - ctx->ip++; + ctx->script->call_ctx->ip++; } static inline void jmp_abs(exec_ctx_t *ctx, unsigned dst) { - ctx->ip = dst; + ctx->script->call_ctx->ip = dst; } /* ECMA-262 3rd Edition 12.2 */ @@ -2428,7 +2433,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) while(except_frame->scope != ctx->scope_chain) scope_pop(&ctx->scope_chain); - ctx->ip = except_frame->catch_off; + frame->ip = except_frame->catch_off; except_val = ctx->script->ei.val; ctx->script->ei.val = jsval_undefined(); @@ -2466,7 +2471,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - unsigned prev_ip, prev_top; + unsigned prev_top; scope_chain_t *prev_scope; call_frame_t *frame; jsop_t op; @@ -2477,11 +2482,9 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t frame = ctx->call_ctx; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; - prev_ip = exec_ctx->ip; - exec_ctx->ip = func->instr_off; - while(exec_ctx->ip != -1) { - op = frame->bytecode->instrs[exec_ctx->ip].op; + while(frame->ip != -1) { + op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](exec_ctx); if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); @@ -2493,12 +2496,10 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t if(FAILED(hres)) break; }else { - exec_ctx->ip += op_move[op]; + frame->ip += op_move[op]; } } - exec_ctx->ip = prev_ip; - assert(ctx->call_ctx == frame); ctx->call_ctx = frame->prev_frame; release_call_frame(frame); @@ -2566,6 +2567,8 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; + frame->ip = function->instr_off; + frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e31b9b9..ddbea50 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -191,6 +191,7 @@ typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; typedef struct _call_frame_t { + unsigned ip; except_frame_t *except_frame; bytecode_t *bytecode; @@ -213,8 +214,6 @@ struct _exec_ctx_t { unsigned stack_size; unsigned top; jsval_t ret; - - unsigned ip; }; static inline void exec_addref(exec_ctx_t *ctx)

1 0

Ken Thomases : user32: Call the EnumDisplayMonitors callback using a wrapper.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 474196c746e95cf84137a85512d01a0e622c5c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474196c746e95cf84137a8551… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 23 21:46:32 2016 -0500 user32: Call the EnumDisplayMonitors callback using a wrapper. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 071230e..109809f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -466,11 +468,46 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) return ret; } +#ifdef __i386__ +/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, + * so we need a small assembly wrapper to call it. + */ +struct enumdisplaymonitors_lparam +{ + MONITORENUMPROC proc; + LPARAM lparam; +}; + +extern BOOL CALLBACK enumdisplaymonitors_callback_wrapper(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam); +__ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $8,%esp\n\t" + "movl 20(%ebp),%eax\n\t" /* struct enumdisplaymonitors_lparam *orig = (struct enumdisplaymonitors_lparam*)lparam */ + "pushl 4(%eax)\n\t" /* push orig->lparam */ + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call *(%eax)\n\t" /* call orig->proc */ + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) +#endif /* __i386__ */ + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { +#ifdef __i386__ + struct enumdisplaymonitors_lparam orig = { proc, lp }; + proc = enumdisplaymonitors_callback_wrapper; + lp = (LPARAM)&orig; +#endif return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); }

1 0

Andrew Eikum : winecoreaudio.drv: Ensure divide-by-zero SSE exceptions are masked before calling AudioConverterNew.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 8efa49375a92913be3db11c7028c8f7eabccfce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8efa49375a92913be3db11c70… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 25 08:26:11 2016 -0500 winecoreaudio.drv: Ensure divide-by-zero SSE exceptions are masked before calling AudioConverterNew. AudioConverterNew can trigger a divide-by-zero exception. Normally this is masked by the default SSE mask flags. However, iRacing disables this mask, leading to a crash when it tries to initialize a recording device. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 9f9fd0d..8316d65 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -36,6 +36,7 @@ #include <sys/stat.h> #include <sys/ioctl.h> #include <fcntl.h> +#include <fenv.h> #include <unistd.h> #include <libkern/OSAtomic.h> @@ -1233,6 +1234,8 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni AudioStreamBasicDescription desc; UInt32 size; Float64 rate; + fenv_t fenv; + BOOL fenv_stored = TRUE; hr = ca_get_audiodesc(&desc, fmt); if(FAILED(hr)) @@ -1262,7 +1265,17 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return osstatus_to_hresult(sc); } + /* AudioConverterNew requires divide-by-zero SSE exceptions to be masked */ + if(feholdexcept(&fenv)){ + WARN("Failed to store fenv state\n"); + fenv_stored = FALSE; + } + sc = AudioConverterNew(dev_desc, &desc, converter); + + if(fenv_stored && fesetenv(&fenv)) + WARN("Failed to restore fenv state\n"); + if(sc != noErr){ WARN("Couldn't create audio converter: %x\n", (int)sc); return osstatus_to_hresult(sc);

1 0

Jacek Caban : jscript: Store entry scope chain in call_frame_t.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 400435dbe394cebc93ff9af8e1950a54df18f82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=400435dbe394cebc93ff9af8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:04:19 2016 +0100 jscript: Store entry scope chain in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 8 +++----- dlls/jscript/engine.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3492bb0..9bf1bfb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2466,7 +2466,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - scope_chain_t *prev_scope; call_frame_t *frame; jsop_t op; HRESULT hres = S_OK; @@ -2474,7 +2473,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t TRACE("\n"); frame = ctx->call_ctx; - prev_scope = frame->scope; while(frame->ip != -1) { op = frame->bytecode->instrs[frame->ip].op; @@ -2496,13 +2494,13 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t assert(ctx->call_ctx == frame); if(FAILED(hres)) { - while(frame->scope != prev_scope) + while(frame->scope != frame->base_scope) scope_pop(&frame->scope); stack_popn(exec_ctx, exec_ctx->top-frame->stack_base); } assert(exec_ctx->top == frame->stack_base); - assert(frame->scope == prev_scope); + assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; release_call_frame(frame); @@ -2565,7 +2563,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->stack_base = ctx->top; if(scope) - frame->scope = scope_addref(scope); + frame->base_scope = frame->scope = scope_addref(scope); frame->exec_ctx = ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c46ca7c..82ff4ed 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -196,6 +196,7 @@ typedef struct _call_frame_t { except_frame_t *except_frame; unsigned stack_base; scope_chain_t *scope; + scope_chain_t *base_scope; bytecode_t *bytecode; function_code_t *function;

1 0

Jacek Caban : jscript: Store function description in call_frame_t.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 132ff14d3739b03549244af07d442209b4a3fc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132ff14d3739b03549244af07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:11 2016 +0100 jscript: Store function description in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 12 +++++------- dlls/jscript/engine.h | 3 +-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8b0477f..333df27 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -825,12 +825,13 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) static HRESULT interp_func(exec_ctx_t *ctx) { unsigned func_idx = get_op_uint(ctx, 0); + call_frame_t *frame = ctx->script->call_ctx; jsdisp_t *dispex; HRESULT hres; TRACE("%d\n", func_idx); - hres = create_source_function(ctx->script, ctx->script->call_ctx->bytecode, ctx->func_code->funcs+func_idx, + hres = create_source_function(ctx->script, frame->bytecode, frame->function->funcs+func_idx, ctx->scope_chain, &dispex); if(FAILED(hres)) return hres; @@ -2453,7 +2454,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; except_frame_t *prev_except_frame; - function_code_t *prev_func; unsigned prev_ip, prev_top; scope_chain_t *prev_scope; call_frame_t *frame; @@ -2467,10 +2467,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; - prev_func = exec_ctx->func_code; exec_ctx->ip = func->instr_off; exec_ctx->except_frame = NULL; - exec_ctx->func_code = func; while(exec_ctx->ip != -1) { op = frame->bytecode->instrs[exec_ctx->ip].op; @@ -2491,7 +2489,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t exec_ctx->ip = prev_ip; exec_ctx->except_frame = prev_except_frame; - exec_ctx->func_code = prev_func; assert(ctx->call_ctx == frame); ctx->call_ctx = frame->prev_frame; @@ -2550,7 +2547,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode) +static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function) { call_frame_t *frame; @@ -2559,6 +2556,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode) return E_OUTOFMEMORY; frame->bytecode = bytecode; + frame->function = function; frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; @@ -2601,7 +2599,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, js } } - hres = setup_call_frame(ctx, code); + hres = setup_call_frame(ctx, code, func); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fc99c68..31b904c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -192,6 +192,7 @@ struct _parser_ctx_t; typedef struct _call_frame_t { bytecode_t *bytecode; + function_code_t *function; struct _call_frame_t *prev_frame; exec_ctx_t *exec_ctx; @@ -200,12 +201,10 @@ typedef struct _call_frame_t { struct _exec_ctx_t { LONG ref; - struct _parser_ctx_t *parser; script_ctx_t *script; scope_chain_t *scope_chain; jsdisp_t *var_disp; IDispatch *this_obj; - function_code_t *func_code; BOOL is_global; jsval_t *stack;

1 0

Matteo Bruni : d3d11: Add a couple missing wined3d_mutex_unlock() in d3d_shader_resource_view_init() error paths.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: b0a9e0cebddf1a2446241b8e7bb3c791d48887cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a9e0cebddf1a2446241b8e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 14:26:22 2016 +0100 d3d11: Add a couple missing wined3d_mutex_unlock() in d3d_shader_resource_view_init() error paths. 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/d3d11/view.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 1d9b766..c4487d3 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1503,6 +1503,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi wined3d_mutex_lock(); if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource))) { + wined3d_mutex_unlock(); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); return E_FAIL; } @@ -1510,6 +1511,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource, view, &d3d_null_wined3d_parent_ops, &view->wined3d_view))) { + wined3d_mutex_unlock(); WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); return hr; }

1 0

André Hentschel : shell32: Provide helper function a buffer of correct size.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 1010372778978a30fb7f9d36d51c0cdacfb1c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1010372778978a30fb7f9d36d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 23 20:25:12 2016 +0100 shell32: Provide helper function a buffer of correct size. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 5fcbe03..6aa3eec 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1087,6 +1087,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR { UINT_PTR retval = SE_ERR_NOASSOC; WCHAR old_dir[1024]; + WCHAR res[MAX_PATH]; TRACE("File %s, Dir %s\n", debugstr_w(lpFile), debugstr_w(lpDirectory)); @@ -1100,7 +1101,10 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR SetCurrentDirectoryW(lpDirectory); } - retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, lpResult, MAX_PATH, NULL, NULL, NULL, NULL); + retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, res, MAX_PATH, NULL, NULL, NULL, NULL); + + if (retval > 32) + strcpyW(lpResult, res); TRACE("returning %s\n", debugstr_w(lpResult)); if (lpDirectory)

1 0

Paul Gofman : wined3d: Support D3DFMT_L8 format as render target.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: d05edd03c43aa826738770910fd5f0a8c0a52b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05edd03c43aa826738770910… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 25 12:04:00 2016 +0300 wined3d: Support D3DFMT_L8 format as render target. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df22e80..e5a3ee6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1262,15 +1262,16 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE, ARB_TEXTURE_RG, NULL}, /* Luminance */ - {WINED3DFMT_L8_UNORM, GL_R8, GL_R8, 0, - GL_RED, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - ARB_TEXTURE_RG, NULL}, {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_L8_UNORM, GL_R8, GL_R8, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_L8A8_UNORM, GL_RG8, GL_RG8, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, @@ -2921,9 +2922,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ idx = get_format_idx(WINED3DFMT_A8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); - idx = get_format_idx(WINED3DFMT_L8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_L8A8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); @@ -2938,6 +2936,13 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); } + if (gl_info->supported[ARB_TEXTURE_RG]) + { + idx = get_format_idx(WINED3DFMT_L8_UNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); + } + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { idx = get_format_idx(WINED3DFMT_P8_UINT);

1 0

Jacek Caban : jscript: Store exception frame in call_frame_t.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: fa5d9b3db132a13ad0527fb57f4bfadd0f288df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5d9b3db132a13ad0527fb57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:35 2016 +0100 jscript: Store exception frame in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 21 ++++++++++----------- dlls/jscript/engine.h | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3118994..8688d4f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -764,6 +764,7 @@ static HRESULT interp_push_except(exec_ctx_t *ctx) { const unsigned arg1 = get_op_uint(ctx, 0); const BSTR arg2 = get_op_bstr(ctx, 1); + call_frame_t *frame = ctx->script->call_ctx; except_frame_t *except; unsigned stack_top; @@ -790,22 +791,23 @@ static HRESULT interp_push_except(exec_ctx_t *ctx) except->scope = ctx->scope_chain; except->catch_off = arg1; except->ident = arg2; - except->next = ctx->except_frame; - ctx->except_frame = except; + except->next = frame->except_frame; + frame->except_frame = except; return S_OK; } /* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_pop_except(exec_ctx_t *ctx) { + call_frame_t *frame = ctx->script->call_ctx; except_frame_t *except; TRACE("\n"); - except = ctx->except_frame; + except = frame->except_frame; assert(except != NULL); - ctx->except_frame = except->next; + frame->except_frame = except->next; heap_free(except); return S_OK; } @@ -2411,13 +2413,14 @@ static void release_call_frame(call_frame_t *frame) static HRESULT unwind_exception(exec_ctx_t *ctx) { + call_frame_t *frame = ctx->script->call_ctx; except_frame_t *except_frame; jsval_t except_val; BSTR ident; HRESULT hres; - except_frame = ctx->except_frame; - ctx->except_frame = except_frame->next; + except_frame = frame->except_frame; + frame->except_frame = except_frame->next; assert(except_frame->stack_top <= ctx->top); stack_popn(ctx, ctx->top - except_frame->stack_top); @@ -2463,7 +2466,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - except_frame_t *prev_except_frame; unsigned prev_ip, prev_top; scope_chain_t *prev_scope; call_frame_t *frame; @@ -2475,10 +2477,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t frame = ctx->call_ctx; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; - prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; exec_ctx->ip = func->instr_off; - exec_ctx->except_frame = NULL; while(exec_ctx->ip != -1) { op = frame->bytecode->instrs[exec_ctx->ip].op; @@ -2486,7 +2486,7 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); - if(!exec_ctx->except_frame) + if(!frame->except_frame) break; hres = unwind_exception(exec_ctx); @@ -2498,7 +2498,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t } exec_ctx->ip = prev_ip; - exec_ctx->except_frame = prev_except_frame; assert(ctx->call_ctx == frame); ctx->call_ctx = frame->prev_frame; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 31b904c..e31b9b9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -191,6 +191,8 @@ typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; typedef struct _call_frame_t { + except_frame_t *except_frame; + bytecode_t *bytecode; function_code_t *function; @@ -210,7 +212,6 @@ struct _exec_ctx_t { jsval_t *stack; unsigned stack_size; unsigned top; - except_frame_t *except_frame; jsval_t ret; unsigned ip;

1 0