From 08eab0ed229ded05aba8175433887ffe1b4f52b3 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Mon, 17 Sep 2012 10:26:03 +0200 Subject: [PATCH] msvcp71: Don't forward _Getcat functions to msvcp80. --- dlls/msvcp71/locale.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 48 +++++++++++++------------- 2 files changed, 109 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 888a99093bd..47a6856901c 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -42,6 +42,7 @@ void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); +const locale* __cdecl locale_classic(void); typedef int category; @@ -832,6 +833,13 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca return LC_COLLATE; } +/* ?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl collate_char__Getcat_old(const locale_facet **facet) +{ + return collate_char__Getcat(facet, locale_classic()); +} + /* _Strcoll */ int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, const char *last2, const _Collvec *coll) @@ -1075,6 +1083,13 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +/* ?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl collate_wchar__Getcat_old(const locale_facet **facet) +{ + return collate_wchar__Getcat(facet, locale_classic()); +} + /* ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const locale *loc) @@ -1087,6 +1102,13 @@ MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +/* ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl collate_short__Getcat_old(const locale_facet **facet) +{ + return collate_short__Getcat(facet, locale_classic()); +} + /* _Wcscoll */ int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) @@ -1517,6 +1539,13 @@ MSVCP_size_t __cdecl ctype_char__Getcat(const locale_facet **facet, const locale return LC_CTYPE; } +/* ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl ctype_char__Getcat_old(const locale_facet **facet) +{ + return ctype_char__Getcat(facet, locale_classic()); +} + ctype_char* ctype_char_use_facet(const locale *loc) { static ctype_char *obj = NULL; @@ -2243,6 +2272,13 @@ MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const local return LC_CTYPE; } +/* ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl ctype_wchar__Getcat_old(const locale_facet **facet) +{ + return ctype_wchar__Getcat(facet, locale_classic()); +} + /* ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl ctype_short__Getcat(const locale_facet **facet, const locale *loc) @@ -2255,6 +2291,13 @@ MSVCP_size_t __cdecl ctype_short__Getcat(const locale_facet **facet, const local return LC_CTYPE; } +/* ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl ctype_short__Getcat_old(const locale_facet **facet) +{ + return ctype_short__Getcat(facet, locale_classic()); +} + /* _Towlower */ wchar_t __cdecl _Towlower(wchar_t ch, const _Ctypevec *ctype) { @@ -2757,6 +2800,13 @@ MSVCP_size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const loca return LC_CTYPE; } +/* ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl codecvt_char__Getcat_old(const locale_facet **facet) +{ + return codecvt_char__Getcat(facet, locale_classic()); +} + codecvt_char* codecvt_char_use_facet(const locale *loc) { static codecvt_char *obj = NULL; @@ -3056,6 +3106,13 @@ MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const loc return LC_CTYPE; } +/* ?_Getcat@?$codecvt@_WDH@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$codecvt@_WDH@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl codecvt_wchar__Getcat_old(const locale_facet **facet) +{ + return codecvt_wchar__Getcat(facet, locale_classic()); +} + codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) { static codecvt_wchar *obj = NULL; @@ -3108,6 +3165,13 @@ MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const loc return LC_CTYPE; } +/* ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$codecvt@GDH@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl codecvt_short__Getcat_old(const locale_facet **facet) +{ + return codecvt_short__Getcat(facet, locale_classic()); +} + codecvt_wchar* codecvt_short_use_facet(const locale *loc) { static codecvt_wchar *obj = NULL; @@ -3521,6 +3585,13 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc return LC_NUMERIC; } +/* ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl numpunct_char__Getcat_old(const locale_facet **facet) +{ + return numpunct_char__Getcat(facet, locale_classic()); +} + static numpunct_char* numpunct_char_use_facet(const locale *loc) { static numpunct_char *obj = NULL; @@ -3874,6 +3945,13 @@ MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const lo return LC_NUMERIC; } +/* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl numpunct_wchar__Getcat_old(const locale_facet **facet) +{ + return numpunct_wchar__Getcat(facet, locale_classic()); +} + static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) { static numpunct_wchar *obj = NULL; @@ -3922,6 +4000,13 @@ MSVCP_size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const lo return LC_NUMERIC; } +/* ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z */ +/* ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z */ +MSVCP_size_t __cdecl numpunct_short__Getcat_old(const locale_facet **facet) +{ + return numpunct_short__Getcat(facet, locale_classic()); +} + static numpunct_wchar* numpunct_short_use_facet(const locale *loc) { static numpunct_wchar *obj = NULL; diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index ccdd2266409..7225a216867 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2001,24 +2001,24 @@ @ cdecl -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z(ptr ptr long ptr ptr long str long long long long) msvcp90.?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z @ cdecl -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z(ptr ptr ptr ptr long str long long long long) msvcp90.?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z @ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA -@ cdecl -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$codecvt@GDH@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$codecvt@_WDH@std@@SAIPAPBVfacet@locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$codecvt@_WDH@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z(ptr) codecvt_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) codecvt_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z(ptr) codecvt_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$codecvt@GDH@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) codecvt_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$codecvt@_WDH@std@@SAIPAPBVfacet@locale@2@@Z(ptr) codecvt_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$codecvt@_WDH@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) codecvt_wchar__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$collate@D@std@@SAIPAPBVfacet@locale@2@@Z(ptr) collate_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$collate@D@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) collate_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@@Z(ptr) collate_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$collate@G@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) collate_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$collate@_W@std@@SAIPAPBVfacet@locale@2@@Z(ptr) collate_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$collate@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) collate_wchar__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@@Z(ptr) ctype_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$ctype@D@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) ctype_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@@Z(ptr) ctype_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$ctype@G@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) ctype_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@@Z(ptr) ctype_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$ctype@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) ctype_wchar__Getcat_old @ stub -arch=win32 ?_Getcat@?$messages@D@std@@SAIPAPBVfacet@locale@2@@Z @ stub -arch=win64 ?_Getcat@?$messages@D@std@@SA_KPEAPEBVfacet@locale@2@@Z @ stub -arch=win32 ?_Getcat@?$messages@G@std@@SAIPAPBVfacet@locale@2@@Z @@ -2061,12 +2061,12 @@ @ stub -arch=win64 ?_Getcat@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@@Z @ stub -arch=win32 ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SAIPAPBVfacet@locale@2@@Z @ stub -arch=win64 ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@@Z(ptr) numpunct_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) numpunct_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@@Z(ptr) numpunct_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) numpunct_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@@Z(ptr) numpunct_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@@Z(ptr) numpunct_wchar__Getcat_old @ stub -arch=win32 ?_Getcat@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SAIPAPBVfacet@locale@2@@Z @ stub -arch=win64 ?_Getcat@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@@Z @ stub -arch=win32 ?_Getcat@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@SAIPAPBVfacet@locale@2@@Z -- 2.11.4.GIT