December 2011 - Wine-Commits

Alexandre Julliard : user32: Don' t try to alpha blend icons on low color bitmaps.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 430c8aa9101317777e99a15c4d2c2b97329136e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430c8aa9101317777e99a15c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 14:20:56 2011 +0100 user32: Don't try to alpha blend icons on low color bitmaps. --- dlls/user32/cursoricon.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4ae7098..d8068d8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2288,15 +2288,15 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (frame->alpha && (flags & DI_IMAGE)) { - BOOL is_mono = FALSE; + BOOL alpha_blend = TRUE; if (GetObjectType( hdc_dest ) == OBJ_MEMDC) { BITMAP bm; HBITMAP bmp = GetCurrentObject( hdc_dest, OBJ_BITMAP ); - is_mono = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel == 1; + alpha_blend = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel > 8; } - if (!is_mono) + if (alpha_blend) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; SelectObject( hMemDC, frame->alpha );

1 0

Francois Gouget : taskmgr: Remove unneeded and untranslatable widget labels .
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

1 0

Alexandre Julliard : oleaut32: Fix IPicture:: SelectPicture to not try to select a bitmap into two DCs at the same time.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 1e0ab160697ddf8162c82854904adf293d581431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0ab160697ddf8162c828549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:29:12 2011 +0100 oleaut32: Fix IPicture::SelectPicture to not try to select a bitmap into two DCs at the same time. --- dlls/oleaut32/olepicture.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 8081785..2195ba5 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -141,6 +141,7 @@ typedef struct OLEPictureImpl { BOOL keepOrigFormat; HDC hDCCur; + HBITMAP stock_bitmap; /* Bitmap transparency mask */ HBITMAP hbmMask; @@ -219,6 +220,7 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) This->himetricWidth = xpixels_to_himetric(bm.bmWidth, hdcRef); This->himetricHeight = ypixels_to_himetric(bm.bmHeight, hdcRef); + This->stock_bitmap = GetCurrentObject( hdcRef, OBJ_BITMAP ); DeleteDC(hdcRef); } @@ -769,10 +771,10 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface, OLEPictureImpl *This = impl_from_IPicture(iface); TRACE("(%p)->(%p, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut); if (This->desc.picType == PICTYPE_BITMAP) { - SelectObject(hdcIn,This->desc.u.bmp.hbitmap); - if (phdcOut) *phdcOut = This->hDCCur; + if (This->hDCCur) SelectObject(This->hDCCur,This->stock_bitmap); + if (hdcIn) SelectObject(hdcIn,This->desc.u.bmp.hbitmap); This->hDCCur = hdcIn; if (phbmpOut) *phbmpOut = HandleToUlong(This->desc.u.bmp.hbitmap);

1 0

Alexandre Julliard : comctl32: Use DrawIconEx to copy icon bits and use the correct background color.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 40cf298c7524f4475b4636301798263aed1d437c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cf298c7524f4475b4636301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 14:19:38 2011 +0100 comctl32: Use DrawIconEx to copy icon bits and use the correct background color. --- dlls/comctl32/imagelist.c | 76 +++++++++++++------------------------------- 1 files changed, 23 insertions(+), 53 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 81ee655..4e71795 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2531,7 +2531,6 @@ done: INT WINAPI ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) { - HDC hdcImage; HICON hBestFitIcon; ICONINFO ii; BITMAP bmp; @@ -2563,23 +2562,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (!hBestFitIcon) return -1; - ret = GetIconInfo (hBestFitIcon, &ii); - if (!ret) { - DestroyIcon(hBestFitIcon); - return -1; - } - - ret = GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp); - if (!ret) { - ERR("couldn't get mask bitmap info\n"); - if (ii.hbmColor) - DeleteObject (ii.hbmColor); - if (ii.hbmMask) - DeleteObject (ii.hbmMask); - DestroyIcon(hBestFitIcon); - return -1; - } - if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) IMAGELIST_InternalExpandBitmaps(himl, 1); @@ -2588,13 +2570,11 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) himl->cCurImage++; } - hdcImage = CreateCompatibleDC (0); - TRACE("hdcImage=%p\n", hdcImage); - if (hdcImage == 0) - ERR("invalid hdcImage!\n"); - - if (himl->has_alpha) + if (himl->has_alpha && GetIconInfo (hBestFitIcon, &ii)) { + HDC hdcImage = CreateCompatibleDC( 0 ); + GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp); + if (!ii.hbmColor) { UINT height = bmp.bmHeight / 2; @@ -2606,48 +2586,38 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); DeleteDC( hdcMask ); DeleteObject( color ); - if (ret) goto done; } - else if (add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, - ii.hbmColor, ii.hbmMask )) goto done; + else ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, + ii.hbmColor, ii.hbmMask ); + + DeleteDC( hdcImage ); + DeleteObject (ii.hbmMask); + if (ii.hbmColor) DeleteObject (ii.hbmColor); + if (ret) goto done; } imagelist_point_from_index(himl, nIndex, &pt); - SetTextColor(himl->hdcImage, RGB(0,0,0)); - SetBkColor (himl->hdcImage, RGB(255,255,255)); - - if (ii.hbmColor) + if (himl->hbmMask) { - SelectObject (hdcImage, ii.hbmColor); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); - if (himl->hbmMask) - { - SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); - } + DrawIconEx( himl->hdcImage, pt.x, pt.y, hBestFitIcon, himl->cx, himl->cy, 0, 0, DI_IMAGE ); + PatBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, WHITENESS ); + DrawIconEx( himl->hdcMask, pt.x, pt.y, hBestFitIcon, himl->cx, himl->cy, 0, 0, DI_MASK ); } else { - UINT height = bmp.bmHeight / 2; - SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, height, bmp.bmWidth, height, SRCCOPY); - if (himl->hbmMask) - StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, height, SRCCOPY); + COLORREF color = himl->clrBk != CLR_NONE ? himl->clrBk : comctl32_color.clrWindow; + HBRUSH brush = CreateSolidBrush( GetNearestColor( himl->hdcImage, color )); + + SelectObject( himl->hdcImage, brush ); + PatBlt( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, PATCOPY ); + SelectObject( himl->hdcImage, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + DrawIconEx( himl->hdcImage, pt.x, pt.y, hBestFitIcon, himl->cx, himl->cy, 0, 0, DI_NORMAL ); } done: DestroyIcon(hBestFitIcon); - if (hdcImage) - DeleteDC (hdcImage); - if (ii.hbmColor) - DeleteObject (ii.hbmColor); - if (ii.hbmMask) - DeleteObject (ii.hbmMask); TRACE("Insert index = %d, himl->cCurImage = %d\n", nIndex, himl->cCurImage); return nIndex;

1 0

Dmitry Timoshkov : ntdll: Replace WRITE by WRITECOPY protection on an image section as Windows does.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 332eee40530f698c74f16d27c9833ccccb25bfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332eee40530f698c74f16d27c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 16 14:45:23 2011 +0800 ntdll: Replace WRITE by WRITECOPY protection on an image section as Windows does. --- dlls/kernel32/tests/loader.c | 8 -------- dlls/ntdll/virtual.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 536bda9..398e5f5 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -647,9 +647,6 @@ static void test_VirtualProtect(void *base, void *section) ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == section, "%d: got %p != expected %p\n", i, info.BaseAddress, section); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - if (info.Protect != td[i].prot_get) - todo_wine ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); - else ok(info.Protect == td[i].prot_get, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_get); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); @@ -667,12 +664,7 @@ static void test_VirtualProtect(void *base, void *section) ret = VirtualProtect(section, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); if (td[i].prot_get) - { - if (old_prot != td[i].prot_get) - todo_wine ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); - else ok(old_prot == td[i].prot_get, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_get); - } else ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ee56e71..6ee3444 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -552,7 +552,7 @@ static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) * RETURNS * Value of page protection flags */ -static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) +static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image ) { switch(protect & 0xff) { @@ -560,7 +560,10 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) *vprot = VPROT_READ; break; case PAGE_READWRITE: - *vprot = VPROT_READ | VPROT_WRITE; + if (image) + *vprot = VPROT_READ | VPROT_WRITECOPY; + else + *vprot = VPROT_READ | VPROT_WRITE; break; case PAGE_WRITECOPY: *vprot = VPROT_READ | VPROT_WRITECOPY; @@ -572,7 +575,10 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) *vprot = VPROT_EXEC | VPROT_READ; break; case PAGE_EXECUTE_READWRITE: - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; + if (image) + *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; + else + *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; break; case PAGE_EXECUTE_WRITECOPY: *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; @@ -1860,7 +1866,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (is_beyond_limit( 0, size, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; - if ((status = get_vprot_flags( protect, &vprot ))) return status; + if ((status = get_vprot_flags( protect, &vprot, FALSE ))) return status; if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED; @@ -2087,7 +2093,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T /* Make sure all the pages are committed */ if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) { - if (!(status = get_vprot_flags( new_prot, &new_vprot ))) + if (!(status = get_vprot_flags( new_prot, &new_vprot, view->protect & VPROT_IMAGE ))) { if ((new_vprot & VPROT_WRITECOPY) && (view->protect & VPROT_VALLOC)) status = STATUS_INVALID_PAGE_PROTECTION; @@ -2392,7 +2398,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC if (len > MAX_PATH*sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; - if ((ret = get_vprot_flags( protect, &vprot ))) return ret; + if ((ret = get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ))) return ret; objattr.rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); objattr.sd_len = 0; @@ -2602,7 +2608,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p server_enter_uninterrupted_section( &csVirtual, &sigset ); - get_vprot_flags( protect, &vprot ); + get_vprot_flags( protect, &vprot, map_vprot & VPROT_IMAGE ); vprot |= (map_vprot & VPROT_COMMITTED); res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot ); if (res)

1 0

Alexandre Julliard : comctl32/tests: Add some more tests for ImageList_Write.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 65b7eb26359110959692db7c0c3cebd263fe21ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b7eb26359110959692db7c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 13:07:45 2011 +0100 comctl32/tests: Add some more tests for ImageList_Write. --- dlls/comctl32/imagelist.c | 14 ++--- dlls/comctl32/tests/imagelist.c | 130 +++++++++++++++++++++++++++++---------- 2 files changed, 102 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65b7eb26359110959692d…

1 0

Jacek Caban : jscript: Get rid of no longer needed expression eval entry.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: fecc2fcb5ef22e5b1f75010a3990a47f0169d53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecc2fcb5ef22e5b1f75010a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:44:03 2011 +0100 jscript: Get rid of no longer needed expression eval entry. --- dlls/jscript/compile.c | 1 - dlls/jscript/engine.c | 15 +++++------ dlls/jscript/engine.h | 3 -- dlls/jscript/parser.y | 63 +----------------------------------------------- 4 files changed, 8 insertions(+), 74 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index daa1846..f2e2ead 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -829,7 +829,6 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, case EXPR_BXOR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: - assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 210cdf7..424659f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -56,7 +56,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ static inline HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - return expr->eval(ctx, expr, flags, ei, ret); + return compiled_expression_eval(ctx, expr, flags, ei, ret); } static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) @@ -3168,12 +3168,11 @@ HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD fl TRACE("\n"); - hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); - if(FAILED(hres)) - return hres; - - if(expr->eval == compiled_expression_eval) - expr->eval = interp_expression_eval; + if(expr->instr_off == -1) { + hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); + if(FAILED(hres)) + return hres; + } - return expr->eval(ctx, expr, flags, ei, ret); + return interp_expression_eval(ctx, expr, flags, ei, ret); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6c1acad..323e9e3 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -469,11 +469,8 @@ typedef enum { EXPR_LITERAL } expression_type_t; -typedef HRESULT (*expression_eval_t)(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); - struct _expression_t { expression_type_t type; - expression_eval_t eval; unsigned instr_off; }; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ab5ebff..1524713 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1303,73 +1303,12 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide return &ret->expr; } -static const expression_eval_t expression_eval_table[] = { - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval -}; - static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *ret = parser_alloc(ctx, size ? size : sizeof(*ret)); ret->type = type; - ret->eval = expression_eval_table[type]; + ret->instr_off = -1; return ret; }

1 0

Jacek Caban : jscript: Use bytecode for object literal implementation.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 5e6faaea12130b61641f0d2efd3c81fd68f7faa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6faaea12130b61641f0d2ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:43:31 2011 +0100 jscript: Use bytecode for object literal implementation. --- dlls/jscript/compile.c | 49 ++++++++++++++++++++++++ dlls/jscript/dispex.c | 8 ++++ dlls/jscript/engine.c | 98 ++++++++++-------------------------------------- dlls/jscript/engine.h | 4 +- dlls/jscript/jscript.h | 5 ++ dlls/jscript/jsutils.c | 47 ++++++++++++++--------- dlls/jscript/parser.y | 2 +- 7 files changed, 113 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e6faaea12130b61641f0…

1 0

Jacek Caban : jscript: Use bytecode for function expression implementation.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: b268e41da6367ea6cb9b24b4450ee94ddb6222a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b268e41da6367ea6cb9b24b44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:42:57 2011 +0100 jscript: Use bytecode for function expression implementation. --- dlls/jscript/compile.c | 17 +++++++++++++++++ dlls/jscript/engine.c | 30 ++++++++++-------------------- dlls/jscript/engine.h | 4 +++- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 6 ++++++ dlls/jscript/tests/run.c | 2 ++ 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9718c69..9331910 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -646,6 +646,21 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi return push_instr_uint(ctx, OP_carray, elem_cnt); } +static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +{ + unsigned instr; + + /* FIXME: not exactly right */ + if(expr->identifier) + return push_instr_bstr(ctx, OP_ident, expr->identifier); + + instr = push_instr(ctx, OP_func); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.func = expr; + return S_OK; +} static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, BOOL *no_ret) { @@ -702,6 +717,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_FUNC: + return compile_function_expression(ctx, (function_expression_t*)expr); case EXPR_GREATER: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); case EXPR_GREATEREQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 98e4158..23f457d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1420,32 +1420,22 @@ HRESULT try_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t } /* ECMA-262 3rd Edition 13 */ -HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_func(exec_ctx_t *ctx) { - function_expression_t *expr = (function_expression_t*)_expr; - VARIANT var; + function_expression_t *expr = ctx->parser->code->instrs[ctx->ip].arg1.func; + jsdisp_t *dispex; + VARIANT v; HRESULT hres; TRACE("\n"); - if(expr->identifier) { - hres = jsdisp_propget_name(ctx->exec_ctx->var_disp, expr->identifier, &var, ei, NULL/*FIXME*/); - if(FAILED(hres)) - return hres; - }else { - jsdisp_t *dispex; - - hres = create_source_function(ctx->exec_ctx->parser, expr->parameter_list, expr->source_elements, ctx->exec_ctx->scope_chain, - expr->src_str, expr->src_len, &dispex); - if(FAILED(hres)) - return hres; - - var_set_jsdisp(&var, dispex); - } + hres = create_source_function(ctx->parser, expr->parameter_list, expr->source_elements, ctx->scope_chain, + expr->src_str, expr->src_len, &dispex); + if(FAILED(hres)) + return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = var; - return S_OK; + var_set_jsdisp(&v, dispex); + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 11.2.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2cea63d..fcdc093 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -57,6 +57,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(func, 1, ARG_FUNC, 0) \ X(gt, 1, 0,0) \ X(gteq, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ @@ -117,6 +118,7 @@ typedef union { LONG lng; WCHAR *str; unsigned uint; + function_expression_t *func; /* FIXME */ } instr_arg_t; typedef enum { @@ -124,6 +126,7 @@ typedef enum { ARG_ADDR, ARG_BSTR, ARG_EXPR, + ARG_FUNC, ARG_INT, ARG_STR } instr_arg_type_t; @@ -565,7 +568,6 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT function_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; HRESULT compiled_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 c791e9c..41481ab 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1357,7 +1357,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - function_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, property_value_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 165e70e..13c90fa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1110,6 +1110,12 @@ ok(newValue === 1, "newValue = " + newValue); obj = {undefined: 3}; +ok(typeof(name_override_func) === "function", "typeof(name_override_func) = " + typeof(name_override_func)); +name_override_func = 3; +ok(name_override_func === 3, "name_override_func = " + name_override_func); +function name_override_func() {}; +ok(name_override_func === 3, "name_override_func = " + name_override_func); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 890809c..5626bd8 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1487,6 +1487,8 @@ static void run_tests(void) CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + parse_script_a("(function reportSuccess() {})()"); + parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");"); parse_script_a("function reportSuccess() {}; reportSuccess();");

1 0

Nikolay Sivov : msxml3: Remove redundant type specifiers.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: f999f4ae69dc4788723ca803e558b8e2865aaa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f999f4ae69dc4788723ca803e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 14:33:32 2011 +0300 msxml3: Remove redundant type specifiers. --- dlls/msxml3/saxreader.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 6765aef..924a979 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -enum ReaderFeatures +typedef enum { ExhaustiveErrors = 1 << 1, ExternalGeneralEntities = 1 << 2, @@ -66,7 +66,7 @@ enum ReaderFeatures UseInlineSchema = 1 << 13, UseSchemaLocation = 1 << 14, LexicalHandlerParEntities = 1 << 15 -}; +} saxreader_features; struct bstrpool { @@ -75,28 +75,28 @@ struct bstrpool unsigned int len; }; -typedef struct _saxreader +typedef struct { DispatchEx dispex; IVBSAXXMLReader IVBSAXXMLReader_iface; ISAXXMLReader ISAXXMLReader_iface; LONG ref; - struct ISAXContentHandler *contentHandler; - struct IVBSAXContentHandler *vbcontentHandler; - struct ISAXErrorHandler *errorHandler; - struct IVBSAXErrorHandler *vberrorHandler; - struct ISAXLexicalHandler *lexicalHandler; - struct IVBSAXLexicalHandler *vblexicalHandler; - struct ISAXDeclHandler *declHandler; - struct IVBSAXDeclHandler *vbdeclHandler; + ISAXContentHandler *contentHandler; + IVBSAXContentHandler *vbcontentHandler; + ISAXErrorHandler *errorHandler; + IVBSAXErrorHandler *vberrorHandler; + ISAXLexicalHandler *lexicalHandler; + IVBSAXLexicalHandler *vblexicalHandler; + ISAXDeclHandler *declHandler; + IVBSAXDeclHandler *vbdeclHandler; xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; - enum ReaderFeatures features; + saxreader_features features; MSXML_VERSION version; } saxreader; -typedef struct _saxlocator +typedef struct { IVBSAXLocator IVBSAXLocator_iface; ISAXLocator ISAXLocator_iface; @@ -231,7 +231,7 @@ static const WCHAR FeatureNamespacesW[] = { '/','n','a','m','e','s','p','a','c','e','s',0 }; -static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) +static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) reader->features |= feature; @@ -241,7 +241,7 @@ static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures f return S_OK; } -static inline HRESULT get_feature_value(const saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL *value) +static inline HRESULT get_feature_value(const saxreader *reader, saxreader_features feature, VARIANT_BOOL *value) { *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; return S_OK;

1 0