diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 4c0a656220b..ad44aadb67f 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -116,6 +116,15 @@ typedef struct {
     const char *true_name;
 } numpunct_char;
 
+typedef struct {
+    locale_facet facet;
+    const char *grouping;
+    wchar_t dp;
+    wchar_t sep;
+    const wchar_t *false_name;
+    const wchar_t *true_name;
+} numpunct_wchar;
+
 /* ?_Id_cnt@id@locale@std@@0HA */
 int locale_id__Id_cnt = 0;
 
@@ -2597,6 +2606,284 @@ basic_string_char __thiscall numpunct_char_truename(const numpunct_char *this)
     return ret;
 }
 
+/* ?id@?$numpunct@_W@std@@2V0locale@2@A */
+locale_id numpunct_wchar_id = {0};
+/* ?id@?$numpunct@G@std@@2V0locale@2@A */
+locale_id numpunct_short_id = {0};
+
+/* ??_7?$numpunct@_W@std@@6B@ */
+extern const vtable_ptr MSVCP_numpunct_wchar_vtable;
+/* ??_7?$numpunct@G@std@@6B@ */
+extern const vtable_ptr MSVCP_numpunct_short_vtable;
+
+/* ?_Init@?$numpunct@_W@std@@IAEXABV_Locinfo@2@_N@Z */
+/* ?_Init@?$numpunct@_W@std@@IEAAXAEBV_Locinfo@2@_N@Z */
+/* ?_Init@?$numpunct@G@std@@IAEXABV_Locinfo@2@_N@Z */
+/* ?_Init@?$numpunct@G@std@@IEAAXAEBV_Locinfo@2@_N@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar__Init, 12)
+void __thiscall numpunct_wchar__Init(numpunct_wchar *this, _Locinfo *locinfo, MSVCP_bool isdef)
+{
+    FIXME("(%p %p %d) stub\n", this, locinfo, isdef);
+}
+
+/* ?_Tidy@?$numpunct@_W@std@@AAEXXZ */
+/* ?_Tidy@?$numpunct@_W@std@@AEAAXXZ */
+/* ?_Tidy@?$numpunct@G@std@@AAEXXZ */
+/* ?_Tidy@?$numpunct@G@std@@AEAAXXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar__Tidy, 4)
+void __thiscall numpunct_wchar__Tidy(numpunct_wchar *this)
+{
+    FIXME("(%p) stub\n", this);
+}
+
+/* ??0?$numpunct@_W@std@@QAE@ABV_Locinfo@1@I_N@Z */
+/* ??0?$numpunct@_W@std@@QEAA@AEBV_Locinfo@1@_K_N@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_ctor_locinfo, 16)
+numpunct_wchar* __thiscall numpunct_wchar_ctor_locinfo(numpunct_wchar *this,
+        _Locinfo *locinfo, MSVCP_size_t refs, MSVCP_bool usedef)
+{
+    FIXME("(%p %p %lu %d) stub\n", this, locinfo, refs, usedef);
+    this->facet.vtable = &MSVCP_numpunct_wchar_vtable;
+    return NULL;
+}
+
+/* ??0?$numpunct@G@std@@QAE@ABV_Locinfo@1@I_N@Z */
+/* ??0?$numpunct@G@std@@QEAA@AEBV_Locinfo@1@_K_N@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_short_ctor_locinfo, 16)
+numpunct_wchar* __thiscall numpunct_short_ctor_locinfo(numpunct_wchar *this,
+        _Locinfo *locinfo, MSVCP_size_t refs, MSVCP_bool usedef)
+{
+    numpunct_wchar_ctor_locinfo(this, locinfo, refs, usedef);
+    this->facet.vtable = &MSVCP_numpunct_short_vtable;
+    return this;
+}
+
+/* ??0?$numpunct@_W@std@@IAE@PBDI_N@Z */
+/* ??0?$numpunct@_W@std@@IEAA@PEBD_K_N@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_ctor_name, 16)
+numpunct_wchar* __thiscall numpunct_wchar_ctor_name(numpunct_wchar *this,
+        const char *name, MSVCP_size_t refs, MSVCP_bool usedef)
+{
+    FIXME("(%p %s %lu %d) stub\n", this, debugstr_a(name), refs, usedef);
+    this->facet.vtable = &MSVCP_numpunct_wchar_vtable;
+    return NULL;
+}
+
+/* ??0?$numpunct@G@std@@IAE@PBDI_N@Z */
+/* ??0?$numpunct@G@std@@IEAA@PEBD_K_N@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_short_ctor_name, 16)
+numpunct_wchar* __thiscall numpunct_short_ctor_name(numpunct_wchar *this,
+        const char *name, MSVCP_size_t refs, MSVCP_bool usedef)
+{
+    numpunct_wchar_ctor_name(this, name, refs, usedef);
+    this->facet.vtable = &MSVCP_numpunct_short_vtable;
+    return this;
+}
+
+/* ??0?$numpunct@_W@std@@QAE@I@Z */
+/* ??0?$numpunct@_W@std@@QEAA@_K@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_ctor_refs, 8)
+numpunct_wchar* __thiscall numpunct_wchar_ctor_refs(numpunct_wchar *this, MSVCP_size_t refs)
+{
+    FIXME("(%p %lu) stub\n", this, refs);
+    this->facet.vtable = &MSVCP_numpunct_wchar_vtable;
+    return NULL;
+}
+
+/* ??0?$numpunct@G@std@@QAE@I@Z */
+/* ??0?$numpunct@G@std@@QEAA@_K@Z */
+DEFINE_THISCALL_WRAPPER(numpunct_short_ctor_refs, 8)
+numpunct_wchar* __thiscall numpunct_short_ctor_refs(numpunct_wchar *this, MSVCP_size_t refs)
+{
+    numpunct_wchar_ctor_refs(this, refs);
+    this->facet.vtable = &MSVCP_numpunct_short_vtable;
+    return this;
+}
+
+/* ??_F?$numpunct@_W@std@@QAEXXZ */
+/* ??_F?$numpunct@_W@std@@QEAAXXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_ctor, 4)
+numpunct_wchar* __thiscall numpunct_wchar_ctor(numpunct_wchar *this)
+{
+    return numpunct_wchar_ctor_refs(this, 0);
+}
+
+/* ??_F?$numpunct@G@std@@QAEXXZ */
+/* ??_F?$numpunct@G@std@@QEAAXXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_short_ctor, 4)
+numpunct_wchar* __thiscall numpunct_short_ctor(numpunct_wchar *this)
+{
+    return numpunct_short_ctor_refs(this, 0);
+}
+
+/* ??1?$numpunct@_W@std@@MAE@XZ */
+/* ??1?$numpunct@_W@std@@MEAA@XZ */
+/* ??1?$numpunct@G@std@@MAE@XZ */
+/* ??1?$numpunct@G@std@@MEAA@XZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_dtor, 4)
+void __thiscall numpunct_wchar_dtor(numpunct_wchar *this)
+{
+    FIXME("(%p) stub\n", this);
+}
+
+DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_wchar_vector_dtor, 8)
+numpunct_wchar* __thiscall MSVCP_numpunct_wchar_vector_dtor(numpunct_wchar *this, unsigned int flags)
+{
+    TRACE("(%p %x)\n", this, flags);
+    if(flags & 2) {
+        /* we have an array, with the number of elements stored before the first object */
+        int i, *ptr = (int *)this-1;
+
+        for(i=*ptr-1; i>=0; i--)
+            numpunct_wchar_dtor(this+i);
+        MSVCRT_operator_delete(ptr);
+    } else {
+        numpunct_wchar_dtor(this);
+        if(flags & 1)
+            MSVCRT_operator_delete(this);
+    }
+
+    return this;
+}
+
+DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_short_vector_dtor, 8)
+numpunct_wchar* __thiscall MSVCP_numpunct_short_vector_dtor(numpunct_wchar *this, unsigned int flags)
+{
+    return MSVCP_numpunct_wchar_vector_dtor(this, flags);
+}
+
+/* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
+/* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
+MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *loc)
+{
+    FIXME("(%p %p) stub\n", facet, loc);
+    return 0;
+}
+
+/* ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
+/* ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
+MSVCP_size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const locale *loc)
+{
+    FIXME("(%p %p) stub\n", facet, loc);
+    return 0;
+}
+
+/* ?do_decimal_point@?$numpunct@_W@std@@MBE_WXZ */
+/* ?do_decimal_point@?$numpunct@_W@std@@MEBA_WXZ */
+/* ?do_decimal_point@?$numpunct@G@std@@MBEGXZ */
+/* ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_do_decimal_point, 4)
+wchar_t __thiscall numpunct_wchar_do_decimal_point(const numpunct_wchar *this)
+{
+    FIXME("(%p) stub\n", this);
+    return 0;
+}
+
+/* ?decimal_point@?$numpunct@_W@std@@QBE_WXZ */
+/* ?decimal_point@?$numpunct@_W@std@@QEBA_WXZ */
+/* ?decimal_point@?$numpunct@G@std@@QBEGXZ */
+/* ?decimal_point@?$numpunct@G@std@@QEBAGXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_decimal_point, 4)
+wchar_t __thiscall numpunct_wchar_decimal_point(const numpunct_wchar *this)
+{
+    FIXME("(%p) stub\n", this);
+    return 0;
+}
+
+/* ?do_thousands_sep@?$numpunct@_W@std@@MBE_WXZ */
+/* ?do_thousands_sep@?$numpunct@_W@std@@MEBA_WXZ */
+/* ?do_thousands_sep@?$numpunct@G@std@@MBEGXZ */
+/* ?do_thousands_sep@?$numpunct@G@std@@MEBAGXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_do_thousands_sep, 4)
+wchar_t __thiscall numpunct_wchar_do_thousands_sep(const numpunct_wchar *this)
+{
+    FIXME("(%p) stub\n", this);
+    return 0;
+}
+
+/* ?thousands_sep@?$numpunct@_W@std@@QBE_WXZ */
+/* ?thousands_sep@?$numpunct@_W@std@@QEBA_WXZ */
+/* ?thousands_sep@?$numpunct@G@std@@QBEGXZ */
+/* ?thousands_sep@?$numpunct@G@std@@QEBAGXZ */
+DEFINE_THISCALL_WRAPPER(numpunct_wchar_thousands_sep, 4)
+wchar_t __thiscall numpunct_wchar_thousands_sep(const numpunct_wchar *this)
+{
+    FIXME("(%p) stub\n", this);
+    return 0;
+}
+
+/* ?do_grouping@?$numpunct@_W@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+/* ?do_grouping@?$numpunct@_W@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+/* ?do_grouping@?$numpunct@G@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+/* ?do_grouping@?$numpunct@G@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+DEFINE_THISCALL_WRAPPER_RETPTR(numpunct_wchar_do_grouping, 4)
+basic_string_char __thiscall numpunct_wchar_do_grouping(const numpunct_wchar *this)
+{
+    basic_string_char ret = {0};
+    FIXME("(%p) stub\n", this);
+    return ret;
+}
+
+/* ?grouping@?$numpunct@_W@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+/* ?grouping@?$numpunct@_W@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+/* ?grouping@?$numpunct@G@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+/* ?grouping@?$numpunct@G@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */
+DEFINE_THISCALL_WRAPPER_RETPTR(numpunct_wchar_grouping, 4)
+basic_string_char __thiscall numpunct_wchar_grouping(const numpunct_wchar *this)
+{
+    basic_string_char ret = {0};
+    FIXME("(%p) stub\n", this);
+    return ret;
+}
+
+/* ?do_falsename@?$numpunct@_W@std@@MBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?do_falsename@?$numpunct@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?do_falsename@?$numpunct@G@std@@MBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+/* ?do_falsename@?$numpunct@G@std@@MEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+DEFINE_THISCALL_WRAPPER_RETPTR(numpunct_wchar_do_falsename, 4)
+basic_string_wchar __thiscall numpunct_wchar_do_falsename(const numpunct_wchar *this)
+{
+    basic_string_wchar ret = {0};
+    FIXME("(%p) stub\n", this);
+    return ret;
+}
+
+/* ?falsename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?falsename@?$numpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?falsename@?$numpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+/* ?falsename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+DEFINE_THISCALL_WRAPPER_RETPTR(numpunct_wchar_falsename, 4)
+basic_string_wchar __thiscall numpunct_wchar_falsename(const numpunct_wchar *this)
+{
+    basic_string_wchar ret = {0};
+    FIXME("(%p) stub\n", this);
+    return ret;
+}
+
+/* ?do_truename@?$numpunct@_W@std@@MBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?do_truename@?$numpunct@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?do_truename@?$numpunct@G@std@@MBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+/* ?do_truename@?$numpunct@G@std@@MEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+DEFINE_THISCALL_WRAPPER_RETPTR(numpunct_wchar_do_truename, 4)
+basic_string_wchar __thiscall numpunct_wchar_do_truename(const numpunct_wchar *this)
+{
+    basic_string_wchar ret = {0};
+    FIXME("(%p) stub\n", this);
+    return ret;
+}
+
+/* ?truename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?truename@?$numpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */
+/* ?truename@?$numpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+/* ?truename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */
+DEFINE_THISCALL_WRAPPER_RETPTR(numpunct_wchar_truename, 4)
+basic_string_wchar __thiscall numpunct_wchar_truename(const numpunct_wchar *this)
+{
+    basic_string_wchar ret = {0};
+    FIXME("(%p) stub\n", this);
+    return ret;
+}
+
 /* ??0_Locimp@locale@std@@AAE@_N@Z */
 /* ??0_Locimp@locale@std@@AEAA@_N@Z */
 DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor_transparent, 8)
