September 2011 - Wine-commits

Piotr Caban : msvcp90: Added basic_string::_Copy_s implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 6e043df036002dca2a223b44aeb4047be552b857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e043df036002dca2a223b44a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:07 2011 +0200 msvcp90: Added basic_string::_Copy_s implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d0c29d0..515e05f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2139,12 +2139,12 @@ @ stub -arch=win64 ?_Copy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IEAAX_K0(a)Z @ stub -arch=win32 ?_Copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII(a)Z @ stub -arch=win64 ?_Copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0(a)Z -@ stub -arch=win32 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADIII(a)Z -@ stub -arch=win64 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z +@ thiscall -arch=win32 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADIII(a)Z(ptr ptr long long long) MSVCP_basic_string_char_Copy_s +@ cdecl -arch=win64 ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z(ptr ptr long long long) MSVCP_basic_string_char_Copy_s @ stub -arch=win32 ?_Copy_s@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIPAGIII(a)Z @ stub -arch=win64 ?_Copy_s@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEAG_K11(a)Z -@ stub -arch=win32 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WIII(a)Z -@ stub -arch=win64 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z +@ thiscall -arch=win32 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WIII(a)Z(ptr ptr long long long) MSVCP_basic_string_wchar_Copy_s +@ cdecl -arch=win64 ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z(ptr ptr long long long) MSVCP_basic_string_wchar_Copy_s @ cdecl -arch=win32 ?_Copy_s@?$char_traits(a)D@std@@SAPADPADIPBDI(a)Z(ptr long ptr long) MSVCP_char_traits_char__Copy_s @ cdecl -arch=win64 ?_Copy_s@?$char_traits(a)D@std@@SAPEADPEAD_KPEBD1(a)Z(ptr long ptr long) MSVCP_char_traits_char__Copy_s @ cdecl -arch=win32 ?_Copy_s@?$char_traits(a)G@std@@SAPAGPAGIPBGI(a)Z(ptr long ptr long) MSVCP_char_traits_short__Copy_s diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 5664e87..47c0c03 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -741,6 +741,25 @@ void __thiscall MSVCP_basic_string_char_Chassign(basic_string_char *this, MSVCP_char_traits_char_assignn(basic_string_char_ptr(this)+off, count, ch); } +/* ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADIII(a)Z */ +/* ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_Copy_s, 20) +MSVCP_size_t __thiscall MSVCP_basic_string_char_Copy_s(const basic_string_char *this, + char *dest, MSVCP_size_t size, MSVCP_size_t off, MSVCP_size_t count) +{ + TRACE("%p %p %lu %lu %lu\n", this, dest, size, off, count); + + if(this->size < off) + MSVCP__String_base_Xran(); + + if(count > this->size-off) + count = this->size-off; + + MSVCP_char_traits_char__Copy_s(dest, size, + basic_string_char_const_ptr(this)+off, count); + return count; +} + /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ @@ -1710,6 +1729,25 @@ void __thiscall MSVCP_basic_string_wchar_Chassign(basic_string_wchar *this, MSVCP_char_traits_wchar_assignn(basic_string_wchar_ptr(this)+off, count, ch); } +/* ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WIII(a)Z */ +/* ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_Copy_s, 20) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_Copy_s(const basic_string_wchar *this, + wchar_t *dest, MSVCP_size_t size, MSVCP_size_t off, MSVCP_size_t count) +{ + TRACE("%p %p %lu %lu %lu\n", this, dest, size, off, count); + + if(this->size < off) + MSVCP__String_base_Xran(); + + if(count > this->size-off) + count = this->size-off; + + MSVCP_char_traits_wchar__Copy_s(dest, size, + basic_string_wchar_const_ptr(this)+off, count); + return count; +} + /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */ /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ */ /* ?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */

1 0

Piotr Caban : msvcp90: Added basic_string::_Pdif implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8ed4f6e07b76c3c5afb021a1f48b2ae648b0cb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed4f6e07b76c3c5afb021a1f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:27 2011 +0200 msvcp90: Added basic_string::_Pdif implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 515e05f..51a2ea1 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2676,12 +2676,12 @@ @ stub -arch=win64 ?_Osfx@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXXZ @ stub -arch=win32 ?_Osfx@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXXZ @ stub -arch=win64 ?_Osfx@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ -@ stub -arch=win32 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KAIV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ stub -arch=win64 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KA_KV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z +@ cdecl -arch=win32 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KAIV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr) MSVCP_basic_string_char_Pdif +@ cdecl -arch=win64 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KA_KV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr) MSVCP_basic_string_char_Pdif @ stub -arch=win32 ?_Pdif@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@KAIV?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z @ stub -arch=win64 ?_Pdif@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@KA_KV?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z -@ stub -arch=win32 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KAIV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z -@ stub -arch=win64 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KA_KV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z +@ cdecl -arch=win32 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KAIV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr) MSVCP_basic_string_wchar_Pdif +@ cdecl -arch=win64 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KA_KV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr) MSVCP_basic_string_wchar_Pdif @ thiscall -arch=win32 ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ(ptr) basic_streambuf_char__Pnavail @ cdecl -arch=win64 ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEBA_JXZ(ptr) basic_streambuf_char__Pnavail @ stub -arch=win32 ?_Pnavail@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IBEHXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 47c0c03..300c8bd 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1505,6 +1505,20 @@ String_reverse_iterator_char __thiscall MSVCP_basic_string_char_rend(basic_strin return ret; } +/* ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KAIV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +/* ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KA_KV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, String_iterator_char i2) +{ + TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos); + + if((!i1.bstr && i1.pos) || i1.bstr!=i2.bstr) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + return !i1.pos ? 0 : i1.pos-i2.pos; +} + /* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2IB */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2_KB */ @@ -2492,3 +2506,17 @@ String_reverse_iterator_wchar __thiscall MSVCP_basic_string_wchar_rend(basic_str ret.pos = basic_string_wchar_const_ptr(this); return ret; } + +/* ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KAIV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +/* ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KA_KV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, String_iterator_wchar i2) +{ + TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos); + + if((!i1.bstr && i1.pos) || i1.bstr!=i2.bstr) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + return !i1.pos ? 0 : i1.pos-i2.pos; +}

1 0

Piotr Caban : msvcp90: Added basic_string::append functions.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 4c66393c47dd9e8849d11b2355402ab21676e344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c66393c47dd9e8849d11b235… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:39 2011 +0200 msvcp90: Added basic_string::append functions. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- dlls/msvcp90/string.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 51a2ea1..060bfd0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2921,14 +2921,14 @@ @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) MSVCP_basic_string_char_append_substr @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_char_append_substr @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z(ptr long long) MSVCP_basic_string_char_append_len_ch -@ stub -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD0@Z -@ stub -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD0@Z(ptr ptr ptr) MSVCP_basic_string_char_append_beg_end +@ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD0@Z(ptr ptr ptr) MSVCP_basic_string_char_append_beg_end @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD@Z(ptr str) MSVCP_basic_string_char_append_cstr @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD@Z(ptr str) MSVCP_basic_string_char_append_cstr @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD_K@Z(ptr str long) MSVCP_basic_string_char_append_cstr_len @ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBDI@Z(ptr str long) MSVCP_basic_string_char_append_cstr_len -@ stub -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ stub -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr) MSVCP_basic_string_char_append_iter +@ thiscall -arch=win32 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr ptr) MSVCP_basic_string_char_append_iter @ cdecl -arch=win64 ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z(ptr long long) MSVCP_basic_string_char_append_len_ch @ stub -arch=win32 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)ABV12@@Z @ stub -arch=win64 ?append@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)AEBV12@@Z @@ -2949,14 +2949,14 @@ @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@II(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_append_substr @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z(ptr ptr long long) MSVCP_basic_string_wchar_append_substr @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)I_W@Z(ptr long long) MSVCP_basic_string_wchar_append_len_ch -@ stub -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W0@Z -@ stub -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W0@Z(ptr ptr ptr) MSVCP_basic_string_wchar_append_beg_end +@ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W0@Z(ptr ptr ptr) MSVCP_basic_string_wchar_append_beg_end @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_append_cstr @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_append_cstr @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W_K@Z(ptr wstr long) MSVCP_basic_string_wchar_append_cstr_len @ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_WI@Z(ptr wstr long) MSVCP_basic_string_wchar_append_cstr_len -@ stub -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z -@ stub -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z +@ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr) MSVCP_basic_string_wchar_append_iter +@ thiscall -arch=win32 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr ptr) MSVCP_basic_string_wchar_append_iter @ cdecl -arch=win64 ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K_W@Z(ptr long long) MSVCP_basic_string_wchar_append_len_ch @ thiscall -arch=win32 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) MSVCP_basic_string_char_assign @ cdecl -arch=win64 ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) MSVCP_basic_string_char_assign diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 300c8bd..d8a7728 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -994,6 +994,24 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr( MSVCP_char_traits_char_length(append)); } +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD0@Z */ +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_beg_end, 12) +basic_string_char* __thiscall MSVCP_basic_string_char_append_beg_end( + basic_string_char *this, const char *beg, const char *end) +{ + return MSVCP_basic_string_char_append_cstr_len(this, beg, end-beg); +} + +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +/* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_iter, 20) +basic_string_char* __thiscall MSVCP_basic_string_char_append_iter( + basic_string_char *this, String_iterator_char beg, String_iterator_char end) +{ + return MSVCP_basic_string_char_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); +} + /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ID@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_len_ch, 12) @@ -1996,6 +2014,24 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr( MSVCP_char_traits_wchar_length(append)); } +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W0@Z */ +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_beg_end, 12) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_beg_end( + basic_string_wchar *this, const wchar_t *beg, const wchar_t *end) +{ + return MSVCP_basic_string_wchar_append_cstr_len(this, beg, end-beg); +} + +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +/* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_iter, 20) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_iter( + basic_string_wchar *this, String_iterator_wchar beg, String_iterator_wchar end) +{ + return MSVCP_basic_string_wchar_append_cstr_len(this, beg.pos, end.pos-beg.pos+1); +} + /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)I_W@Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_len_ch, 12)

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 96567b18b04f2c3e87463352d91259ecdf8c1bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=96567b18b04f2c3e87463352d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:54 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp60/msvcp60.spec | 12 ++-- dlls/msvcp70/msvcp70.spec | 22 ++++---- dlls/msvcp71/msvcp71.spec | 18 +++--- dlls/msvcp80/msvcp80.spec | 116 +++++++++++++++++++++--------------------- 5 files changed, 86 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96567b18b04f2c3e87463…

1 0

Andrew Talbot : winspool.drv: Const-correctness fix.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 4c7f394b74f07aebb4793b88e79dd979e7e61ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f394b74f07aebb4793b88e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Sep 12 23:18:01 2011 +0100 winspool.drv: Const-correctness fix. --- dlls/winspool.drv/info.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index cb74482..abc8478 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -516,6 +516,8 @@ static BOOL CUPS_LoadPrinters(void) static BOOL PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { PRINTER_INFO_2A pinfo2a; + const char *r; + size_t name_len; char *e,*s,*name,*prettyname,*devname; BOOL ret = FALSE, set_default = FALSE; char *port = NULL, *env_default; @@ -523,14 +525,17 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { WCHAR devnameW[MAX_PATH]; while (isspace(*pent)) pent++; - s = strchr(pent,':'); - if(s) *s='\0'; - name = HeapAlloc(GetProcessHeap(), 0, strlen(pent) + 1); - strcpy(name,pent); - if(s) { - *s=':'; - pent = s; - } else + r = strchr(pent,':'); + if (r) + name_len = r - pent; + else + name_len = strlen(pent); + name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); + memcpy(name, pent, name_len); + name[name_len] = '\0'; + if (r) + pent = r; + else pent = ""; TRACE("name=%s entry=%s\n",name, pent);

1 0

Jacek Caban : vbscipt: Added object member assign parser/ compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: a822569db2ec0fab893af53d97a1331720cc3211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a822569db2ec0fab893af53d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:35:33 2011 +0200 vbscipt: Added object member assign parser/compiler implementation. --- dlls/vbscript/compile.c | 7 +++++-- dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parser.y | 4 ++-- dlls/vbscript/vbscript.h | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8cc55c7..877780d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -303,8 +303,11 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * } if(stat->member_expr->obj_expr) { - FIXME("obj_expr not implemented\n"); - hres = E_NOTIMPL; + hres = compile_expression(ctx, stat->member_expr->obj_expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_bstr(ctx, OP_assign_member, stat->member_expr->identifier); }else { hres = push_instr_bstr(ctx, OP_assign_ident, stat->member_expr->identifier); } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4099642..3212935 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -257,6 +257,12 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) return assign_ident(ctx, arg, v.v, v.owned); } +static HRESULT interp_assign_member(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0d56acd..5d9ae7d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -113,8 +113,8 @@ Statement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } MemberExpression - : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - /* FIXME: MemberExpressionArgs '.' tIdentifier */ + : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } + | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } Arguments_opt : EmptyBrackets_opt { $$ = NULL; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 49b2cfa..6367c12 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -91,6 +91,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ X(assign_ident, 1, ARG_BSTR, 0) \ + X(assign_member, 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_member implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 151056bde2848c20505914c67627ea8c1fbe3300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151056bde2848c20505914c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:35:50 2011 +0200 vbscript: Added interp_assign_member implementation. --- dlls/vbscript/interp.c | 59 +++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 2 + dlls/vbscript/vbscript_main.c | 32 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3212935..45a7504 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -144,6 +144,33 @@ static inline void release_val(variant_val_t *v) VariantClear(v->v); } +static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) +{ + VARIANT *v = stack_pop(ctx); + + if(V_VT(v) == VT_DISPATCH) { + *ret = V_DISPATCH(v); + return S_OK; + } + + if(V_VT(v) != (VT_VARIANT|VT_BYREF)) { + FIXME("not supported type: %s\n", debugstr_variant(v)); + VariantClear(v); + return E_FAIL; + } + + v = V_BYREF(v); + if(V_VT(v) != VT_DISPATCH) { + FIXME("not disp %s\n", debugstr_variant(v)); + return E_FAIL; + } + + if(V_DISPATCH(v)) + IDispatch_AddRef(V_DISPATCH(v)); + *ret = V_DISPATCH(v); + return S_OK; +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -259,8 +286,36 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) static HRESULT interp_assign_member(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + BSTR identifier = ctx->instr->arg1.bstr; + variant_val_t val; + IDispatch *obj; + DISPID id; + HRESULT hres; + + TRACE("%s\n", debugstr_w(identifier)); + + hres = stack_pop_disp(ctx, &obj); + if(FAILED(hres)) + return hres; + + if(!obj) { + FIXME("NULL obj\n"); + return E_FAIL; + } + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + hres = disp_get_id(obj, identifier, &id); + if(SUCCEEDED(hres)) + hres = disp_propput(ctx->script, obj, id, val.v); + + release_val(&val); + IDispatch_Release(obj); + return hres; } static HRESULT interp_ret(exec_ctx_t *ctx) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 6367c12..226f0d2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -158,6 +158,8 @@ HRESULT exec_script(script_ctx_t*,function_t*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 1527281..43ab484 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -31,6 +31,38 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + if(V_ISBYREF(v)) + return wine_dbg_sprintf("{V_BYREF -> %s}", debugstr_variant(V_BYREF(v))); + + switch(V_VT(v)) { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I2: + return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_UI4: + return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(v)); + case VT_R8: + return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_BOOL: + return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + default: + return wine_dbg_sprintf("{vt %d}", V_VT(v)); + } +} + #define MIN_BLOCK_SIZE 128 static inline DWORD block_size(DWORD block)

