msvcp100: Removed unused functions.

dlls/msvcp100/exception.c

@@ -188,7 +188,7 @@ static const cxx_exception_type exception_cxx_type = {
 /* bad_alloc class data */
 typedef exception bad_alloc;
 
-bad_alloc* MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name)
+static bad_alloc* MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
     MSVCP_exception_ctor(this, name);

dlls/msvcp100/ios.c

@@ -1905,7 +1905,7 @@ streamsize __thiscall basic_streambuf_wchar_sputn(basic_streambuf_wchar *this, c
 
 /* ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */
 /* ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA */
-int basic_filebuf_char__Init__Stinit = 0;
+static int basic_filebuf_char__Init__Stinit = 0;
 
 /* ?_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@12@@Z */
 /* ?_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@12@@Z */
@@ -2373,11 +2373,11 @@ void __thiscall basic_filebuf_char_imbue(basic_filebuf_char *this, const locale
 
 /* ?_Stinit@?1??_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */
 /* ?_Stinit@?1??_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA */
-int basic_filebuf_wchar__Init__Stinit = 0;
+static int basic_filebuf_wchar__Init__Stinit = 0;
 
 /* ?_Stinit@?1??_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */
 /* ?_Stinit@?1??_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA */
-int basic_filebuf_short__Init__Stinit = 0;
+static int basic_filebuf_short__Init__Stinit = 0;
 
 /* ?_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@12@@Z */
 /* ?_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@12@@Z */

dlls/msvcp100/locale.c

@@ -209,7 +209,7 @@ static struct list lazy_facets = LIST_INIT(lazy_facets);
 
 /* ?facet_Register@facet@locale@std@@CAXPAV123@@Z */
 /* ?facet_Register@facet@locale@std@@CAXPEAV123@@Z */
-static void __cdecl locale_facet_register(locale_facet *add)
+static void locale_facet_register(locale_facet *add)
 {
     facets_elem *head = MSVCRT_operator_new(sizeof(*head));
     if(!head) {
@@ -2967,7 +2967,7 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne
 
 /* ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
 /* ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
-static MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *loc)
+static MSVCP_size_t numpunct_char__Getcat(const locale_facet **facet, const locale *loc)
 {
     TRACE("(%p %p)\n", facet, loc);
 
@@ -3273,7 +3273,7 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi
 
 /* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
 /* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
-static MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *loc)
+static MSVCP_size_t numpunct_wchar__Getcat(const locale_facet **facet, const locale *loc)
 {
     TRACE("(%p %p)\n", facet, loc);
 
@@ -3321,7 +3321,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc)
 
 /* ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
 /* ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
-static MSVCP_size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const locale *loc)
+static MSVCP_size_t numpunct_short__Getcat(const locale_facet **facet, const locale *loc)
 {
     TRACE("(%p %p)\n", facet, loc);
 
@@ -4896,7 +4896,7 @@ num_get* num_get_char_use_facet(const locale *loc)
  * Size of dest buffer is not specified, assuming it's not smaller than 32:
  * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte)
  */
-static int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first,
+static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first,
         istreambuf_iterator_char *last, const locale *loc)
 {
     numpunct_char *numpunct = numpunct_char_use_facet(loc);
@@ -6668,7 +6668,7 @@ char* __cdecl num_put_wchar__Ifmt(const num_put *this, char *fmt, const char *sp
     return fmt;
 }
 
-static ostreambuf_iterator_wchar* __cdecl num_put__Iput(const num_put *this, ostreambuf_iterator_wchar *ret,
+static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_iterator_wchar *ret,
         ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf,
         MSVCP_size_t count, numpunct_wchar *numpunct)
 {

dlls/msvcp100/memory.c

@@ -41,11 +41,6 @@ char* MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
     return MSVCRT_operator_new(count);
 }
 
-MSVCP_size_t MSVCP_allocator_char_max_size(void *this)
-{
-    return UINT_MAX/sizeof(char);
-}
-
 /* allocator<wchar_t> */
 /* ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z */
 /* ?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z */
@@ -66,10 +61,3 @@ wchar_t* MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t count)
 
     return MSVCRT_operator_new(count * sizeof(wchar_t));
 }
-
-/* ?max_size@?$allocator@_W@std@@QBEIXZ */
-/* ?max_size@?$allocator@_W@std@@QEBA_KXZ */
-MSVCP_size_t MSVCP_allocator_wchar_max_size(void *this)
-{
-    return UINT_MAX/sizeof(wchar_t);
-}

dlls/msvcp100/msvcp.h

@@ -48,9 +48,7 @@ typedef struct
     MSVCP_size_t res;
 } basic_string_char;
 
-basic_string_char* MSVCP_basic_string_char_ctor(basic_string_char*);
 basic_string_char* MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*);