@@ -3016,6 +3303,8 @@ DEFINE_RTTI_DATA(ctype_char, 0, 2, &ctype_base_rtti_base_descriptor, &locale_fac
 DEFINE_RTTI_DATA(ctype_wchar, 0, 2, &ctype_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, NULL, ".?AV?$ctype@_W@std@@");
 DEFINE_RTTI_DATA(ctype_short, 0, 2, &ctype_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, NULL, ".?AV?$ctype@G@std@@");
 DEFINE_RTTI_DATA(numpunct_char, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$numpunct@D@std@@");
+DEFINE_RTTI_DATA(numpunct_wchar, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$numpunct@_W@std@@");
+DEFINE_RTTI_DATA(numpunct_short, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$numpunct@G@std@@");
 
 #ifndef __GNUC__
 void __asm_dummy_vtables(void) {
@@ -3080,6 +3369,18 @@ void __asm_dummy_vtables(void) {
             VTABLE_ADD_FUNC(numpunct_char_do_grouping)
             VTABLE_ADD_FUNC(numpunct_char_do_falsename)
             VTABLE_ADD_FUNC(numpunct_char_do_truename));
+    __ASM_VTABLE(numpunct_wchar,
+            VTABLE_ADD_FUNC(numpunct_wchar_do_decimal_point)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_thousands_sep)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_grouping)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_falsename)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_truename));
+    __ASM_VTABLE(numpunct_short,
+            VTABLE_ADD_FUNC(numpunct_wchar_do_decimal_point)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_thousands_sep)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_grouping)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_falsename)
+            VTABLE_ADD_FUNC(numpunct_wchar_do_truename));
 #ifndef __GNUC__
 }
 #endif
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index fe6d74d337e..750e27972d6 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -1018,18 +1018,18 @@
 @ cdecl -arch=win64 ??0?$numpunct@D@std@@QEAA@AEBV_Locinfo@1@_K_N@Z(ptr ptr long long) numpunct_char_ctor_locinfo
 @ thiscall -arch=win32 ??0?$numpunct@D@std@@QAE@I@Z(ptr long) numpunct_char_ctor_refs
 @ cdecl -arch=win64 ??0?$numpunct@D@std@@QEAA@_K@Z(ptr long) numpunct_char_ctor_refs
-@ stub -arch=win32 ??0?$numpunct@G@std@@IAE@PBDI_N@Z
-@ stub -arch=win64 ??0?$numpunct@G@std@@IEAA@PEBD_K_N@Z
-@ stub -arch=win32 ??0?$numpunct@G@std@@QAE@ABV_Locinfo@1@I_N@Z
-@ stub -arch=win64 ??0?$numpunct@G@std@@QEAA@AEBV_Locinfo@1@_K_N@Z
-@ stub -arch=win32 ??0?$numpunct@G@std@@QAE@I@Z
-@ stub -arch=win64 ??0?$numpunct@G@std@@QEAA@_K@Z
-@ stub -arch=win32 ??0?$numpunct@_W@std@@IAE@PBDI_N@Z
-@ stub -arch=win64 ??0?$numpunct@_W@std@@IEAA@PEBD_K_N@Z
-@ stub -arch=win32 ??0?$numpunct@_W@std@@QAE@ABV_Locinfo@1@I_N@Z
-@ stub -arch=win64 ??0?$numpunct@_W@std@@QEAA@AEBV_Locinfo@1@_K_N@Z
-@ stub -arch=win32 ??0?$numpunct@_W@std@@QAE@I@Z
-@ stub -arch=win64 ??0?$numpunct@_W@std@@QEAA@_K@Z
+@ thiscall -arch=win32 ??0?$numpunct@G@std@@IAE@PBDI_N@Z(ptr str long long) numpunct_short_ctor_name
+@ cdecl -arch=win64 ??0?$numpunct@G@std@@IEAA@PEBD_K_N@Z(ptr str long long) numpunct_short_ctor_name
+@ thiscall -arch=win32 ??0?$numpunct@G@std@@QAE@ABV_Locinfo@1@I_N@Z(ptr ptr long long) numpunct_short_ctor_locinfo
+@ cdecl -arch=win64 ??0?$numpunct@G@std@@QEAA@AEBV_Locinfo@1@_K_N@Z(ptr ptr long long) numpunct_short_ctor_locinfo
+@ thiscall -arch=win32 ??0?$numpunct@G@std@@QAE@I@Z(ptr long) numpunct_short_ctor_refs
+@ cdecl -arch=win64 ??0?$numpunct@G@std@@QEAA@_K@Z(ptr long) numpunct_short_ctor_refs
+@ thiscall -arch=win32 ??0?$numpunct@_W@std@@IAE@PBDI_N@Z(ptr str long long) numpunct_wchar_ctor_name
+@ cdecl -arch=win64 ??0?$numpunct@_W@std@@IEAA@PEBD_K_N@Z(ptr str long long) numpunct_wchar_ctor_name
+@ thiscall -arch=win32 ??0?$numpunct@_W@std@@QAE@ABV_Locinfo@1@I_N@Z(ptr ptr long long) numpunct_wchar_ctor_locinfo
+@ cdecl -arch=win64 ??0?$numpunct@_W@std@@QEAA@AEBV_Locinfo@1@_K_N@Z(ptr ptr long long) numpunct_wchar_ctor_locinfo
+@ thiscall -arch=win32 ??0?$numpunct@_W@std@@QAE@I@Z(ptr long) numpunct_wchar_ctor_refs
+@ cdecl -arch=win64 ??0?$numpunct@_W@std@@QEAA@_K@Z(ptr long) numpunct_wchar_ctor_refs
 @ stub -arch=win32 ??0?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAE@PBDI@Z
 @ stub -arch=win64 ??0?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAA@PEBD_K@Z
 @ stub -arch=win32 ??0?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAE@ABV_Locinfo@1@I@Z
