Alexandre Julliard : msvcp100: Implement _Locinfo::_Getname.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 91356c3bedccc379c6457a83a7895050f1ce5b1e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=91356c3bedccc379c6457a83a7...

Author: Alexandre Julliard 
Date:   Sat Dec 21 17:57:46 2013 +0100

msvcp100: Implement _Locinfo::_Getname.

---

dlls/msvcp100/msvcp100.spec |    4 ++--
 dlls/msvcp110/msvcp110.spec |    4 ++--
 dlls/msvcp90/locale.c       |   10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index 92c99d7..12463af 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -908,8 +908,8 @@
 @ cdecl -arch=win64 ?_Getlconv@_Locinfo@std@@QEBAPEBUlconv@@XZ(ptr) _Locinfo__Getlconv
 @ thiscall -arch=win32 ?_Getmonths@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getmonths
 @ cdecl -arch=win64 ?_Getmonths@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths
-@ stub -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ
-@ stub -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ
+@ thiscall -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getname
+@ cdecl -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getname
 @ cdecl -arch=arm ?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst
 @ thiscall -arch=i386 ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst
 @ cdecl -arch=win64 ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 3d9871c..d31f301 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -1331,8 +1331,8 @@
 @ thiscall -arch=i386 ?_Getmonths@_Locinfo@std@@QBEPBDXZ(ptr) msvcp90.?_Getmonths@_Locinfo@std@@QBEPBDXZ
 @ cdecl -arch=win64 ?_Getmonths@_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp90.?_Getmonths@_Locinfo@std@@QEBAPEBDXZ
 @ stub -arch=arm ?_Getname@_Locinfo@std@@QBAPBDXZ
-@ stub -arch=i386 ?_Getname@_Locinfo@std@@QBEPBDXZ
-@ stub -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ
+@ thiscall -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ(ptr) msvcp100.?_Getname@_Locinfo@std@@QBEPBDXZ
+@ cdecl -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp100.?_Getname@_Locinfo@std@@QEBAPEBDXZ
 @ cdecl -arch=arm ?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ(ptr) msvcp100.?_Getpfirst@_Container_base12@std@@QBAPAPAU_Iterator_base12@2@XZ
 @ thiscall -arch=i386 ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ(ptr) msvcp100.?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ
 @ cdecl -arch=win64 ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ(ptr) msvcp100.?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 5fdf890..08cc893 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -9454,6 +9454,16 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char
     return ret;
 }

+#else
+
+/* ?_Getname@_Locinfo@std@@QBEPBDXZ */
+/* ?_Getname@_Locinfo@std@@QEBAPEBDXZ */
+DEFINE_THISCALL_WRAPPER(_Locinfo__Getname, 4)
+const char * __thiscall _Locinfo__Getname( const _Locinfo *this )
+{
+    return locale_string_char_c_str( &this->newlocname );
+}
+
 #endif  /* _MSVCP_VER < 100 */

/* wctrans */