1 0

Jacek Caban : vbscript: Added object member assignment tests.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 29ccac7966d41e84cc93eaab592b04cc368393b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ccac7966d41e84cc93eaab5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:07 2011 +0200 vbscript: Added object member assignment tests. --- dlls/vbscript/tests/run.c | 113 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 101 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index e9beab9..aa2e3f1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -60,6 +60,8 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); DEFINE_EXPECT(global_vbvar_i); +DEFINE_EXPECT(testobj_propput_d); +DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -67,6 +69,9 @@ DEFINE_EXPECT(global_vbvar_i); #define DISPID_GLOBAL_GETVT 1003 #define DISPID_GLOBAL_ISENGLOC 1004 #define DISPID_GLOBAL_VBVAR 1005 +#define DISPID_GLOBAL_TESTOBJ 1006 + +#define DISPID_TESTOBJ_PROPPUT 2001 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -226,6 +231,64 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + if(!strcmp_wa(bstrName, "propput")) { + CHECK_EXPECT(testobj_propput_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_TESTOBJ_PROPPUT; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; +} + +static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + switch(id) { + case DISPID_TESTOBJ_PROPPUT: + CHECK_EXPECT(testobj_propput_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 1, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + return S_OK; + } + + ok(0, "unexpected call %d\n", id); + return E_FAIL; +} + +static IDispatchExVtbl testObjVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + testObj_GetDispID, + testObj_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testObj = { &testObjVtbl }; static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { @@ -255,6 +318,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLOC; return S_OK; } + if(!strcmp_wa(bstrName, "testObj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTOBJ; + return S_OK; + } if(!strcmp_wa(bstrName, "vbvar")) { CHECK_EXPECT(global_vbvar_d); test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -328,18 +396,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_GETVT: - ok(pdp != NULL, "pdp == NULL\n"); - ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); - ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); - ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); - ok(pei != NULL, "pei == NULL\n"); - - V_VT(pvarRes) = VT_BSTR; - V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); - return S_OK; + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + 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); @@ -376,6 +444,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_TESTOBJ: + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "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_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testObj; + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -690,6 +773,12 @@ static void run_tests(void) CHECK_CALLED(global_vbvar_d); CHECK_CALLED(global_vbvar_i); + SET_EXPECT(testobj_propput_d); + SET_EXPECT(testobj_propput_i); + parse_script_a("testObj.propput = 1"); + CHECK_CALLED(testobj_propput_d); + CHECK_CALLED(testobj_propput_i); + run_from_res("lang.vbs"); }