@@ -1292,10 +1292,10 @@
 @ stub -arch=win64 ??1?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MEAA@XZ
 @ thiscall -arch=win32 ??1?$numpunct@D@std@@MAE@XZ(ptr) numpunct_char_dtor
 @ cdecl -arch=win64 ??1?$numpunct@D@std@@MEAA@XZ(ptr) numpunct_char_dtor
-@ stub -arch=win32 ??1?$numpunct@G@std@@MAE@XZ
-@ stub -arch=win64 ??1?$numpunct@G@std@@MEAA@XZ
-@ stub -arch=win32 ??1?$numpunct@_W@std@@MAE@XZ
-@ stub -arch=win64 ??1?$numpunct@_W@std@@MEAA@XZ
+@ thiscall -arch=win32 ??1?$numpunct@G@std@@MAE@XZ(ptr) numpunct_wchar_dtor
+@ cdecl -arch=win64 ??1?$numpunct@G@std@@MEAA@XZ(ptr) numpunct_wchar_dtor
+@ thiscall -arch=win32 ??1?$numpunct@_W@std@@MAE@XZ(ptr) numpunct_wchar_dtor
+@ cdecl -arch=win64 ??1?$numpunct@_W@std@@MEAA@XZ(ptr) numpunct_wchar_dtor
 @ stub -arch=win32 ??1?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MAE@XZ
 @ stub -arch=win64 ??1?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEAA@XZ
 @ stub -arch=win32 ??1?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@MAE@XZ
@@ -1849,8 +1849,8 @@
 # extern ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
 # extern ??_7?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@
 @ extern ??_7?$numpunct@D@std@@6B@ MSVCP_numpunct_char_vtable
-# extern ??_7?$numpunct@G@std@@6B@
-# extern ??_7?$numpunct@_W@std@@6B@
+@ extern ??_7?$numpunct@G@std@@6B@ MSVCP_numpunct_short_vtable
+@ extern ??_7?$numpunct@_W@std@@6B@ MSVCP_numpunct_wchar_vtable
 # extern ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
 # extern ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
 # extern ??_7?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@
@@ -2059,10 +2059,10 @@
 @ stub -arch=win64 ??_F?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEAAXXZ
 @ thiscall -arch=win32 ??_F?$numpunct@D@std@@QAEXXZ(ptr) numpunct_char_ctor
 @ cdecl -arch=win64 ??_F?$numpunct@D@std@@QEAAXXZ(ptr) numpunct_char_ctor
-@ stub -arch=win32 ??_F?$numpunct@G@std@@QAEXXZ
-@ stub -arch=win64 ??_F?$numpunct@G@std@@QEAAXXZ
-@ stub -arch=win32 ??_F?$numpunct@_W@std@@QAEXXZ
-@ stub -arch=win64 ??_F?$numpunct@_W@std@@QEAAXXZ
+@ thiscall -arch=win32 ??_F?$numpunct@G@std@@QAEXXZ(ptr) numpunct_short_ctor
+@ cdecl -arch=win64 ??_F?$numpunct@G@std@@QEAAXXZ(ptr) numpunct_short_ctor
+@ thiscall -arch=win32 ??_F?$numpunct@_W@std@@QAEXXZ(ptr) numpunct_wchar_ctor
+@ cdecl -arch=win64 ??_F?$numpunct@_W@std@@QEAAXXZ(ptr) numpunct_wchar_ctor
 @ stub -arch=win32 ??_F?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QAEXXZ
 @ stub -arch=win64 ??_F?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEAAXXZ
 @ stub -arch=win32 ??_F?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QAEXXZ
@@ -2283,10 +2283,10 @@
 @ stub -arch=win64 ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z
 @ cdecl -arch=win32 ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) numpunct_char__Getcat
 @ cdecl -arch=win64 ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z(ptr ptr) numpunct_char__Getcat
-@ stub -arch=win32 ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z
-@ stub -arch=win64 ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z
-@ stub -arch=win32 ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z
-@ stub -arch=win64 ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z
+@ cdecl -arch=win32 ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) numpunct_short__Getcat
+@ cdecl -arch=win64 ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z(ptr ptr) numpunct_short__Getcat
+@ cdecl -arch=win32 ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) numpunct_wchar__Getcat
+@ cdecl -arch=win64 ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z(ptr ptr) numpunct_wchar__Getcat
 @ stub -arch=win32 ?_Getcat@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SAIPAPBVfacet@locale@2@PBV42@@Z
 @ stub -arch=win64 ?_Getcat@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z
 @ stub -arch=win32 ?_Getcat@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@SAIPAPBVfacet@locale@2@PBV42@@Z
@@ -2508,10 +2508,10 @@
 @ stub -arch=win64 ?_Init@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z
 @ thiscall -arch=win32 ?_Init@?$numpunct@D@std@@IAEXABV_Locinfo@2@_N@Z(ptr ptr long) numpunct_char__Init
 @ cdecl -arch=win64 ?_Init@?$numpunct@D@std@@IEAAXAEBV_Locinfo@2@_N@Z(ptr ptr long) numpunct_char__Init
-@ stub -arch=win32 ?_Init@?$numpunct@G@std@@IAEXABV_Locinfo@2@_N@Z
-@ stub -arch=win64 ?_Init@?$numpunct@G@std@@IEAAXAEBV_Locinfo@2@_N@Z
-@ stub -arch=win32 ?_Init@?$numpunct@_W@std@@IAEXABV_Locinfo@2@_N@Z
-@ stub -arch=win64 ?_Init@?$numpunct@_W@std@@IEAAXAEBV_Locinfo@2@_N@Z
+@ thiscall -arch=win32 ?_Init@?$numpunct@G@std@@IAEXABV_Locinfo@2@_N@Z(ptr ptr long) numpunct_wchar__Init
+@ cdecl -arch=win64 ?_Init@?$numpunct@G@std@@IEAAXAEBV_Locinfo@2@_N@Z(ptr ptr long) numpunct_wchar__Init
+@ thiscall -arch=win32 ?_Init@?$numpunct@_W@std@@IAEXABV_Locinfo@2@_N@Z(ptr ptr long) numpunct_wchar__Init
+@ cdecl -arch=win64 ?_Init@?$numpunct@_W@std@@IEAAXAEBV_Locinfo@2@_N@Z(ptr ptr long) numpunct_wchar__Init
 @ stub -arch=win32 ?_Init@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z
 @ stub -arch=win64 ?_Init@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAXAEBV_Locinfo@2@@Z
 @ stub -arch=win32 ?_Init@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEXABV_Locinfo@2@@Z
@@ -2824,10 +2824,10 @@
 @ cdecl -arch=win64 ?_Tidy@?$ctype@D@std@@IEAAXXZ(ptr) ctype_char__Tidy
 @ thiscall -arch=win32 ?_Tidy@?$numpunct@D@std@@AAEXXZ(ptr) numpunct_char__Tidy
 @ cdecl -arch=win64 ?_Tidy@?$numpunct@D@std@@AEAAXXZ(ptr) numpunct_char__Tidy
