June 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Allow opening the clipboard again with the same owner.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: bdf3f413afc2efae68b7545083d6eb0893cd2687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf3f413afc2efae68b754508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 18:39:18 2015 +0900 server: Allow opening the clipboard again with the same owner. --- dlls/user32/tests/clipboard.c | 3 ++- server/clipboard.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f12e0cd..a9aef84 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -51,11 +51,12 @@ static void test_ClipboardOwner(void) ok(OpenClipboard(0), "OpenClipboard failed\n"); ok(!GetClipboardOwner(), "clipboard should still be not owned\n"); ok(!OpenClipboard(hWnd1), "OpenClipboard should fail since clipboard already opened\n"); + ok(OpenClipboard(0), "OpenClipboard again failed\n"); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); - todo_wine ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); + ok(OpenClipboard(hWnd1), "OpenClipboard second time in the same hwnd failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); diff --git a/server/clipboard.c b/server/clipboard.c index f144ea1..7a77ed2 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -138,7 +138,7 @@ void cleanup_clipboard_thread(struct thread *thread) static int open_clipboard( struct clipboard *clipboard, user_handle_t win ) { win = get_user_full_handle( win ); - if (clipboard->open_thread && clipboard->open_thread != current) + if (clipboard->open_thread && (clipboard->open_thread != current || clipboard->open_win != win)) { set_error(STATUS_WAS_LOCKED); return 0;

1 0

Alexandre Julliard : user32/tests: Remove support for Win9x in clipboard test.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 4c64d137ff5e2d67a249d4043246fe825cd705b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c64d137ff5e2d67a249d4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 17:13:40 2015 +0900 user32/tests: Remove support for Win9x in clipboard test. --- dlls/user32/tests/clipboard.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 01dbe93..f12e0cd 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -24,17 +24,6 @@ #include "wingdi.h" #include "winuser.h" -static BOOL is_win9x = FALSE; - -#define test_last_error(expected_error) \ - do \ - { \ - if (!is_win9x) \ - ok(GetLastError() == expected_error, \ - "Last error should be set to %d, not %d\n", \ - expected_error, GetLastError()); \ - } while (0) - static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -118,7 +107,7 @@ static void test_RegisterClipboardFormatA(void) SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, 256); ok(len == 0, "GetAtomNameA should fail\n"); - test_last_error(ERROR_INVALID_HANDLE); + ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); todo_wine { @@ -126,13 +115,13 @@ todo_wine SetLastError(0xdeadbeef); len = GlobalGetAtomNameA((ATOM)format_id, buf, 256); ok(len == 0, "GlobalGetAtomNameA should fail\n"); - test_last_error(ERROR_INVALID_HANDLE); + ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); } SetLastError(0xdeadbeef); atom_id = FindAtomA("my_cool_clipboard_format"); ok(atom_id == 0, "FindAtomA should fail\n"); - test_last_error(ERROR_FILE_NOT_FOUND); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); if (0) { @@ -140,7 +129,7 @@ todo_wine SetLastError(0xdeadbeef); atom_id = GlobalFindAtomA("my_cool_clipboard_format"); ok(atom_id == 0, "GlobalFindAtomA should fail\n"); - test_last_error(ERROR_FILE_NOT_FOUND); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); } for (format_id = 0; format_id < 0xffff; format_id++) @@ -356,10 +345,6 @@ static void test_messages(void) START_TEST(clipboard) { - SetLastError(0xdeadbeef); - FindAtomW(NULL); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) is_win9x = TRUE; - test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

Jacek Caban : jscript: Added beginning support for 'automagic' event binding feature.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 170bb3771f43f1120435e98ea38543d5a667f9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=170bb3771f43f1120435e98ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 14:45:10 2015 +0200 jscript: Added beginning support for 'automagic' event binding feature. --- dlls/jscript/compile.c | 18 ++++++++++----- dlls/jscript/engine.c | 60 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 1 + dlls/jscript/lex.c | 8 ++++++- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 17 +++++++++----- 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f056be1..52e6b66 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -862,7 +862,7 @@ static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_express ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); /* FIXME: not exactly right */ - if(expr->identifier) { + if(expr->identifier && !expr->event_target) { ctx->func->func_cnt++; return push_instr_bstr(ctx, OP_ident, expr->identifier); } @@ -1865,10 +1865,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->instr_off = off; - if(func_expr && func_expr->identifier) { - func->name = compiler_alloc_bstr(ctx, func_expr->identifier); - if(!func->name) - return E_OUTOFMEMORY; + if(func_expr) { + if(func_expr->identifier) { + func->name = compiler_alloc_bstr(ctx, func_expr->identifier); + if(!func->name) + return E_OUTOFMEMORY; + } + + if(func_expr->event_target) { + func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); + if(!func->event_target) + return E_OUTOFMEMORY; + } } if(func_expr) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index de60755..ca08d91 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -511,14 +511,16 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re TRACE("%s\n", debugstr_w(identifier)); - for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { - if(scope->jsobj) - hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); - else - hres = disp_get_id(ctx, scope->obj, identifier, identifier, fdexNameImplicit, &id); - if(SUCCEEDED(hres)) { - exprval_set_idref(ret, scope->obj, id); - return S_OK; + if(ctx->exec_ctx) { + for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { + if(scope->jsobj) + hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); + else + hres = disp_get_id(ctx, scope->obj, identifier, identifier, fdexNameImplicit, &id); + if(SUCCEEDED(hres)) { + exprval_set_idref(ret, scope->obj, id); + return S_OK; + } } } @@ -2504,6 +2506,43 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code return S_OK; } +static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdisp_t *func_obj) +{ + IBindEventHandler *target; + exprval_t exprval; + IDispatch *disp; + jsval_t v; + HRESULT hres; + + hres = identifier_eval(ctx, func->event_target, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx, &exprval, &v); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + if(!is_object_instance(v)) { + FIXME("Can't bind to %s\n", debugstr_jsval(v)); + jsval_release(v); + } + + disp = get_object(v); + hres = IDispatch_QueryInterface(disp, &IID_IBindEventHandler, (void**)&target); + if(SUCCEEDED(hres)) { + hres = IBindEventHandler_BindHandler(target, func->name, (IDispatch*)&func_obj->IDispatchEx_iface); + IBindEventHandler_Release(target); + if(FAILED(hres)) + WARN("BindEvent failed: %08x\n", hres); + }else { + FIXME("No IBindEventHandler, not yet supported binding\n"); + } + + IDispatch_Release(disp); + return hres; +} + HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BOOL from_eval, jsval_t *ret) { exec_ctx_t *prev_ctx; @@ -2521,7 +2560,10 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); + if(func->funcs[i].event_target) + hres = bind_event_target(ctx->script, func->funcs+i, func_obj); + else + hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bd49c99..dd8ed4c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -127,6 +127,7 @@ typedef struct { typedef struct _function_code_t { BSTR name; + BSTR event_target; unsigned instr_off; const WCHAR *source; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index af4b24b..57ab033 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -590,7 +590,6 @@ static int next_token(parser_ctx_t *ctx, void *lval) case ',': case '~': case '?': - case ':': return *ctx->ptr++; case '}': @@ -786,6 +785,13 @@ static int next_token(parser_ctx_t *ctx, void *lval) } return '/'; + case ':': + if(++ctx->ptr < ctx->end && *ctx->ptr == ':') { + ctx->ptr++; + return kDCOL; + } + return ':'; + case '\"': case '\'': return parse_string_literal(ctx, lval, *ctx->ptr); diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index ab5744a..f8d404f 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -285,6 +285,7 @@ struct _source_elements_t { typedef struct _function_expression_t { expression_t expr; const WCHAR *identifier; + const WCHAR *event_target; parameter_t *parameter_list; source_elements_t *source_elements; const WCHAR *src_str; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7b36b11..59e6757 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -120,7 +120,7 @@ static parameter_list_t *parameter_list_add(parser_ctx_t*,parameter_list_t*,cons static void *new_expression(parser_ctx_t *ctx,expression_type_t,size_t); static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,parameter_list_t*, - source_elements_t*,const WCHAR*,DWORD); + source_elements_t*,const WCHAR*,const WCHAR*,DWORD); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*); @@ -166,7 +166,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state /* keywords */ %token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN %token kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH -%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ +%token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL %token <srcptr> kFUNCTION '}' @@ -264,8 +264,12 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' - { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } + : KFunction left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, $1, $7-$1+1); } + | KFunction tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $2, $4, $7, NULL, $1, $8-$1+1); } + | KFunction tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, $4, $6, $9, $2, $1, $10-$1+1); } KFunction : kFUNCTION { $$ = $1; } @@ -1300,14 +1304,15 @@ static parameter_list_t *parameter_list_add(parser_ctx_t *ctx, parameter_list_t return list; } -static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, - parameter_list_t *parameter_list, source_elements_t *source_elements, const WCHAR *src_str, DWORD src_len) +static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *identifier, parameter_list_t *parameter_list, + source_elements_t *source_elements, const WCHAR *event_target, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; ret->source_elements = source_elements; + ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; ret->next = NULL;

1 0

Matteo Bruni : wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: e8cb3bdba5dfefb9a1bf0e858dd755ca6637149a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cb3bdba5dfefb9a1bf0e858… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 2 16:39:46 2015 +0200 wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend. Core contexts don't support clamping the point size to GL_POINT_SIZE_MIN / GL_POINT_SIZE_MAX. Incidentally this mostly fixes per-vertex point sizes for vertex shader version 1 and 2. --- dlls/wined3d/arb_program_shader.c | 3 ++ dlls/wined3d/context.c | 1 + dlls/wined3d/glsl_shader.c | 67 +++++++++++++++++++-------------------- dlls/wined3d/shader.c | 8 +++++ dlls/wined3d/state.c | 8 ++--- dlls/wined3d/wined3d_private.h | 24 +++++++------- 6 files changed, 59 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cb3bdba5dfefb9a1bf0…

1 0

Nikolay Sivov : d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity).
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 3d6ee7e5b9fa22e844eaa6177bf146aad4a05777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ee7e5b9fa22e844eaa6177… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 11:45:25 2015 +0300 d3d8: Fix token type checks in convert_to_wined3d_declaration (Coverity). --- dlls/d3d8/vertexdeclaration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 4be9127..968b76b 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -275,7 +275,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 { stream = ((*token & D3DVSD_STREAMNUMBERMASK) >> D3DVSD_STREAMNUMBERSHIFT); offset = 0; - } else if (token_type == D3DVSD_TOKEN_STREAMDATA && !(token_type & 0x10000000)) { + } else if (token_type == D3DVSD_TOKEN_STREAMDATA && !(*token & D3DVSD_DATALOADTYPEMASK)) { DWORD type = ((*token & D3DVSD_DATATYPEMASK) >> D3DVSD_DATATYPESHIFT); DWORD reg = ((*token & D3DVSD_VERTEXREGMASK) >> D3DVSD_VERTEXREGSHIFT); @@ -293,7 +293,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->usage_idx = wined3d_usage_lookup[reg].usage_idx; offset += wined3d_type_sizes[type]; - } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (token_type & 0x10000000)) { + } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); offset += sizeof(DWORD) * ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); }