-basic_string_char* MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t);
 basic_string_char* MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*);
 void MSVCP_basic_string_char_dtor(basic_string_char*);
 const char* MSVCP_basic_string_char_c_str(const basic_string_char*);
@@ -68,19 +66,15 @@ typedef struct
     MSVCP_size_t res;
 } basic_string_wchar;
 
-basic_string_wchar* MSVCP_basic_string_wchar_ctor(basic_string_wchar*);
 basic_string_wchar* MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*);
-basic_string_wchar* MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t);
 void MSVCP_basic_string_wchar_dtor(basic_string_wchar*);
 const wchar_t* MSVCP_basic_string_wchar_c_str(const basic_string_wchar*);
 MSVCP_size_t MSVCP_basic_string_wchar_length(const basic_string_wchar*);
 
 char* MSVCP_allocator_char_allocate(void*, MSVCP_size_t);
 void MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t);
-MSVCP_size_t MSVCP_allocator_char_max_size(void*);
 wchar_t* MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t);
 void MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t);
-MSVCP_size_t MSVCP_allocator_wchar_max_size(void*);
 
 /* class locale::facet */
 typedef struct {

dlls/msvcp100/string.c

@@ -33,21 +33,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp);
 /* char_traits<char> */
 /* ?assign@?$char_traits@D@std@@SAXAADABD@Z */
 /* ?assign@?$char_traits@D@std@@SAXAEADAEBD@Z */
-static void CDECL MSVCP_char_traits_char_assign(char *ch, const char *assign)
+static void MSVCP_char_traits_char_assign(char *ch, const char *assign)
 {
     *ch = *assign;
 }
 
 /* ?length@?$char_traits@D@std@@SAIPBD@Z */
 /* ?length@?$char_traits@D@std@@SA_KPEBD@Z */
-static MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str)
+static MSVCP_size_t MSVCP_char_traits_char_length(const char *str)
 {
     return strlen(str);
 }
 
 /* ?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */
 /* ?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */
-static char* CDECL MSVCP_char_traits_char__Copy_s(char *dest,
+static char* MSVCP_char_traits_char__Copy_s(char *dest,
         MSVCP_size_t size, const char *src, MSVCP_size_t count)
 {
     if(!dest || !src || size<count) {
@@ -62,7 +62,7 @@ static char* CDECL MSVCP_char_traits_char__Copy_s(char *dest,
 
 /* ?_Move_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */
 /* ?_Move_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */
-static char* CDECL MSVCP_char_traits_char__Move_s(char *dest,
+static char* MSVCP_char_traits_char__Move_s(char *dest,
         MSVCP_size_t size, const char *src, MSVCP_size_t count)
 {
     if(!dest || !src || size<count) {
@@ -78,7 +78,7 @@ static char* CDECL MSVCP_char_traits_char__Move_s(char *dest,
 /* char_traits<wchar_t> */
 /* ?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z */
 /* ?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z */
-static void CDECL MSVCP_char_traits_wchar_assign(wchar_t *ch,
+static void MSVCP_char_traits_wchar_assign(wchar_t *ch,
         const wchar_t *assign)
 {
     *ch = *assign;
@@ -86,14 +86,14 @@ static void CDECL MSVCP_char_traits_wchar_assign(wchar_t *ch,
 
 /* ?length@?$char_traits@_W@std@@SAIPB_W@Z */
 /* ?length@?$char_traits@_W@std@@SA_KPEB_W@Z */
-static MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str)
+static MSVCP_size_t MSVCP_char_traits_wchar_length(const wchar_t *str)
 {
     return wcslen((WCHAR*)str);
 }
 
 /* ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */
 /* ?_Copy_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */
-static wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest,
+static wchar_t* MSVCP_char_traits_wchar__Copy_s(wchar_t *dest,
         MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count)
 {
     if(!dest || !src || size<count) {
@@ -108,7 +108,7 @@ static wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest,
 
 /* ?_Move_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */
 /* ?_Move_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */
-static wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest,
+static wchar_t* MSVCP_char_traits_wchar__Move_s(wchar_t *dest,
         MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count)
 {
     if(!dest || !src || size<count) {
@@ -123,7 +123,7 @@ static wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest,
 
 /* _String_base */
 /* ?_Xran@_String_base@std@@SAXXZ */
-static void CDECL MSVCP__String_base_Xran(void)
+static void MSVCP__String_base_Xran(void)
 {
     static const char msg[] = "invalid string position";
 
@@ -328,16 +328,6 @@ const char* MSVCP_basic_string_char_c_str(const basic_string_char *this)
     return basic_string_char_const_ptr(this);
 }
 
-/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */
-/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ */
-basic_string_char* MSVCP_basic_string_char_ctor(basic_string_char *this)
-{
-    TRACE("%p\n", this);
-
-    basic_string_char_tidy(this, FALSE, 0);
-    return this;
-}
-
 /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z */
 /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z */
 basic_string_char* MSVCP_basic_string_char_copy_ctor(
@@ -362,18 +352,6 @@ basic_string_char* MSVCP_basic_string_char_ctor_cstr(
     return this;
 }
 
-/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDI@Z */
-/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_K@Z */
-basic_string_char* MSVCP_basic_string_char_ctor_cstr_len(
-        basic_string_char *this, const char *str, MSVCP_size_t len)
-{
-    TRACE("%p %s %ld\n", this, debugstr_an(str, len), len);
-
-    basic_string_char_tidy(this, FALSE, 0);
-    MSVCP_basic_string_char_assign_cstr_len(this, str, len);
-    return this;
-}
-
 /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */
 /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ */
 void MSVCP_basic_string_char_dtor(basic_string_char *this)
@@ -610,18 +588,6 @@ const wchar_t* MSVCP_basic_string_wchar_c_str(const basic_string_wchar *this)
     return basic_string_wchar_const_ptr(this);
 }
 
-/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ */
-/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ */
-/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ */
-/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ */
-basic_string_wchar* MSVCP_basic_string_wchar_ctor(basic_string_wchar *this)
-{
-    TRACE("%p\n", this);
-
-    basic_string_wchar_tidy(this, FALSE, 0);
-    return this;
-}
-
 /* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W@Z */
 /* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W@Z */
 /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@PBG@Z */
@@ -636,20 +602,6 @@ basic_string_wchar* MSVCP_basic_string_wchar_ctor_cstr(
     return this;
 }
 
-/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_WI@Z */
-/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W_K@Z */
-/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@PBGI@Z */
-/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@PEBG_K@Z */
-basic_string_wchar* MSVCP_basic_string_wchar_ctor_cstr_len(
-        basic_string_wchar *this, const wchar_t *str, MSVCP_size_t len)
-{
-    TRACE("%p %s %ld\n", this, debugstr_wn(str, len), len);
-
-    basic_string_wchar_tidy(this, FALSE, 0);
-    MSVCP_basic_string_wchar_assign_cstr_len(this, str, len);
-    return this;
-}
-
 /* ??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ */
 /* ??1?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ */
 /* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ */