September 2008 - Wine-commits

Erik Inge Bolsø : wineesd.drv: Allow all errors to interrupt recording.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: e4a0e0cc3f4149d10db49e4f346d32862e6c2570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0e0cc3f4149d10db49e4f3… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Fri Sep 12 00:04:26 2008 +0200 wineesd.drv: Allow all errors to interrupt recording. --- dlls/wineesd.drv/audio.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index b57191c..a48e277 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1680,7 +1680,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) WINE_WAVEIN* wwi = (WINE_WAVEIN*)&WInDev[uDevID]; WAVEHDR* lpWaveHdr; DWORD dwSleepTime; - DWORD bytesRead; + int bytesRead; enum win_wm_message msg; DWORD param; HANDLE ev; @@ -1707,11 +1707,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded, lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded); TRACE("bytesRead=%d\n",bytesRead); - if (bytesRead == -1 && errno == EAGAIN) - bytesRead = 0; - if (bytesRead==0) break; /* So we can stop recording smoothly */ - if (bytesRead < 0) - bytesRead = 0; + if (bytesRead <= 0) break; /* So we can stop recording smoothly */ lpWaveHdr->dwBytesRecorded += bytesRead; wwi->dwRecordedTotal += bytesRead;

1 0

Dylan Smith : richedit: Don't put cursor in the table row start paragraph.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 88a3a8a9c082cf85e20d3b036ae9fa31a5d3d3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a3a8a9c082cf85e20d3b036… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 11 12:45:36 2008 -0400 richedit: Don't put cursor in the table row start paragraph. --- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 1 + dlls/riched20/table.c | 16 ++++++++++++++++ dlls/riched20/undo.c | 2 ++ 4 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b1a0b0..3d06611 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2012,6 +2012,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } else return TRUE; + ME_MoveCursorFromTableRowStartParagraph(editor); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6ec4c1f..cbebdba 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -304,6 +304,7 @@ void ME_CheckTablesForCorruption(ME_TextEditor *editor); void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, int nOfs,int *nChars); ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, ME_DisplayItem *table_row); void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow); +void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor); struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor); void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 9cb4bbf..08846fe 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -588,6 +588,22 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) ME_SendSelChange(editor); } +/* Make sure the cursor is not in the hidden table row start paragraph + * without a selection. */ +void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) +{ + ME_DisplayItem *para = ME_GetParagraph(editor->pCursors[0].pRun); + if (para == ME_GetParagraph(editor->pCursors[1].pRun) && + para->member.para.nFlags & MEPF_ROWSTART) { + /* The cursors should not be at the hidden start row paragraph without + * a selection, so the cursor is moved into the first cell. */ + para = para->member.para.next_para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } +} + struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) { RTFTable *tableDef = ALLOC_OBJ(RTFTable); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 3ab39d0..8f3a22b 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -386,6 +386,7 @@ BOOL ME_Undo(ME_TextEditor *editor) { } while(p && p->type != diUndoEndTransaction); if (p) p->prev = NULL; + ME_MoveCursorFromTableRowStartParagraph(editor); ME_AddUndoItem(editor, diUndoEndTransaction, NULL); ME_CheckTablesForCorruption(editor); editor->nUndoStackSize--; @@ -422,6 +423,7 @@ BOOL ME_Redo(ME_TextEditor *editor) { } while(p && p->type != diUndoEndTransaction); if (p) p->prev = NULL; + ME_MoveCursorFromTableRowStartParagraph(editor); ME_AddUndoItem(editor, diUndoEndTransaction, NULL); ME_CheckTablesForCorruption(editor); editor->nUndoMode = nMode;

1 0

Dylan Smith : richedit: Enter at the end of a table row appends a new row.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 0843768919955de4e67da543343aa396664b6abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0843768919955de4e67da5433… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Sep 11 12:45:47 2008 -0400 richedit: Enter at the end of a table row appends a new row. --- dlls/riched20/editor.c | 10 +++++++++- dlls/riched20/para.c | 7 +++++++ dlls/riched20/table.c | 7 ++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3d06611..14c7256 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3701,7 +3701,15 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } else if (!editor->bEmulateVersion10) { /* v4.1 */ if (para->member.para.nFlags & MEPF_ROWEND) { if (wstr=='\r') { - /* FIXME: Add a new table row after this row. */ + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor); return 0; } else if (from == to) { para = para->member.para.next_para; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index dd745ff..517bf28 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -220,6 +220,13 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.pCell = run_para->member.para.pCell; assert(run_para->member.para.prev_para->member.para.nFlags & MEPF_CELL); assert(!(run_para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART)); + if (new_para->member.para.pCell != new_para->member.para.next_para->member.para.pCell + && new_para->member.para.next_para->member.para.pCell + && !new_para->member.para.next_para->member.para.pCell->member.cell.prev_cell) + { + /* Row starts just after the row that was ended. */ + new_para->member.para.nFlags |= MEPF_ROWSTART; + } } else { new_para->member.para.pCell = run_para->member.para.pCell; } diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 08846fe..c4de61d 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -227,7 +227,7 @@ void ME_CheckTablesForCorruption(ME_TextEditor *editor) } else if (!(p->member.para.nFlags & MEPF_ROWSTART)) { - assert(!(p->member.para.pFmt->wEffects & (PFE_TABLE|PFE_TABLEROWDELIMITER))); + assert(!(p->member.para.pFmt->wEffects & PFE_TABLEROWDELIMITER)); /* ROWSTART must be followed by a cell. */ assert(!(p->member.para.nFlags & MEPF_CELL)); /* ROWSTART must be followed by a cell. */ @@ -393,10 +393,7 @@ ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, assert(table_row->type == diParagraph); if (!editor->bEmulateVersion10) { /* v4.1 */ ME_DisplayItem *insertedCell, *para, *cell; - if (table_row->member.para.nFlags & MEPF_ROWEND) - cell = ME_FindItemBack(table_row, diCell); - else - cell = ME_FindItemFwd(table_row, diCell); + cell = ME_FindItemFwd(ME_GetTableRowStart(table_row), diCell); run = ME_GetTableRowEnd(table_row)->member.para.next_para; run = ME_FindItemFwd(run, diRun); editor->pCursors[0].pRun = run;

1 0

John Klehm : wintab32: Support overlap statuses in WTOverlap.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 8e42ca626e82abce18b37ebfdbcbeb9ab1133dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e42ca626e82abce18b37ebfd… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Apr 29 00:51:20 2008 -0500 wintab32: Support overlap statuses in WTOverlap. --- dlls/wintab32/context.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 9551d87..271473a 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -629,10 +629,32 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) /*********************************************************************** * WTOverlap (WINTAB32.41) + * + * Move context to top or bottom of overlap order */ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) { - FIXME("(%p, %u): stub\n", hCtx, fToTop); + LPOPENCONTEXT context; + + TRACE("hCtx=%p, fToTop=%u\n", hCtx, fToTop); + + if (!hCtx) return FALSE; + + EnterCriticalSection(&csTablet); + context = TABLET_FindOpenContext(hCtx); + if (fToTop) + { + /* TODO: Move context to top of overlap order */ + FIXME("Not moving context to top of overlap order\n"); + context->context.lcStatus = CXS_ONTOP; + } + else + { + /* TODO: Move context to bottom of overlap order */ + FIXME("Not moving context to bottom of overlap order\n"); + context->context.lcStatus = CXS_OBSCURED; + } + LeaveCriticalSection(&csTablet); return TRUE; }

