September 2011 - Wine-commits

Erich Hoover : quartz: Do not assert when IAsyncReader:: WaitForNext returns VFW_E_TIMEOUT.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: bc204370aeb7b1062ef89f2eef8fae46287c0ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc204370aeb7b1062ef89f2ee… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:19 2011 -0600 quartz: Do not assert when IAsyncReader::WaitForNext returns VFW_E_TIMEOUT. --- dlls/quartz/pin.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index af26a6b..4c6a84d 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -478,14 +478,15 @@ static void PullPin_Thread_Process(PullPin *This) } else { - /* FIXME: This is not well handled yet! */ - ERR("Processing error: %x\n", hr); if (hr == VFW_E_TIMEOUT) { - assert(!pSample); + if (pSample != NULL) + WARN("Non-NULL sample returned with VFW_E_TIMEOUT.\n"); hr = S_OK; - continue; } + /* FIXME: Errors are not well handled yet! */ + else + ERR("Processing error: %x\n", hr); } if (pSample)

1 0

Erich Hoover : quartz: Samples should be freed when IAsyncReader:: Request fails.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: cd4ee69ef3c7ea94bae78dd9ee29be93d5fe0dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4ee69ef3c7ea94bae78dd9e… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:42 2011 -0600 quartz: Samples should be freed when IAsyncReader::Request fails. --- dlls/quartz/mpegsplit.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index c556b78..6043f69 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -217,9 +217,14 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) IMediaSample_SetPreroll(sample, 0); IMediaSample_SetDiscontinuity(sample, 0); IMediaSample_SetSyncPoint(sample, 1); - pin->rtCurrent = rtSampleStart; - pin->rtNext = rtSampleStop; hr = IAsyncReader_Request(pin->pReader, sample, 0); + if (SUCCEEDED(hr)) + { + pin->rtCurrent = rtSampleStart; + pin->rtNext = rtSampleStop; + } + else + IMediaSample_Release(sample); } if (FAILED(hr)) FIXME("o_Ox%08x\n", hr); @@ -754,15 +759,19 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - pin->rtCurrent = pin->rtNext; - pin->rtNext = rtSampleStop; - IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); This->seek = 0; hr = IAsyncReader_Request(pin->pReader, sample, 0); + if (SUCCEEDED(hr)) + { + pin->rtCurrent = pin->rtNext; + pin->rtNext = rtSampleStop; + } + else + IMediaSample_Release(sample); } if (FAILED(hr)) ERR("Horsemen of the apocalypse came to bring error 0x%08x\n", hr);

1 0

Erich Hoover : quartz: Add missing release.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 9f7ef3786ad4c6b7e18247cfecdbeba6e72e2448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7ef3786ad4c6b7e18247cfe… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:54 2011 -0600 quartz: Add missing release. --- dlls/quartz/pin.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 4c6a84d..15d5f4b 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -134,6 +134,8 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi } out: + if (enumpins) + IEnumPins_Release( enumpins ); if (pin_info.pFilter) IBaseFilter_Release( pin_info.pFilter ); return hr;

1 0

Erich Hoover : quartz: Add support for EndOfStream in PullPin.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b7bc6dcfaeb1aa18c559d5e93b4163210d4d6f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bc6dcfaeb1aa18c559d5e93… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:11:04 2011 -0600 quartz: Add support for EndOfStream in PullPin. --- dlls/quartz/pin.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 15d5f4b..500d7d3 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -726,9 +726,17 @@ HRESULT WINAPI PullPin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI PullPin_EndOfStream(IPin * iface) { - FIXME("(%p)->() stub\n", iface); + PullPin *This = (PullPin *)iface; + HRESULT hr = S_FALSE; + + TRACE("(%p)->()\n", iface); + + EnterCriticalSection(This->pin.pCritSec); + hr = SendFurther( iface, deliver_endofstream, NULL, NULL ); + SetEvent(This->hEventStateChanged); + LeaveCriticalSection(This->pin.pCritSec); - return SendFurther( iface, deliver_endofstream, NULL, NULL ); + return hr; } HRESULT WINAPI PullPin_BeginFlush(IPin * iface)

1 0

Erich Hoover : quartz: Fix converting between the media time and REFTIME.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 09f134cb69209a94ca1a61da8841ea39d470f2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f134cb69209a94ca1a61da8… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:11:10 2011 -0600 quartz: Fix converting between the media time and REFTIME. --- dlls/quartz/filtergraph.c | 67 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1becf11..c154f92 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2621,21 +2621,62 @@ static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdM return E_NOTIMPL; } +static HRESULT ConvertFromREFTIME(IMediaSeeking *seek, REFTIME time_in, LONGLONG *time_out) +{ + GUID time_format; + HRESULT hr; + + hr = MediaSeeking_GetTimeFormat(seek, &time_format); + if (FAILED(hr)) + return hr; + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, &time_format)) + { + FIXME("Unsupported time format.\n"); + return E_NOTIMPL; + } + + *time_out = (LONGLONG) (time_in * 10000000); /* convert from 1 second intervals to 100 ns intervals */ + return S_OK; +} + +static HRESULT ConvertToREFTIME(IMediaSeeking *seek, LONGLONG time_in, REFTIME *time_out) +{ + GUID time_format; + HRESULT hr; + + hr = MediaSeeking_GetTimeFormat(seek, &time_format); + if (FAILED(hr)) + return hr; + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, &time_format)) + { + FIXME("Unsupported time format.\n"); + return E_NOTIMPL; + } + + *time_out = (REFTIME)time_in / 10000000; /* convert from 100 ns intervals to 1 second intervals */ + return S_OK; +} + /*** IMediaPosition methods ***/ static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength) { LONGLONG duration; IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); HRESULT hr = IMediaSeeking_GetDuration(&This->IMediaSeeking_iface, &duration); - if (SUCCEEDED(hr)) *plength = duration; - return hr; + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, duration, plength); } static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime) { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - LONGLONG reftime = llTime; + LONGLONG reftime; + HRESULT hr; + hr = ConvertFromREFTIME(&This->IMediaSeeking_iface, llTime, &reftime); + if (FAILED(hr)) + return hr; return IMediaSeeking_SetPositions(&This->IMediaSeeking_iface, &reftime, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } @@ -2644,9 +2685,12 @@ static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG pos; - HRESULT hr = IMediaSeeking_GetCurrentPosition(&This->IMediaSeeking_iface, &pos); - if (SUCCEEDED(hr)) *pllTime = pos; - return hr; + HRESULT hr; + + hr = IMediaSeeking_GetCurrentPosition(&This->IMediaSeeking_iface, &pos); + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, pos, pllTime); } static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime) @@ -2654,15 +2698,20 @@ static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG pos; HRESULT hr = IMediaSeeking_GetStopPosition(&This->IMediaSeeking_iface, &pos); - if (SUCCEEDED(hr)) *pllTime = pos; - return hr; + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, pos, pllTime); } static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime) { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - LONGLONG reftime = llTime; + LONGLONG reftime; + HRESULT hr; + hr = ConvertFromREFTIME(&This->IMediaSeeking_iface, llTime, &reftime); + if (FAILED(hr)) + return hr; return IMediaSeeking_SetPositions(&This->IMediaSeeking_iface, NULL, AM_SEEKING_NoPositioning, &reftime, AM_SEEKING_AbsolutePositioning); }

1 0

Bernhard Loos : msi: The underlying tables might have changed, so it' s not possible to cache the result of the execute.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: dc16dd135191bd68ea21130bd5e62d4a844f7ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc16dd135191bd68ea21130bd… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 11:25:51 2011 +0200 msi: The underlying tables might have changed, so it's not possible to cache the result of the execute. --- dlls/msi/tests/db.c | 24 +++++++++++++++++++++++- dlls/msi/where.c | 35 ++++++++++++++--------------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b581633..b915fa0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -297,7 +297,7 @@ make_add_entry(binary, static void test_msiinsert(void) { - MSIHANDLE hdb = 0, hview = 0, hrec = 0; + MSIHANDLE hdb = 0, hview = 0, hview2 = 0, hrec = 0; UINT r; const char *query; char buf[80]; @@ -322,6 +322,14 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM phone WHERE number = '8675309'"; + r = MsiDatabaseOpenView(hdb, query, &hview2); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview2, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch produced items\n"); + /* insert a value into it */ query = "INSERT INTO `phone` ( `id`, `name`, `number` )" "VALUES('1', 'Abe', '8675309')"; @@ -334,6 +342,20 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch produced items\n"); + r = MsiViewExecute(hview2, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %u\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewClose(hview2); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview2); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM `phone` WHERE `id` = 1"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 0e346d6..17b655b 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -73,27 +73,10 @@ typedef struct tagMSIWHEREVIEW struct expr *cond; UINT rec_index; MSIORDERINFO *order_info; - UINT error; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 -static UINT init_reorder(MSIWHEREVIEW *wv) -{ - MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); - if (!new) - return ERROR_OUTOFMEMORY; - - if (wv->reorder) - msi_free(wv->reorder); - - wv->reorder = new; - wv->reorder_size = INITIAL_REORDER_SIZE; - wv->row_count = 0; - - return ERROR_SUCCESS; -} - static void free_reorder(MSIWHEREVIEW *wv) { UINT i; @@ -110,6 +93,20 @@ static void free_reorder(MSIWHEREVIEW *wv) wv->row_count = 0; } +static UINT init_reorder(MSIWHEREVIEW *wv) +{ + MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); + if (!new) + return ERROR_OUTOFMEMORY; + + free_reorder(wv); + + wv->reorder = new; + wv->reorder_size = INITIAL_REORDER_SIZE; + + return ERROR_SUCCESS; +} + static inline UINT find_row(MSIWHEREVIEW *wv, UINT row, UINT *(values[])) { if (row >= wv->row_count) @@ -618,9 +615,6 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( !table ) return ERROR_FUNCTION_FAILED; - if (wv->reorder) - return wv->error; - r = init_reorder(wv); if (r != ERROR_SUCCESS) return r; @@ -654,7 +648,6 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) r = wv->order_info->error; msi_free( rows ); - wv->error = r; return r; }

1 0

