Module: wine Branch: master Commit: fbd77651873793d6ba98f4d80f57c9dd68647296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd77651873793d6ba98f4d80f... Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:43:25 2012 +0200 msvcp90: Fixed _Getcat return type. --- dlls/msvcp100/locale.c | 10 +++++----- dlls/msvcp90/locale.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index e1abed8..ccf6297 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -2935,7 +2935,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne /* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -2987,7 +2987,7 @@ codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) /* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6172,7 +6172,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6819,7 +6819,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6843,7 +6843,7 @@ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const loc /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ddf1424..5cca3e0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3046,7 +3046,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne /* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -3098,7 +3098,7 @@ codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) /* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6315,7 +6315,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6962,7 +6962,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6986,7 +6986,7 @@ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const loc /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc);