wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

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

12 Sep '11

Module: wine Branch: master Commit: aa19d0cf5f366830d7e4b47ca6f556a16f4c08f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa19d0cf5f366830d7e4b47ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:36 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 24 +++++++++--------- dlls/msvcp70/msvcp70.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 52 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 52 +++++++++++++++++++++--------------------- 4 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa19d0cf5f366830d7e4b…

1 0

Piotr Caban : msvcp90: Added basic_string::push_back(char) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

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@GU?$char_traits@G@std@@@std@@QEAAHXZ @ stub -arch=win32 ?pubsync@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAEHXZ @ stub -arch=win64 ?pubsync@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAAHXZ -@ stub -arch=win32 ?push_back@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXD@Z -@ stub -arch=win64 ?push_back@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXD@Z +@ thiscall -arch=win32 ?push_back@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXD@Z(ptr long) MSVCP_basic_string_char_append_ch +@ cdecl -arch=win64 ?push_back@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXD@Z(ptr long) MSVCP_basic_string_char_append_ch @ stub -arch=win32 ?push_back@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXG@Z @ stub -arch=win64 ?push_back@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXG@Z -@ stub -arch=win32 ?push_back@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEX_W@Z -@ stub -arch=win64 ?push_back@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAX_W@Z +@ thiscall -arch=win32 ?push_back@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEX_W@Z(ptr long) MSVCP_basic_string_wchar_append_ch +@ cdecl -arch=win64 ?push_back@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAX_W@Z(ptr long) MSVCP_basic_string_wchar_append_ch @ thiscall -arch=win32 ?put@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV12@D@Z(ptr long) basic_ostream_char_put @ cdecl -arch=win64 ?put@?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@D@Z(ptr long) basic_ostream_char_put @ stub -arch=win32 ?put@?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV12@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z */ /* ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z */ +/* ?push_back@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXD@Z */ +/* ?push_back@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXD@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@_W@Z */ /* ??Y?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@_W@Z */ +/* ?push_back@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEX_W@Z */ +/* ?push_back@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAX_W@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::operator=(char) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: c0f991e9b1ef258b926f57e6345f80036657ecf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f991e9b1ef258b926f57e63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:16 2011 +0200 msvcp90: Added basic_string::operator=(char) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 32c3766..d5d1ca3 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1382,8 +1382,8 @@ @ cdecl -arch=win64 ??4?$allocator@_W@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign @ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign -@ stub -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z -@ stub -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z +@ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z(ptr long) MSVCP_basic_string_char_assign_ch +@ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z(ptr long) MSVCP_basic_string_char_assign_ch @ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ stub -arch=win32 ??4?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@ABV01@@Z @@ -1396,8 +1396,8 @@ @ cdecl -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign @ thiscall -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr @ cdecl -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr -@ stub -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@_W@Z -@ stub -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@_W@Z +@ thiscall -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@_W@Z(ptr long) MSVCP_basic_string_wchar_assign_ch +@ cdecl -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@_W@Z(ptr long) MSVCP_basic_string_wchar_assign_ch @ stub -arch=win32 ??4?$char_traits@D@std@@QAEAAU01@ABU01@@Z @ stub -arch=win64 ??4?$char_traits@D@std@@QEAAAEAU01@AEBU01@@Z @ stub -arch=win32 ??4?$char_traits@G@std@@QAEAAU01@ABU01@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6260ee8..c161335 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -697,6 +697,15 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr_len( return this; } +/* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z */ +/* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_ch, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_assign_ch( + basic_string_char *this, char ch) +{ + return MSVCP_basic_string_char_assign_cstr_len(this, &ch, 1); +} + /* ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z */ /* ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z */ /* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z */ @@ -1573,6 +1582,15 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( return this; } +/* ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@_W@Z */ +/* ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@_W@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_ch, 8) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_ch( + basic_string_wchar *this, wchar_t ch) +{ + return MSVCP_basic_string_wchar_assign_cstr_len(this, &ch, 1); +} + /* ?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@PB_W@Z */ /* ?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@PEB_W@Z */ /* ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@PB_W@Z */

1 0

