wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcp60: Added iostream tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: c0589a31e0e22e2efd4894656f8f2c5201ded6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0589a31e0e22e2efd4894656… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:55 2012 +0100 msvcp60: Added iostream tests. --- dlls/msvcp60/tests/Makefile.in | 1 + dlls/msvcp60/tests/ios.c | 1626 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1627 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0589a31e0e22e2efd489…

1 0

Piotr Caban : msvcp60: Fixed basic_istream::getline(basic_string) implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 43e8e008b2f41355051b71b43f61959ba784505b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e8e008b2f41355051b71b43… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:41 2012 +0100 msvcp60: Fixed basic_istream::getline(basic_string) implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp60/string.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 08a3848..02e903d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7617,9 +7617,9 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); - basic_string_char_clear(str); c = basic_streambuf_char_sgetc(strbuf); for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) @@ -8909,9 +8909,9 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - basic_string_wchar_clear(str); c = basic_streambuf_wchar_sgetc(strbuf); for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 803cd33..d2e1c81 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -153,7 +153,8 @@ void __thiscall basic_string_char__Eos(basic_string_char *this, MSVCP_size_t len void basic_string_char_clear(basic_string_char *this) { - basic_string_char__Eos(this, 0); + if(this->ptr) + basic_string_char__Eos(this, 0); } /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEX_N@Z */ @@ -1865,7 +1866,8 @@ void __thiscall basic_string_wchar__Eos(basic_string_wchar *this, MSVCP_size_t l void basic_string_wchar_clear(basic_string_wchar *this) { - basic_string_wchar__Eos(this, 0); + if(this->ptr) + basic_string_wchar__Eos(this, 0); } /* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEX_N@Z */

1 0

Piotr Caban : msvcp60: Fixed basic_istream::seekg implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: a43840bcdf69050a7ae0f4ee3d1f0df883a60be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43840bcdf69050a7ae0f4ee3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:31 2012 +0100 msvcp60: Fixed basic_istream::seekg implementation. --- dlls/msvcp60/ios.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 99493c4..08a3848 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7264,14 +7264,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this fpos_int ret; basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + } return this; } @@ -7290,14 +7283,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + } return this; } @@ -8530,14 +8516,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + } return this; } @@ -8558,14 +8537,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + } return this; }

1 0

Piotr Caban : msvcp60: Fixed basic_istream::ipfx implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 9796cf388c967fdf8c21a264cc186636177951be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9796cf388c967fdf8c21a264c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:19 2012 +0100 msvcp60: Fixed basic_istream::ipfx implementation. --- dlls/msvcp60/ios.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index d243b1d..99493c4 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -6756,12 +6756,7 @@ static MSVCP_bool basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool for(ch = basic_streambuf_char_sgetc(strbuf); ; ch = basic_streambuf_char_snextc(strbuf)) { - if(ch == EOF) { - basic_ios_char_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==EOF || !ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) break; } } @@ -7985,12 +7980,7 @@ static MSVCP_bool basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_boo for(ch = basic_streambuf_wchar_sgetc(strbuf); ; ch = basic_streambuf_wchar_snextc(strbuf)) { - if(ch == WEOF) { - basic_ios_wchar_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==WEOF || !ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) break; } }

1 0