1 0

Alexandre Julliard : server: Use a standard timestamp for the clipboard.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: b7f79bae86e62dd642f52145c0f480ba44e56a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f79bae86e62dd642f52145c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:02:11 2015 +0900 server: Use a standard timestamp for the clipboard. --- server/clipboard.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 0c39319..8f26703 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "request.h" #include "object.h" +#include "file.h" #include "process.h" #include "user.h" #include "winuser.h" @@ -44,7 +45,7 @@ struct clipboard user_handle_t owner_win; /* window that owns the clipboard data */ user_handle_t viewer; /* first window in clipboard viewer list */ unsigned int seqno; /* clipboard change sequence number */ - time_t seqno_timestamp; /* time stamp of last seqno increment */ + timeout_t seqno_timestamp; /* time stamp of last seqno increment */ }; static void clipboard_dump( struct object *obj, int verbose ); @@ -70,7 +71,7 @@ static const struct object_ops clipboard_ops = }; -#define MINUPDATELAPSE 2 +#define MINUPDATELAPSE (2 * TICKS_PER_SEC) /* dump a clipboard object */ static void clipboard_dump( struct object *obj, int verbose ) @@ -178,11 +179,9 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win, static int get_seqno( struct clipboard *clipboard ) { - time_t tm = time(NULL); - - if (!clipboard->owner_thread && (tm > (clipboard->seqno_timestamp + MINUPDATELAPSE))) + if (!clipboard->owner_thread && (current_time - clipboard->seqno_timestamp > MINUPDATELAPSE)) { - clipboard->seqno_timestamp = tm; + clipboard->seqno_timestamp = current_time; clipboard->seqno++; } return clipboard->seqno;

