April 2011 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Added basic_string<char> operator+=(char*) implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: f55449d3547a914d41f45642367de6436857a02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55449d3547a914d41f456423… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:46 2011 +0200 msvcp90: Added basic_string<char> operator+=(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 881908c..f594990 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1726,8 +1726,8 @@ @ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_append @ thiscall -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z(ptr long) MSVCP_basic_string_char_append_ch @ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z(ptr long) MSVCP_basic_string_char_append_ch -@ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z -@ stub -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z(ptr str) MSVCP_basic_string_char_append_cstr +@ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z(ptr str) MSVCP_basic_string_char_append_cstr @ stub -arch=win32 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)G@Z @@ -1736,8 +1736,8 @@ @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z @ thiscall -arch=win32 ??Y?$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_append @ cdecl -arch=win64 ??Y?$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_append -@ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z -@ stub -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z +@ thiscall -arch=win32 ??Y?$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_append_cstr +@ cdecl -arch=win64 ??Y?$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_append_cstr @ thiscall -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_append_ch @ cdecl -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_append_ch @ stub -arch=win32 ??Y?$complex(a)M@std@@QAEAAV01(a)ABM@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 19c1882..ddb0b51 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -879,6 +879,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr_len( /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD@Z */ +/* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z */ +/* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_cstr, 8) basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr( basic_string_char *this, const char *append) @@ -1547,6 +1549,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr_len( /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z */ +/* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z */ +/* ??Y?$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_append_cstr, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr( basic_string_wchar *this, const wchar_t *append)

1 0

Piotr Caban : msvcp90: Added basic_string<char> clear implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 930cfafa0589ed295336022d9ba91638ac1014c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930cfafa0589ed295336022d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:34 2011 +0200 msvcp90: Added basic_string<char> clear implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index dd1d3a7..881908c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3071,12 +3071,12 @@ @ stub -arch=win64 ?clear@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXH_N(a)Z @ stub -arch=win32 ?clear@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXI(a)Z @ stub -arch=win64 ?clear@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXI(a)Z -@ stub -arch=win32 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ -@ stub -arch=win64 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ +@ thiscall -arch=win32 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ(ptr) MSVCP_basic_string_char_clear +@ cdecl -arch=win64 ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ(ptr) MSVCP_basic_string_char_clear @ stub -arch=win32 ?clear@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXXZ @ stub -arch=win64 ?clear@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXXZ -@ stub -arch=win32 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ -@ stub -arch=win64 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ +@ thiscall -arch=win32 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ(ptr) MSVCP_basic_string_wchar_clear +@ cdecl -arch=win64 ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ(ptr) MSVCP_basic_string_wchar_clear @ stub -arch=win32 ?clear(a)ios_base@std@@QAEXH(a)Z @ stub -arch=win64 ?clear(a)ios_base@std@@QEAAXH(a)Z @ stub -arch=win32 ?clear(a)ios_base@std@@QAEXH_N(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6a9dcb1..19c1882 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1156,6 +1156,14 @@ void __thiscall MSVCP_basic_string_char_resize( MSVCP_basic_string_char_resize_ch(this, size, '\0'); } +/* ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_clear, 4) +void __thiscall MSVCP_basic_string_char_clear(basic_string_char *this) +{ + basic_string_char_eos(this, 0); +} + /* 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 */ @@ -1815,3 +1823,11 @@ void __thiscall MSVCP_basic_string_wchar_resize( { MSVCP_basic_string_wchar_resize_ch(this, size, '\0'); } + +/* ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_clear, 4) +void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar *this) +{ + basic_string_wchar_eos(this, 0); +}

1 0

Piotr Caban : msvcp90: Added basic_string<char> at implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: ce8a64470b09c156120b6eb538c35313dc5e0e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8a64470b09c156120b6eb53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:47 2011 +0200 msvcp90: Added basic_string<char> at implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++------ dlls/msvcp90/string.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 8e10b85..4161ab7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3012,18 +3012,18 @@ @ cdecl -arch=win64 ?assign@?$char_traits(a)_W@std@@SAPEA_WPEA_W_K_W(a)Z(ptr long long) MSVCP_char_traits_wchar_assignn @ cdecl -arch=win32 ?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z(ptr ptr) MSVCP_char_traits_wchar_assign @ cdecl -arch=win64 ?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z(ptr ptr) MSVCP_char_traits_wchar_assign -@ stub -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z -@ stub -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z +@ thiscall -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z(ptr long) MSVCP_basic_string_char_at +@ cdecl -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z(ptr long) MSVCP_basic_string_char_at +@ thiscall -arch=win32 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z(ptr long) MSVCP_basic_string_char_const_at +@ cdecl -arch=win64 ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z(ptr long) MSVCP_basic_string_char_const_at @ stub -arch=win32 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGI(a)Z @ stub -arch=win64 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAG_K(a)Z @ stub -arch=win32 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGI(a)Z @ stub -arch=win64 ?at@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z -@ stub -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z -@ stub -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z -@ stub -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z +@ thiscall -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z(ptr long) MSVCP_basic_string_wchar_at +@ cdecl -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_at +@ thiscall -arch=win32 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z(ptr long) MSVCP_basic_string_wchar_const_at +@ cdecl -arch=win64 ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_const_at @ stub ?atan2@?$_Ctraits(a)M@std@@SAMMM(a)Z @ stub ?atan2@?$_Ctraits(a)N@std@@SANNN(a)Z @ stub ?atan2@?$_Ctraits(a)O@std@@SAOOO(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index a54f323..e65043a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1088,6 +1088,35 @@ size_t __thiscall MSVCP_basic_string_char_find_ch( return MSVCP_basic_string_char_find_cstr_substr(this, &ch, pos, 1); } +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_at, 8) +char* __thiscall MSVCP_basic_string_char_at( + basic_string_char *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_char_ptr(this)+pos; +} + +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ +/* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_const_at, 8) +const char* __thiscall MSVCP_basic_string_char_const_at( + const basic_string_char *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_char_const_ptr(this)+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 */ @@ -1678,3 +1707,31 @@ size_t __thiscall MSVCP_basic_string_wchar_find_ch( { return MSVCP_basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); } + +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z */ +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_at, 8) +wchar_t* __thiscall MSVCP_basic_string_wchar_at( + basic_string_wchar *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_wchar_ptr(this)+pos; +} + +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z */ +/* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_const_at, 8) +const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( + const basic_string_wchar *this, size_t pos) +{ + TRACE("%p %lu\n", this, (unsigned long)pos); + + if(this->size <= pos) + MSVCP__String_base_Xran(); + + return basic_string_wchar_const_ptr(this)+pos; +}

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator< implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 6bf4541bf854af3482e26eaab8c76034b02a2134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf4541bf854af3482e26eaab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:02 2011 +0200 msvcp90: Added basic_string<char> operator< implementation. --- dlls/msvcp90/msvcp90.spec | 24 ++++++------ dlls/msvcp90/string.c | 96 +++++++++++++++++++++++++++++++++----------- 2 files changed, 84 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bf4541bf854af3482e26…

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator[] implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 73d60c3a08aa87d617cd16eb759794bc0a02ba8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d60c3a08aa87d617cd16eb7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:16:00 2011 +0200 msvcp90: Added basic_string<char> operator[] implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- dlls/msvcp90/string.c | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4161ab7..2601900 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1682,14 +1682,14 @@ @ stub -arch=win64 ??8locale(a)std@@QEBA_NAEBV01@@Z @ stub -arch=win32 ??9locale(a)std@@QBE_NABV01@@Z @ stub -arch=win64 ??9locale(a)std@@QEBA_NAEBV01@@Z -@ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z +@ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z(ptr long) MSVCP_basic_string_char_at @ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEADU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z -@ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z(ptr long) MSVCP_basic_string_char_at +@ thiscall -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z(ptr long) MSVCP_basic_string_char_const_at @ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBDU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z(ptr long) MSVCP_basic_string_char_const_at @ stub -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGI(a)Z @ stub -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAGU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAGU_Size_type_nosscl(a)01@@Z @@ -1698,14 +1698,14 @@ @ stub -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBGU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEABGU_Size_type_nosscl(a)01@@Z @ stub -arch=win64 ??A?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAAEBG_K(a)Z -@ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z +@ thiscall -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z(ptr long) MSVCP_basic_string_wchar_at @ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_WU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z -@ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_at +@ thiscall -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z(ptr long) MSVCP_basic_string_wchar_const_at @ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_WU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WU_Size_type_nosscl(a)01@@Z -@ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z +@ cdecl -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_const_at @ stub -arch=win32 ??Bid(a)locale@std@@QAEIXZ @ stub -arch=win64 ??Bid(a)locale@std@@QEAA_KXZ @ stub -arch=win32 ??Bios_base(a)std@@QBEPAXXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index e65043a..2c565c0 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1090,6 +1090,8 @@ size_t __thiscall MSVCP_basic_string_char_find_ch( /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAADI(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_at, 8) char* __thiscall MSVCP_basic_string_char_at( basic_string_char *this, size_t pos) @@ -1104,6 +1106,8 @@ char* __thiscall MSVCP_basic_string_char_at( /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ /* ?at@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEABDI(a)Z */ +/* ??A?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAAEBD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_const_at, 8) const char* __thiscall MSVCP_basic_string_char_const_at( const basic_string_char *this, size_t pos) @@ -1710,6 +1714,8 @@ size_t __thiscall MSVCP_basic_string_wchar_find_ch( /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z */ /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAA_WI(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEA_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_at, 8) wchar_t* __thiscall MSVCP_basic_string_wchar_at( basic_string_wchar *this, size_t pos) @@ -1724,6 +1730,8 @@ wchar_t* __thiscall MSVCP_basic_string_wchar_at( /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z */ /* ?at@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WI(a)Z */ +/* ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_const_at, 8) const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( const basic_string_wchar *this, size_t pos)

1 0

Piotr Caban : msvcp90: Added basic_string<char> find implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: c08b647cf637c21a25f3807e2b7eda97d548074b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08b647cf637c21a25f3807e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:15 2011 +0200 msvcp90: Added basic_string<char> find implementation. --- dlls/msvcp90/msvcp90.spec | 16 +++++----- dlls/msvcp90/string.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 81eaf08..82f02ec 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3819,11 +3819,11 @@ @ 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 -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z +@ 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 @ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr @ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K(a)Z @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIABV12(a)I@Z @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KAEBV12(a)_K@Z @@ -3836,11 +3836,11 @@ @ 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 @ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z +@ 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 @ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win32 ?find@?$char_traits(a)D@std@@SAPBDPBDIABD(a)Z(ptr long ptr) MSVCP_char_traits_char_find @ cdecl -arch=win64 ?find@?$char_traits(a)D@std@@SAPEBDPEBD_KAEBD(a)Z(ptr long ptr) MSVCP_char_traits_char_find @ cdecl -arch=win32 ?find@?$char_traits(a)G@std@@SAPBGPBGIABG(a)Z(ptr long ptr) MSVCP_char_traits_short_find diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 5169426..23b5c3b 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1025,6 +1025,41 @@ MSVCP_BOOL __cdecl MSVCP_basic_string_char_lower_cstr_bstr( return MSVCP_basic_string_char_compare_cstr(right, left) > 0; } +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_cstr_substr, 16) +size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( + const basic_string_char *this, const char *find, size_t pos, size_t len) +{ + const char *p, *end; + + TRACE("%p %s %lu %lu\n", this, find, (unsigned long)pos, (unsigned long)len); + + if(len==0 && pos<=this->size) + return pos; + + end = basic_string_char_const_ptr(this)+this->size-len+1; + for(p=basic_string_char_const_ptr(this)+pos; p<end; p++) { + p = MSVCP_char_traits_char_find(p, end-p, find); + if(!p) + break; + + if(!MSVCP_char_traits_char_compare(p, find, len)) + return p-basic_string_char_const_ptr(this); + } + + return MSVCP_basic_string_char_npos; +} + +/* ?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) +size_t __thiscall MSVCP_basic_string_char_find_ch( + const basic_string_char *this, char ch, size_t pos) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, &ch, pos, 1); +} + /* 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 */ @@ -1552,3 +1587,38 @@ MSVCP_BOOL __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr( { return MSVCP_basic_string_wchar_compare_cstr(right, left) > 0; } + +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_cstr_substr, 16) +size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( + const basic_string_wchar *this, const wchar_t *find, size_t pos, size_t len) +{ + const wchar_t *p, *end; + + TRACE("%p %s %lu %lu\n", this, debugstr_w(find), (unsigned long)pos, (unsigned long)len); + + if(len==0 && pos<=this->size) + return pos; + + end = basic_string_wchar_const_ptr(this)+this->size-len+1; + for(p=basic_string_wchar_const_ptr(this)+pos; p<end; p++) { + p = MSVCP_char_traits_wchar_find(p, end-p, find); + if(!p) + break; + + if(!MSVCP_char_traits_wchar_compare(p, find, len)) + return p-basic_string_wchar_const_ptr(this); + } + + return MSVCP_basic_string_wchar_npos; +} + +/* ?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) +size_t __thiscall MSVCP_basic_string_wchar_find_ch( + const basic_string_wchar *this, wchar_t ch, size_t pos) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); +}

1 0

Piotr Caban : msvcp90: Added basic_string<char> operator +=(char) implementation.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: b8408b257a1ce0d75494982782e4ee3ab5560a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8408b257a1ce0d7549498278… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:38 2011 +0200 msvcp90: Added basic_string<char> operator +=(char) implementation. --- dlls/msvcp90/msvcp90.spec | 16 ++++++------ dlls/msvcp90/string.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8408b257a1ce0d754949…

1 0

Piotr Caban : msvcp90/tests: Added basic_string<char> find tests.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 02e46c8eaa2123631c1169ef83b8bf91f5332579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e46c8eaa2123631c1169ef8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 29 11:15:29 2011 +0200 msvcp90/tests: Added basic_string<char> find tests. --- dlls/msvcp90/tests/string.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 4f84264..4ceb24c 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -68,6 +68,7 @@ static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, size_t, size_t); static int (WINAPI *p_basic_string_char_compare_substr_substr)(size_t, size_t, basic_string_char*, size_t, size_t); static int (WINAPI *p_basic_string_char_compare_substr_cstr_len)(size_t, size_t, const char*, size_t); +static size_t (WINAPI *p_basic_string_char_find_cstr_substr)(const char*, size_t, size_t); static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor)(void); static basic_string_wchar* (WINAPI *p_basic_string_wchar_copy_ctor)(basic_string_wchar*); @@ -96,6 +97,7 @@ static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, basic_string_char*, size_t, size_t); static int (WINAPI *p_basic_string_char_compare_substr_substr)(basic_string_char*, size_t, size_t, basic_string_char*, size_t, size_t); static int (WINAPI *p_basic_string_char_compare_substr_cstr_len)(basic_string_char*, size_t, size_t, const char*, size_t); +static size_t (WINAPI *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); @@ -381,6 +383,8 @@ static BOOL init(void) "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@0(a)Z"); p_basic_string_char_concatenate_cstr = (void*)GetProcAddress(msvcp, "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@PEBD(a)Z"); + p_basic_string_char_find_cstr_substr = (void*)GetProcAddress(msvcp, + "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ"); @@ -439,6 +443,8 @@ static BOOL init(void) "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@0(a)Z"); p_basic_string_char_concatenate_cstr = (void*)GetProcAddress(msvcp, "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@PBD(a)Z"); + p_basic_string_char_find_cstr_substr = (void*)GetProcAddress(msvcp, + "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ"); @@ -661,7 +667,7 @@ static void test_basic_string_char_concatenate(void) { if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_concatenate || !p_basic_string_char_concatenate_cstr || !p_basic_string_char_cstr || !p_basic_string_char_dtor) { - win_skip("basic_string<wchar> unavailable\n"); + win_skip("basic_string<char> unavailable\n"); return; } @@ -682,6 +688,28 @@ static void test_basic_string_char_concatenate(void) { call_func1(p_basic_string_char_dtor, &str); } +static void test_basic_string_char_find(void) { + static const char tmp[] = {'a','a','a','\0','b','b','b',0}; + basic_string_char str; + size_t ret; + + if(!p_basic_string_char_ctor || !p_basic_string_char_assign_cstr_len + || !p_basic_string_char_dtor || !p_basic_string_char_find_cstr_substr) { + win_skip("basic_stringr> unavailable\n"); + return; + } + + call_func1(p_basic_string_char_ctor, &str); + call_func3(p_basic_string_char_assign_cstr_len, &str, tmp, 7); + ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 0, 3); + ok(ret == 0, "ret = %lu\n", (unsigned long)ret); + ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 1, 3); + ok(ret == -1, "ret = %lu\n", (unsigned long)ret); + ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "bbb", 0, 3); + ok(ret == 4, "ret = %lu\n", (unsigned long)ret); + call_func1(p_basic_string_char_dtor, &str); +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -807,6 +835,7 @@ START_TEST(string) test_basic_string_char_append(); test_basic_string_char_compare(); test_basic_string_char_concatenate(); + test_basic_string_char_find(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0

Marcus Meissner : avifil32: Mark internal symbols as hidden.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 719345017c99e66558c729e3d3740883631d45f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719345017c99e66558c729e3d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 10:05:58 2011 +0200 avifil32: Mark internal symbols as hidden. --- dlls/avifil32/avifile_private.h | 18 +++++++++--------- dlls/avifil32/extrachunk.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 85f1ca1..d35aa0f 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -57,16 +57,16 @@ DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0); DEFINE_AVIGUID(CLSID_WAVFile, 0x00020003, 0, 0); DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0); -extern HMODULE AVIFILE_hModule; +extern HMODULE AVIFILE_hModule DECLSPEC_HIDDEN; -extern HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppobj); -extern HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppobj); -extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj); -extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj); -extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream); -extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream); -extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams); +extern HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) DECLSPEC_HIDDEN; +extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; +extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; -extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName); +extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; #endif diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h index 1eda7ef..843a73c 100644 --- a/dlls/avifil32/extrachunk.h +++ b/dlls/avifil32/extrachunk.h @@ -35,18 +35,18 @@ typedef struct _EXTRACHUNKS { } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size); +HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size) DECLSPEC_HIDDEN; /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size) DECLSPEC_HIDDEN; /* reads a chunk fomr the HMMIO into the extrachunk-structure */ -HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck); +HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) DECLSPEC_HIDDEN; /* reads all non-junk chunks into the extrachunk-structure until it finds * the given chunk or the optional parent-chunk is at the end */ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio, - MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags); + MMCKINFO *lpck,MMCKINFO *lpckParent,UINT flags) DECLSPEC_HIDDEN; #ifdef __cplusplus }

1 0

Marcus Meissner : wintrust: Mark internal symbols as hidden.
by Alexandre Julliard April 29, 2011

April 29, 2011

Module: wine Branch: master Commit: 4b0457427598659560ef287a45793f8de825161c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0457427598659560ef287a4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 29 10:10:10 2011 +0200 wintrust: Mark internal symbols as hidden. --- dlls/wintrust/wintrust_priv.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 148e161..66c925a 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -18,14 +18,14 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ -void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1); -void WINAPI WINTRUST_Free(void *p); -BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); +void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; +void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, - BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, - BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddPrivData(CRYPT_PROVIDER_DATA *data, - CRYPT_PROVIDER_PRIVDATA *pPrivData2Add); + CRYPT_PROVIDER_PRIVDATA *pPrivData2Add) DECLSPEC_HIDDEN; #endif /* ndef __WINTRUST_PRIV_H__ */

1 0