September 2011 - Wine-Commits

Piotr Caban : msvcp90: Added basic_string::push_back(char) implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 69f93177ac0b221ac1eaa593e705269481511db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f93177ac0b221ac1eaa593e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:26 2011 +0200 msvcp90: Added basic_string::push_back(char) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d5d1ca3..d5baaf4 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4890,12 +4890,12 @@ @ stub -arch=win64 ?pubsync@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAAHXZ @ stub -arch=win32 ?pubsync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEHXZ @ stub -arch=win64 ?pubsync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAHXZ -@ stub -arch=win32 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXD(a)Z -@ stub -arch=win64 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXD(a)Z +@ thiscall -arch=win32 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXD(a)Z(ptr long) MSVCP_basic_string_char_append_ch +@ cdecl -arch=win64 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXD(a)Z(ptr long) MSVCP_basic_string_char_append_ch @ stub -arch=win32 ?push_back@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXG(a)Z @ stub -arch=win64 ?push_back@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXG(a)Z -@ stub -arch=win32 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEX_W(a)Z -@ stub -arch=win64 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_W(a)Z +@ thiscall -arch=win32 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEX_W(a)Z(ptr long) MSVCP_basic_string_wchar_append_ch +@ cdecl -arch=win64 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_W(a)Z(ptr long) MSVCP_basic_string_wchar_append_ch @ thiscall -arch=win32 ?put@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)D@Z(ptr long) basic_ostream_char_put @ cdecl -arch=win64 ?put@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)D@Z(ptr long) basic_ostream_char_put @ stub -arch=win32 ?put@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)G@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c161335..6492202 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -964,6 +964,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_len_ch( /* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z */ /* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z */ +/* ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXD(a)Z */ +/* ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_ch, 8) basic_string_char* __thiscall MSVCP_basic_string_char_append_ch( basic_string_char *this, char ch) @@ -1849,6 +1851,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_len_ch( /* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z */ /* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z */ +/* ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEX_W(a)Z */ +/* ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_W(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_ch, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch( basic_string_wchar *this, wchar_t ch)

1 0

Piotr Caban : msvcp90: Added basic_string<wchar>::operator=(const wchar*) implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: ac29261f1972fe725a95b491170c345a1367df75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac29261f1972fe725a95b4911… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:49 2011 +0200 msvcp90: Added basic_string<wchar>::operator=(const wchar*) implementation. --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5518c06..fc6cf20 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1394,8 +1394,8 @@ @ stub -arch=win64 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z @ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign @ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign -@ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z -@ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z +@ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr +@ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr @ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z @ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z @ stub -arch=win32 ??4?$char_traits(a)D@std@@QAEAAU01(a)ABU01@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c25c7f1..1d15331 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1552,6 +1552,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z */ /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_cstr, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr( basic_string_wchar *this, const wchar_t *str)

1 0

Erich Hoover : quartz: Add support for EndOfStream in PullPin.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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: Add missing release.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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: Samples should be freed when IAsyncReader:: Request fails.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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

Piotr Caban : msvcp90: Added basic_string::find(basic_string, size_t) implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 05b2cc19603bf557e565a80aa9a0670210f898c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b2cc19603bf557e565a80aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:07 2011 +0200 msvcp90: Added basic_string::find(basic_string, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 66ec6a0..32c3766 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3817,8 +3817,8 @@ @ stub -arch=win64 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAA_W_W(a)Z @ stub -arch=win32 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QBE_WXZ @ stub -arch=win64 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_WXZ -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z(ptr ptr long) MSVCP_basic_string_char_find_off +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z(ptr ptr long) MSVCP_basic_string_char_find_off @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @@ -3833,8 +3833,8 @@ @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEBG_K1(a)Z @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIPBGII(a)Z @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEBG_K(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z(ptr ptr long) MSVCP_basic_string_wchar_find_off +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z(ptr ptr long) MSVCP_basic_string_wchar_find_off @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 2ad568c..6260ee8 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1195,6 +1195,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_off( MSVCP_char_traits_char_length(find)); } +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_off( + const basic_string_char *this, const basic_string_char *find, MSVCP_size_t off) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, + basic_string_char_const_ptr(find), off, find->size); +} + /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z */ /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) @@ -2061,6 +2071,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_off( MSVCP_char_traits_wchar_length(find)); } +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_off( + const basic_string_wchar *this, const basic_string_wchar *find, MSVCP_size_t off) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, + basic_string_wchar_const_ptr(find), off, find->size); +} + /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z */ /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12)