Jacek Caban : vbscript: Added concatenation tests.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: a5fe24c61d03189c431d98f229ee2674e6cfb703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fe24c61d03189c431d98f22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:07 2011 +0200 vbscript: Added concatenation tests. --- dlls/vbscript/tests/lang.vbs | 11 +++++++++++ dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dba5c9a..dc64c91 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -52,5 +52,16 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") + +Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") +Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null)) +Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) +Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) + +'if(isEnglishLocale) then +' Call ok("" & true = "True", """"" & true = " & true) +' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) +'end if reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 329d75a..dac8bec 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -63,6 +63,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 #define DISPID_GLOBAL_GETVT 1003 +#define DISPID_GLOBAL_ISENGLOC 1004 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -121,6 +122,12 @@ static const char *vt2a(VARIANT *v) } } +static BOOL is_english(void) +{ + return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH + && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) { @@ -240,6 +247,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_GETVT; return S_OK; } + if(!strcmp_wa(bstrName, "isEnglishLocale")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_ISENGLOC; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -319,6 +331,25 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_BSTR; V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_ISENGLOC: + ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_BOOL; + if(is_english()) { + V_BOOL(pvarRes) = VARIANT_TRUE; + }else { + skip("Skipping some test in non-English locale\n"); + V_BOOL(pvarRes) = VARIANT_FALSE; + } + return S_OK; + } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Added negation expression parser/ compiler implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: fb5509ec06939b26647e8054dd439aba9c0913c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5509ec06939b26647e8054d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:37 2011 +0200 vbscript: Added negation expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 11 ++++++++--- dlls/vbscript/vbscript.h | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9e59fe1..baaa078 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -246,6 +246,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); + case EXPR_NEG: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NULL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 90531fb..a70ca5f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -391,6 +391,12 @@ static HRESULT interp_concat(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_neg(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index b47360c..0c87209 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,7 @@ typedef enum { EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, + EXPR_NEG, EXPR_NOT, EXPR_NULL, EXPR_STRING, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 756cf6a..316957c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -84,7 +84,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression -%type <expression> NotExpression +%type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -145,8 +145,13 @@ ConcatExpression | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } AdditiveExpression - : LiteralExpression /* FIXME */ { $$ = $1; } - | CallExpression /* FIXME */ { $$ = $1; } + : UnaryExpression /* FIXME */ { $$ = $1; } + + +UnaryExpression + : LiteralExpression { $$ = $1; } + | CallExpression { $$ = $1; } + | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } CallExpression : PrimaryExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2abbc9d..9db2692 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -96,6 +96,7 @@ typedef enum { X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(long, 1, ARG_INT, 0) \ + X(neg, 1, 0, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_neg implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 8e1ccb8be6efd4b31fac18ae9c31454311848da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1ccb8be6efd4b31fac18ae9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:47 2011 +0200 vbscript: Added interp_neg implementation. --- dlls/vbscript/interp.c | 16 ++++++++++++++-- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a70ca5f..67230da 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -393,8 +393,20 @@ static HRESULT interp_concat(exec_ctx_t *ctx) static HRESULT interp_neg(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + hres = VarNeg(val.v, &v); + release_val(&val); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc64c91..9b1d771 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -35,6 +35,10 @@ Call ok(0 = 0.0, "0 <> 0.0") Call ok(16 = &h10&, "16 <> &h10&") Call ok(010 = 10, "010 <> 10") Call ok(10. = 10, "10. <> 10") +Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") +Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") +Call ok(--1 = 1, "--1 = " & --1) +Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") @@ -53,6 +57,8 @@ Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") +Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) +Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null)) Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null))

1 0

Jacek Caban : vbscript: Added additive expressions parser/ compiler implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 0ec93395334bdb069c2b206ad5e6d9c6053cbd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec93395334bdb069c2b206ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:58 2011 +0200 vbscript: Added additive expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 7 ++++++- dlls/vbscript/vbscript.h | 4 +++- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index baaa078..9e34c35 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -234,6 +234,8 @@ static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_ADD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: @@ -254,6 +256,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); + case EXPR_SUB: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_USHORT: return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); case EXPR_ULONG: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 67230da..fb3adfe 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -391,6 +391,18 @@ static HRESULT interp_concat(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_add(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_sub(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 0c87209..3d6d604 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -17,6 +17,7 @@ */ typedef enum { + EXPR_ADD, EXPR_BOOL, EXPR_CONCAT, EXPR_DOUBLE, @@ -27,6 +28,7 @@ typedef enum { EXPR_NOT, EXPR_NULL, EXPR_STRING, + EXPR_SUB, EXPR_ULONG, EXPR_USHORT } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 316957c..2f42ab6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -83,7 +83,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -145,6 +145,11 @@ ConcatExpression | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } AdditiveExpression + : ModExpression { $$ = $1; } + | AdditiveExpression '+' ModExpression { $$ = new_binary_expression(ctx, EXPR_ADD, $1, $3); CHECK_ERROR; } + | AdditiveExpression '-' ModExpression { $$ = new_binary_expression(ctx, EXPR_SUB, $1, $3); CHECK_ERROR; } + +ModExpression : UnaryExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9db2692..cf90b38 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -88,6 +88,7 @@ typedef enum { } instr_arg_type_t; #define OP_LIST \ + X(add, 1, 0, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ @@ -101,7 +102,8 @@ typedef enum { X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(short, 1, ARG_INT, 0) \ - X(string, 1, ARG_STR, 0) + X(string, 1, ARG_STR, 0) \ + X(sub, 1, 0, 0) typedef enum { #define X(x,n,a,b) OP_##x,

1 0