-@ stub -arch=win32 ?_Tidy@?$numpunct@G@std@@AAEXXZ
-@ stub -arch=win64 ?_Tidy@?$numpunct@G@std@@AEAAXXZ
-@ stub -arch=win32 ?_Tidy@?$numpunct@_W@std@@AAEXXZ
-@ stub -arch=win64 ?_Tidy@?$numpunct@_W@std@@AEAAXXZ
+@ thiscall -arch=win32 ?_Tidy@?$numpunct@G@std@@AAEXXZ(ptr) numpunct_wchar__Tidy
+@ cdecl -arch=win64 ?_Tidy@?$numpunct@G@std@@AEAAXXZ(ptr) numpunct_wchar__Tidy
+@ thiscall -arch=win32 ?_Tidy@?$numpunct@_W@std@@AAEXXZ(ptr) numpunct_wchar__Tidy
+@ cdecl -arch=win64 ?_Tidy@?$numpunct@_W@std@@AEAAXXZ(ptr) numpunct_wchar__Tidy
 @ stub -arch=win32 ?_Tidy@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AAEXXZ
 @ stub -arch=win64 ?_Tidy@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@AEAAXXZ
 @ stub -arch=win32 ?_Tidy@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AAEXXZ
@@ -3224,10 +3224,10 @@
 @ stub -arch=win64 ?decimal_point@?$_Mpunct@_W@std@@QEBA_WXZ
 @ thiscall -arch=win32 ?decimal_point@?$numpunct@D@std@@QBEDXZ(ptr) numpunct_char_decimal_point
 @ cdecl -arch=win64 ?decimal_point@?$numpunct@D@std@@QEBADXZ(ptr) numpunct_char_decimal_point
-@ stub -arch=win32 ?decimal_point@?$numpunct@G@std@@QBEGXZ
-@ stub -arch=win64 ?decimal_point@?$numpunct@G@std@@QEBAGXZ
-@ stub -arch=win32 ?decimal_point@?$numpunct@_W@std@@QBE_WXZ
-@ stub -arch=win64 ?decimal_point@?$numpunct@_W@std@@QEBA_WXZ
+@ thiscall -arch=win32 ?decimal_point@?$numpunct@G@std@@QBEGXZ(ptr) numpunct_wchar_decimal_point
+@ cdecl -arch=win64 ?decimal_point@?$numpunct@G@std@@QEBAGXZ(ptr) numpunct_wchar_decimal_point
+@ thiscall -arch=win32 ?decimal_point@?$numpunct@_W@std@@QBE_WXZ(ptr) numpunct_wchar_decimal_point
+@ cdecl -arch=win64 ?decimal_point@?$numpunct@_W@std@@QEBA_WXZ(ptr) numpunct_wchar_decimal_point
 @ cdecl ?denorm_min@?$numeric_limits@C@std@@SACXZ() std_numeric_limits_signed_char_denorm_min
 @ cdecl ?denorm_min@?$numeric_limits@D@std@@SADXZ() std_numeric_limits_char_denorm_min
 @ cdecl ?denorm_min@?$numeric_limits@E@std@@SAEXZ() std_numeric_limits_unsigned_char_denorm_min
@@ -3322,18 +3322,18 @@
 @ stub -arch=win64 ?do_decimal_point@?$_Mpunct@_W@std@@MEBA_WXZ
 @ thiscall -arch=win32 ?do_decimal_point@?$numpunct@D@std@@MBEDXZ(ptr) numpunct_char_do_decimal_point
 @ cdecl -arch=win64 ?do_decimal_point@?$numpunct@D@std@@MEBADXZ(ptr) numpunct_char_do_decimal_point
-@ stub -arch=win32 ?do_decimal_point@?$numpunct@G@std@@MBEGXZ
-@ stub -arch=win64 ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ
-@ stub -arch=win32 ?do_decimal_point@?$numpunct@_W@std@@MBE_WXZ
-@ stub -arch=win64 ?do_decimal_point@?$numpunct@_W@std@@MEBA_WXZ
+@ thiscall -arch=win32 ?do_decimal_point@?$numpunct@G@std@@MBEGXZ(ptr) numpunct_wchar_do_decimal_point
+@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ(ptr) numpunct_wchar_do_decimal_point
+@ thiscall -arch=win32 ?do_decimal_point@?$numpunct@_W@std@@MBE_WXZ(ptr) numpunct_wchar_do_decimal_point
+@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@_W@std@@MEBA_WXZ(ptr) numpunct_wchar_do_decimal_point
 @ stub -arch=win32 ?do_encoding@codecvt_base@std@@MBEHXZ
 @ stub -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ
 @ thiscall -arch=win32 ?do_falsename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_falsename
 @ cdecl -arch=win64 ?do_falsename@?$numpunct@D@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_falsename
-@ stub -arch=win32 ?do_falsename@?$numpunct@G@std@@MBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win64 ?do_falsename@?$numpunct@G@std@@MEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win32 ?do_falsename@?$numpunct@_W@std@@MBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
-@ stub -arch=win64 ?do_falsename@?$numpunct@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
+@ thiscall -arch=win32 ?do_falsename@?$numpunct@G@std@@MBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_do_falsename
+@ cdecl -arch=win64 ?do_falsename@?$numpunct@G@std@@MEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_do_falsename
+@ thiscall -arch=win32 ?do_falsename@?$numpunct@_W@std@@MBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_do_falsename
+@ cdecl -arch=win64 ?do_falsename@?$numpunct@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_do_falsename
 @ stub -arch=win32 ?do_frac_digits@?$_Mpunct@D@std@@MBEHXZ
 @ stub -arch=win64 ?do_frac_digits@?$_Mpunct@D@std@@MEBAHXZ
 @ stub -arch=win32 ?do_frac_digits@?$_Mpunct@G@std@@MBEHXZ
@@ -3462,10 +3462,10 @@
 @ stub -arch=win64 ?do_grouping@?$_Mpunct@_W@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
 @ thiscall -arch=win32 ?do_grouping@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_grouping
 @ cdecl -arch=win64 ?do_grouping@?$numpunct@D@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_grouping
