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
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 2011
----- 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
2 participants
996 discussions
Start a n
N
ew thread
Maarten Lankhorst : winegstreamer: Use WAVE_FORMAT_PCM when possible for demux.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 6df92c11cabfd7d8c1289afe81442c7cb7669d03 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6df92c11cabfd7d8c1289afe8…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 13 15:32:31 2011 +0200 winegstreamer: Use WAVE_FORMAT_PCM when possible for demux. --- dlls/winegstreamer/gstdemux.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6670d6b..655a9f2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -147,8 +147,13 @@ static int amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) { if (!strcmp(typename, "audio/x-raw-float")) { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; - } else + } else { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + if (wfx->nChannels <= 2 && bpp <= 16 && depth == bpp) { + wfx->wFormatTag = WAVE_FORMAT_PCM; + wfx->cbSize = 0; + } + } wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; return 1;
1
0
0
0
Piotr Caban : msvcp60: Remove incorrect forwards from spec file.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 565ece5ecc067d62171a66195ef9321432187d3b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=565ece5ecc067d62171a66195…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 14 15:57:43 2011 +0200 msvcp60: Remove incorrect forwards from spec file. --- dlls/msvcp60/msvcp60.spec | 916 ++++++++++++++++++++++---------------------- 1 files changed, 458 insertions(+), 458 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=565ece5ecc067d62171a6…
1
0
0
0
Alexandre Julliard : make_specfiles: Support a magic comment to prevent forwarding an entry point.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: c0ac16403ff0b10f68ff34f7e9ffd3b6a38839a5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c0ac16403ff0b10f68ff34f7e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 16:29:35 2011 +0200 make_specfiles: Support a magic comment to prevent forwarding an entry point. --- tools/make_specfiles | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index ff21ca8..89af185 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -202,6 +202,7 @@ sub update_spec_file($) my %parent = %{$funcs{$func}}; goto done if $parent{spec} eq $descr{spec}; # the definition is in this spec file + goto done if $descr{comment} && $descr{comment} =~ /don't forward/; if ($descr{callconv} ne "stub" && $descr{target} !~ /\./ && !$commented_out) { printf "%s:%u: note: %s already defined in %s\n", $file, $., $func, $parent{spec} if $show_duplicates;
1
0
0
0
Alexandre Julliard : msvcrt: Synchronize the spec files.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: f127a2c0757b7886004d4a215ae8c74ec9df27be URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f127a2c0757b7886004d4a215…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 16:27:26 2011 +0200 msvcrt: Synchronize the spec files. --- dlls/crtdll/crtdll.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 16 ++++++++-------- dlls/msvcr70/msvcr70.spec | 12 ++++++------ dlls/msvcr71/msvcr71.spec | 12 ++++++------ dlls/msvcr80/msvcr80.spec | 16 ++++++++-------- dlls/msvcr90/msvcr90.spec | 16 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 12 ++++++------ dlls/msvcrt40/msvcrt40.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 12 ++++++------ 9 files changed, 60 insertions(+), 60 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f127a2c0757b7886004d4…
1
0
0
0
Aric Stewart : usp10: Set fNoGlyphIndex only if the fonts has no opentype/ truetype tables.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 7ccf31bde84f28ff03698d6ae9d34dc67290bb18 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7ccf31bde84f28ff03698d6ae…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 14 08:53:05 2011 -0500 usp10: Set fNoGlyphIndex only if the fonts has no opentype/truetype tables. --- dlls/usp10/usp10.c | 8 +++----- dlls/usp10/usp10_internal.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9095fe3..fe8f6a8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -427,6 +427,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) heap_free(sc); return E_INVALIDARG; } + sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); *psc = sc; TRACE("<- %p\n", sc); return S_OK; @@ -1747,11 +1748,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys; - /* set fNoGlyphIndex for symbolic, and device fonts or non truetype fonts */ - if (!psa->fNoGlyphIndex && - (!(get_cache_pitch_family(psc) & TMPF_TRUETYPE) || - (get_cache_pitch_family(psc) & TMPF_DEVICE) || - (((ScriptCache *)*psc)->tm.tmCharSet == SYMBOL_CHARSET))) + /* set fNoGlyphIndex non truetype/opentype fonts */ + if (!psa->fNoGlyphIndex && !((ScriptCache *)*psc)->sfnt) psa->fNoGlyphIndex = TRUE; /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 09ffc65..e85afbe 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -85,6 +85,7 @@ typedef struct { typedef struct { LOGFONTW lf; TEXTMETRICW tm; + BOOL sfnt; WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table;
1
0
0
0
Jacek Caban : vbscript: Added interp_imp implementation.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 429bac4c8657e342c13299495d2265bf7302617b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=429bac4c8657e342c13299495…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:23 2011 +0200 vbscript: Added interp_imp implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1c01933..2a50667 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -662,8 +662,26 @@ static HRESULT interp_eqv(exec_ctx_t *ctx) static HRESULT interp_imp(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarImp(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT cmp_oper(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0b24b2d..b9b5c57 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -106,6 +106,11 @@ call ok(false eqv false, "false does not equal false?") call ok(not (false eqv true), "false equals true?") call ok(getVT(false eqv null) = "VT_NULL", "getVT(false eqv null) = " & getVT(false eqv null)) +call ok(true imp true, "true does not imp true?") +call ok(false imp false, "false does not imp false?") +call ok(not (true imp false), "true imp false?") +call ok(false imp null, "false imp null is false?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")
1
0
0
0
Jacek Caban : vbscript: Added interp_eqv implementation.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 89c9a737f4efe25f81793f7198fc70727b30aa92 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=89c9a737f4efe25f81793f719…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:12 2011 +0200 vbscript: Added interp_eqv implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8a875ee..1c01933 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -638,8 +638,26 @@ static HRESULT interp_xor(exec_ctx_t *ctx) static HRESULT interp_eqv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarEqv(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_imp(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 329df36..0b24b2d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -102,6 +102,10 @@ call ok(not (false xor false), "false xor false is true?") call ok(not (true or false xor true), "true or false xor true is true?") call ok(not (true xor false or true), "true xor false or true is true?") +call ok(false eqv false, "false does not equal false?") +call ok(not (false eqv true), "false equals true?") +call ok(getVT(false eqv null) = "VT_NULL", "getVT(false eqv null) = " & getVT(false eqv null)) + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")
1
0
0
0
Jacek Caban : vbscript: Added interp_xor implementation.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: f17b35fdebf34a0c271d9b8f5f49e4b25d1012b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f17b35fdebf34a0c271d9b8f5…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:02 2011 +0200 vbscript: Added interp_xor implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e166b21..8a875ee 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -614,8 +614,26 @@ static HRESULT interp_or(exec_ctx_t *ctx) static HRESULT interp_xor(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarXor(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_eqv(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c6a336d..329df36 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -97,6 +97,11 @@ call ok(false and false or true, "false and false or true is false?") call ok(true or false and false, "true or false and false is false?") call ok(null or true, "null or true is false") +call ok(true xor false, "true xor false is false?") +call ok(not (false xor false), "false xor false is true?") +call ok(not (true or false xor true), "true or false xor true is true?") +call ok(not (true xor false or true), "true xor false or true is true?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")
1
0
0
0
Jacek Caban : vbscript: Added xor, imp and eqv expressions parser/ compiler implementation.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 43d10693ca62cf811d65570ffc4f897b67e074fc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=43d10693ca62cf811d65570ff…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:49 2011 +0200 vbscript: Added xor, imp and eqv expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 6 ++++++ dlls/vbscript/interp.c | 18 ++++++++++++++++++ dlls/vbscript/parse.h | 5 ++++- dlls/vbscript/parser.y | 11 ++++++++++- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8b75918..f74f5fe 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -370,10 +370,14 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); + case EXPR_EQV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eqv); case EXPR_EXP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_exp); case EXPR_IDIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); + case EXPR_IMP: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_imp); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: @@ -398,6 +402,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); case EXPR_ULONG: return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); + case EXPR_XOR: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: FIXME("Unimplemented expression type %d\n", expr->type); return E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7316501..e166b21 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -612,6 +612,24 @@ static HRESULT interp_or(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_xor(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_eqv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_imp(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT cmp_oper(exec_ctx_t *ctx) { variant_val_t l, r; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index b4a91c8..7e1124c 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -25,8 +25,10 @@ typedef enum { EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, + EXPR_EQV, EXPR_EXP, EXPR_IDIV, + EXPR_IMP, EXPR_MEMBER, EXPR_MOD, EXPR_MUL, @@ -38,7 +40,8 @@ typedef enum { EXPR_STRING, EXPR_SUB, EXPR_ULONG, - EXPR_USHORT + EXPR_USHORT, + EXPR_XOR } expression_type_t; typedef struct _expression_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 48843e7..a6281d6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -98,7 +98,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); %type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression AndExpression OrExpression +%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -188,7 +188,16 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression + : EqvExpression { $$ = $1; } + | Expression tIMP EqvExpression { $$ = new_binary_expression(ctx, EXPR_IMP, $1, $3); CHECK_ERROR; } + +EqvExpression + : XorExpression { $$ = $1; } + | EqvExpression tEQV XorExpression { $$ = new_binary_expression(ctx, EXPR_EQV, $1, $3); CHECK_ERROR; } + +XorExpression : OrExpression { $$ = $1; } + | XorExpression tXOR OrExpression { $$ = new_binary_expression(ctx, EXPR_XOR, $1, $3); CHECK_ERROR; } OrExpression : AndExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2a05998..5f1d6ce 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -126,10 +126,12 @@ typedef enum { X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ + X(eqv, 1, 0, 0) \ X(exp, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ + X(imp, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ @@ -143,7 +145,8 @@ typedef enum { X(ret, 0, 0, 0) \ X(short, 1, ARG_INT, 0) \ X(string, 1, ARG_STR, 0) \ - X(sub, 1, 0, 0) + X(sub, 1, 0, 0) \ + X(xor, 1, 0, 0) typedef enum { #define X(x,n,a,b) OP_##x,
1
0
0
0
Jacek Caban : vbscript: Added interp_or implementation.
by Alexandre Julliard
14 Sep '11
14 Sep '11
Module: wine Branch: master Commit: 4916c1b26ce096e83cda7c34818e06e1306241cf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4916c1b26ce096e83cda7c348…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:37 2011 +0200 vbscript: Added interp_or implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e55d328..7316501 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -590,8 +590,26 @@ static HRESULT interp_and(exec_ctx_t *ctx) static HRESULT interp_or(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarOr(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT cmp_oper(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 69aeade..c6a336d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -91,6 +91,12 @@ call ok(true and not false, "true and not false is not true") call ok(not (false and true), "not (false and true) is not true") call ok(getVT(null and true) = "VT_NULL", "getVT(null and true) = " & getVT(null and true)) +call ok(false or true, "false or uie is false?") +call ok(not (false or false), "false or false is not false?") +call ok(false and false or true, "false and false or true is false?") +call ok(true or false and false, "true or false and false is false?") +call ok(null or true, "null or true is false") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")
1
0
0
0
← Newer
1
...
45
46
47
48
49
50
51
...
100
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
Results per page:
10
25
50
100
200