December 2011 - Wine-Commits

Dmitry Timoshkov : user32: Add more window style tests, make them pass under Wine.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 8f565eb6ae2663e2ef11342e85ce1cada1f6404c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f565eb6ae2663e2ef11342e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 7 16:06:23 2011 +0800 user32: Add more window style tests, make them pass under Wine. --- dlls/user32/tests/win.c | 56 +++++++++++++++++++++++++++++++++++++--------- dlls/user32/win.c | 23 +++++++++++------- 2 files changed, 59 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a090389..a85c8ad 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3696,6 +3696,7 @@ static void register_style_check_class(void) }; atomStyleCheckClass = RegisterClass(&wc); + assert(atomStyleCheckClass); } static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyleOut, DWORD dwExStyleOut) @@ -3723,12 +3724,23 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); - ok((dwActualStyle == dwStyleOut) && (dwActualExStyle == dwExStyleOut), - "Style (0x%08x) should really be 0x%08x and/or Ex style (0x%08x) should really be 0x%08x\n", - dwActualStyle, dwStyleOut, dwActualExStyle, dwExStyleOut); + ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); /* try setting the styles explicitly */ SetWindowLong( hwnd, GWL_EXSTYLE, dwExStyleIn ); + dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); + dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); + /* WS_EX_WINDOWEDGE can't always be changed */ + if (dwExStyleIn & WS_EX_DLGMODALFRAME) + dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; + else if ((dwActualStyle & (WS_DLGFRAME | WS_THICKFRAME)) && !(dwExStyleIn & WS_EX_STATICEDGE)) + dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; + else + dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; + ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + SetWindowLong( hwnd, GWL_STYLE, dwStyleIn ); dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); @@ -3736,15 +3748,18 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle if ((dwStyleIn & (WS_CHILD|WS_POPUP)) == WS_CHILD) dwStyleOut = dwStyleIn; else dwStyleOut = dwStyleIn | WS_CLIPSIBLINGS; /* WS_EX_WINDOWEDGE can't always be changed */ - if ((dwExStyleIn & WS_EX_DLGMODALFRAME) || (dwStyleIn & WS_THICKFRAME)) + if (dwExStyleIn & WS_EX_DLGMODALFRAME) dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; - else if (dwStyleIn & (WS_CHILD | WS_POPUP)) + else if ((dwActualStyle & (WS_DLGFRAME | WS_THICKFRAME)) && !(dwExStyleIn & WS_EX_STATICEDGE)) + dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; + else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; + ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); + /* FIXME: Remove the condition below once Wine is fixed */ + if (dwActualExStyle != dwExStyleOut) + todo_wine ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); else - dwExStyleOut = dwExStyleIn; - ok((dwActualStyle == dwStyleOut) && (dwActualExStyle == dwExStyleOut), - "%08x/%08x: Style (0x%08x) should really be 0x%08x and/or Ex style (0x%08x) should really be 0x%08x\n", - dwStyleIn, dwExStyleIn, dwActualStyle, dwStyleOut, dwActualExStyle, dwExStyleOut); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -3756,17 +3771,36 @@ static void test_window_styles(void) register_style_check_class(); check_window_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); + check_window_style(WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); check_window_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE); check_window_style(WS_CHILD, 0, WS_CHILD, 0); + check_window_style(WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE); + check_window_style(WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE); + check_window_style(WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); + check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); + check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); check_window_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); + check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); + check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); check_window_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); check_window_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); check_window_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW); check_window_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0); check_window_style(WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); + check_window_style(WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); + check_window_style(WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); check_window_style(WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE); check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f94b181..74e8d6b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1324,14 +1324,15 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->dwStyle |= WS_CAPTION; } - /* - * WS_EX_WINDOWEDGE appears to be enforced based on the other styles, so - * why does the user get to set it? - */ - - if ((wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) || - (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) + /* WS_EX_WINDOWEDGE depends on some other styles */ + if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; + else if (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) + { + if (!((wndPtr->dwExStyle & WS_EX_STATICEDGE) && + (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))) + wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; + } else wndPtr->dwExStyle &= ~WS_EX_WINDOWEDGE; @@ -2176,6 +2177,8 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B newval = style.styleNew; /* WS_CLIPSIBLINGS can't be reset on top-level windows */ if (wndPtr->parent == GetDesktopWindow()) newval |= WS_CLIPSIBLINGS; + /* FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change + WS_EX_WINDOWEDGE too */ break; case GWL_EXSTYLE: style.styleOld = wndPtr->dwExStyle; @@ -2186,9 +2189,11 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B /* WS_EX_TOPMOST can only be changed through SetWindowPos */ newval = (style.styleNew & ~WS_EX_TOPMOST) | (wndPtr->dwExStyle & WS_EX_TOPMOST); /* WS_EX_WINDOWEDGE depends on some other styles */ - if ((newval & WS_EX_DLGMODALFRAME) || (wndPtr->dwStyle & WS_THICKFRAME)) + if (newval & WS_EX_DLGMODALFRAME) + newval |= WS_EX_WINDOWEDGE; + else if (!(newval & WS_EX_STATICEDGE) && (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) newval |= WS_EX_WINDOWEDGE; - else if (wndPtr->dwStyle & (WS_CHILD|WS_POPUP)) + else newval &= ~WS_EX_WINDOWEDGE; break; case GWLP_HWNDPARENT:

1 0

Jacek Caban : jscript: Use binary_expression_t instead of array_expression_t.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 9c9157a1443919bcbfe80dbd25bdff12e371e268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9157a1443919bcbfe80dbd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 11:01:40 2011 +0100 jscript: Use binary_expression_t instead of array_expression_t. --- dlls/jscript/compile.c | 12 ++++++------ dlls/jscript/engine.c | 6 +++--- dlls/jscript/engine.h | 6 ------ dlls/jscript/parser.y | 15 ++------------- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a476155..c1073d8 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -257,13 +257,13 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex break; } case EXPR_ARRAY: { - array_expression_t *array_expr = (array_expression_t*)expr; + binary_expression_t *array_expr = (binary_expression_t*)expr; - hres = compile_expression(ctx, array_expr->member_expr); + hres = compile_expression(ctx, array_expr->expression1); if(FAILED(hres)) return hres; - hres = compile_expression(ctx, array_expr->expression); + hres = compile_expression(ctx, array_expr->expression2); if(FAILED(hres)) return hres; @@ -438,13 +438,13 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t switch(expr->expression->type) { case EXPR_ARRAY: { - array_expression_t *array_expr = (array_expression_t*)expr->expression; + binary_expression_t *array_expr = (binary_expression_t*)expr->expression; - hres = compile_expression(ctx, array_expr->member_expr); + hres = compile_expression(ctx, array_expr->expression1); if(FAILED(hres)) return hres; - hres = compile_expression(ctx, array_expr->expression); + hres = compile_expression(ctx, array_expr->expression2); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d3b1334..b6eeaed 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1508,7 +1508,7 @@ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD f /* ECMA-262 3rd Edition 11.2.1 */ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - array_expression_t *expr = (array_expression_t*)_expr; + binary_expression_t *expr = (binary_expression_t*)_expr; exprval_t exprval; VARIANT member, val; DISPID id; @@ -1518,7 +1518,7 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag TRACE("\n"); - hres = expr_eval(ctx, expr->member_expr, 0, ei, &exprval); + hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); if(FAILED(hres)) return hres; @@ -1527,7 +1527,7 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag if(FAILED(hres)) return hres; - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + hres = expr_eval(ctx, expr->expression2, EXPR_NEWREF, ei, &exprval); if(SUCCEEDED(hres)) { hres = exprval_to_value(ctx, &exprval, ei, &val); exprval_release(&exprval); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ffa0fcd..fdc732d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -499,12 +499,6 @@ typedef struct { typedef struct { expression_t expr; - expression_t *member_expr; - expression_t *expression; -} array_expression_t; - -typedef struct { - expression_t expr; expression_t *expression; const WCHAR *identifier; } member_expression_t; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f02fc67..25d1fcb 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -129,7 +129,6 @@ static expression_t *new_function_expression(parser_ctx_t*,const WCHAR*,paramete 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*); -static expression_t *new_array_expression(parser_ctx_t*,expression_t*,expression_t*); static expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); static expression_t *new_new_expression(parser_ctx_t*,expression_t*,argument_list_t*); static expression_t *new_call_expression(parser_ctx_t*,expression_t*,argument_list_t*); @@ -710,7 +709,7 @@ MemberExpression : PrimaryExpression { $$ = $1; } | FunctionExpression { $$ = $1; } | MemberExpression '[' Expression ']' - { $$ = new_array_expression(ctx, $1, $3); } + { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); } | MemberExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); } | kNEW MemberExpression Arguments @@ -723,7 +722,7 @@ CallExpression | CallExpression Arguments { $$ = new_call_expression(ctx, $1, $2); } | CallExpression '[' Expression ']' - { $$ = new_array_expression(ctx, $1, $3); } + { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); } | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); } @@ -1407,16 +1406,6 @@ static expression_t *new_conditional_expression(parser_ctx_t *ctx, expression_t return &ret->expr; } -static expression_t *new_array_expression(parser_ctx_t *ctx, expression_t *member_expr, expression_t *expression) -{ - array_expression_t *ret = new_expression(ctx, EXPR_ARRAY, sizeof(*ret)); - - ret->member_expr = member_expr; - ret->expression = expression; - - return &ret->expr; -} - static expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *expression, const WCHAR *identifier) { member_expression_t *ret = new_expression(ctx, EXPR_MEMBER, sizeof(*ret));

1 0

Jacek Caban : jscript: Use bytecode for post-increment expression.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: a508149fad4602793df0cd893f42f7b48c7ee0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a508149fad4602793df0cd893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 11:01:53 2011 +0100 jscript: Use bytecode for post-increment expression. --- dlls/jscript/compile.c | 21 +++++++++++++++++++++ dlls/jscript/engine.c | 39 ++++++++++++++++++--------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/api.js | 7 +++++++ dlls/jscript/tests/lang.js | 4 ++++ 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3e5800e..b274a0e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -292,6 +292,25 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex return hres; } +static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expression_t *expr) +{ + HRESULT hres; + + if(!is_memberid_expr(expr->expression->type)) { + hres = compile_expression(ctx, expr->expression); + if(FAILED(hres)) + return hres; + + return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + } + + hres = compile_memberid_expression(ctx, expr->expression, fdexNameEnsure); + if(FAILED(hres)) + return hres; + + return push_instr_int(ctx, OP_postinc, 1); +} + /* ECMA-262 3rd Edition 11.14 */ static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr) { @@ -628,6 +647,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_nz); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); + case EXPR_POSTINC: + return compile_increment_expression(ctx, (unary_expression_t*)expr); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e98e98a..8bf0a0a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2704,38 +2704,35 @@ static HRESULT interp_tonum(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.3.1 */ -HRESULT post_increment_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_postinc(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - VARIANT val, num; - exprval_t exprval; + const int arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; + IDispatch *obj; + DISPID id; + VARIANT v; HRESULT hres; - TRACE("\n"); + TRACE("%d\n", arg); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; + obj = stack_pop_objid(ctx, &id); + if(!obj) + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_OBJECT_EXPECTED, NULL); - hres = exprval_value(ctx, &exprval, ei, &val); + hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); if(SUCCEEDED(hres)) { - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); - } + VARIANT n, inc; - if(SUCCEEDED(hres)) { - VARIANT inc; - num_set_val(&inc, num_val(&num)+1.0); - hres = put_value(ctx, &exprval, &inc, ei); + hres = to_number(ctx->parser->script, &v, &ctx->ei, &n); + if(SUCCEEDED(hres)) { + num_set_val(&inc, num_val(&n)+(double)arg); + hres = disp_propput(ctx->parser->script, obj, id, &inc, &ctx->ei, NULL/*FIXME*/); + } } - - exprval_release(&exprval); + IDispatch_Release(obj); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = num; - return S_OK; + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 11.3.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8b2c0a7..21d599b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -77,6 +77,7 @@ typedef struct _func_stack { X(null, 1, 0,0) \ X(or, 1, 0,0) \ X(pop, 1, 0,0) \ + X(postinc, 1, ARG_INT, 0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ @@ -562,7 +563,6 @@ HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 25d1fcb..f32788e 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1322,7 +1322,7 @@ static const expression_eval_t expression_eval_table[] = { typeof_expression_eval, compiled_expression_eval, compiled_expression_eval, - post_increment_expression_eval, + compiled_expression_eval, post_decrement_expression_eval, pre_increment_expression_eval, pre_decrement_expression_eval, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 0118743..7291979 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2031,6 +2031,9 @@ testException(function() {new nullDisp;}, "E_NO_PROPERTY"); testException(function() {new VBArray();}, "E_NOT_VBARRAY"); testException(function() {new VBArray(new VBArray(createArray()));}, "E_NOT_VBARRAY"); testException(function() {VBArray.prototype.lbound.call(new Object());}, "E_NOT_VBARRAY"); +//FIXME: testException(function() {nonexistent++;}, "E_OBJECT_EXPECTED"); +//FIXME: testException(function() {undefined.nonexistent++;}, "E_OBJECT_EXPECTED"); + // SyntaxError tests function testSyntaxError(code, id) { @@ -2088,6 +2091,10 @@ tmp = ""; testException(function() {(tmp = tmp+"1") = (tmp = tmp+"2");}, "E_ILLEGAL_ASSIGN"); ok(tmp === "12", "assign evaluated in unexpected order"); +tmp = false; +testException(function() { ((tmp = true) && false)++; }, "E_ILLEGAL_ASSIGN") +ok(tmp, "incremented expression not evaluated"); + // RegExpError tests testException(function() {RegExp(/a/, "g");}, "E_REGEXP_SYNTAX_ERROR"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1dd0c02..3710ae7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -521,6 +521,10 @@ ok(tmp === 2, "incremented tmp(1) is not 2"); ok(tmp-- === 2, "tmp-- (2) is not 2"); ok(tmp === 1, "decremented tmp is not 1"); +tmp = new Object(); +tmp.iii++; +ok(isNaN(tmp.iii), "tmp.iii = " + tmp.iii); + String.prototype.test = true; ok("".test === true, "\"\".test is not true");

1 0

Jacek Caban : jscript: Added bytecode version of array expression.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: aa809f1b7ee39c2b3879fb8998e92d96ad8d58f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa809f1b7ee39c2b3879fb899… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 11:01:13 2011 +0100 jscript: Added bytecode version of array expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c1073d8..3e5800e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -558,6 +558,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_AND: return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); + case EXPR_ARRAY: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array); case EXPR_ASSIGN: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); case EXPR_ASSIGNADD: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b6eeaed..e98e98a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1561,6 +1561,46 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag } /* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT interp_array(exec_ctx_t *ctx) +{ + VARIANT v, *namev; + IDispatch *obj; + DISPID id; + BSTR name; + HRESULT hres; + + TRACE("\n"); + + namev = stack_pop(ctx); + + hres = stack_pop_object(ctx, &obj); + if(FAILED(hres)) { + VariantClear(namev); + return hres; + } + + hres = to_string(ctx->parser->script, namev, &ctx->ei, &name); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + hres = disp_get_id(ctx->parser->script, obj, name, 0, &id); + SysFreeString(name); + if(SUCCEEDED(hres)) { + hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); + }else if(hres == DISP_E_UNKNOWNNAME) { + V_VT(&v) = VT_EMPTY; + hres = S_OK; + } + IDispatch_Release(obj); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + +/* ECMA-262 3rd Edition 11.2.1 */ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { member_expression_t *expr = (member_expression_t*)_expr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fdc732d..8b2c0a7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,6 +43,7 @@ typedef struct _func_stack { #define OP_LIST \ X(add, 1, 0,0) \ + X(array, 1, 0,0) \ X(assign, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \

1 0

Pierre Schweitzer : kernel32: Fix memory leak.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: d5642a47ed6a80537011d15e4a987c8b982c3787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5642a47ed6a80537011d15e4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:51:45 2011 +0100 kernel32: Fix memory leak. --- dlls/kernel32/sync.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 9630258..7d5d45c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1529,6 +1529,8 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) FILE_SYNCHRONOUS_IO_NONALERT); if (status != ERROR_SUCCESS) { + HeapFree( GetProcessHeap(), 0, pipe_wait); + RtlFreeUnicodeString( &nt_name ); SetLastError( ERROR_PATH_NOT_FOUND ); return FALSE; }

