msvcp90: Added char_traits<unsigned short> implementation.
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d92864e..c4aae30 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec
@@ -1134,7 +1134,7 @@ @ stub ?_Copy_s@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIPAGIII@Z @ stub ?_Copy_s@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPA_WIII@Z @ cdecl ?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z(ptr long ptr long) MSVCP_char_traits_char__Copy_s -@ stub ?_Copy_s@?$char_traits@G@std@@SAPAGPAGIPBGI@Z +@ cdecl ?_Copy_s@?$char_traits@G@std@@SAPAGPAGIPBGI@Z(ptr long ptr long) MSVCP_char_traits_short__Copy_s @ cdecl ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z(ptr long ptr long) MSVCP_char_traits_wchar__Copy_s @ stub ?_Cosh@?$_Ctraits@M@std@@SAMMM@Z @ stub ?_Cosh@?$_Ctraits@N@std@@SANNN@Z @@ -1386,7 +1386,7 @@ @ stub ?_Makpat@?$_Mpunct@G@std@@AAEXAAUpattern@money_base@2@III@Z @ stub ?_Makpat@?$_Mpunct@_W@std@@AAEXAAUpattern@money_base@2@III@Z @ cdecl ?_Move_s@?$char_traits@D@std@@SAPADPADIPBDI@Z(ptr long ptr long) MSVCP_char_traits_char__Move_s -@ stub ?_Move_s@?$char_traits@G@std@@SAPAGPAGIPBGI@Z +@ cdecl ?_Move_s@?$char_traits@G@std@@SAPAGPAGIPBGI@Z(ptr long ptr long) MSVCP_char_traits_short__Move_s @ cdecl ?_Move_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z(ptr long ptr long) MSVCP_char_traits_wchar__Move_s @ stub ?_Mutex_Lock@_Mutex@std@@CAXPAV12@@Z @ stub ?_Mutex_Unlock@_Mutex@std@@CAXPAV12@@Z @@ -1581,8 +1581,8 @@ @ stub ?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z @ cdecl ?assign@?$char_traits@D@std@@SAPADPADID@Z(ptr long long) MSVCP_char_traits_char_assignn @ cdecl ?assign@?$char_traits@D@std@@SAXAADABD@Z(ptr ptr) MSVCP_char_traits_char_assign -@ stub ?assign@?$char_traits@G@std@@SAPAGPAGIG@Z -@ stub ?assign@?$char_traits@G@std@@SAXAAGABG@Z +@ cdecl ?assign@?$char_traits@G@std@@SAPAGPAGIG@Z(ptr long long) MSVCP_char_traits_short_assignn +@ cdecl ?assign@?$char_traits@G@std@@SAXAAGABG@Z(ptr ptr) MSVCP_char_traits_short_assign @ cdecl ?assign@?$char_traits@_W@std@@SAPA_WPA_WI_W@Z(ptr long long) MSVCP_char_traits_wchar_assignn @ cdecl ?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z(ptr ptr) MSVCP_char_traits_wchar_assign @ stub ?at@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAADI@Z @@ -1658,7 +1658,7 @@ @ stub ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHIIPB_WI@Z @ stub ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEHPB_W@Z @ cdecl ?compare@?$char_traits@D@std@@SAHPBD0I@Z(ptr ptr long) MSVCP_char_traits_char_compare -@ stub ?compare@?$char_traits@G@std@@SAHPBG0I@Z +@ cdecl ?compare@?$char_traits@G@std@@SAHPBG0I@Z(ptr ptr long) MSVCP_char_traits_short_compare @ cdecl ?compare@?$char_traits@_W@std@@SAHPB_W0I@Z(ptr ptr long) MSVCP_char_traits_wchar_compare @ stub ?compare@?$collate@D@std@@QBEHPBD000@Z @ stub ?compare@?$collate@G@std@@QBEHPBG000@Z @@ -1670,7 +1670,7 @@ @ stub ?copy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIPAGII@Z @ stub ?copy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPA_WII@Z @ cdecl ?copy@?$char_traits@D@std@@SAPADPADPBDI@Z(ptr ptr long) MSVCP_char_traits_char_copy -@ stub ?copy@?$char_traits@G@std@@SAPAGPAGPBGI@Z +@ cdecl ?copy@?$char_traits@G@std@@SAPAGPAGPBGI@Z(ptr ptr long) MSVCP_char_traits_short_copy @ cdecl ?copy@?$char_traits@_W@std@@SAPA_WPA_WPB_WI@Z(ptr ptr long) MSVCP_char_traits_wchar_copy @ stub ?copyfmt@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEAAV12@ABV12@@Z @ stub ?copyfmt@?$basic_ios@GU?$char_traits@G@std@@@std@@QAEAAV12@ABV12@@Z @@ -1976,7 +1976,7 @@ @ stub ?ends@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@1@AAV21@@Z @ stub ?ends@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z @ cdecl ?eof@?$char_traits@D@std@@SAHXZ() MSVCP_char_traits_char_eof -@ stub ?eof@?$char_traits@G@std@@SAGXZ +@ cdecl ?eof@?$char_traits@G@std@@SAGXZ() MSVCP_char_traits_short_eof @ cdecl ?eof@?$char_traits@_W@std@@SAGXZ() MSVCP_char_traits_wchar_eof @ stub ?eof@ios_base@std@@QBE_NXZ @ stub ?epptr@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEPADXZ @@ -1999,10 +1999,10 @@ @ stub ?epsilon@?$numeric_limits@_N@std@@SA_NXZ @ stub ?epsilon@?$numeric_limits@_W@std@@SA_WXZ @ cdecl ?eq@?$char_traits@D@std@@SA_NABD0@Z(ptr ptr) MSVCP_char_traits_char_eq -@ stub ?eq@?$char_traits@G@std@@SA_NABG0@Z +@ cdecl ?eq@?$char_traits@G@std@@SA_NABG0@Z(ptr ptr) MSVCP_char_traits_short_eq @ cdecl ?eq@?$char_traits@_W@std@@SA_NAB_W0@Z(ptr ptr) MSVCP_char_traits_wchar_eq @ cdecl ?eq_int_type@?$char_traits@D@std@@SA_NABH0@Z(ptr ptr) MSVCP_char_traits_char_eq_int_type -@ stub ?eq_int_type@?$char_traits@G@std@@SA_NABG0@Z +@ cdecl ?eq_int_type@?$char_traits@G@std@@SA_NABG0@Z(ptr ptr) MSVCP_char_traits_short_eq_int_type @ cdecl ?eq_int_type@?$char_traits@_W@std@@SA_NABG0@Z(ptr ptr) MSVCP_char_traits_wchar_eq_int_tpe @ stub ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z @ stub ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$_String_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@V?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z @@ -2042,7 +2042,7 @@ @ stub ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@Z @ stub ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z @ cdecl ?find@?$char_traits@D@std@@SAPBDPBDIABD@Z(ptr long ptr) MSVCP_char_traits_char_find -@ stub ?find@?$char_traits@G@std@@SAPBGPBGIABG@Z +@ cdecl ?find@?$char_traits@G@std@@SAPBGPBGIABG@Z(ptr long ptr) MSVCP_char_traits_short_find @ cdecl ?find@?$char_traits@_W@std@@SAPB_WPB_WIAB_W@Z(ptr long ptr) MSVCP_char_traits_wchar_find @ stub ?find_first_not_of@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIABV12@I@Z @ stub ?find_first_not_of@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z @@ -2406,7 +2406,7 @@ @ stub ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ @ stub ?length@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIXZ @ cdecl ?length@?$char_traits@D@std@@SAIPBD@Z(ptr) MSVCP_char_traits_char_length -@ stub ?length@?$char_traits@G@std@@SAIPBG@Z +@ cdecl ?length@?$char_traits@G@std@@SAIPBG@Z(ptr) MSVCP_char_traits_short_length @ cdecl ?length@?$char_traits@_W@std@@SAIPB_W@Z(ptr) MSVCP_char_traits_wchar_length @ stub ?length@?$codecvt@DDH@std@@QBEHABHPBD1I@Z @ stub ?length@?$codecvt@GDH@std@@QBEHABHPBD1I@Z @@ -2415,7 +2415,7 @@ @ stub ?log@?$_Ctraits@N@std@@SANN@Z @ stub ?log@?$_Ctraits@O@std@@SAOO@Z @ cdecl ?lt@?$char_traits@D@std@@SA_NABD0@Z(ptr ptr) MSVCP_char_traits_lt -@ stub ?lt@?$char_traits@G@std@@SA_NABG0@Z +@ cdecl ?lt@?$char_traits@G@std@@SA_NABG0@Z(ptr ptr) MSVCP_char_traits_short_lt @ cdecl ?lt@?$char_traits@_W@std@@SA_NAB_W0@Z(ptr ptr) MSVCP_char_traits_wchar_lt @ stub ?max@?$numeric_limits@C@std@@SACXZ @ stub ?max@?$numeric_limits@D@std@@SADXZ @@ -2473,7 +2473,7 @@ @ stub ?min_exponent@?$numeric_limits@O@std@@2HB @ stub ?min_exponent@_Num_base@std@@2HB @ cdecl ?move@?$char_traits@D@std@@SAPADPADPBDI@Z(ptr ptr long) MSVCP_char_traits_char_move -@ stub ?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z +@ cdecl ?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z(ptr ptr long) MSVCP_char_traits_short_move @ cdecl ?move@?$char_traits@_W@std@@SAPA_WPA_WPB_WI@Z(ptr ptr long) MSVCP_char_traits_wchar_move @ stub ?name@locale@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ @ stub ?narrow@?$basic_ios@DU?$char_traits@D@std@@@std@@QBEDDD@Z @@ -2492,7 +2492,7 @@ @ stub ?negative_sign@?$_Mpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ @ stub ?negative_sign@?$_Mpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ @ cdecl ?not_eof@?$char_traits@D@std@@SAHABH@Z(ptr) MSVCP_char_traits_char_not_eof -@ stub ?not_eof@?$char_traits@G@std@@SAGABG@Z +@ cdecl ?not_eof@?$char_traits@G@std@@SAGABG@Z(ptr) MSVCP_char_traits_short_not_eof @ cdecl ?not_eof@?$char_traits@_W@std@@SAGABG@Z(ptr) MSVCP_char_traits_wchar_not_eof @ stub ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB @ stub ?npos@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@2IB @@ -3026,10 +3026,10 @@ @ stub ?tinyness_before@_Num_base@std@@2_NB @ stub ?tinyness_before@_Num_float_base@std@@2_NB @ cdecl ?to_char_type@?$char_traits@D@std@@SADABH@Z(ptr) MSVCP_char_traits_char_to_char_type -@ stub ?to_char_type@?$char_traits@G@std@@SAGABG@Z +@ cdecl ?to_char_type@?$char_traits@G@std@@SAGABG@Z(ptr) MSVCP_char_traits_short_to_char_type @ cdecl ?to_char_type@?$char_traits@_W@std@@SA_WABG@Z(ptr) MSVCP_char_traits_wchar_to_char_type @ cdecl ?to_int_type@?$char_traits@D@std@@SAHABD@Z(ptr) MSVCP_char_traits_char_to_int_type -@ stub ?to_int_type@?$char_traits@G@std@@SAGABG@Z +@ cdecl ?to_int_type@?$char_traits@G@std@@SAGABG@Z(ptr) MSVCP_char_traits_short_to_int_type @ cdecl ?to_int_type@?$char_traits@_W@std@@SAGAB_W@Z(ptr) MSVCP_char_traits_wchar_to_int_type @ stub ?tolower@?$ctype@D@std@@QBEDD@Z @ stub ?tolower@?$ctype@D@std@@QBEPBDPADPBD@Z
diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index f317ae1..a43acfd 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c
@@ -277,3 +277,143 @@ { return (*in==WEOF ? !WEOF : *in); } + + +/* char_traits<unsigned short> */ +/* ?assign@?$char_traits@G@std@@SAXAAGABG@Z */ +void CDECL MSVCP_char_traits_short_assign(unsigned short *ch, + const unsigned short *assign) +{ + *ch = *assign; +} + +/* ?eq@?$char_traits@G@std@@SA_NABG0@Z */ +MSVCP_BOOL CDECL MSVCP_char_traits_short_eq(const unsigned short *ch1, + const unsigned short *ch2) +{ + return *ch1 == *ch2; +} + +/* ?lt@?$char_traits@G@std@@SA_NABG0@Z */ +MSVCP_BOOL CDECL MSVCP_char_traits_short_lt(const unsigned short *ch1, + const unsigned short *ch2) +{ + return *ch1 < *ch2; +} + +/* ?compare@?$char_traits@G@std@@SAHPBG0I@Z */ +int CDECL MSVCP_char_traits_short_compare(const unsigned short *s1, + const unsigned short *s2, unsigned int count) +{ + unsigned int i; + + for(i=0; i<count; i++) + if(s1[i] != s2[i]) + return (s1[i] < s2[i] ? -1 : 1); + + return 0; +} + +/* ?length@?$char_traits@G@std@@SAIPBG@Z */ +unsigned int CDECL MSVCP_char_traits_short_length(const unsigned short *str) +{ + unsigned int len; + + for(len=0; str[len]; len++); + + return len; +} + +/* ?_Copy_s@?$char_traits@G@std@@SAPAGPAGIPBGI@Z */ +unsigned short * CDECL MSVCP_char_traits_short__Copy_s(unsigned short *dest, + unsigned int size, const unsigned short *src, unsigned int count) +{ + if(size<count) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + return dest; + } + + return memcpy(dest, src, sizeof(unsigned short[count])); +} + +/* ?copy@?$char_traits@G@std@@SAPAGPAGPBGI@Z */ +unsigned short* CDECL MSVCP_char_traits_short_copy(unsigned short *dest, + const unsigned short *src, unsigned int count) +{ + return MSVCP_char_traits_short__Copy_s(dest, count, src, count); +} + +/* ?find@?$char_traits@G@std@@SAPBGPBGIABG@Z */ +const unsigned short* CDECL MSVCP_char_traits_short_find( + const unsigned short *str, unsigned int range, const unsigned short *c) +{ + unsigned int i; + + for(i=0; i<range; i++) + if(str[i] == *c) + return str+i; + + return NULL; +} + +/* ?_Move_s@?$char_traits@G@std@@SAPAGPAGIPBGI@Z */ +unsigned short* CDECL MSVCP_char_traits_short__Move_s(unsigned short *dest, + unsigned int size, const unsigned short *src, unsigned int count) +{ + if(size<count) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + return dest; + } + + return memmove(dest, src, sizeof(unsigned short[count])); +} + +/* ?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z */ +unsigned short* CDECL MSVCP_char_traits_short_move(unsigned short *dest, + const unsigned short *src, unsigned int count) +{ + return MSVCP_char_traits_short__Move_s(dest, count, src, count); +} + +/* ?assign@?$char_traits@G@std@@SAPAGPAGIG@Z */ +unsigned short* CDECL MSVCP_char_traits_short_assignn(unsigned short *str, + unsigned int num, unsigned short c) +{ + unsigned int i; + + for(i=0; i<num; i++) + str[i] = c; + + return str; +} + +/* ?to_char_type@?$char_traits@G@std@@SAGABG@Z */ +unsigned short CDECL MSVCP_char_traits_short_to_char_type(const unsigned short *i) +{ + return *i; +} + +/* ?to_int_type@?$char_traits@G@std@@SAGABG@Z */ +unsigned short CDECL MSVCP_char_traits_short_to_int_type(const unsigned short *ch) +{ + return *ch; +} + +/* ?eq_int_type@?$char_traits@G@std@@SA_NABG0@Z */ +MSVCP_BOOL CDECL MSVCP_char_traits_short_eq_int_type(unsigned short *i1, + unsigned short *i2) +{ + return *i1 == *i2; +} + +/* ?eof@?$char_traits@G@std@@SAGXZ */ +unsigned short CDECL MSVCP_char_traits_short_eof(void) +{ + return -1; +} + +/* ?not_eof@?$char_traits@G@std@@SAGABG@Z */ +unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in) +{ + return (*in==(unsigned short)-1 ? 0 : *in); +}