Piotr Caban : msvcp90: Added basic_string::find(basic_string, size_t) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

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@_WU?$char_traits@_W@std@@@std@@QEAA_W_W@Z @ stub -arch=win32 ?fill@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QBE_WXZ @ stub -arch=win64 ?fill@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QEBA_WXZ -@ stub -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIABV12@I@Z -@ stub -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KAEBV12@_K@Z +@ thiscall -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIABV12@I@Z(ptr ptr long) MSVCP_basic_string_char_find_off +@ cdecl -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KAEBV12@_K@Z(ptr ptr long) MSVCP_basic_string_char_find_off @ thiscall -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z(ptr long long) MSVCP_basic_string_char_find_ch @ cdecl -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z(ptr long long) MSVCP_basic_string_char_find_ch @ thiscall -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDI@Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @@ -3833,8 +3833,8 @@ @ stub -arch=win64 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KPEBG_K1@Z @ stub -arch=win32 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIPBGII@Z @ stub -arch=win64 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KPEBG_K@Z -@ stub -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIABV12@I@Z -@ stub -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KAEBV12@_K@Z +@ thiscall -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIABV12@I@Z(ptr ptr long) MSVCP_basic_string_wchar_find_off +@ cdecl -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KAEBV12@_K@Z(ptr ptr long) MSVCP_basic_string_wchar_find_off @ thiscall -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WI@Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K1@Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIABV12@I@Z */ +/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KAEBV12@_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@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z */ /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIABV12@I@Z */ +/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KAEBV12@_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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z */ /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12)

1 0

