winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2008
----- 2025 -----
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1215 discussions
Start a n
N
ew thread
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
0
0
John Klehm : wintab32: Support overlap statuses in WTEnable.
by Alexandre Julliard
12 Sep '08
12 Sep '08
Module: wine Branch: master Commit: 20276da9af2c8cf7e679edec536117d5d544462a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=20276da9af2c8cf7e679edec5…
Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Apr 29 00:37:55 2008 -0500 wintab32: Support overlap statuses in WTEnable. --- dlls/wintab32/context.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 5e5ada8..9b1da18 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -622,15 +622,27 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) { LPOPENCONTEXT context; - TRACE("(%p, %u)\n", hCtx, fEnable); + TRACE("hCtx=%p, fEnable=%u\n", hCtx, fEnable); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); - if(!fEnable) + /* if we want to enable and it is not enabled then */ + if(fEnable && !context->enabled) + { + context->enabled = TRUE; + /* TODO: Add to top of overlap order */ + context->context.lcStatus = CXS_ONTOP; + } + /* if we want to disable and it is not disabled then */ + else if (!fEnable && context->enabled) + { + context->enabled = FALSE; + /* TODO: Remove from overlap order?? needs a test */ + context->context.lcStatus = CXS_DISABLED; TABLET_FlushQueue(context); - context->enabled = fEnable; + } LeaveCriticalSection(&csTablet); return TRUE;
1
0
0
0
John Klehm : wintab32: Support overlap statuses in WTOpen.
by Alexandre Julliard
12 Sep '08
12 Sep '08
Module: wine Branch: master Commit: 212488d846f6739d7f9dd611427449d140512b91 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=212488d846f6739d7f9dd6114…
Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Apr 29 00:21:30 2008 -0500 wintab32: Support overlap statuses in WTOpen. --- dlls/wintab32/context.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 271473a..5e5ada8 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -435,13 +435,12 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { LPOPENCONTEXT newcontext; - TRACE("(%p, %p, %u)\n", hWnd, lpLogCtx, fEnable); + TRACE("hWnd=%p, lpLogCtx=%p, fEnable=%u\n", hWnd, lpLogCtx, fEnable); DUMPCONTEXT(*lpLogCtx); newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); newcontext->context = *lpLogCtx; newcontext->hwndOwner = hWnd; - newcontext->enabled = fEnable; newcontext->ActiveCursor = -1; newcontext->QueueSize = 10; newcontext->PacketsQueued = 0; @@ -458,7 +457,17 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) TABLET_PostTabletMessage(newcontext, _WT_CTXOPEN(newcontext->context.lcMsgBase), (WPARAM)newcontext->handle, newcontext->context.lcStatus, TRUE); - newcontext->context.lcStatus = CXS_ONTOP; + if (fEnable) + { + newcontext->enabled = TRUE; + /* TODO: Add to top of overlap order */ + newcontext->context.lcStatus = CXS_ONTOP; + } + else + { + newcontext->enabled = FALSE; + newcontext->context.lcStatus = CXS_DISABLED; + } TABLET_PostTabletMessage(newcontext, _WT_CTXOVERLAP(newcontext->context.lcMsgBase), (WPARAM)newcontext->handle,
1
0
0
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
0
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
0
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
0
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
0
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
0
0
Jacek Caban : jscript: Added prefix increment expression.
by Alexandre Julliard
12 Sep '08
12 Sep '08
Module: wine Branch: master Commit: 5df7ac456f0a812fe8d20d249061ab0101afd746 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5df7ac456f0a812fe8d20d249…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:57:40 2008 +0200 jscript: Added prefix increment expression. --- dlls/jscript/engine.c | 34 +++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 666f3ea..f6d5d86 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1548,10 +1548,38 @@ HRESULT post_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWOR return E_NOTIMPL; } -HRESULT pre_increment_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.4 */ +HRESULT pre_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)) { + 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 pre_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 9211483..269c9da 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -223,4 +223,8 @@ ok("abce" >= "abcd", "abce >= abce failed"); ok("x" >= "", "\"x\" >= \"\" failed"); ok(0 >= 0, "0 >= 0"); +tmp = 1; +ok(++tmp === 2, "++tmp (1) is not 2"); +ok(tmp === 2, "incremented tmp is not 2"); + reportSuccess();
1
0
0
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
0
0
← Newer
1
...
56
57
58
59
60
61
62
...
122
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
Results per page:
10
25
50
100
200