Piotr Caban : msvcp60: Fixed num_put::fput implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1cd95d4f828c066d5854c77845cbe8c9e97c72f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd95d4f828c066d5854c7784… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:08 2012 +0100 msvcp60: Fixed num_put::fput implementation. --- dlls/msvcp60/locale.c | 47 ----------------------------------------------- 1 files changed, 0 insertions(+), 47 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 2ed61de..a2a50df 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -5732,10 +5732,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb ostreambuf_iterator_char dest, ios_base *base, char fill, char *buf, MSVCP_size_t count) { numpunct_char *numpunct = numpunct_char_use_facet(&base->loc); - basic_string_char grouping_bstr; - const char *grouping; char *p, sep = *localeconv()->decimal_point; - int cur_group = 0, group_size = 0; int adjustfield = base->fmtfl & FMTFLAG_adjustfield; MSVCP_size_t pad; @@ -5750,25 +5747,6 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb } p--; - /* Add separators to number */ - numpunct_char_grouping(numpunct, &grouping_bstr); - grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; - - for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { - group_size++; - if(group_size == grouping[cur_group]) { - group_size = 0; - if(grouping[cur_group+1]) - cur_group++; - - memmove(p+1, p, buf+count-p); - *p = sep; - count++; - } - } - basic_string_char_dtor(&grouping_bstr); - /* Display number with padding */ if(count >= base->wide) pad = 0; @@ -6420,11 +6398,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, MSVCP_size_t count, numpunct_wchar *numpunct) { - basic_string_char grouping_bstr; - const char *grouping; char *p, dec_point = *localeconv()->decimal_point; - wchar_t sep; - int cur_group = 0, group_size = 0; int adjustfield = base->fmtfl & FMTFLAG_adjustfield; MSVCP_size_t i, pad; @@ -6436,25 +6410,6 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ } p--; - /* Add separators to number */ - numpunct_wchar_grouping(numpunct, &grouping_bstr); - grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : '\0'; - - for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { - group_size++; - if(group_size == grouping[cur_group]) { - group_size = 0; - if(grouping[cur_group+1]) - cur_group++; - - memmove(p+1, p, buf+count-p); - *p = '\0'; /* mark thousands separator positions */ - count++; - } - } - basic_string_char_dtor(&grouping_bstr); - /* Display number with padding */ if(count >= base->wide) pad = 0; @@ -6474,8 +6429,6 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ for(i=0; i<count; i++) { if(buf[i] == dec_point) num_put_wchar__Rep(this, &dest, dest, numpunct_wchar_decimal_point(numpunct), 1); - else if(!buf[i]) - num_put_wchar__Rep(this, &dest, dest, sep, 1); else num_put_wchar__Putc(this, &dest, dest, buf+i, 1); }

1 0

Piotr Caban : msvcp60: Fixed num_get class implementataion.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 8048d04e59ab2b7119c168e50781385441694aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8048d04e59ab2b7119c168e50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:38:54 2012 +0100 msvcp60: Fixed num_get class implementataion. --- dlls/msvcp60/ios.c | 17 +-- dlls/msvcp60/locale.c | 312 +++++++++---------------------------------------- dlls/msvcp60/msvcp.h | 5 +- 3 files changed, 68 insertions(+), 266 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8048d04e59ab2b7119c16…

1 0