-@ stub -arch=win32 ?do_grouping@?$numpunct@G@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
-@ stub -arch=win64 ?do_grouping@?$numpunct@G@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
-@ stub -arch=win32 ?do_grouping@?$numpunct@_W@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
-@ stub -arch=win64 ?do_grouping@?$numpunct@_W@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
+@ thiscall -arch=win32 ?do_grouping@?$numpunct@G@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_do_grouping
+@ cdecl -arch=win64 ?do_grouping@?$numpunct@G@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_do_grouping
+@ thiscall -arch=win32 ?do_grouping@?$numpunct@_W@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_do_grouping
+@ cdecl -arch=win64 ?do_grouping@?$numpunct@_W@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_do_grouping
 @ thiscall -arch=win32 ?do_hash@?$collate@D@std@@MBEJPBD0@Z(ptr ptr ptr) collate_char_do_hash
 @ cdecl -arch=win64 ?do_hash@?$collate@D@std@@MEBAJPEBD0@Z(ptr ptr ptr) collate_char_do_hash
 @ thiscall -arch=win32 ?do_hash@?$collate@G@std@@MBEJPBG0@Z(ptr ptr ptr) collate_wchar_do_hash
@@ -3628,10 +3628,10 @@
 @ stub -arch=win64 ?do_thousands_sep@?$_Mpunct@_W@std@@MEBA_WXZ
 @ thiscall -arch=win32 ?do_thousands_sep@?$numpunct@D@std@@MBEDXZ(ptr) numpunct_char_do_thousands_sep
 @ cdecl -arch=win64 ?do_thousands_sep@?$numpunct@D@std@@MEBADXZ(ptr) numpunct_char_do_thousands_sep
-@ stub -arch=win32 ?do_thousands_sep@?$numpunct@G@std@@MBEGXZ
-@ stub -arch=win64 ?do_thousands_sep@?$numpunct@G@std@@MEBAGXZ
-@ stub -arch=win32 ?do_thousands_sep@?$numpunct@_W@std@@MBE_WXZ
-@ stub -arch=win64 ?do_thousands_sep@?$numpunct@_W@std@@MEBA_WXZ
+@ thiscall -arch=win32 ?do_thousands_sep@?$numpunct@G@std@@MBEGXZ(ptr) numpunct_wchar_do_thousands_sep
+@ cdecl -arch=win64 ?do_thousands_sep@?$numpunct@G@std@@MEBAGXZ(ptr) numpunct_wchar_do_thousands_sep
+@ thiscall -arch=win32 ?do_thousands_sep@?$numpunct@_W@std@@MBE_WXZ(ptr) numpunct_wchar_do_thousands_sep
+@ cdecl -arch=win64 ?do_thousands_sep@?$numpunct@_W@std@@MEBA_WXZ(ptr) numpunct_wchar_do_thousands_sep
 @ thiscall -arch=win32 ?do_tolower@?$ctype@D@std@@MBEDD@Z(ptr long) ctype_char_do_tolower_ch
 @ cdecl -arch=win64 ?do_tolower@?$ctype@D@std@@MEBADD@Z(ptr long) ctype_char_do_tolower_ch
 @ thiscall -arch=win32 ?do_tolower@?$ctype@D@std@@MBEPBDPADPBD@Z(ptr ptr ptr) ctype_char_do_tolower
@@ -3664,10 +3664,10 @@
 @ cdecl -arch=win64 ?do_transform@?$collate@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@PEB_W0@Z(ptr ptr ptr ptr) collate_wchar_do_transform
 @ thiscall -arch=win32 ?do_truename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_truename
 @ cdecl -arch=win64 ?do_truename@?$numpunct@D@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_truename
-@ stub -arch=win32 ?do_truename@?$numpunct@G@std@@MBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win64 ?do_truename@?$numpunct@G@std@@MEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win32 ?do_truename@?$numpunct@_W@std@@MBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
-@ stub -arch=win64 ?do_truename@?$numpunct@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
+@ thiscall -arch=win32 ?do_truename@?$numpunct@G@std@@MBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_do_truename
+@ cdecl -arch=win64 ?do_truename@?$numpunct@G@std@@MEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_do_truename
+@ thiscall -arch=win32 ?do_truename@?$numpunct@_W@std@@MBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_do_truename
+@ cdecl -arch=win64 ?do_truename@?$numpunct@_W@std@@MEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_do_truename
 @ stub -arch=win32 ?do_unshift@?$codecvt@DDH@std@@MBEHAAHPAD1AAPAD@Z
 @ stub -arch=win64 ?do_unshift@?$codecvt@DDH@std@@MEBAHAEAHPEAD1AEAPEAD@Z
 @ stub -arch=win32 ?do_unshift@?$codecvt@GDH@std@@MBEHAAHPAD1AAPAD@Z
@@ -3801,10 +3801,10 @@
 @ cdecl -arch=win64 ?fail@ios_base@std@@QEBA_NXZ(ptr) ios_base_fail
 @ thiscall -arch=win32 ?falsename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_falsename
 @ cdecl -arch=win64 ?falsename@?$numpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_falsename
-@ stub -arch=win32 ?falsename@?$numpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win64 ?falsename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win32 ?falsename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
-@ stub -arch=win64 ?falsename@?$numpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
+@ thiscall -arch=win32 ?falsename@?$numpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_falsename
+@ cdecl -arch=win64 ?falsename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_falsename
+@ thiscall -arch=win32 ?falsename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_falsename
+@ cdecl -arch=win64 ?falsename@?$numpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_falsename
 @ thiscall -arch=win32 ?fill@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEDD@Z(ptr long) basic_ios_char_fill_set
 @ cdecl -arch=win64 ?fill@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAADD@Z(ptr long) basic_ios_char_fill_set
 @ thiscall -arch=win32 ?fill@?$basic_ios@DU?$char_traits@D@std@@@std@@QBEDXZ(ptr) basic_ios_char_fill_get
@@ -4173,10 +4173,10 @@
 @ stub -arch=win64 ?grouping@?$_Mpunct@_W@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
 @ thiscall -arch=win32 ?grouping@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_grouping
 @ cdecl -arch=win64 ?grouping@?$numpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_grouping
-@ stub -arch=win32 ?grouping@?$numpunct@G@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
-@ stub -arch=win64 ?grouping@?$numpunct@G@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
-@ stub -arch=win32 ?grouping@?$numpunct@_W@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
-@ stub -arch=win64 ?grouping@?$numpunct@_W@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
+@ thiscall -arch=win32 ?grouping@?$numpunct@G@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_grouping
+@ cdecl -arch=win64 ?grouping@?$numpunct@G@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_grouping
+@ thiscall -arch=win32 ?grouping@?$numpunct@_W@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_grouping
+@ cdecl -arch=win64 ?grouping@?$numpunct@_W@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_wchar_grouping
 @ extern ?has_denorm@_Num_base@std@@2W4float_denorm_style@2@B std_Num_base_has_denorm
 @ extern ?has_denorm@_Num_float_base@std@@2W4float_denorm_style@2@B std_Num_float_base_has_denorm
 @ extern ?has_denorm_loss@_Num_base@std@@2_NB std_Num_base_has_denorm_loss
@@ -4224,8 +4224,8 @@
 # extern ?id@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
 # extern ?id@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@2V0locale@2@A
 @ extern ?id@?$numpunct@D@std@@2V0locale@2@A numpunct_char_id
-# extern ?id@?$numpunct@G@std@@2V0locale@2@A
-# extern ?id@?$numpunct@_W@std@@2V0locale@2@A
+@ extern ?id@?$numpunct@G@std@@2V0locale@2@A numpunct_short_id
+@ extern ?id@?$numpunct@_W@std@@2V0locale@2@A numpunct_wchar_id
 # extern ?id@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
 # extern ?id@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
 # extern ?id@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@2V0locale@2@A
@@ -5560,10 +5560,10 @@
 @ stub -arch=win64 ?thousands_sep@?$_Mpunct@_W@std@@QEBA_WXZ
 @ thiscall -arch=win32 ?thousands_sep@?$numpunct@D@std@@QBEDXZ(ptr) numpunct_char_thousands_sep
 @ cdecl -arch=win64 ?thousands_sep@?$numpunct@D@std@@QEBADXZ(ptr) numpunct_char_thousands_sep
-@ stub -arch=win32 ?thousands_sep@?$numpunct@G@std@@QBEGXZ
-@ stub -arch=win64 ?thousands_sep@?$numpunct@G@std@@QEBAGXZ
-@ stub -arch=win32 ?thousands_sep@?$numpunct@_W@std@@QBE_WXZ
-@ stub -arch=win64 ?thousands_sep@?$numpunct@_W@std@@QEBA_WXZ
+@ thiscall -arch=win32 ?thousands_sep@?$numpunct@G@std@@QBEGXZ(ptr) numpunct_wchar_thousands_sep
+@ cdecl -arch=win64 ?thousands_sep@?$numpunct@G@std@@QEBAGXZ(ptr) numpunct_wchar_thousands_sep
+@ thiscall -arch=win32 ?thousands_sep@?$numpunct@_W@std@@QBE_WXZ(ptr) numpunct_wchar_thousands_sep
+@ cdecl -arch=win64 ?thousands_sep@?$numpunct@_W@std@@QEBA_WXZ(ptr) numpunct_wchar_thousands_sep
 @ thiscall -arch=win32 ?tie@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEPAV?$basic_ostream@DU?$char_traits@D@std@@@2@PAV32@@Z(ptr ptr) basic_ios_char_tie_set
 @ cdecl -arch=win64 ?tie@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAAPEAV?$basic_ostream@DU?$char_traits@D@std@@@2@PEAV32@@Z(ptr ptr) basic_ios_char_tie_set
 @ thiscall -arch=win32 ?tie@?$basic_ios@DU?$char_traits@D@std@@@std@@QBEPAV?$basic_ostream@DU?$char_traits@D@std@@@2@XZ(ptr) basic_ios_char_tie_get
@@ -5624,10 +5624,10 @@
 @ extern ?traps@_Num_float_base@std@@2_NB std_Num_float_base_traps
 @ thiscall -arch=win32 ?truename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_truename
 @ cdecl -arch=win64 ?truename@?$numpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_truename
-@ stub -arch=win32 ?truename@?$numpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win64 ?truename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
-@ stub -arch=win32 ?truename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
-@ stub -arch=win64 ?truename@?$numpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ
+@ thiscall -arch=win32 ?truename@?$numpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_truename
+@ cdecl -arch=win64 ?truename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_truename
+@ thiscall -arch=win32 ?truename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_truename
+@ cdecl -arch=win64 ?truename@?$numpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ(ptr ptr) numpunct_wchar_truename
 @ stub -arch=win32 ?uflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ
 @ stub -arch=win64 ?uflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ
 @ stub -arch=win32 ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