1 0

Jacek Caban : mshtml: Added body dispatch id test.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 1c51d3598df31a196320c74fb39f9fa33f537dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c51d3598df31a196320c74fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 12 00:12:13 2008 +0200 mshtml: Added body dispatch id test. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ed28808..84c18e6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -257,7 +257,7 @@ static const elem_type_info_t elem_type_infos[] = { {"HTML", elem_iids, NULL}, {"HEAD", elem_iids, NULL}, {"TITLE", elem_iids, NULL}, - {"BODY", body_iids, NULL}, + {"BODY", body_iids, &DIID_DispHTMLBody}, {"A", anchor_iids, NULL}, {"INPUT", input_iids, &DIID_DispHTMLInputElement}, {"SELECT", select_iids, &DIID_DispHTMLSelectElement},

1 0

Jacek Caban : jscript: Added postfix decrement expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 2950c3fa2d9726af00adedd05083d58b11e67ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2950c3fa2d9726af00adedd05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:58:48 2008 +0200 jscript: Added postfix decrement expression implementation. --- dlls/jscript/engine.c | 35 ++++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5b17572..2a1bf15 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1571,10 +1571,39 @@ HRESULT post_increment_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWO return S_OK; } -HRESULT post_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.3.2 */ +HRESULT post_decrement_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + VARIANT val, num; + exprval_t exprval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_value(ctx->parser->script, &exprval, ei, &val); + if(SUCCEEDED(hres)) { + hres = to_number(ctx->parser->script, &val, ei, &num); + VariantClear(&val); + } + + if(SUCCEEDED(hres)) { + VARIANT dec; + num_set_val(&dec, num_val(&num)-1.0); + hres = put_value(ctx->parser->script, &exprval, &dec, ei); + } + + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = num; + return S_OK; } /* ECMA-262 3rd Edition 11.4.4 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7f51dde..fef8403 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -230,5 +230,7 @@ ok(--tmp === 1, "--tmp (2) is not 1"); ok(tmp === 1, "decremented tmp is not 1"); ok(tmp++ === 1, "tmp++ (1) is not 1"); 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"); reportSuccess();

1 0

Jacek Caban : jscript: Added postfix increment expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: b291b83a6bfb3fbfb988048270e9c188acefefd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b291b83a6bfb3fbfb98804827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:58:28 2008 +0200 jscript: Added postfix increment expression implementation. --- dlls/jscript/engine.c | 35 ++++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d9e6353..5b17572 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1536,10 +1536,39 @@ HRESULT plus_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, j return E_NOTIMPL; } -HRESULT post_increment_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.3.1 */ +HRESULT post_increment_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + VARIANT val, num; + exprval_t exprval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_value(ctx->parser->script, &exprval, ei, &val); + if(SUCCEEDED(hres)) { + hres = to_number(ctx->parser->script, &val, ei, &num); + VariantClear(&val); + } + + if(SUCCEEDED(hres)) { + VARIANT inc; + num_set_val(&inc, num_val(&num)+1.0); + hres = put_value(ctx->parser->script, &exprval, &inc, ei); + } + + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = num; + return S_OK; } HRESULT post_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ef3e454..7f51dde 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -228,5 +228,7 @@ ok(++tmp === 2, "++tmp (1) is not 2"); ok(tmp === 2, "incremented tmp is not 2"); ok(--tmp === 1, "--tmp (2) is not 1"); ok(tmp === 1, "decremented tmp is not 1"); +ok(tmp++ === 1, "tmp++ (1) is not 1"); +ok(tmp === 2, "incremented tmp(1) is not 2"); reportSuccess();