1 0

Alexandre Julliard : user32: Merge the AcquireClipboard and EmptyClipboard driver entry points.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 070a82e743cbcfd82f211d79b2453a84c7eedec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=070a82e743cbcfd82f211d79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:45:40 2015 +0900 user32: Merge the AcquireClipboard and EmptyClipboard driver entry points. --- dlls/user32/clipboard.c | 4 ---- dlls/user32/driver.c | 13 ------------- dlls/user32/user_private.h | 1 - dlls/winemac.drv/clipboard.c | 12 +----------- dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/clipboard.c | 20 ++++++++------------ dlls/winex11.drv/window.c | 3 ++- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/x11drv.h | 2 +- 9 files changed, 12 insertions(+), 45 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 666acf0..c55b830 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -295,10 +295,6 @@ BOOL WINAPI EmptyClipboard(void) * WM_DESTROYCLIPBOARD itself. */ CLIPBOARD_SetClipboardOwner(cbinfo.hWndOpen); - /* Acquire the selection. This will notify the previous owner - * to clear its cache. */ - USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); - USER_Driver->pEmptyClipboard(); bCBHasChanged = TRUE; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 400d30a..ced8836 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -120,7 +120,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetCursorPos); GET_USER_FUNC(SetCursorPos); GET_USER_FUNC(ClipCursor); - GET_USER_FUNC(AcquireClipboard); GET_USER_FUNC(EmptyClipboard); GET_USER_FUNC(SetClipboardData); GET_USER_FUNC(GetClipboardData); @@ -334,11 +333,6 @@ static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) return FALSE; } -static INT CDECL nulldrv_AcquireClipboard( HWND hwnd ) -{ - return 0; -} - static BOOL CDECL nulldrv_CountClipboardFormats(void) { return 0; @@ -536,7 +530,6 @@ static USER_DRIVER null_driver = nulldrv_SetCursorPos, nulldrv_ClipCursor, /* clipboard functions */ - nulldrv_AcquireClipboard, nulldrv_CountClipboardFormats, nulldrv_EmptyClipboard, nulldrv_EndClipboardUpdate, @@ -674,11 +667,6 @@ static BOOL CDECL loaderdrv_ClipCursor( LPCRECT clip ) return load_driver()->pClipCursor( clip ); } -static INT CDECL loaderdrv_AcquireClipboard( HWND hwnd ) -{ - return load_driver()->pAcquireClipboard( hwnd ); -} - static BOOL CDECL loaderdrv_CountClipboardFormats(void) { return load_driver()->pCountClipboardFormats(); @@ -791,7 +779,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ - loaderdrv_AcquireClipboard, loaderdrv_CountClipboardFormats, loaderdrv_EmptyClipboard, loaderdrv_EndClipboardUpdate, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 01b9728..e0c1b43 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -80,7 +80,6 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pSetCursorPos)(INT,INT); BOOL (CDECL *pClipCursor)(LPCRECT); /* clipboard functions */ - INT (CDECL *pAcquireClipboard)(HWND); /* Acquire selection */ BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3851d23..97fa80e 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1880,17 +1880,6 @@ static void check_clipboard_ownership(HWND *owner) /************************************************************************** - * AcquireClipboard (MACDRV.@) - */ -int CDECL macdrv_AcquireClipboard(HWND hwnd) -{ - TRACE("hwnd %p\n", hwnd); - check_clipboard_ownership(NULL); - return 0; -} - - -/************************************************************************** * CountClipboardFormats (MACDRV.@) */ INT CDECL macdrv_CountClipboardFormats(void) @@ -1955,6 +1944,7 @@ INT CDECL macdrv_CountClipboardFormats(void) void CDECL macdrv_EmptyClipboard(void) { TRACE("()\n"); + check_clipboard_ownership(NULL); macdrv_clear_pasteboard(); } diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index a7dbb30..a97177d 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -4,7 +4,6 @@ # USER driver -@ cdecl AcquireClipboard(long) macdrv_AcquireClipboard @ cdecl ActivateKeyboardLayout(long long) macdrv_ActivateKeyboardLayout @ cdecl Beep() macdrv_Beep @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) macdrv_ChangeDisplaySettingsEx diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 073e7cb..6c6b3b9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2924,9 +2924,9 @@ static DWORD WINAPI selection_thread_proc(LPVOID p) } /************************************************************************** - * AcquireClipboard (X11DRV.@) + * X11DRV_AcquireClipboard */ -int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) +void X11DRV_AcquireClipboard(HWND hWndClipWindow) { DWORD procid; HANDLE selectionThread; @@ -2953,7 +2953,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) GetCurrentThreadId(), GetWindowThreadProcessId(hWndClipWindow, NULL), hWndClipWindow); - return SendMessageW(hWndClipWindow, WM_X11DRV_ACQUIRE_SELECTION, 0, 0); + SendMessageW(hWndClipWindow, WM_X11DRV_ACQUIRE_SELECTION, 0, 0); + return; } } @@ -2966,19 +2967,13 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); selectionThread = CreateThread(NULL, 0, selection_thread_proc, event, 0, NULL); - if (!selectionThread) + if (selectionThread) { - WARN("Could not start clipboard thread\n"); - CloseHandle(event); - return 0; + WaitForSingleObject(event, INFINITE); + CloseHandle(selectionThread); } - - WaitForSingleObject(event, INFINITE); CloseHandle(event); - CloseHandle(selectionThread); } - - return 1; } @@ -3005,6 +3000,7 @@ static void empty_clipboard(BOOL keepunowned) */ void CDECL X11DRV_EmptyClipboard(void) { + X11DRV_AcquireClipboard( GetOpenClipboardWindow() ); empty_clipboard( FALSE ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7146cfc..ea37dd7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2593,7 +2593,8 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) switch(msg) { case WM_X11DRV_ACQUIRE_SELECTION: - return X11DRV_AcquireClipboard( hwnd ); + X11DRV_AcquireClipboard( hwnd ); + return 0; case WM_X11DRV_SET_WIN_REGION: if ((data = get_win_data( hwnd ))) { diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ce084b5..d9bbebc 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -23,7 +23,6 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) X11DRV_GetMonitorInfo -@ cdecl AcquireClipboard(long) X11DRV_AcquireClipboard @ cdecl CountClipboardFormats() X11DRV_CountClipboardFormats @ cdecl CreateDesktopWindow(long) X11DRV_CreateDesktopWindow @ cdecl CreateWindow(long) X11DRV_CreateWindow diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index da13c6e..213f610 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -600,7 +600,7 @@ extern XContext win_data_context DECLSPEC_HIDDEN; extern XContext cursor_context DECLSPEC_HIDDEN; extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN; -extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; +extern void X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN; extern void X11DRV_ResetSelectionOwner(void) DECLSPEC_HIDDEN; extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added 'automagic' test.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: 326c1e61b453eb7857c1c45753e341dde1d2ba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=326c1e61b453eb7857c1c4575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 2 14:45:20 2015 +0200 jscript: Added 'automagic' test. --- dlls/jscript/tests/run.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 40a1245..6259071 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -110,6 +110,7 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); DEFINE_EXPECT(DeleteMemberByDispID_false); +DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -140,6 +141,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_DISPEXFUNC 0x101a #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c +#define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -273,6 +275,13 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *res, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -583,6 +592,75 @@ static IDispatchExVtbl pureDispVtbl = { static IDispatchEx pureDisp = { &pureDispVtbl }; +static HRESULT WINAPI BindEventHandler_QueryInterface(IBindEventHandler *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI BindEventHandler_AddRef(IBindEventHandler *iface) +{ + return 2; +} + +static ULONG WINAPI BindEventHandler_Release(IBindEventHandler *iface) +{ + return 1; +} + +static HRESULT WINAPI BindEventHandler_BindHandler(IBindEventHandler *iface, const WCHAR *event, IDispatch *disp) +{ + CHECK_EXPECT(BindHandler); + ok(!strcmp_wa(event, "eventName"), "event = %s\n", wine_dbgstr_w(event)); + ok(disp != NULL, "disp = NULL\n"); + return S_OK; +} + +static const IBindEventHandlerVtbl BindEventHandlerVtbl = { + BindEventHandler_QueryInterface, + BindEventHandler_AddRef, + BindEventHandler_Release, + BindEventHandler_BindHandler +}; + +static IBindEventHandler BindEventHandler = { &BindEventHandlerVtbl }; + +static HRESULT WINAPI bindEventHandlerDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IDispatchEx)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(riid, &IID_IBindEventHandler)) { + *ppv = &BindEventHandler; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static IDispatchExVtbl bindEventHandlerDispVtbl = { + bindEventHandlerDisp_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx bindEventHandlerDisp = { &bindEventHandlerDispVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -763,6 +841,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "bindEventHandler")) { + *pid = DISPID_GLOBAL_BINDEVENTHANDLER; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1127,6 +1210,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } + case DISPID_GLOBAL_BINDEVENTHANDLER: + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&bindEventHandlerDisp; + return S_OK; + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1974,6 +2062,49 @@ static void test_start(void) script_engine = NULL; } +static void test_automagic(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("function bindEventHandler::eventName() {}\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(BindHandler); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(BindHandler); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; @@ -2502,6 +2633,7 @@ static BOOL run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); test_start(); + test_automagic(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();");

