Module: wine Branch: master Commit: 34d947189a665152de54dd8874aedfab31e1b3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d947189a665152de54dd8874...
Author: Piotr Caban piotr@codeweavers.com Date: Tue Dec 6 12:49:16 2011 +0100
msvcp90: Added _Getcoll implementation.
---
dlls/msvcp90/locale.c | 18 +++++++++++++++--- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0cc0c58..a319d12 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -846,14 +846,26 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char return _Locinfo__Locinfo_Addcats(this, category, locstr); }
+/* _Getcoll */ +_Collvec __cdecl _Getcoll(void) +{ + _Collvec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_collate_cp; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + _free_locale(locale); + return ret; +} + /* ?_Getcoll@_Locinfo@std@@QBE?AU_Collvec@@XZ */ /* ?_Getcoll@_Locinfo@std@@QEBA?AU_Collvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 4) _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) { - _Collvec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getcoll(); }
/* ?_Getctype@_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 43cc50e..2464328 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5750,7 +5750,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ stub _Getcoll +@ cdecl _Getcoll() @ stub _Getctype @ stub _Getcvt @ stub _Getdateorder