From 3490ad32449fd22e9cc0d9ff4254fa30886c4359 Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Fri, 6 Jan 2012 07:30:10 -0800 Subject: msvcp90: fix basic_ios::imbue arguments return is the 2nd argument a const locale is the 3rd argument --- dlls/msvcp90/ios.c | 7 +++---- dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7c490a0..0a056ac 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -706,11 +706,10 @@ char __thiscall basic_ios_char_fill_get(basic_ios_char *this) /* ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@ABV32@@Z */ /* ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z */ -DEFINE_THISCALL_WRAPPER(basic_ios_char_imbue, 4) -locale __thiscall basic_ios_char_imbue(basic_ios_char *this) +DEFINE_THISCALL_WRAPPER(basic_ios_char_imbue, 12) +locale *__thiscall basic_ios_char_imbue(basic_ios_char *this, locale *ret, const locale *loc) { - locale ret = { NULL }; - FIXME("(%p) stub\n", this); + FIXME("(%p %p %p) stub\n", this, ret, loc); return ret; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index e2f4ea7..790d243 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4256,8 +4256,8 @@ @ stub -arch=win64 ?imbue@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAXAEBVlocale@2@@Z @ stub -arch=win32 ?imbue@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEXABVlocale@2@@Z @ stub -arch=win64 ?imbue@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAXAEBVlocale@2@@Z -@ thiscall -arch=win32 ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@ABV32@@Z(ptr) basic_ios_char_imbue -@ cdecl -arch=win64 ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z(ptr) basic_ios_char_imbue +@ thiscall -arch=win32 ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@ABV32@@Z(ptr ptr ptr) basic_ios_char_imbue +@ cdecl -arch=win64 ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z(ptr ptr ptr) basic_ios_char_imbue @ stub -arch=win32 ?imbue@?$basic_ios@GU?$char_traits@G@std@@@std@@QAE?AVlocale@2@ABV32@@Z @ stub -arch=win64 ?imbue@?$basic_ios@GU?$char_traits@G@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z @ thiscall -arch=win32 ?imbue@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAE?AVlocale@2@ABV32@@Z(ptr ptr ptr) basic_ios_wchar_imbue -- 1.6.0.4