1 0

Jacek Caban : vbscript: Added negation expression parser/ compiler implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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 Sept. 12, 2011

Sept. 12, 2011

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 assign statement compiler implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 3c85122e05eb668a7faa63ba6003a9339f48c6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c85122e05eb668a7faa63ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:50 2011 +0200 vbscript: Added assign statement compiler implementation. --- dlls/vbscript/compile.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index a91cb5d..8cc55c7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -150,6 +150,23 @@ static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) return ctx->code->bstr_pool[ctx->code->bstr_cnt++]; } +static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) +{ + unsigned instr; + BSTR bstr; + + bstr = alloc_bstr_arg(ctx, arg); + if(!bstr) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.bstr = bstr; + return S_OK; +} + static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg1, unsigned arg2) { unsigned instr; @@ -272,12 +289,38 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return S_OK; } +static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat) +{ + HRESULT hres; + + hres = compile_expression(ctx, stat->value_expr); + if(FAILED(hres)) + return hres; + + if(stat->member_expr->args) { + FIXME("arguments support not implemented\n"); + return E_NOTIMPL; + } + + if(stat->member_expr->obj_expr) { + FIXME("obj_expr not implemented\n"); + hres = E_NOTIMPL; + }else { + hres = push_instr_bstr(ctx, OP_assign_ident, stat->member_expr->identifier); + } + + return hres; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; while(stat) { switch(stat->type) { + case STAT_ASSIGN: + hres = compile_assign_statement(ctx, (assign_statement_t*)stat); + break; case STAT_CALL: hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 51ec8e7..1e84afa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -217,6 +217,12 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT interp_assign_ident(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e2cfdea..070fdbb 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -89,6 +89,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ + X(assign_ident, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \

1 0

Jacek Caban : vbscript: Added interp_assign_ident implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 2083935c649f38f5b881d907d5999ce923b5c1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2083935c649f38f5b881d907d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:33:03 2011 +0200 vbscript: Added interp_assign_ident implementation. --- dlls/vbscript/interp.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbdisp.c | 22 ++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1e84afa..4099642 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -217,10 +217,44 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) +{ + ref_t ref; + HRESULT hres; + + hres = lookup_identifier(ctx, name, &ref); + if(FAILED(hres)) + return hres; + + switch(ref.type) { + case REF_DISP: + hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, val); + if(own_val) + VariantClear(val); + break; + case REF_NONE: + FIXME("%s not found\n", debugstr_w(name)); + if(own_val) + VariantClear(val); + return DISP_E_UNKNOWNNAME; + } + + return hres; +} + static HRESULT interp_assign_ident(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const BSTR arg = ctx->instr->arg1.bstr; + variant_val_t v; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = stack_pop_val(ctx, &v); + if(FAILED(hres)) + return hres; + + return assign_ident(ctx, arg, v.v, v.owned); } static HRESULT interp_ret(exec_ctx_t *ctx) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c115199..9cfdab2 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -246,3 +246,25 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, IDispatchEx_Release(dispex); return hres; } + +HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val) +{ + DISPID propput_dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {val, &propput_dispid, 1, 1}; + IDispatchEx *dispex; + EXCEPINFO ei = {0}; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL /* FIXME! */); + IDispatchEx_Release(dispex); + }else { + ULONG err = 0; + + TRACE("using IDispatch\n"); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, &err); + } + + return hres; +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 070fdbb..49b2cfa 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -63,6 +63,7 @@ typedef struct { HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); struct _script_ctx_t { IActiveScriptSite *site;

1 0