1 0

Piotr Caban : msvcrt: Use fd critical section in dup2.
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: c7b0fb51543a166508dbbc28945b163bba4713d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b0fb51543a166508dbbc289… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:10 2015 +0200 msvcrt: Use fd critical section in dup2. --- dlls/msvcrt/file.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1ba5fd..1077752 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -260,8 +260,15 @@ static inline ioinfo* get_ioinfo_nolock(int fd) static inline ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); - if(ret->exflag & EF_CRIT_INIT) - EnterCriticalSection(&ret->crit); + if(!(ret->exflag & EF_CRIT_INIT)) { + LOCK_FILES(); + if(!(ret->exflag & EF_CRIT_INIT)) { + InitializeCriticalSection(&ret->crit); + ret->exflag |= EF_CRIT_INIT; + } + UNLOCK_FILES(); + } + EnterCriticalSection(&ret->crit); return ret; } @@ -1016,20 +1023,33 @@ int CDECL MSVCRT__close(int fd) */ int CDECL MSVCRT__dup2(int od, int nd) { + ioinfo *info_od, *info_nd; int ret; TRACE("(od=%d, nd=%d)\n", od, nd); LOCK_FILES(); - if (nd < MSVCRT_MAX_FILES && nd >= 0 && msvcrt_is_valid_fd(od)) + + if (od < nd) + { + info_od = get_ioinfo(od); + info_nd = get_ioinfo(nd); + } + else + { + info_nd = get_ioinfo(nd); + info_od = get_ioinfo(od); + } + + if (nd < MSVCRT_MAX_FILES && nd >= 0 && (info_od->wxflag & WX_OPEN)) { HANDLE handle; - if (DuplicateHandle(GetCurrentProcess(), get_ioinfo_nolock(od)->handle, + if (DuplicateHandle(GetCurrentProcess(), info_od->handle, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) { - int wxflag = get_ioinfo_nolock(od)->wxflag & ~MSVCRT__O_NOINHERIT; + int wxflag = info_od->wxflag & ~MSVCRT__O_NOINHERIT; - if (msvcrt_is_valid_fd(nd)) + if (info_nd->wxflag & WX_OPEN) MSVCRT__close(nd); ret = msvcrt_set_fd(handle, wxflag, nd); if (ret == -1) @@ -1054,6 +1074,9 @@ int CDECL MSVCRT__dup2(int od, int nd) *MSVCRT__errno() = MSVCRT_EBADF; ret = -1; } + + release_ioinfo(info_od); + release_ioinfo(info_nd); UNLOCK_FILES(); return ret; }

1 0

Nikolay Sivov : winex11: Remove unreachable XFreePixmap(), mask_pixmap is always NULL on failure (Coverity).
by Alexandre Julliard June 3, 2015

June 3, 2015

Module: wine Branch: master Commit: c0af3fad4ef02ac82e472f05048e866506aae589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0af3fad4ef02ac82e472f050… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 13:52:11 2015 +0300 winex11: Remove unreachable XFreePixmap(), mask_pixmap is always NULL on failure (Coverity). --- dlls/winex11.drv/window.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ea37dd7..14dc44c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -573,7 +573,6 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret failed: if (color_pixmap) XFreePixmap( gdi_display, color_pixmap ); - if (mask_pixmap) XFreePixmap( gdi_display, mask_pixmap ); HeapFree( GetProcessHeap(), 0, bits.ptr ); return FALSE; }

1 0