Piotr Caban : msvcp90: Added basic_string::substr(size_t, size_t) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 145f6c14f2f7469f903594d3258b3287edd2b3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145f6c14f2f7469f903594d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:58 2011 +0200 msvcp90: Added basic_string::substr(size_t, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index fc6cf20..66ec6a0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5496,12 +5496,12 @@ @ stub -arch=win64 ?str@?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ @ stub -arch=win32 ?str@strstreambuf@std@@QAEPADXZ @ stub -arch=win64 ?str@strstreambuf@std@@QEAAPEADXZ -@ stub -arch=win32 ?substr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV12@II@Z -@ stub -arch=win64 ?substr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA?AV12@_K0@Z +@ thiscall -arch=win32 ?substr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV12@II@Z(ptr ptr long long) MSVCP_basic_string_char_substr +@ cdecl -arch=win64 ?substr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA?AV12@_K0@Z(ptr ptr long long) MSVCP_basic_string_char_substr @ stub -arch=win32 ?substr@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV12@II@Z @ stub -arch=win64 ?substr@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA?AV12@_K0@Z -@ stub -arch=win32 ?substr@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBE?AV12@II@Z -@ stub -arch=win64 ?substr@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV12@_K0@Z +@ thiscall -arch=win32 ?substr@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBE?AV12@II@Z(ptr ptr long long) MSVCP_basic_string_wchar_substr +@ cdecl -arch=win64 ?substr@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV12@_K0@Z(ptr ptr long long) MSVCP_basic_string_wchar_substr @ thiscall -arch=win32 ?sungetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sungetc @ cdecl -arch=win64 ?sungetc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sungetc @ stub -arch=win32 ?sungetc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAEGXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 1d15331..2ad568c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -847,6 +847,19 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri } } +/* ?substr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV12@II@Z */ +/* ?substr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA?AV12@_K0@Z */ +DEFINE_THISCALL_WRAPPER_RETPTR(MSVCP_basic_string_char_substr, 12) +basic_string_char __thiscall MSVCP_basic_string_char_substr( + basic_string_char *this, MSVCP_size_t off, MSVCP_size_t len) +{ + basic_string_char ret = { 0 }; + TRACE("%p %lu %lu\n", this, off, len); + + MSVCP_basic_string_char_ctor_substr(&ret, this, off, len); + return ret; +} + /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z */ /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_substr, 16) @@ -1700,6 +1713,19 @@ void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_st } } +/* ?substr@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBE?AV12@II@Z */ +/* ?substr@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV12@_K0@Z */ +DEFINE_THISCALL_WRAPPER_RETPTR(MSVCP_basic_string_wchar_substr, 12) +basic_string_wchar __thiscall MSVCP_basic_string_wchar_substr( + basic_string_wchar *this, MSVCP_size_t off, MSVCP_size_t len) +{ + basic_string_wchar ret = { 0 }; + TRACE("%p %lu %lu\n", this, off, len); + + MSVCP_basic_string_wchar_ctor_substr(&ret, this, off, len); + return ret; +} + /* ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@ABV12@II@Z */ /* ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@_K1@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_substr, 16)

1 0

Piotr Caban : msvcp90: Added basic_string<wchar>::operator=(const wchar*) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

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@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@PEBG@Z @ thiscall -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign @ cdecl -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign -@ stub -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@PB_W@Z -@ stub -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@PEB_W@Z +@ thiscall -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr +@ cdecl -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr @ stub -arch=win32 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@_W@Z @ stub -arch=win64 ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@_W@Z @ stub -arch=win32 ??4?$char_traits@D@std@@QAEAAU01@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@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@PB_W@Z */ /* ?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@PEB_W@Z */ +/* ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV01@PB_W@Z */ +/* ??4?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV01@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

Piotr Caban : msvcp90: Added basic_string::find(const char*, size_t) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 44f64f29b33c5e268dc312d50d3ca0b11b809e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f64f29b33c5e268dc312d50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:40 2011 +0200 msvcp90: Added basic_string::find(const char*, 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 277ef26..5518c06 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3821,10 +3821,10 @@ @ stub -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KAEBV12@_K@Z @ thiscall -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z(ptr long long) MSVCP_basic_string_char_find_ch @ cdecl -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z(ptr long long) MSVCP_basic_string_char_find_ch -@ stub -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDI@Z +@ thiscall -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDI@Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K1@Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDII@Z(ptr str long long) MSVCP_basic_string_char_find_cstr_substr -@ stub -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K@Z +@ cdecl -arch=win64 ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K@Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @ stub -arch=win32 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIABV12@I@Z @ stub -arch=win64 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KAEBV12@_K@Z @ stub -arch=win32 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIGI@Z @@ -3835,10 +3835,10 @@ @ stub -arch=win64 ?find@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KPEBG_K@Z @ stub -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIABV12@I@Z @ stub -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KAEBV12@_K@Z -@ stub -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WI@Z +@ thiscall -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WI@Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K1@Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr -@ stub -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K@Z +@ cdecl -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K@Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ thiscall -arch=win32 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win64 ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z(ptr long long) MSVCP_basic_string_wchar_find_ch @ cdecl -arch=win32 ?find@?$char_traits@D@std@@SAPBDPBDIABD@Z(ptr long ptr) MSVCP_char_traits_char_find diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index dfc0af5..c25c7f1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1172,6 +1172,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( return MSVCP_basic_string_char_npos; } +/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDI@Z */ +/* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_cstr_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_off( + const basic_string_char *this, const char *find, MSVCP_size_t pos) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, find, pos, + MSVCP_char_traits_char_length(find)); +} + /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z */ /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) @@ -2013,6 +2023,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( return MSVCP_basic_string_wchar_npos; } +/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WI@Z */ +/* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_cstr_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_off( + const basic_string_wchar *this, const wchar_t *find, MSVCP_size_t pos) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, find, pos, + MSVCP_char_traits_wchar_length(find)); +} + /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z */ /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12)

1 0

