Daniel Lehman : msvcp90: Change basic_ios<wchar_t>:: imbue to match char version.
Module: wine Branch: master Commit: d67923575aa1f47a496ffda9fe6ca260ed2be968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67923575aa1f47a496ffda9fe... Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 1 23:06:02 2012 -0700 msvcp90: Change basic_ios<wchar_t>::imbue to match char version. --- dlls/msvcp90/ios.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6dfb8f4..e497304 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5275,11 +5275,12 @@ locale *__thiscall basic_ios_wchar_imbue(basic_ios_wchar *this, locale *ret, con { TRACE("(%p %p %p)\n", this, ret, loc); - if(this->strbuf) - return basic_streambuf_wchar_pubimbue(this->strbuf, ret, loc); + if(this->strbuf) { + basic_streambuf_wchar_pubimbue(this->strbuf, ret, loc); + locale_dtor(ret); + } - locale_copy_ctor(ret, loc); - return ret; + return ios_base_imbue(&this->base, ret, loc); } /* ?narrow@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QBED_WD(a)Z */
participants (1)
-
Alexandre Julliard