Piotr Caban : msvcp60: Remove mutex class.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: b999c3e3070228aae404cc8b575c12add7a3c734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b999c3e3070228aae404cc8b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:38:39 2012 +0100 msvcp60: Remove mutex class. --- dlls/msvcp60/ios.c | 5 ----- dlls/msvcp60/misc.c | 37 ------------------------------------- dlls/msvcp60/msvcp.h | 11 ----------- 3 files changed, 0 insertions(+), 53 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 5c2a1f4..eb5cbe0 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1592,7 +1592,6 @@ static basic_streambuf_wchar* basic_streambuf_wchar_ctor_uninitialized(basic_str { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; - mutex_ctor(&this->lock); return this; } @@ -1614,7 +1613,6 @@ static basic_streambuf_wchar* basic_streambuf_wchar_ctor(basic_streambuf_wchar * TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; - mutex_ctor(&this->lock); locale_ctor(&this->loc); basic_streambuf_wchar__Init_empty(this); @@ -1641,7 +1639,6 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); - mutex_dtor(&this->lock); locale_dtor(&this->loc); } @@ -1736,7 +1733,6 @@ void __thiscall basic_streambuf_wchar__Init(basic_streambuf_wchar *this, wchar_t static void basic_streambuf_wchar__Lock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); - mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IBEHXZ */ @@ -1847,7 +1843,6 @@ static streamsize basic_streambuf_wchar__Sgetn_s(basic_streambuf_wchar *this, wc static void basic_streambuf_wchar__Unlock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); - mutex_unlock(&this->lock); } /* ?eback@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IBEPA_WXZ */ diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 9c840b7..98eb9cf 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -27,43 +27,6 @@ #include "winbase.h" -/* ??0_Mutex@std@@QAE@XZ */ -/* ??0_Mutex@std@@QEAA@XZ */ -mutex* mutex_ctor(mutex *this) -{ - CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); - if(!cs) - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - - InitializeCriticalSection(cs); - cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); - this->mutex = cs; - return this; -} - -/* ??1_Mutex@std@@QAE@XZ */ -/* ??1_Mutex@std@@QEAA@XZ */ -void mutex_dtor(mutex *this) -{ - ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; - DeleteCriticalSection(this->mutex); - MSVCRT_operator_delete(this->mutex); -} - -/* ?_Lock@_Mutex@std@@QAEXXZ */ -/* ?_Lock@_Mutex@std@@QEAAXXZ */ -void mutex_lock(mutex *this) -{ - EnterCriticalSection(this->mutex); -} - -/* ?_Unlock@_Mutex@std@@QAEXXZ */ -/* ?_Unlock@_Mutex@std@@QEAAXXZ */ -void mutex_unlock(mutex *this) -{ - LeaveCriticalSection(this->mutex); -} - static CRITICAL_SECTION lockit_cs; void init_lockit(void) { diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 17cb6eb..ea52743 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -198,16 +198,6 @@ void free_lockit(void); _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit*, int); void __thiscall _Lockit_dtor(_Lockit*); -/* class mutex */ -typedef struct { - void *mutex; -} mutex; - -mutex* mutex_ctor(mutex*); -void mutex_dtor(mutex*); -void mutex_lock(mutex*); -void mutex_unlock(mutex*); - typedef enum { FMTFLAG_skipws = 0x0001, FMTFLAG_unitbuf = 0x0002, @@ -331,7 +321,6 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char*, char); /* class basic_streambuf<wchar> */ typedef struct { const vtable_ptr *vtable; - mutex lock; wchar_t *rbuf; wchar_t *wbuf; wchar_t **prbuf;

1 0

Piotr Caban : msvcp60: Added basic_string tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 4b7333e227a2b69b9736d1d618fc03881d6ce102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7333e227a2b69b9736d1d61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:38:20 2012 +0100 msvcp60: Added basic_string tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp60/string.c | 14 +- dlls/msvcp60/tests/Makefile.in | 9 + dlls/msvcp60/tests/string.c | 704 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 723 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b7333e227a2b69b9736d…

1 0

Piotr Caban : msvcp60: Fixed basic_string::c_str implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1c33835a53bc00d315f63721fa684d31b805fbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c33835a53bc00d315f63721f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:54 2012 +0100 msvcp60: Fixed basic_string::c_str implementation. --- dlls/msvcp60/locale.c | 12 ++++++------ dlls/msvcp60/string.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index bbeb5a5..f350014 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -3970,7 +3970,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; if(sep) basic_string_char_ctor(&groups_found); @@ -4124,7 +4124,7 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_wchar_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -5034,7 +5034,7 @@ static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; if(sep) basic_string_char_ctor(&groups_found); @@ -5186,7 +5186,7 @@ static int num_get_char__Getifld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -5949,7 +5949,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; @@ -6032,7 +6032,7 @@ static ostreambuf_iterator_char* num_put_char__Iput(const num_put *this, ostream /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index ed4391c..69917dc 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1666,7 +1666,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_c_str, 4) const char* __thiscall basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); - return this->ptr; + return this->ptr ? this->ptr : basic_string_char__Nullstr(); } /* ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ @@ -3376,7 +3376,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_c_str, 4) const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); - return this->ptr; + return this->ptr ? this->ptr : basic_string_wchar__Nullstr(); } /* ?size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ */

1 0

Piotr Caban : msvcp60: Fixed basic_filebuf<short> implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 3b69e28a899bc9739fea1d446b4c0661d0b85bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b69e28a899bc9739fea1d446… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:42 2012 +0100 msvcp60: Fixed basic_filebuf<short> implementation. --- dlls/msvcp60/ios.c | 250 +++++++++++++++++-------------------------------- dlls/msvcp60/msvcp.h | 1 + 2 files changed, 88 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b69e28a899bc9739fea1…

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
71
Older →

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 November 2012