diff options
| -rw-r--r-- | include/ntapi/ntapi.h | 4 | ||||
| -rw-r--r-- | src/internal/ntapi.c | 4 | ||||
| -rw-r--r-- | src/internal/ntapi_fnapi.h | 2 | ||||
| -rw-r--r-- | src/string/ntapi_tt_string_null_offset.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/ntapi/ntapi.h b/include/ntapi/ntapi.h index 0d9f432..3d3d4de 100644 --- a/include/ntapi/ntapi.h +++ b/include/ntapi/ntapi.h @@ -363,13 +363,13 @@ typedef struct _ntapi_vtbl { ntapi_memset * memset; ntapi_sprintf * sprintf; ntapi_snprintf * snprintf; - ntapi_strlen * strlen; /* imported symbols: tail */ /* alternate implementation */ /* nt_string.h */ - ntapi_wcslen * wcslen; ntapi_rtl_init_unicode_string * rtl_init_unicode_string; + ntapi_strlen * strlen; + ntapi_wcslen * wcslen; /* extension functions */ /* nt_object.h */ diff --git a/src/internal/ntapi.c b/src/internal/ntapi.c index 70a9de5..818f15d 100644 --- a/src/internal/ntapi.c +++ b/src/internal/ntapi.c @@ -139,6 +139,8 @@ static int32_t __fastcall __ntapi_init_once(ntapi_vtbl ** pvtbl) /* alternate implementation */ __ntapi->rtl_init_unicode_string = __ntapi_tt_init_unicode_string_from_utf16; + __ntapi->strlen = __ntapi_tt_string_null_offset_multibyte; + __ntapi->wcslen = __ntapi_tt_wcslen; /* extension functions */ /* nt_object.h */ @@ -171,8 +173,6 @@ static int32_t __fastcall __ntapi_init_once(ntapi_vtbl ** pvtbl) __ntapi->tt_strcmp_utf16 = __ntapi_tt_strcmp_utf16; __ntapi->tt_strncmp_multibyte = __ntapi_tt_strncmp_multibyte; __ntapi->tt_strncmp_utf16 = __ntapi_tt_strncmp_utf16; - __ntapi->strlen = __ntapi_tt_string_null_offset_multibyte; - __ntapi->wcslen = __ntapi_wcslen; __ntapi->tt_aligned_block_memset = __ntapi_tt_aligned_block_memset; __ntapi->tt_aligned_block_memcpy = __ntapi_tt_aligned_block_memcpy; __ntapi->tt_memcpy_utf16 = __ntapi_tt_memcpy_utf16; diff --git a/src/internal/ntapi_fnapi.h b/src/internal/ntapi_fnapi.h index 6dbb87d..44c4ce6 100644 --- a/src/internal/ntapi_fnapi.h +++ b/src/internal/ntapi_fnapi.h @@ -57,7 +57,6 @@ ntapi_tt_strcmp_multibyte __ntapi_tt_strcmp_multibyte; ntapi_tt_strcmp_utf16 __ntapi_tt_strcmp_utf16; ntapi_tt_strncmp_multibyte __ntapi_tt_strncmp_multibyte; ntapi_tt_strncmp_utf16 __ntapi_tt_strncmp_utf16; -ntapi_wcslen __ntapi_wcslen; ntapi_tt_aligned_block_memset __ntapi_tt_aligned_block_memset; ntapi_tt_aligned_block_memcpy __ntapi_tt_aligned_block_memcpy; ntapi_tt_init_unicode_string_from_utf16 __ntapi_tt_init_unicode_string_from_utf16; @@ -77,6 +76,7 @@ ntapi_tt_uint16_to_hex_utf8 __ntapi_tt_uint16_to_hex_utf8; ntapi_tt_uint32_to_hex_utf8 __ntapi_tt_uint32_to_hex_utf8; ntapi_tt_uint64_to_hex_utf8 __ntapi_tt_uint64_to_hex_utf8; ntapi_tt_uintptr_to_hex_utf8 __ntapi_tt_uintptr_to_hex_utf8; +ntapi_wcslen __ntapi_tt_wcslen; /* nt_guid.h */ ntapi_tt_guid_to_utf16_string __ntapi_tt_guid_to_utf16_string; diff --git a/src/string/ntapi_tt_string_null_offset.c b/src/string/ntapi_tt_string_null_offset.c index baeace4..e5bdc62 100644 --- a/src/string/ntapi_tt_string_null_offset.c +++ b/src/string/ntapi_tt_string_null_offset.c @@ -85,7 +85,7 @@ size_t __cdecl __ntapi_tt_string_null_offset_ptrsize( return (size_t)cap - (size_t)str; } -size_t __cdecl __ntapi_wcslen(const wchar16_t * str) +size_t __cdecl __ntapi_tt_wcslen(const wchar16_t * str) { size_t len; len = __ntapi_tt_string_null_offset_short((const int16_t *)str); |