Piotr Caban : msvcp90: Added basic_string<char>(allocator<char>) constructor implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 6e4ad3394152077d630bac6cedfa47c81cecef4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad3394152077d630bac6ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:30 2011 +0200 msvcp90: Added basic_string<char>(allocator<char>) constructor implementation. --- dlls/msvcp90/memory.c | 4 ++-- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 0941006..85d80ae 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -54,7 +54,7 @@ void* __thiscall MSVCP_allocator_char_ctor(void *this) /* ??0?$allocator@D@std@@QAE@ABV01@@Z */ /* ??0?$allocator@D@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8) -void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, void *copy) +void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy) { return this; } @@ -62,7 +62,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, void *copy) /* ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z */ /* ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); -void* __thiscall MSVCP_allocator_char_assign(void *this, void *assign) +void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) { return this; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index f3062cd..277ef26 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -738,8 +738,8 @@ @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1@Z(ptr ptr long long) MSVCP_basic_string_char_ctor_substr @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@IIABV?$allocator@D@1@@Z @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@D@1@@Z -@ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$allocator@D@1@@Z -@ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV?$allocator@D@1@@Z +@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$allocator@D@1@@Z(ptr ptr) MSVCP_basic_string_char_ctor_alloc +@ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV?$allocator@D@1@@Z(ptr ptr) MSVCP_basic_string_char_ctor_alloc @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ID@Z @ stub -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD0@Z @ stub -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@IDABV?$allocator@D@1@@Z @@ -790,8 +790,8 @@ @ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1@Z(ptr ptr long long) MSVCP_basic_string_wchar_ctor_substr @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV01@IIABV?$allocator@_W@1@@Z @ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@_W@1@@Z -@ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV?$allocator@_W@1@@Z -@ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV?$allocator@_W@1@@Z +@ thiscall -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV?$allocator@_W@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc +@ cdecl -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV?$allocator@_W@1@@Z(ptr ptr) MSVCP_basic_string_wchar_ctor_alloc @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@I_W@Z @ stub -arch=win64 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W0@Z @ stub -arch=win32 ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@I_WABV?$allocator@_W@1@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 049659e..dfc0af5 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -793,6 +793,18 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_substr( return this; } +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$allocator@D@1@@Z */ +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV?$allocator@D@1@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_alloc, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_alloc( + basic_string_char *this, const void *alloc) +{ + TRACE("%p %p\n", this, alloc); + + basic_string_char_tidy(this, FALSE, 0); + return this; +} + /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */ /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) @@ -1622,6 +1634,18 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_substr( return this; } +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@ABV?$allocator@_W@1@@Z */ +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV?$allocator@_W@1@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_alloc, 8) + basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_alloc( + basic_string_wchar *this, const void *alloc) +{ + TRACE("%p %p\n", this, alloc); + + basic_string_wchar_tidy(this, FALSE, 0); + return this; +} + /* ??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ */ /* ??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4)

1 0

Piotr Caban : msvcp60: Export more functions on win32.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: eba2ca4a1e33c4c024edc0db0b40a39a4e34f611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba2ca4a1e33c4c024edc0db0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:20 2011 +0200 msvcp60: Export more functions on win32. --- dlls/msvcp60/msvcp60.spec | 112 ++++++++++++++++++++++---------------------- 1 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eba2ca4a1e33c4c024edc…

1 0

Frédéric Delanoy : ntdll: Add NtCreateFile tests for invalid chars in file/dir name.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: a5229fc51f805d86dccbcc99389093a6dedf9113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5229fc51f805d86dccbcc993… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 22:52:45 2011 +0200 ntdll: Add NtCreateFile tests for invalid chars in file/dir name. --- dlls/ntdll/tests/file.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ec62fe7..e299560 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -160,8 +160,10 @@ static void create_file_test(void) { static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t', '\\','f','a','i','l','i','n','g',0}; + static const WCHAR questionmarkInvalidNameW[] = {'a','f','i','l','e','?',0}; + static const WCHAR pipeInvalidNameW[] = {'a','|','b',0}; NTSTATUS status; - HANDLE dir; + HANDLE dir, file; WCHAR path[MAX_PATH]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; @@ -249,6 +251,35 @@ static void create_file_test(void) todo_wine ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + /* Invalid chars in file/dirnames */ + pRtlDosPathNameToNtPathName_U(questionmarkInvalidNameW, &nameW, NULL, NULL); + attr.ObjectName = &nameW; + status = pNtCreateFile(&dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, + 0, FILE_CREATE, + FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); + attr.ObjectName = &nameW; + status = pNtCreateFile(&dir, GENERIC_READ|SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, + FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + + status = pNtCreateFile(&file, GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0, + 0, FILE_CREATE, + FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok(status == STATUS_OBJECT_NAME_INVALID, + "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); } static void open_file_test(void)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011