From cfad9c3d54f6f299cde85df9dbb0bbc34a673bab Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 27 May 2011 14:56:18 +0200 Subject: [PATCH] msvcp90: Add an msvcp-specific size_t to avoid casts in traces. --- dlls/msvcp90/ios.c | 18 +-- dlls/msvcp90/memory.c | 26 ++-- dlls/msvcp90/msvcp90.h | 19 +-- dlls/msvcp90/msvcp90_main.c | 2 +- dlls/msvcp90/string.c | 244 ++++++++++++++++++------------------ 5 files changed, 153 insertions(+), 156 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index aeeab3c533d..df68ccfa912 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -85,12 +85,12 @@ MSVCP_bool ios_base_Sync = FALSE; typedef struct _ios_base { const vtable_ptr *vtable; - size_t stdstr; + MSVCP_size_t stdstr; IOSB_iostate state; IOSB_iostate except; IOSB_fmtflags fmtfl; - size_t prec; - size_t wide; + MSVCP_size_t prec; + MSVCP_size_t wide; IOS_BASE_iosarray *arr; IOS_BASE_fnarray *calls; locale *loc; @@ -484,16 +484,16 @@ MSVCP_long* __thiscall ios_base_iword(ios_base *this, int index) /* ?precision@ios_base@std@@QAEHH@Z */ /* ?precision@ios_base@std@@QEAA_J_J@Z */ DEFINE_THISCALL_WRAPPER(ios_base_precision_set, 8) -size_t __thiscall ios_base_precision_set(ios_base *this, size_t precision) +MSVCP_size_t __thiscall ios_base_precision_set(ios_base *this, MSVCP_size_t precision) { - FIXME("(%p %lu) stub\n", this, (unsigned long)precision); + FIXME("(%p %lu) stub\n", this, precision); return 0; } /* ?precision@ios_base@std@@QBEHXZ */ /* ?precision@ios_base@std@@QEBA_JXZ */ DEFINE_THISCALL_WRAPPER(ios_base_precision_get, 4) -size_t __thiscall ios_base_precision_get(const ios_base *this) +MSVCP_size_t __thiscall ios_base_precision_get(const ios_base *this) { FIXME("(%p) stub\n", this); return 0; @@ -584,16 +584,16 @@ void __thiscall ios_base_unsetf(ios_base *this, IOSB_fmtflags flags) /* ?width@ios_base@std@@QAEHH@Z */ /* ?width@ios_base@std@@QEAA_J_J@Z */ DEFINE_THISCALL_WRAPPER(ios_base_width_set, 8) -size_t __thiscall ios_base_width_set(ios_base *this, size_t width) +MSVCP_size_t __thiscall ios_base_width_set(ios_base *this, MSVCP_size_t width) { - FIXME("(%p %lu) stub\n", this, (unsigned long)width); + FIXME("(%p %lu) stub\n", this, width); return 0; } /* ?width@ios_base@std@@QBEHXZ */ /* ?width@ios_base@std@@QEBA_JXZ */ DEFINE_THISCALL_WRAPPER(ios_base_width_get, 4) -size_t __thiscall ios_base_width_get(ios_base *this) +MSVCP_size_t __thiscall ios_base_width_get(ios_base *this) { FIXME("(%p) stub\n", this); return 0; diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index a86ac7b8640..094100677f0 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -70,7 +70,7 @@ void* __thiscall MSVCP_allocator_char_assign(void *this, void *assign) /* ?deallocate@?$allocator@D@std@@QAEXPADI@Z */ /* ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12); -void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t size) +void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size) { MSVCRT_operator_delete(ptr); } @@ -78,7 +78,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, size_t si /* ?allocate@?$allocator@D@std@@QAEPADI@Z */ /* ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8); -char* __thiscall MSVCP_allocator_char_allocate(void *this, size_t count) +char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { return MSVCRT_operator_new(sizeof(char[count])); } @@ -87,7 +87,7 @@ char* __thiscall MSVCP_allocator_char_allocate(void *this, size_t count) /* ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12); char* __thiscall MSVCP_allocator_char_allocate_hint(void *this, - size_t count, const void *hint) + MSVCP_size_t count, const void *hint) { /* Native ignores hint */ return MSVCP_allocator_char_allocate(this, count); @@ -111,7 +111,7 @@ void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr) /* ?max_size@?$allocator@D@std@@QBEIXZ */ /* ?max_size@?$allocator@D@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4); -size_t __thiscall MSVCP_allocator_char_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this) { return UINT_MAX/sizeof(char); } @@ -162,7 +162,7 @@ void* __thiscall MSVCP_allocator_wchar_assign(void *this, void *assign) /* ?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_deallocate, 12) void __thiscall MSVCP_allocator_wchar_deallocate(void *this, - wchar_t *ptr, size_t size) + wchar_t *ptr, MSVCP_size_t size) { MSVCRT_operator_delete(ptr); } @@ -170,7 +170,7 @@ void __thiscall MSVCP_allocator_wchar_deallocate(void *this, /* ?allocate@?$allocator@_W@std@@QAEPA_WI@Z */ /* ?allocate@?$allocator@_W@std@@QEAAPEA_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_allocate, 8) -wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, size_t count) +wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t count) { if(UINT_MAX/count < sizeof(wchar_t)) { throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -184,7 +184,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, size_t count) /* ?allocate@?$allocator@_W@std@@QEAAPEA_W_KPEBX@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_allocate_hint, 12) wchar_t* __thiscall MSVCP_allocator_wchar_allocate_hint(void *this, - size_t count, const void *hint) + MSVCP_size_t count, const void *hint) { return MSVCP_allocator_wchar_allocate(this, count); } @@ -208,7 +208,7 @@ void __thiscall MSVCP_allocator_wchar_destroy(void *this, char *ptr) /* ?max_size@?$allocator@_W@std@@QBEIXZ */ /* ?max_size@?$allocator@_W@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_max_size, 4) -size_t __thiscall MSVCP_allocator_wchar_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void *this) { return UINT_MAX/sizeof(wchar_t); } @@ -260,7 +260,7 @@ void* __thiscall MSVCP_allocator_short_assign(void *this, void *assign) /* ?deallocate@?$allocator@G@std@@QEAAXPEAG_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_deallocate, 12) void __thiscall MSVCP_allocator_short_deallocate(void *this, - unsigned short *ptr, size_t size) + unsigned short *ptr, MSVCP_size_t size) { MSVCRT_operator_delete(ptr); } @@ -269,7 +269,7 @@ void __thiscall MSVCP_allocator_short_deallocate(void *this, /* ?allocate@?$allocator@G@std@@QEAAPEAG_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_allocate, 8) unsigned short* __thiscall MSVCP_allocator_short_allocate( - void *this, size_t count) + void *this, MSVCP_size_t count) { if(UINT_MAX/count < sizeof(unsigned short)) { throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -283,7 +283,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate( /* ?allocate@?$allocator@G@std@@QEAAPEAG_KPEBX@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_allocate_hint, 12) unsigned short* __thiscall MSVCP_allocator_short_allocate_hint( - void *this, size_t count, const void *hint) + void *this, MSVCP_size_t count, const void *hint) { return MSVCP_allocator_short_allocate(this, count); } @@ -300,14 +300,14 @@ void __thiscall MSVCP_allocator_short_construct(void *this, /* ?destroy@?$allocator@G@std@@QAEXPAG@Z */ /* ?destroy@?$allocator@G@std@@QEAAXPEAG@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_destroy, 8) -void __thiscall MSVCP_allocator_short_destroy(void *this, size_t *ptr) +void __thiscall MSVCP_allocator_short_destroy(void *this, MSVCP_size_t *ptr) { } /* ?max_size@?$allocator@G@std@@QBEIXZ */ /* ?max_size@?$allocator@G@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_max_size, 4) -size_t __thiscall MSVCP_allocator_short_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_short_max_size(void *this) { return UINT_MAX/sizeof(unsigned short); } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 81c0af2242d..308a49331a3 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -21,11 +21,12 @@ typedef unsigned char MSVCP_bool; typedef int MSVCP_long; +typedef SIZE_T MSVCP_size_t; void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t); -extern void* (__cdecl *MSVCRT_operator_new)(size_t); +extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); /* Copied from dlls/msvcrt/cpp.c */ @@ -150,8 +151,8 @@ typedef struct _basic_string_char char buf[BUF_SIZE_CHAR]; char *ptr; } data; - size_t size; - size_t res; + MSVCP_size_t size; + MSVCP_size_t res; } basic_string_char; basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); @@ -167,14 +168,14 @@ typedef struct _basic_string_wchar wchar_t buf[BUF_SIZE_WCHAR]; wchar_t *ptr; } data; - size_t size; - size_t res; + MSVCP_size_t size; + MSVCP_size_t res; } basic_string_wchar; -char* __stdcall MSVCP_allocator_char_allocate(void*, size_t); -void __stdcall MSVCP_allocator_char_deallocate(void*, char*, size_t); -wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, size_t); -void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, size_t); +char* __stdcall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); +void __stdcall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); +wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); +void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); /* class locale */ typedef struct diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 75c807efe05..5dd44717151 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); -void* (__cdecl *MSVCRT_operator_new)(size_t); +void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); static void init_cxx_funcs(void) { diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index d70fe94816a..fa9f18a02d5 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -53,7 +53,7 @@ MSVCP_bool CDECL MSVCP_char_traits_lt(const char *ch1, const char *ch2) /* ?compare@?$char_traits@D@std@@SAHPBD0I@Z */ /* ?compare@?$char_traits@D@std@@SAHPEBD0_K@Z */ int CDECL MSVCP_char_traits_char_compare( - const char *s1, const char *s2, size_t count) + const char *s1, const char *s2, MSVCP_size_t count) { int ret = memcmp(s1, s2, count); return (ret>0 ? 1 : (ret<0 ? -1 : 0)); @@ -61,7 +61,7 @@ int CDECL MSVCP_char_traits_char_compare( /* ?length@?$char_traits@D@std@@SAIPBD@Z */ /* ?length@?$char_traits@D@std@@SA_KPEBD@Z */ -size_t CDECL MSVCP_char_traits_char_length(const char *str) +MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str) { return strlen(str); } @@ -69,7 +69,7 @@ size_t CDECL MSVCP_char_traits_char_length(const char *str) /* ?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */ /* ?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */ char* CDECL MSVCP_char_traits_char__Copy_s(char *dest, - size_t size, const char *src, size_t count) + MSVCP_size_t size, const char *src, MSVCP_size_t count) { if(!dest || !src || size0 ? 1 : (ret<0 ? -1 : 0)); @@ -197,7 +197,7 @@ int CDECL MSVCP_char_traits_wchar_compare(const wchar_t *s1, /* ?length@?$char_traits@_W@std@@SAIPB_W@Z */ /* ?length@?$char_traits@_W@std@@SA_KPEB_W@Z */ -size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) +MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) { return wcslen((WCHAR*)str); } @@ -205,7 +205,7 @@ size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) /* ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */ /* ?_Copy_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */ wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, - size_t size, const wchar_t *src, size_t count) + MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) { if(!dest || !src || size, allocator> */ /* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB */ /* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2_KB */ -const size_t MSVCP_basic_string_char_npos = -1; +const MSVCP_size_t MSVCP_basic_string_char_npos = -1; /* Internal: basic_string_char_ptr - return pointer to stored string */ static char* basic_string_char_ptr(basic_string_char *this) @@ -517,7 +517,7 @@ static const char* basic_string_char_const_ptr(const basic_string_char *this) } /* Internal: basic_string_char_eos - sets string length, puts '\0' on the end */ -static void basic_string_char_eos(basic_string_char *this, size_t len) +static void basic_string_char_eos(basic_string_char *this, MSVCP_size_t len) { static const char nullbyte = '\0'; @@ -537,7 +537,7 @@ static MSVCP_bool basic_string_char_inside( /* Internal: basic_string_char_tidy - initialize basic_string buffer, deallocates data */ /* Caution: new_size have to be smaller than BUF_SIZE_CHAR */ static void basic_string_char_tidy(basic_string_char *this, - MSVCP_bool built, size_t new_size) + MSVCP_bool built, MSVCP_size_t new_size) { if(built && BUF_SIZE_CHAR<=this->res) { char *ptr = this->data.ptr; @@ -553,10 +553,10 @@ static void basic_string_char_tidy(basic_string_char *this, /* Internal: basic_string_char_grow - changes size of internal buffer */ static MSVCP_bool basic_string_char_grow( - basic_string_char *this, size_t new_size, MSVCP_bool trim) + basic_string_char *this, MSVCP_size_t new_size, MSVCP_bool trim) { if(this->res < new_size) { - size_t new_res = new_size; + MSVCP_size_t new_res = new_size; char *ptr; new_res |= 0xf; @@ -594,9 +594,9 @@ static MSVCP_bool basic_string_char_grow( /* ?erase@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_K0@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_erase, 12) basic_string_char* __thiscall MSVCP_basic_string_char_erase( - basic_string_char *this, size_t pos, size_t len) + basic_string_char *this, MSVCP_size_t pos, MSVCP_size_t len) { - TRACE("%p %lu %lu\n", this, (unsigned long)pos, (unsigned long)len); + TRACE("%p %lu %lu\n", this, pos, len); if(pos > this->size) { MSVCP__String_base_Xran(); @@ -621,9 +621,9 @@ basic_string_char* __thiscall MSVCP_basic_string_char_erase( DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_substr, 16) basic_string_char* __thiscall MSVCP_basic_string_char_assign_substr( basic_string_char *this, const basic_string_char *assign, - size_t pos, size_t len) + MSVCP_size_t pos, MSVCP_size_t len) { - TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); + TRACE("%p %p %lu %lu\n", this, assign, pos, len); if(assign->size < pos) { MSVCP__String_base_Xran(); @@ -661,9 +661,9 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign( /* ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_cstr_len, 12) basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr_len( - basic_string_char *this, const char *str, size_t len) + basic_string_char *this, const char *str, MSVCP_size_t len) { - TRACE("%p %s %lu\n", this, debugstr_a(str), (unsigned long)len); + TRACE("%p %s %lu\n", this, debugstr_a(str), len); if(basic_string_char_inside(this, str)) return MSVCP_basic_string_char_assign_substr(this, this, @@ -703,7 +703,7 @@ const char* __thiscall MSVCP_basic_string_char_c_str(basic_string_char *this) /* ?capacity@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ /* ?capacity@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_capacity, 4) -size_t __thiscall MSVCP_basic_string_char_capacity(basic_string_char *this) +MSVCP_size_t __thiscall MSVCP_basic_string_char_capacity(basic_string_char *this) { TRACE("%p\n", this); return this->res; @@ -750,9 +750,9 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr( /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr_len, 12) basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len( - basic_string_char *this, const char *str, size_t len) + basic_string_char *this, const char *str, MSVCP_size_t len) { - TRACE("%p %s %d\n", this, str, len); + TRACE("%p %s %ld\n", this, str, len); basic_string_char_tidy(this, FALSE, 0); MSVCP_basic_string_char_assign_cstr_len(this, str, len); @@ -764,9 +764,9 @@ basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len( DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_substr, 16) basic_string_char* __thiscall MSVCP_basic_string_char_ctor_substr( basic_string_char *this, const basic_string_char *assign, - size_t pos, size_t len) + MSVCP_size_t pos, MSVCP_size_t len) { - TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); + TRACE("%p %p %lu %lu\n", this, assign, pos, len); basic_string_char_tidy(this, FALSE, 0); MSVCP_basic_string_char_assign_substr(this, assign, pos, len); @@ -787,7 +787,7 @@ void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_length, 4) -size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) { TRACE("%p\n", this); return this->size; @@ -800,8 +800,8 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri { if(this != str) { char tmp[sizeof(this->data)]; - const size_t size = this->size; - const size_t res = this->res; + const MSVCP_size_t size = this->size; + const MSVCP_size_t res = this->res; memcpy(tmp, this->data.buf, sizeof(this->data)); memcpy(this->data.buf, str->data.buf, sizeof(this->data)); @@ -819,9 +819,9 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_substr, 16) basic_string_char* __thiscall MSVCP_basic_string_char_append_substr(basic_string_char *this, - const basic_string_char *append, size_t offset, size_t count) + const basic_string_char *append, MSVCP_size_t offset, MSVCP_size_t count) { - TRACE("%p %p %lu %lu\n", this, append, (unsigned long)offset, (unsigned long)count); + TRACE("%p %p %lu %lu\n", this, append, offset, count); if(append->size < offset) MSVCP__String_base_Xran(); @@ -857,9 +857,9 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append( /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_cstr_len, 12) basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr_len( - basic_string_char *this, const char *append, size_t count) + basic_string_char *this, const char *append, MSVCP_size_t count) { - TRACE("%p %s %lu\n", this, append, (unsigned long)count); + TRACE("%p %s %lu\n", this, append, count); if(basic_string_char_inside(this, append)) return MSVCP_basic_string_char_append_substr(this, this, @@ -893,9 +893,9 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr( /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_len_ch, 12) basic_string_char* __thiscall MSVCP_basic_string_char_append_len_ch( - basic_string_char *this, size_t count, char ch) + basic_string_char *this, MSVCP_size_t count, char ch) { - TRACE("%p %lu %c\n", this, (unsigned long)count, ch); + TRACE("%p %lu %c\n", this, count, ch); if(MSVCP_basic_string_char_npos-this->size <= count) MSVCP__String_base_Xlen(); @@ -957,13 +957,12 @@ basic_string_char* __cdecl MSVCP_basic_string_char_concatenate(basic_string_char /* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD0@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_cstr_len, 20) int __thiscall MSVCP_basic_string_char_compare_substr_cstr_len( - const basic_string_char *this, size_t pos, size_t num, - const char *str, size_t count) + const basic_string_char *this, MSVCP_size_t pos, MSVCP_size_t num, + const char *str, MSVCP_size_t count) { int ans; - TRACE("%p %lu %lu %s %lu\n", this, (unsigned long)pos, - (unsigned long)num, str, (unsigned long)count); + TRACE("%p %lu %lu %s %lu\n", this, pos, num, str, count); if(this->size < pos) MSVCP__String_base_Xran(); @@ -987,7 +986,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_cstr_len( /* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0PEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_cstr, 16) int __thiscall MSVCP_basic_string_char_compare_substr_cstr(const basic_string_char *this, - size_t pos, size_t num, const char *str) + MSVCP_size_t pos, MSVCP_size_t num, const char *str) { return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, str, MSVCP_char_traits_char_length(str)); @@ -1007,11 +1006,10 @@ int __thiscall MSVCP_basic_string_char_compare_cstr( /* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@00@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr_substr, 24) int __thiscall MSVCP_basic_string_char_compare_substr_substr( - const basic_string_char *this, size_t pos, size_t num, - const basic_string_char *compare, size_t off, size_t count) + const basic_string_char *this, MSVCP_size_t pos, MSVCP_size_t num, + const basic_string_char *compare, MSVCP_size_t off, MSVCP_size_t count) { - TRACE("%p %lu %lu %p %lu %lu\n", this, (unsigned long)pos, (unsigned long)num, - compare, (unsigned long)off, (unsigned long)count); + TRACE("%p %lu %lu %p %lu %lu\n", this, pos, num, compare, off, count); if(compare->size < off) MSVCP__String_base_Xran(); @@ -1027,7 +1025,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_substr( /* ?compare@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAH_K0AEBV12@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_compare_substr, 16) int __thiscall MSVCP_basic_string_char_compare_substr( - const basic_string_char *this, size_t pos, size_t num, + const basic_string_char *this, MSVCP_size_t pos, MSVCP_size_t num, const basic_string_char *compare) { return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, @@ -1071,12 +1069,12 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_lower_cstr_bstr( /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIPBDII@Z */ /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KPEBD_K1@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_cstr_substr, 16) -size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( - const basic_string_char *this, const char *find, size_t pos, size_t len) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( + const basic_string_char *this, const char *find, MSVCP_size_t pos, MSVCP_size_t len) { const char *p, *end; - TRACE("%p %s %lu %lu\n", this, find, (unsigned long)pos, (unsigned long)len); + TRACE("%p %s %lu %lu\n", this, find, pos, len); if(len==0 && pos<=this->size) return pos; @@ -1097,8 +1095,8 @@ size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIDI@Z */ /* ?find@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) -size_t __thiscall MSVCP_basic_string_char_find_ch( - const basic_string_char *this, char ch, size_t pos) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_ch( + const basic_string_char *this, char ch, MSVCP_size_t pos) { return MSVCP_basic_string_char_find_cstr_substr(this, &ch, pos, 1); } @@ -1109,9 +1107,9 @@ size_t __thiscall MSVCP_basic_string_char_find_ch( /* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_at, 8) char* __thiscall MSVCP_basic_string_char_at( - basic_string_char *this, size_t pos) + basic_string_char *this, MSVCP_size_t pos) { - TRACE("%p %lu\n", this, (unsigned long)pos); + TRACE("%p %lu\n", this, pos); if(this->size <= pos) MSVCP__String_base_Xran(); @@ -1125,9 +1123,9 @@ char* __thiscall MSVCP_basic_string_char_at( /* ??A?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAAEBD_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_const_at, 8) const char* __thiscall MSVCP_basic_string_char_const_at( - const basic_string_char *this, size_t pos) + const basic_string_char *this, MSVCP_size_t pos) { - TRACE("%p %lu\n", this, (unsigned long)pos); + TRACE("%p %lu\n", this, pos); if(this->size <= pos) MSVCP__String_base_Xran(); @@ -1139,9 +1137,9 @@ const char* __thiscall MSVCP_basic_string_char_const_at( /* ?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAX_KD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_resize_ch, 12) void __thiscall MSVCP_basic_string_char_resize_ch( - basic_string_char *this, size_t size, char ch) + basic_string_char *this, MSVCP_size_t size, char ch) { - TRACE("%p %lu %c\n", this, (unsigned long)size, ch); + TRACE("%p %lu %c\n", this, size, ch); if(size <= this->size) MSVCP_basic_string_char_erase(this, size, this->size); @@ -1153,7 +1151,7 @@ void __thiscall MSVCP_basic_string_char_resize_ch( /* ?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAX_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_resize, 8) void __thiscall MSVCP_basic_string_char_resize( - basic_string_char *this, size_t size) + basic_string_char *this, MSVCP_size_t size) { MSVCP_basic_string_char_resize_ch(this, size, '\0'); } @@ -1170,7 +1168,7 @@ void __thiscall MSVCP_basic_string_char_clear(basic_string_char *this) /* basic_string, allocator> */ /* ?npos@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@2IB */ /* ?npos@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@2_KB */ -const size_t MSVCP_basic_string_wchar_npos = -1; +const MSVCP_size_t MSVCP_basic_string_wchar_npos = -1; /* Internal: basic_string_wchar_ptr - return pointer to stored string */ static wchar_t* basic_string_wchar_ptr(basic_string_wchar *this) @@ -1189,7 +1187,7 @@ static const wchar_t* basic_string_wchar_const_ptr(const basic_string_wchar *thi } /* Internal: basic_string_wchar_eos - sets string length, puts '\0' on the end */ -static void basic_string_wchar_eos(basic_string_wchar *this, size_t len) +static void basic_string_wchar_eos(basic_string_wchar *this, MSVCP_size_t len) { static const wchar_t nullbyte_w = '\0'; @@ -1209,7 +1207,7 @@ static MSVCP_bool basic_string_wchar_inside( /* Internal: basic_string_char_tidy - initialize basic_string buffer, deallocates data */ /* Caution: new_size have to be smaller than BUF_SIZE_WCHAR */ static void basic_string_wchar_tidy(basic_string_wchar *this, - MSVCP_bool built, size_t new_size) + MSVCP_bool built, MSVCP_size_t new_size) { if(built && BUF_SIZE_WCHAR<=this->res) { wchar_t *ptr = this->data.ptr; @@ -1225,10 +1223,10 @@ static void basic_string_wchar_tidy(basic_string_wchar *this, /* Internal: basic_string_wchar_grow - changes size of internal buffer */ static MSVCP_bool basic_string_wchar_grow( - basic_string_wchar *this, size_t new_size, MSVCP_bool trim) + basic_string_wchar *this, MSVCP_size_t new_size, MSVCP_bool trim) { if(this->res < new_size) { - size_t new_res = new_size; + MSVCP_size_t new_res = new_size; wchar_t *ptr; new_res |= 0xf; @@ -1266,9 +1264,9 @@ static MSVCP_bool basic_string_wchar_grow( /* ?erase@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K0@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_erase, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_erase( - basic_string_wchar *this, size_t pos, size_t len) + basic_string_wchar *this, MSVCP_size_t pos, MSVCP_size_t len) { - TRACE("%p %lu %lu\n", this, (unsigned long)pos, (unsigned long)len); + TRACE("%p %lu %lu\n", this, pos, len); if(pos > this->size) { MSVCP__String_base_Xran(); @@ -1293,9 +1291,9 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_erase( DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_substr, 16) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_substr( basic_string_wchar *this, const basic_string_wchar *assign, - size_t pos, size_t len) + MSVCP_size_t pos, MSVCP_size_t len) { - TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); + TRACE("%p %p %lu %lu\n", this, assign, pos, len); if(assign->size < pos) { MSVCP__String_base_Xran(); @@ -1333,9 +1331,9 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign( /* ?assign@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@PEB_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_cstr_len, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( - basic_string_wchar *this, const wchar_t *str, size_t len) + basic_string_wchar *this, const wchar_t *str, MSVCP_size_t len) { - TRACE("%p %s %lu\n", this, debugstr_w(str), (unsigned long)len); + TRACE("%p %s %lu\n", this, debugstr_w(str), len); if(basic_string_wchar_inside(this, str)) return MSVCP_basic_string_wchar_assign_substr(this, this, @@ -1373,7 +1371,7 @@ const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(basic_string_wchar *thi /* ?capacity@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIXZ */ /* ?capacity@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_capacity, 4) -size_t __thiscall MSVCP_basic_string_wchar_capacity(basic_string_wchar *this) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_capacity(basic_string_wchar *this) { TRACE("%p\n", this); return this->res; @@ -1420,9 +1418,9 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr( /* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_cstr_len, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len( - basic_string_wchar *this, const wchar_t *str, size_t len) + basic_string_wchar *this, const wchar_t *str, MSVCP_size_t len) { - TRACE("%p %s %d\n", this, debugstr_w(str), len); + TRACE("%p %s %ld\n", this, debugstr_w(str), len); basic_string_wchar_tidy(this, FALSE, 0); MSVCP_basic_string_wchar_assign_cstr_len(this, str, len); @@ -1434,9 +1432,9 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len( DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_substr, 16) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_substr( basic_string_wchar *this, const basic_string_wchar *assign, - size_t pos, size_t len) + MSVCP_size_t pos, MSVCP_size_t len) { - TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); + TRACE("%p %p %lu %lu\n", this, assign, pos, len); basic_string_wchar_tidy(this, FALSE, 0); MSVCP_basic_string_wchar_assign_substr(this, assign, pos, len); @@ -1457,7 +1455,7 @@ void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) /* ?length@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIXZ */ /* ?length@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_length, 4) -size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this) { TRACE("%p\n", this); return this->size; @@ -1470,8 +1468,8 @@ void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_st { if(this != str) { char tmp[sizeof(this->data)]; - const size_t size = this->size; - const size_t res = this->res; + const MSVCP_size_t size = this->size; + const MSVCP_size_t res = this->res; memcpy(tmp, this->data.buf, sizeof(this->data)); memcpy(this->data.buf, str->data.buf, sizeof(this->data)); @@ -1489,9 +1487,9 @@ void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_st /* ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@AEBV12@_K1@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_substr, 16) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_substr(basic_string_wchar *this, - const basic_string_wchar *append, size_t offset, size_t count) + const basic_string_wchar *append, MSVCP_size_t offset, MSVCP_size_t count) { - TRACE("%p %p %lu %lu\n", this, append, (unsigned long)offset, (unsigned long)count); + TRACE("%p %p %lu %lu\n", this, append, offset, count); if(append->size < offset) MSVCP__String_base_Xran(); @@ -1527,9 +1525,9 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append( /* ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@PEB_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_cstr_len, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr_len( - basic_string_wchar *this, const wchar_t *append, size_t count) + basic_string_wchar *this, const wchar_t *append, MSVCP_size_t count) { - TRACE("%p %s %lu\n", this, debugstr_w(append), (unsigned long)count); + TRACE("%p %s %lu\n", this, debugstr_w(append), count); if(basic_string_wchar_inside(this, append)) return MSVCP_basic_string_wchar_append_substr(this, this, @@ -1563,9 +1561,9 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_cstr( /* ?append@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@_K_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_len_ch, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_len_ch( - basic_string_wchar *this, size_t count, wchar_t ch) + basic_string_wchar *this, MSVCP_size_t count, wchar_t ch) { - TRACE("%p %lu %c\n", this, (unsigned long)count, ch); + TRACE("%p %lu %c\n", this, count, ch); if(MSVCP_basic_string_wchar_npos-this->size <= count) MSVCP__String_base_Xlen(); @@ -1627,13 +1625,12 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate(basic_string_wc /* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W0@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_cstr_len, 20) int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr_len( - const basic_string_wchar *this, size_t pos, size_t num, - const wchar_t *str, size_t count) + const basic_string_wchar *this, MSVCP_size_t pos, MSVCP_size_t num, + const wchar_t *str, MSVCP_size_t count) { int ans; - TRACE("%p %lu %lu %s %lu\n", this, (unsigned long)pos, - (unsigned long)num, debugstr_w(str), (unsigned long)count); + TRACE("%p %lu %lu %s %lu\n", this, pos, num, debugstr_w(str), count); if(this->size < pos) MSVCP__String_base_Xran(); @@ -1657,7 +1654,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr_len( /* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0PEB_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_cstr, 16) int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr(const basic_string_wchar *this, - size_t pos, size_t num, const wchar_t *str) + MSVCP_size_t pos, MSVCP_size_t num, const wchar_t *str) { return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, str, MSVCP_char_traits_wchar_length(str)); @@ -1677,11 +1674,10 @@ int __thiscall MSVCP_basic_string_wchar_compare_cstr( /* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@00@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr_substr, 24) int __thiscall MSVCP_basic_string_wchar_compare_substr_substr( - const basic_string_wchar *this, size_t pos, size_t num, - const basic_string_wchar *compare, size_t off, size_t count) + const basic_string_wchar *this, MSVCP_size_t pos, MSVCP_size_t num, + const basic_string_wchar *compare, MSVCP_size_t off, MSVCP_size_t count) { - TRACE("%p %lu %lu %p %lu %lu\n", this, (unsigned long)pos, (unsigned long)num, - compare, (unsigned long)off, (unsigned long)count); + TRACE("%p %lu %lu %p %lu %lu\n", this, pos, num, compare, off, count); if(compare->size < off) MSVCP__String_base_Xran(); @@ -1697,7 +1693,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_substr( /* ?compare@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAH_K0AEBV12@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_compare_substr, 16) int __thiscall MSVCP_basic_string_wchar_compare_substr( - const basic_string_wchar *this, size_t pos, size_t num, + const basic_string_wchar *this, MSVCP_size_t pos, MSVCP_size_t num, const basic_string_wchar *compare) { return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, @@ -1741,12 +1737,12 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr( /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEIPB_WII@Z */ /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_KPEB_W_K1@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_cstr_substr, 16) -size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( - const basic_string_wchar *this, const wchar_t *find, size_t pos, size_t len) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( + const basic_string_wchar *this, const wchar_t *find, MSVCP_size_t pos, MSVCP_size_t len) { const wchar_t *p, *end; - TRACE("%p %s %lu %lu\n", this, debugstr_w(find), (unsigned long)pos, (unsigned long)len); + TRACE("%p %s %lu %lu\n", this, debugstr_w(find), pos, len); if(len==0 && pos<=this->size) return pos; @@ -1767,8 +1763,8 @@ size_t __thiscall MSVCP_basic_string_wchar_find_cstr_substr( /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEI_WI@Z */ /* ?find@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA_K_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12) -size_t __thiscall MSVCP_basic_string_wchar_find_ch( - const basic_string_wchar *this, wchar_t ch, size_t pos) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_ch( + const basic_string_wchar *this, wchar_t ch, MSVCP_size_t pos) { return MSVCP_basic_string_wchar_find_cstr_substr(this, &ch, pos, 1); } @@ -1779,9 +1775,9 @@ size_t __thiscall MSVCP_basic_string_wchar_find_ch( /* ??A?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEA_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_at, 8) wchar_t* __thiscall MSVCP_basic_string_wchar_at( - basic_string_wchar *this, size_t pos) + basic_string_wchar *this, MSVCP_size_t pos) { - TRACE("%p %lu\n", this, (unsigned long)pos); + TRACE("%p %lu\n", this, pos); if(this->size <= pos) MSVCP__String_base_Xran(); @@ -1795,9 +1791,9 @@ wchar_t* __thiscall MSVCP_basic_string_wchar_at( /* ??A?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAAEB_W_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_const_at, 8) const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( - const basic_string_wchar *this, size_t pos) + const basic_string_wchar *this, MSVCP_size_t pos) { - TRACE("%p %lu\n", this, (unsigned long)pos); + TRACE("%p %lu\n", this, pos); if(this->size <= pos) MSVCP__String_base_Xran(); @@ -1809,9 +1805,9 @@ const wchar_t* __thiscall MSVCP_basic_string_wchar_const_at( /* ?resize@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAX_K_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_resize_ch, 12) void __thiscall MSVCP_basic_string_wchar_resize_ch( - basic_string_wchar *this, size_t size, wchar_t ch) + basic_string_wchar *this, MSVCP_size_t size, wchar_t ch) { - TRACE("%p %lu %c\n", this, (unsigned long)size, ch); + TRACE("%p %lu %c\n", this, size, ch); if(size <= this->size) MSVCP_basic_string_wchar_erase(this, size, this->size); @@ -1823,7 +1819,7 @@ void __thiscall MSVCP_basic_string_wchar_resize_ch( /* ?resize@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAX_K@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_resize, 8) void __thiscall MSVCP_basic_string_wchar_resize( - basic_string_wchar *this, size_t size) + basic_string_wchar *this, MSVCP_size_t size) { MSVCP_basic_string_wchar_resize_ch(this, size, '\0'); }