1 0

Jacek Caban : jscript: Added prefix decrement expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: ce423c2e3bdf0ba1d8d5c8f6ad7191bfbf07c173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce423c2e3bdf0ba1d8d5c8f6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:58:03 2008 +0200 jscript: Added prefix decrement expression implementation. --- dlls/jscript/engine.c | 34 +++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f6d5d86..d9e6353 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1582,10 +1582,38 @@ HRESULT pre_increment_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWOR return S_OK; } -HRESULT pre_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.5 */ +HRESULT pre_decrement_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + VARIANT val, num; + exprval_t exprval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_value(ctx->parser->script, &exprval, ei, &val); + if(SUCCEEDED(hres)) { + hres = to_number(ctx->parser->script, &val, ei, &num); + VariantClear(&val); + } + + if(SUCCEEDED(hres)) { + num_set_val(&val, num_val(&num)-1.0); + hres = put_value(ctx->parser->script, &exprval, &val, ei); + } + + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = val; + return S_OK; } HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 269c9da..ef3e454 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -226,5 +226,7 @@ ok(0 >= 0, "0 >= 0"); tmp = 1; ok(++tmp === 2, "++tmp (1) is not 2"); ok(tmp === 2, "incremented tmp is not 2"); +ok(--tmp === 1, "--tmp (2) is not 1"); +ok(tmp === 1, "decremented tmp is not 1"); reportSuccess();

1 0

Jacek Caban : jscript: Added '>' expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: aa0c254e4afc57ce93ba4026dc8efa70f00b4b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0c254e4afc57ce93ba4026d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:56:51 2008 +0200 jscript: Added '>' expression implementation. --- dlls/jscript/engine.c | 23 ++++++++++++++++++++--- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3d21b21..20516e2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1706,10 +1706,27 @@ HRESULT lesseq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return return_bool(ret, !b); } -HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.8.2 */ +HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = less_eval(ctx, &rval, &lval, ei, &b); + VariantClear(&lval); + VariantClear(&rval); + if(FAILED(hres)) + return hres; + + return return_bool(ret, b); } HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 2799b15..41b6cb5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -209,4 +209,11 @@ ok("abcd" <= "abce", "abce <= abce failed"); ok("" <= "x", "\"\" <= \"x\" failed"); ok(0 <= 0, "0 <= 0 failed"); +ok(3.4 > 1, "3.4 > 1 failed"); +ok(!(1 > 3.4), "1 > 3.4"); +ok("abcd" > "abc", "abc > abcd failed"); +ok("abce" > "abcd", "abce > abce failed"); +ok("x" > "", "\"x\" > \"\" failed"); +ok(!(0 > 0), "0 > 0"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '>=' expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: aa4f801ed0abdca2c8256645bb8c92dbd0a8d70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4f801ed0abdca2c8256645b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:57:13 2008 +0200 jscript: Added '>=' expression implementation. --- dlls/jscript/engine.c | 23 ++++++++++++++++++++--- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 20516e2..666f3ea 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1729,10 +1729,27 @@ HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flag return return_bool(ret, b); } -HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.8.4 */ +HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = less_eval(ctx, &lval, &rval, ei, &b); + VariantClear(&lval); + VariantClear(&rval); + if(FAILED(hres)) + return hres; + + return return_bool(ret, !b); } HRESULT binary_negation_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 41b6cb5..9211483 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -216,4 +216,11 @@ ok("abce" > "abcd", "abce > abce failed"); ok("x" > "", "\"x\" > \"\" failed"); ok(!(0 > 0), "0 > 0"); +ok(3.4 >= 1, "3.4 >= 1 failed"); +ok(!(1 >= 3.4), "1 >= 3.4"); +ok("abcd" >= "abc", "abc >= abcd failed"); +ok("abce" >= "abcd", "abce >= abce failed"); +ok("x" >= "", "\"x\" >= \"\" failed"); +ok(0 >= 0, "0 >= 0"); + reportSuccess();

1 0