1 0

Jacek Caban : vbscript: Added dim statement parser implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 924da4056bf7a83712c85705f911721666858077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924da4056bf7a83712c85705f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:26 2011 +0200 vbscript: Added dim statement parser implementation. --- dlls/vbscript/parse.h | 13 ++++++++++++- dlls/vbscript/parser.y | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f7b9436..d50889d 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -79,7 +79,8 @@ typedef struct { typedef enum { STAT_ASSIGN, - STAT_CALL + STAT_CALL, + STAT_DIM } statement_type_t; typedef struct _statement_t { @@ -98,6 +99,16 @@ typedef struct { expression_t *value_expr; } assign_statement_t; +typedef struct _dim_decl_t { + const WCHAR *name; + struct _dim_decl_t *next; +} dim_decl_t; + +typedef struct _dim_statement_t { + statement_t stat; + dim_decl_t *dim_decls; +} dim_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5d9ae7d..b5e740e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,7 +46,10 @@ static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expre static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); - static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); +static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); +static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); + +static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -60,6 +63,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + dim_decl_t *dim_decl; LONG lng; BOOL bool; double dbl; @@ -89,6 +93,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <dim_decl> DimDeclList %% @@ -111,11 +116,16 @@ Statement | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } | MemberExpression Arguments_opt '=' Expression { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } + | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } +DimDeclList /* FIXME: Support arrays */ + : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } + | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } + Arguments_opt : EmptyBrackets_opt { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } @@ -341,6 +351,31 @@ static statement_t *new_assign_statement(parser_ctx_t *ctx, member_expression_t return &stat->stat; } +static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t *next) +{ + dim_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->name = name; + decl->next = next; + return decl; +} + +static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) +{ + dim_statement_t *stat; + + stat = new_statement(ctx, STAT_DIM, sizeof(*stat)); + if(!stat) + return NULL; + + stat->dim_decls = decls; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0

Jacek Caban : vbscript: Added dim statement compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: d1c152756c3fd6461f4cab9d29cb993c2d0a30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c152756c3fd6461f4cab9d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:47 2011 +0200 vbscript: Added dim statement compiler implementation. --- dlls/vbscript/compile.c | 104 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 2 + dlls/vbscript/vbscript.h | 8 +++ 3 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 877780d..9bdc31d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -32,6 +32,9 @@ typedef struct { unsigned instr_cnt; unsigned instr_size; vbscode_t *code; + + dim_decl_t *dim_decls; + dynamic_var_t *global_vars; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); @@ -315,6 +318,38 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * return hres; } +static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) +{ + dim_decl_t *dim_decl; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + if(!strcmpiW(dim_decl->name, name)) + return TRUE; + } + + return FALSE; +} + +static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) +{ + dim_decl_t *dim_decl = stat->dim_decls; + + while(1) { + if(lookup_dim_decls(ctx, dim_decl->name)) { + FIXME("dim %s name redefined\n", debugstr_w(dim_decl->name)); + return E_FAIL; + } + + if(!dim_decl->next) + break; + dim_decl = dim_decl->next; + } + + dim_decl->next = ctx->dim_decls; + ctx->dim_decls = stat->dim_decls; + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -327,6 +362,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_CALL: hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; + case STAT_DIM: + hres = compile_dim_statement(ctx, (dim_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -353,6 +391,52 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; + if(ctx->dim_decls) { + dim_decl_t *dim_decl; + dynamic_var_t *new_var; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + new_var = compiler_alloc(ctx->code, sizeof(*new_var)); + if(!new_var) + return E_OUTOFMEMORY; + + new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!new_var->name) + return E_OUTOFMEMORY; + + V_VT(&new_var->v) = VT_EMPTY; + + new_var->next = ctx->global_vars; + ctx->global_vars = new_var; + } + } + + return S_OK; +} + +static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) +{ + dynamic_var_t *var; + + for(var = script->global_vars; var; var = var->next) { + if(!strcmpiW(var->name, identifier)) + return TRUE; + } + + return FALSE; +} + +static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) +{ + dynamic_var_t *var; + + for(var = ctx->global_vars; var; var = var->next) { + if(lookup_script_identifier(script, var->name)) { + FIXME("%s: redefined\n", debugstr_w(var->name)); + return E_FAIL; + } + } + return S_OK; } @@ -422,12 +506,32 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) if(!ctx.code) return E_OUTOFMEMORY; + ctx.global_vars = NULL; + ctx.dim_decls = NULL; + hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { release_vbscode(ctx.code); return hres; } + hres = check_script_collisions(&ctx, script); + if(FAILED(hres)) { + release_vbscode(ctx.code); + return hres; + } + + if(ctx.global_vars) { + dynamic_var_t *var; + + for(var = ctx.global_vars; var->next; var = var->next); + + var->next = script->global_vars; + script->global_vars = ctx.global_vars; + } + + parser_release(&ctx.parser); + list_add_tail(&script->code_list, &ctx.code->entry); *ret = ctx.code; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2e81643..94dc3eb 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,6 +18,8 @@ Option Explicit +dim x, y + call ok(true, "true is not true?") ok true, "true is not true?" call ok((true), "true is not true?") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 226f0d2..734ce8a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -65,6 +65,12 @@ 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*); +typedef struct _dynamic_var_t { + struct _dynamic_var_t *next; + VARIANT v; + const WCHAR *name; +} dynamic_var_t; + struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -73,6 +79,8 @@ struct _script_ctx_t { vbdisp_t *script_obj; + dynamic_var_t *global_vars; + struct list code_list; struct list named_items; };

1 0