wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : gdi32: Compute the correct rectangle interior when using wide pens.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 0c840f66ed9734873d9ce76a5f2743f799069bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c840f66ed9734873d9ce76a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 20:53:35 2011 +0100 gdi32: Compute the correct rectangle interior when using wide pens. --- dlls/gdi32/dibdrv/graphics.c | 10 ++++------ dlls/gdi32/dibdrv/objects.c | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e8daa69..f319849 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -590,12 +590,10 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) pdev->pen_lines(pdev, 4, pts, TRUE); - /* FIXME: Will need updating when we support wide pens */ - - rect.left += 1; - rect.top += 1; - rect.right -= 1; - rect.bottom -= 1; + rect.left += (pdev->pen_width + 1) / 2; + rect.top += (pdev->pen_width + 1) / 2; + rect.right -= (pdev->pen_width + 2) / 2; + rect.bottom -= (pdev->pen_width + 2) / 2; brush_rect( pdev, &rect, GetROP2(dev->hdc) ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 626511c..fe83dec 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1266,9 +1266,9 @@ static inline int get_pen_device_width( dibdrv_physdev *pdev, LOGPEN *pen ) pts[0].x = pts[0].y = pts[1].y = 0; pts[1].x = width; LPtoDP( pdev->dev.hdc, pts, 2 ); - width = max( abs( pts[1].x - pts[0].x ), 1 ); + width = abs( pts[1].x - pts[0].x ); } - return width; + return max( width, 1 ); } /***********************************************************************

1 0

Jacek Caban : vbscript: Added compiler support for parametrized assignment statements.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: edd5ca71b22724eb107a286cd0633e184913be3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd5ca71b22724eb107a286cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 16:17:21 2011 +0100 vbscript: Added compiler support for parametrized assignment statements. --- dlls/vbscript/compile.c | 17 +++++++++-------- dlls/vbscript/interp.c | 24 ++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 8 ++++---- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9b3f3e6..435f9e3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -687,28 +687,29 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { + unsigned args_cnt; + vbsop_t op; HRESULT hres; hres = compile_expression(ctx, stat->value_expr); if(FAILED(hres)) return hres; - if(stat->member_expr->args) { - FIXME("arguments support not implemented\n"); - return E_NOTIMPL; - } - if(stat->member_expr->obj_expr) { hres = compile_expression(ctx, stat->member_expr->obj_expr); if(FAILED(hres)) return hres; - hres = push_instr_bstr(ctx, is_set ? OP_set_member : OP_assign_member, stat->member_expr->identifier); + op = is_set ? OP_set_member : OP_assign_member; }else { - hres = push_instr_bstr(ctx, is_set ? OP_set_ident : OP_assign_ident, stat->member_expr->identifier); + op = is_set ? OP_set_ident : OP_assign_ident; } - return hres; + hres = compile_args(ctx, stat->member_expr->args, &args_cnt); + if(FAILED(hres)) + return hres; + + return push_instr_bstr_uint(ctx, op, stat->member_expr->identifier, args_cnt); } static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f036557..cca5eb9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -562,11 +562,17 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v static HRESULT interp_assign_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; variant_val_t v; HRESULT hres; TRACE("%s\n", debugstr_w(arg)); + if(arg_cnt) { + FIXME("arguments not supported\n"); + return E_NOTIMPL; + } + hres = stack_pop_val(ctx, &v); if(FAILED(hres)) return hres; @@ -577,12 +583,18 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) static HRESULT interp_set_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; IDispatch *disp; VARIANT v; HRESULT hres; TRACE("%s\n", debugstr_w(arg)); + if(arg_cnt) { + FIXME("arguments not supported\n"); + return E_NOTIMPL; + } + hres = stack_pop_disp(ctx, &disp); if(FAILED(hres)) return hres; @@ -595,6 +607,7 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) static HRESULT interp_assign_member(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; variant_val_t val; IDispatch *obj; DISPID id; @@ -602,6 +615,11 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); + if(arg_cnt) { + FIXME("arguments not supported\n"); + return E_NOTIMPL; + } + hres = stack_pop_disp(ctx, &obj); if(FAILED(hres)) return hres; @@ -629,12 +647,18 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) static HRESULT interp_set_member(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; IDispatch *obj, *val; DISPID id; HRESULT hres; TRACE("%s\n", debugstr_w(identifier)); + if(arg_cnt) { + FIXME("arguments not supported\n"); + return E_NOTIMPL; + } + hres = stack_pop_disp(ctx, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 890c7c7..173b03e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -186,8 +186,8 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ X(and, 1, 0, 0) \ - X(assign_ident, 1, ARG_BSTR, 0) \ - X(assign_member, 1, ARG_BSTR, 0) \ + X(assign_ident, 1, ARG_BSTR, ARG_UINT) \ + X(assign_member, 1, ARG_BSTR, ARG_UINT) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ @@ -226,8 +226,8 @@ typedef enum { X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(ret, 0, 0, 0) \ - X(set_ident, 1, ARG_BSTR, 0) \ - X(set_member, 1, ARG_BSTR, 0) \ + X(set_ident, 1, ARG_BSTR, ARG_UINT) \ + X(set_member, 1, ARG_BSTR, ARG_UINT) \ X(short, 1, ARG_INT, 0) \ X(step, 0, ARG_ADDR, ARG_BSTR) \ X(stop, 1, 0, 0) \

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for IoUnregisterShutdownNotification.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: b54f3e711f9fc081422109ebeab4ed1e6ff322a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54f3e711f9fc081422109ebe… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 27 16:04:59 2011 +0100 ntoskrnl.exe: Add stub for IoUnregisterShutdownNotification. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 13c8c7f..e6706d8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -838,6 +838,15 @@ NTSTATUS WINAPI IoRegisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoUnregisterShutdownNotification (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) +{ + FIXME( "stub: %p\n", obj ); +} + + +/*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_obj, PCM_RESOURCE_LIST drv_list, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c90b45a..a391c81 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -470,7 +470,7 @@ @ stdcall IoUnregisterFileSystem(ptr) @ stub IoUnregisterFsRegistrationChange @ stub IoUnregisterPlugPlayNotification -@ stub IoUnregisterShutdownNotification +@ stdcall IoUnregisterShutdownNotification(ptr) @ stub IoUpdateShareAccess @ stub IoValidateDeviceIoControlAccess @ stub IoVerifyPartitionTable

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 13a7e6995a0841b0e98be0f2b37dfaf2b080a4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a7e6995a0841b0e98be0f2b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Dec 25 22:09:43 2011 +0900 po: Updated Korean translation. --- po/ko.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/ko.po b/po/ko.po index de47a92..c8817b1 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3303,24 +3303,20 @@ msgid "Address" msgstr "주소" #: ieframe.rc:78 -#, fuzzy msgid "Searching for %s" -msgstr "%s 설정" +msgstr "%s 찾는 중" #: ieframe.rc:79 -#, fuzzy msgid "Start downloading %s" -msgstr "%s로부터 다운로드중..." +msgstr "%s 다운로드 시작." #: ieframe.rc:80 -#, fuzzy msgid "Downloading %s" -msgstr "다운로드중..." +msgstr " %s 다운로드중..." #: ieframe.rc:81 -#, fuzzy msgid "Asking for %s" -msgstr "%s 설정" +msgstr "%s 대하여 묻기" #: inetcpl.rc:46 msgid " Home page " @@ -3328,7 +3324,7 @@ msgstr " 홈 페이지 " #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." -msgstr "홈페이지로 사용할 주소를 선택할 수 있습니다." +msgstr "당신은 홈페이지로 사용할 주소를 선택할 수 있습니다." #: inetcpl.rc:50 msgid "&Current page"

1 0

Jacek Caban : ntoskrnl.exe: Added IoGetCurrentProcess stub.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 992316ab4a6b701316f97e631e6d404ea6db090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=992316ab4a6b701316f97e631… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 14:46:10 2011 +0100 ntoskrnl.exe: Added IoGetCurrentProcess stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bc64ce1..13c8c7f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1113,6 +1113,15 @@ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING Redi } /*********************************************************************** + * IoGetCurrentProcess / PsGetCurrentProcess (NTOSKRNL.EXE.@) + */ +PEPROCESS WINAPI IoGetCurrentProcess(void) +{ + FIXME("() stub\n"); + return NULL; +} + +/*********************************************************************** * KeGetCurrentThread / PsGetCurrentThread (NTOSKRNL.EXE.@) */ PRKTHREAD WINAPI KeGetCurrentThread(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 97c15a4..c90b45a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -378,7 +378,7 @@ @ stub IoGetBaseFileSystemDeviceObject @ stub IoGetBootDiskInformation @ stdcall IoGetConfigurationInformation() -@ stub IoGetCurrentProcess +@ stdcall IoGetCurrentProcess() @ stub IoGetDeviceAttachmentBaseRef @ stub IoGetDeviceInterfaceAlias @ stdcall IoGetDeviceInterfaces(ptr ptr long ptr) @@ -849,7 +849,7 @@ @ stub PsDisableImpersonation @ stub PsEstablishWin32Callouts @ stub PsGetContextThread -@ stub PsGetCurrentProcess +@ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() @ stub PsGetCurrentProcessSessionId @ stdcall PsGetCurrentThread() KeGetCurrentThread

1 0

Francois Gouget : iphlpapi/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 694f27743ff7a32b027d983b08a1c4f182168e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694f27743ff7a32b027d983b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 27 12:27:17 2011 +0100 iphlpapi/tests: Fix compilation on systems that don't support nameless unions. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0b274ff..0cbfb31 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -399,7 +399,7 @@ static void testGetIpNetTable(void) for (i = 0; i < buf->dwNumEntries; i++) { trace( "%u: idx %u type %u addr %s phys", - i, buf->table[i].dwIndex, buf->table[i].dwType, ntoa( buf->table[i].dwAddr )); + i, buf->table[i].dwIndex, U(buf->table[i]).dwType, ntoa( buf->table[i].dwAddr )); for (j = 0; j < buf->table[i].dwPhysAddrLen; j++) printf( " %02x", buf->table[i].bPhysAddr[j] ); printf( "\n" );

1 0

Akihiro Sagawa : gdi32: Avoid making a DBCS character in range.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: 70c222218000dda65efce325a3170c252e7c5180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c222218000dda65efce325a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 26 18:27:37 2011 +0900 gdi32: Avoid making a DBCS character in range. --- dlls/gdi32/font.c | 18 ++++++++++++++---- dlls/gdi32/tests/font.c | 30 +++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d2dfd44..71e0857 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1596,13 +1596,15 @@ UINT WINAPI GetOutlineTextMetricsW( static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT pByteLen) { INT i, count = lastChar - firstChar + 1; + UINT mbcp; UINT c; LPSTR str; if (count <= 0) return NULL; - switch (GdiGetCodePage(hdc)) + mbcp = GdiGetCodePage(hdc); + switch (mbcp) { case 932: case 936: @@ -1617,6 +1619,7 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT default: if (lastChar > 0xff) return NULL; + mbcp = 0; break; } @@ -1626,9 +1629,16 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT for(i = 0, c = firstChar; c <= lastChar; i++, c++) { - if (c > 0xff) - str[i++] = (BYTE)(c >> 8); - str[i] = (BYTE)c; + if (mbcp) { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + if (c <= 0xff && IsDBCSLeadByteEx(mbcp, c)) + str[i] = 0x1f; /* FIXME: use default character */ + else + str[i] = (BYTE)c; + } + else + str[i] = (BYTE)c; } str[i] = '\0'; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4d53aaf..41ceff4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -957,7 +957,8 @@ static void test_GetCharABCWidths(void) {0xffffff, 0xffffff}, {0x1000000, 0x1000000}, {0xffffff, 0x1000000}, - {0xffffffff, 0xffffffff} + {0xffffffff, 0xffffffff}, + {0x00, 0xff} }; static const struct { @@ -967,12 +968,18 @@ static void test_GetCharABCWidths(void) BOOL r[sizeof range / sizeof range[0]]; } c[] = { - {ANSI_CHARSET, 0x30, 0x30, {TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {SHIFTJIS_CHARSET, 0x82a0, 0x3042, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {HANGEUL_CHARSET, 0x8141, 0xac02, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {JOHAB_CHARSET, 0x8446, 0x3135, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {GB2312_CHARSET, 0x8141, 0x4e04, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}}, - {CHINESEBIG5_CHARSET, 0xa142, 0x3001, {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}} + {ANSI_CHARSET, 0x30, 0x30, + {TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, + {SHIFTJIS_CHARSET, 0x82a0, 0x3042, + {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, + {HANGEUL_CHARSET, 0x8141, 0xac02, + {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, + {JOHAB_CHARSET, 0x8446, 0x3135, + {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, + {GB2312_CHARSET, 0x8141, 0x4e04, + {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001, + {TRUE, TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE}} }; UINT i; @@ -1057,9 +1064,18 @@ static void test_GetCharABCWidths(void) for (j = 0; j < sizeof range / sizeof range[0]; ++j) { + memset(full, 0xdd, sizeof full); ret = pGetCharABCWidthsA(hdc, range[j].first, range[j].last, full); ok(ret == c[i].r[j], "GetCharABCWidthsA %x - %x should have %s\n", range[j].first, range[j].last, c[i].r[j] ? "succeeded" : "failed"); + if (ret) + { + UINT last = range[j].last - range[j].first; + ret = pGetCharABCWidthsA(hdc, range[j].last, range[j].last, a); + ok(ret && memcmp(&full[last], &a[0], sizeof(ABC)) == 0, + "GetCharABCWidthsA %x should match. codepage = %u\n", + range[j].last, c[i].cs); + } } hfont = SelectObject(hdc, hfont);

1 0

Jacek Caban : jscript: Use bytecode for labelled statement stub.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: a6530f4032da470fe9dfa7de9555a355d4ea6654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6530f4032da470fe9dfa7de9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:51 2011 +0100 jscript: Use bytecode for labelled statement stub. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e54c16a..5f25598 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1246,6 +1246,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_for_statement(ctx, (for_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); + case STAT_LABEL: + return push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ case STAT_SWITCH: return compile_switch_statement(ctx, (switch_statement_t*)stat); case STAT_VAR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 99c492f..fbeee6f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1067,7 +1067,7 @@ HRESULT interp_pop_scope(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.12 */ -HRESULT labelled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +HRESULT interp_label(exec_ctx_t *ctx) { FIXME("\n"); return E_NOTIMPL; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 263548e..7dbaeb2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -71,6 +71,7 @@ typedef struct _func_stack { X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(label, 0, 0,0) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \ @@ -410,7 +411,6 @@ HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIAN HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT with_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT labelled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT switch_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT throw_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index aaec649..02d35bd 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -844,7 +844,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, forin_statement_eval, compiled_statement_eval, - labelled_statement_eval, + compiled_statement_eval, return_statement_eval, compiled_statement_eval, throw_statement_eval,

1 0

Jacek Caban : jscript: Added bytecode version of switch statement.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: c57dd899a4bfd9b6326d7ae851bcaf9d38219f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57dd899a4bfd9b6326d7ae85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:40 2011 +0100 jscript: Added bytecode version of switch statement. --- dlls/jscript/compile.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 25 +++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- 4 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c2179d3..e54c16a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1131,6 +1131,108 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta return S_OK; } +/* ECMA-262 3rd Edition 12.13 */ +static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t *stat) +{ + unsigned case_cnt = 0, *case_jmps, i, default_jmp; + BOOL have_default = FALSE; + statement_t *stat_iter; + case_clausule_t *iter; + unsigned off_backup; + BOOL prev_no_fallback; + HRESULT hres; + + off_backup = ctx->code_off; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + for(iter = stat->case_list; iter; iter = iter->next) { + if(iter->expr) + case_cnt++; + } + + case_jmps = heap_alloc(case_cnt * sizeof(*case_jmps)); + if(!case_jmps) + return E_OUTOFMEMORY; + + i = 0; + for(iter = stat->case_list; iter; iter = iter->next) { + if(!iter->expr) { + have_default = TRUE; + continue; + } + + hres = compile_expression(ctx, iter->expr); + if(FAILED(hres)) + break; + + case_jmps[i] = push_instr(ctx, OP_case); + if(case_jmps[i] == -1) { + hres = E_OUTOFMEMORY; + break; + } + i++; + } + + if(SUCCEEDED(hres)) { + if(push_instr(ctx, OP_pop) != -1) { + default_jmp = push_instr(ctx, OP_jmp); + if(default_jmp == -1) + hres = E_OUTOFMEMORY; + }else { + hres = E_OUTOFMEMORY; + } + } + + if(FAILED(hres)) { + heap_free(case_jmps); + return hres; + } + + i = 0; + for(iter = stat->case_list; iter; iter = iter->next) { + while(iter->next && iter->next->stat == iter->stat) { + instr_ptr(ctx, iter->expr ? case_jmps[i++] : default_jmp)->arg1.uint = ctx->code_off; + iter = iter->next; + } + + instr_ptr(ctx, iter->expr ? case_jmps[i++] : default_jmp)->arg1.uint = ctx->code_off; + + for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); stat_iter = stat_iter->next) { + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat_iter); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = switch_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + break; + + if(stat_iter->next && push_instr(ctx, OP_pop) == -1) { + hres = E_OUTOFMEMORY; + break; + } + } + if(FAILED(hres)) + break; + } + + heap_free(case_jmps); + if(FAILED(hres)) + return hres; + assert(i == case_cnt); + + if(!have_default) + instr_ptr(ctx, default_jmp)->arg1.uint = ctx->code_off; + + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -1144,6 +1246,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_for_statement(ctx, (for_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); + case STAT_SWITCH: + return compile_switch_statement(ctx, (switch_statement_t*)stat); case STAT_VAR: return compile_var_statement(ctx, (var_statement_t*)stat); case STAT_WHILE: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index af15a94..99c492f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1074,6 +1074,31 @@ HRESULT labelled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ } /* ECMA-262 3rd Edition 12.13 */ +static HRESULT interp_case(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; + VARIANT *v; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = equal2_values(stack_top(ctx), v, &b); + VariantClear(v); + if(FAILED(hres)) + return hres; + + if(b) { + stack_popn(ctx, 1); + ctx->ip = arg; + }else { + ctx->ip++; + } + return S_OK; +} + +/* ECMA-262 3rd Edition 12.13 */ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { switch_statement_t *stat = (switch_statement_t*)_stat; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1ca6630..263548e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -52,6 +52,7 @@ typedef struct _func_stack { X(call, 1, ARG_UINT, ARG_UINT) \ X(call_member,1, ARG_UINT, ARG_UINT) \ X(carray, 1, ARG_UINT, 0) \ + X(case, 0, ARG_ADDR, 0) \ X(cnd_nz, 0, ARG_ADDR, 0) \ X(cnd_z, 0, ARG_ADDR, 0) \ X(delete, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 578ae23..aaec649 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -846,7 +846,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, labelled_statement_eval, return_statement_eval, - switch_statement_eval, + compiled_statement_eval, throw_statement_eval, try_statement_eval, compiled_statement_eval,

1 0

Jacek Caban : jscript: Added bytecode version of with statement.
by Alexandre Julliard 27 Dec '11

27 Dec '11

Module: wine Branch: master Commit: abffe88e1991ec90a368f8a67142ae57c12cc46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abffe88e1991ec90a368f8a67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:26 2011 +0100 jscript: Added bytecode version of with statement. --- dlls/jscript/compile.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/jscript/dispex.c | 5 +++++ dlls/jscript/engine.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 2 ++ dlls/jscript/jscript.h | 1 + dlls/jscript/parser.y | 2 +- 6 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 663edf0..c2179d3 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1097,6 +1097,40 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) return S_OK; } +/* ECMA-262 3rd Edition 12.10 */ +static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) +{ + unsigned off_backup; + BOOL prev_no_fallback; + HRESULT hres; + + off_backup = ctx->code_off; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_push_scope) == -1) + return E_OUTOFMEMORY; + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = with_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_pop_scope) == -1) + return E_OUTOFMEMORY; + + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -1114,6 +1148,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_var_statement(ctx, (var_statement_t*)stat); case STAT_WHILE: return compile_while_statement(ctx, (while_statement_t*)stat); + case STAT_WITH: + return compile_with_statement(ctx, (with_statement_t*)stat); default: return compile_interp_fallback(ctx, stat); } diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f2d2992..0b73073 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -837,6 +837,11 @@ jsdisp_t *as_jsdisp(IDispatch *disp) return impl_from_IDispatchEx((IDispatchEx*)disp); } +jsdisp_t *to_jsdisp(IDispatch *disp) +{ + return disp->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl ? impl_from_IDispatchEx((IDispatchEx*)disp) : NULL; +} + HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, jsdisp_t *prototype) { TRACE("%p (%p)\n", dispex, prototype); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9f4a5a7..af15a94 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1029,6 +1029,43 @@ HRESULT with_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return hres; } +/* ECMA-262 3rd Edition 12.10 */ +HRESULT interp_push_scope(exec_ctx_t *ctx) +{ + IDispatch *disp; + jsdisp_t *obj; + VARIANT *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = to_object(ctx->parser->script, v, &disp); + VariantClear(v); + if(FAILED(hres)) + return hres; + + obj = to_jsdisp(disp); + if(!obj) { + IDispatch_Release(disp); + FIXME("disp is not jsdisp\n"); + return E_NOTIMPL; + } + + hres = scope_push(ctx->scope_chain, obj, &ctx->scope_chain); + jsdisp_release(obj); + return hres; +} + +/* ECMA-262 3rd Edition 12.10 */ +HRESULT interp_pop_scope(exec_ctx_t *ctx) +{ + TRACE("\n"); + + scope_pop(&ctx->scope_chain); + return S_OK; +} + /* ECMA-262 3rd Edition 12.12 */ HRESULT labelled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { @@ -2955,6 +2992,7 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ { exec_ctx_t *exec_ctx = ctx->exec_ctx; unsigned prev_ip, prev_top; + scope_chain_t *prev_scope; return_type_t *prev_rt; jsexcept_t *prev_ei; jsop_t op; @@ -2970,6 +3008,7 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ prev_rt = exec_ctx->rt; prev_top = exec_ctx->top; + prev_scope = exec_ctx->scope_chain; prev_ip = exec_ctx->ip; prev_ei = exec_ctx->ei; exec_ctx->ip = stat->instr_off; @@ -2990,10 +3029,13 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ if(FAILED(hres)) { stack_popn(exec_ctx, exec_ctx->top-prev_top); + while(exec_ctx->scope_chain != prev_scope) + scope_pop(&exec_ctx->scope_chain); return hres; } assert(exec_ctx->top == prev_top+1 || exec_ctx->top == prev_top); + assert(exec_ctx->scope_chain == prev_scope); if(exec_ctx->top == prev_top) V_VT(ret) = VT_EMPTY; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2f0ba53..1ca6630 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -87,8 +87,10 @@ typedef struct _func_stack { X(obj_prop, 1, ARG_BSTR, 0) \ X(or, 1, 0,0) \ X(pop, 1, 0,0) \ + X(pop_scope, 1, 0,0) \ X(postinc, 1, ARG_INT, 0) \ X(preinc, 1, ARG_INT, 0) \ + X(push_scope, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(rshift, 1, 0,0) \ X(rshift2, 1, 0,0) \ diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bd00cbe..8b1aa2d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -190,6 +190,7 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) } jsdisp_t *as_jsdisp(IDispatch*); +jsdisp_t *to_jsdisp(IDispatch*); static inline void jsdisp_addref(jsdisp_t *jsdisp) { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 008ada2..578ae23 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -851,7 +851,7 @@ static const statement_eval_t stat_eval_table[] = { try_statement_eval, compiled_statement_eval, compiled_statement_eval, - with_statement_eval + compiled_statement_eval }; static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011