Piotr Caban : msvcp90: Fix basic_ios<char>::imbue implementation.
Alexandre Julliard
julliard at winehq.org
Wed Jun 20 13:49:44 CDT 2012
Module: wine
Branch: master
Commit: ef2b4d74326b9f1c5479b510b4341bb08dd3e208
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2b4d74326b9f1c5479b510b4341bb08dd3e208
Author: Piotr Caban <piotr at codeweavers.com>
Date: Wed Jun 20 13:15:45 2012 +0200
msvcp90: Fix basic_ios<char>::imbue implementation.
---
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 2b43123..6bafa95 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -3174,11 +3174,12 @@ locale *__thiscall basic_ios_char_imbue(basic_ios_char *this, locale *ret, const
{
TRACE("(%p %p %p)\n", this, ret, loc);
- if(this->strbuf)
- return basic_streambuf_char_pubimbue(this->strbuf, ret, loc);
+ if(this->strbuf) {
+ basic_streambuf_char_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 at DU?$char_traits at D@std@@@std@@QBEDDD at Z */
More information about the wine-cvs
mailing list