1 0

Jacek Caban : jscript: Use bytecode for all call expressions.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 4da0cf39f4399f22f34c4c1ef0d5f14e971f3dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da0cf39f4399f22f34c4c1ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 11:00:44 2011 +0100 jscript: Use bytecode for all call expressions. --- dlls/jscript/compile.c | 13 ++++-- dlls/jscript/engine.c | 103 ++++++----------------------------------------- dlls/jscript/engine.h | 2 +- 3 files changed, 23 insertions(+), 95 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 34ac0a4..a476155 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -400,14 +400,17 @@ static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *e unsigned arg_cnt = 0; argument_t *arg; unsigned instr; + jsop_t op; HRESULT hres; - if(!is_memberid_expr(expr->expression->type)) { - expr->expr.eval = call_expression_eval; - return compile_interp_fallback(ctx, &expr->expr); + if(is_memberid_expr(expr->expression->type)) { + op = OP_call_member; + hres = compile_memberid_expression(ctx, expr->expression, 0); + }else { + op = OP_call; + hres = compile_expression(ctx, expr->expression); } - hres = compile_memberid_expression(ctx, expr->expression, 0); if(FAILED(hres)) return hres; @@ -418,7 +421,7 @@ static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *e arg_cnt++; } - instr = push_instr(ctx, OP_call_member); + instr = push_instr(ctx, op); if(instr == -1) return E_OUTOFMEMORY; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0170303..d3b1334 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1697,55 +1697,6 @@ static HRESULT interp_refval(exec_ctx_t *ctx) return stack_push(ctx, &v); } -static void free_dp(DISPPARAMS *dp) -{ - DWORD i; - - for(i=0; i < dp->cArgs; i++) - VariantClear(dp->rgvarg+i); - heap_free(dp->rgvarg); -} - -static HRESULT args_to_param(script_ctx_t *ctx, argument_t *args, jsexcept_t *ei, DISPPARAMS *dp) -{ - VARIANTARG *vargs; - exprval_t exprval; - argument_t *iter; - DWORD cnt = 0, i; - HRESULT hres = S_OK; - - memset(dp, 0, sizeof(*dp)); - if(!args) - return S_OK; - - for(iter = args; iter; iter = iter->next) - cnt++; - - vargs = heap_alloc_zero(cnt * sizeof(*vargs)); - if(!vargs) - return E_OUTOFMEMORY; - - for(i = cnt, iter = args; iter; iter = iter->next) { - hres = expr_eval(ctx, iter->expr, 0, ei, &exprval); - if(FAILED(hres)) - break; - - hres = exprval_to_value(ctx, &exprval, ei, vargs + (--i)); - exprval_release(&exprval); - if(FAILED(hres)) - break; - } - - if(FAILED(hres)) { - free_dp(dp); - return hres; - } - - dp->rgvarg = vargs; - dp->cArgs = cnt; - return S_OK; -} - static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { VARIANT tmp; @@ -1798,55 +1749,29 @@ static HRESULT interp_new(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.2.3 */ -HRESULT call_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_call(exec_ctx_t *ctx) { - call_expression_t *expr = (call_expression_t*)_expr; - VARIANT var; - exprval_t exprval; + const unsigned argn = ctx->parser->code->instrs[ctx->ip].arg1.uint; + const int do_ret = ctx->parser->code->instrs[ctx->ip].arg2.lng; + VARIANT v, *objv; DISPPARAMS dp; HRESULT hres; - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = args_to_param(ctx, expr->argument_list, ei, &dp); - if(SUCCEEDED(hres)) { - switch(exprval.type) { - case EXPRVAL_VARIANT: - if(V_VT(&exprval.u.var) == VT_DISPATCH) - hres = disp_call(ctx, V_DISPATCH(&exprval.u.var), DISPID_VALUE, - DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); - else - hres = throw_type_error(ctx, ei, JS_E_INVALID_PROPERTY, NULL); - break; - case EXPRVAL_IDREF: - assert(0); - case EXPRVAL_INVALID: - hres = throw_type_error(ctx, ei, JS_E_OBJECT_EXPECTED, NULL); - break; - default: - FIXME("unimplemented type %d\n", exprval.type); - hres = E_NOTIMPL; - } + TRACE("%d %d\n", argn, do_ret); - free_dp(&dp); - } + objv = stack_topn(ctx, argn); + if(V_VT(objv) != VT_DISPATCH) + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_INVALID_PROPERTY, NULL); - exprval_release(&exprval); + jsstack_to_dp(ctx, argn, &dp); + hres = disp_call(ctx->parser->script, V_DISPATCH(objv), DISPID_VALUE, DISPATCH_METHOD, &dp, + do_ret ? &v : NULL, &ctx->ei, NULL/*FIXME*/); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - if(flags & EXPR_NOVAL) { - V_VT(&ret->u.var) = VT_EMPTY; - }else { - TRACE("= %s\n", debugstr_variant(&var)); - ret->u.var = var; - } - return S_OK; + stack_popn(ctx, argn+1); + return do_ret ? stack_push(ctx, &v) : S_OK; + } /* ECMA-262 3rd Edition 11.2.3 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 88c61fc..ffa0fcd 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -46,6 +46,7 @@ typedef struct _func_stack { X(assign, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ + X(call, 1, ARG_UINT, ARG_UINT) \ X(call_member,1, ARG_UINT, ARG_UINT) \ X(delete, 1, 0,0) \ X(div, 1, 0,0) \ @@ -558,7 +559,6 @@ typedef struct { HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT call_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : user32: Add the tests for dialog window styles, make them pass under Wine.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 18576b36e4f5759cef7fe04474d9e968748251fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=18576b36e4f5759cef7fe0447… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 7 16:07:38 2011 +0800 user32: Add the tests for dialog window styles, make them pass under Wine. --- dlls/user32/dialog.c | 5 +- dlls/user32/tests/win.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c6b2455..1eb656b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -557,11 +557,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, rect.left = rect.top = 0; rect.right = MulDiv(template.cx, xBaseUnit, 4); rect.bottom = MulDiv(template.cy, yBaseUnit, 8); - if (template.style & WS_CHILD) - template.style &= ~(WS_CAPTION|WS_SYSMENU); + template.style |= DS_3DLOOK; if (template.style & DS_MODALFRAME) template.exStyle |= WS_EX_DLGMODALFRAME; - if (template.style & DS_CONTROL) + if ((template.style & DS_CONTROL) || !(template.style & WS_CHILD)) template.exStyle |= WS_EX_CONTROLPARENT; AdjustWindowRectEx( &rect, template.style, (hMenu != 0), template.exStyle ); pos.x = rect.left; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a85c8ad..5fd5287 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3813,6 +3813,137 @@ static void test_window_styles(void) } } +static INT_PTR WINAPI empty_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return 0; +} + +static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_out, DWORD ex_style_out) +{ + struct + { + DLGTEMPLATE dt; + WORD menu_name; + WORD class_id; + WORD class_atom; + WCHAR caption[1]; + } dlg_data; + DWORD style, ex_style; + HWND hwnd, parent = 0; + + if (style_in & WS_CHILD) + parent = CreateWindowEx(0, "static", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + + dlg_data.dt.style = style_in; + dlg_data.dt.dwExtendedStyle = ex_style_in; + dlg_data.dt.cdit = 0; + dlg_data.dt.x = 0; + dlg_data.dt.y = 0; + dlg_data.dt.cx = 100; + dlg_data.dt.cy = 100; + dlg_data.menu_name = 0; + dlg_data.class_id = 0; + dlg_data.class_atom = 0; + dlg_data.caption[0] = 0; + + hwnd = CreateDialogIndirectParam(GetModuleHandle(0), &dlg_data.dt, parent, empty_dlg_proc, 0); + ok(hwnd != 0, "dialog creation failed, style %#x, exstyle %#x\n", style_in, ex_style_in); + + flush_events( TRUE ); + + style = GetWindowLong(hwnd, GWL_STYLE); + ex_style = GetWindowLong(hwnd, GWL_EXSTYLE); + ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out | DS_3DLOOK, style); + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + + /* try setting the styles explicitly */ + SetWindowLong(hwnd, GWL_EXSTYLE, ex_style_in); + style = GetWindowLong(hwnd, GWL_STYLE); + ex_style = GetWindowLong(hwnd, GWL_EXSTYLE); + ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out|DS_3DLOOK, style); + /* WS_EX_WINDOWEDGE can't always be changed */ + if (ex_style_in & WS_EX_DLGMODALFRAME) + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + else + ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + + SetWindowLong(hwnd, GWL_STYLE, style_in); + style = GetWindowLong(hwnd, GWL_STYLE); + ex_style = GetWindowLong(hwnd, GWL_EXSTYLE); + /* WS_CLIPSIBLINGS can't be reset on top-level windows */ + if ((style_in & (WS_CHILD | WS_POPUP)) == WS_CHILD) style_out = style_in; + else style_out = style_in | WS_CLIPSIBLINGS; + ok(style == style_out, "expected style %#x, got %#x\n", style_out, style); + /* WS_EX_WINDOWEDGE can't always be changed */ + if (ex_style_in & WS_EX_DLGMODALFRAME) + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + else if ((style & (WS_DLGFRAME | WS_THICKFRAME)) && !(ex_style_in & WS_EX_STATICEDGE)) + ex_style_out = ex_style_in | WS_EX_WINDOWEDGE; + else + ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; + /* FIXME: Remove the condition below once Wine is fixed */ + if (ex_style != ex_style_out) + todo_wine ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + else + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + + DestroyWindow(hwnd); + DestroyWindow(parent); +} + +static void test_dialog_styles(void) +{ + check_dialog_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(DS_CONTROL, 0, WS_CLIPSIBLINGS|WS_CAPTION|DS_CONTROL, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_CHILD, 0, WS_CHILD, 0); + check_dialog_style(WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE); + check_dialog_style(WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE); + check_dialog_style(WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE); + check_dialog_style(WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE); + check_dialog_style(WS_CHILD|DS_CONTROL, 0, WS_CHILD|DS_CONTROL, WS_EX_CONTROLPARENT); + check_dialog_style(WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE); + check_dialog_style(WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE); + check_dialog_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); + check_dialog_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); + check_dialog_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); + check_dialog_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); + check_dialog_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_dialog_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_dialog_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); + check_dialog_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); + check_dialog_style(WS_CHILD|WS_POPUP|DS_CONTROL, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS|DS_CONTROL, WS_EX_CONTROLPARENT); + check_dialog_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); + check_dialog_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); + check_dialog_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); + check_dialog_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(WS_POPUP|DS_CONTROL, 0, WS_POPUP|WS_CLIPSIBLINGS|DS_CONTROL, WS_EX_CONTROLPARENT); + check_dialog_style(WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + + if (pGetLayeredWindowAttributes) + { + check_dialog_style(0, WS_EX_LAYERED, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + check_dialog_style(0, WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, + WS_EX_LAYERED|WS_EX_TRANSPARENT|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE|WS_EX_CONTROLPARENT); + } +} + static void test_scrollwindow( HWND hwnd) { HDC hdc; @@ -6745,6 +6876,7 @@ START_TEST(win) test_AdjustWindowRect(); test_window_styles(); + test_dialog_styles(); test_redrawnow(); test_csparentdc(); test_SetWindowLong();

1 0

Pierre Schweitzer : msctf: Fix memory leaks.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: f566f38e2fd85f05f1291d7b6154440887c15a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f566f38e2fd85f05f1291d7b6… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:53:20 2011 +0100 msctf: Fix memory leaks. --- dlls/msctf/context.c | 3 +++ dlls/msctf/inputprocessor.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index fbd7229..c013cf9 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -1013,7 +1013,10 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, sinkcookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); if (!sinkcookie) + { + HeapFree(GetProcessHeap(), 0, cookie); return E_OUTOFMEMORY; + } cookie->lockType = dwLockFlags; cookie->pOwningContext = This->pContext; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 62b93c6..5242f14 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -924,7 +924,10 @@ static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut) if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szwSystemTIPKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &This->key, NULL) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, This); return E_FAIL; + } TRACE("returning %p\n", This); *ppOut = (IEnumGUID*)This; @@ -1161,7 +1164,10 @@ static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguage if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szwSystemTIPKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &This->tipkey, NULL) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, This); return E_FAIL; + } TRACE("returning %p\n", This); *ppOut = (IEnumTfLanguageProfiles*)This;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DBOX typedef.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 5c5216e609cfa81a40ad6d53f8316ff3f415f735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5216e609cfa81a40ad6d53f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:47 2011 +0100 wined3d: Get rid of the WINED3DBOX typedef. --- dlls/d3d8/cubetexture.c | 16 +++++----- dlls/d3d8/texture.c | 16 +++++----- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 16 +++++----- dlls/d3d9/texture.c | 16 +++++----- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/wined3d/surface.c | 26 ++++++++-------- dlls/wined3d/texture.c | 6 ++-- dlls/wined3d/volume.c | 62 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 10 +++--- include/wine/wined3d.h | 22 +++++++------- 13 files changed, 99 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c5216e609cfa81a40ad6…

1 0

Jacek Caban : jscript: Use bytecode for calls on identifier and member expressions.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 3aa7cee00e69c6a912abd1f23e846f6af35d9f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa7cee00e69c6a912abd1f23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 11:00:20 2011 +0100 jscript: Use bytecode for calls on identifier and member expressions. --- dlls/jscript/compile.c | 164 +++++++++++++++++++++++++++++++++------------ dlls/jscript/engine.c | 69 +++++++++++++++----- dlls/jscript/engine.h | 7 +- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/run.c | 2 +- 5 files changed, 178 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa7cee00e69c6a912abd…

1 0