diff options
| -rw-r--r-- | include/ntapi/nt_unicode.h | 12 | ||||
| -rw-r--r-- | src/unicode/ntapi_uc_unicode_conversion_from_utf16.c | 8 | ||||
| -rw-r--r-- | src/unicode/ntapi_uc_unicode_conversion_from_utf8.c | 8 | ||||
| -rw-r--r-- | src/unicode/ntapi_uc_unicode_validation.c | 4 |
4 files changed, 24 insertions, 8 deletions
diff --git a/include/ntapi/nt_unicode.h b/include/ntapi/nt_unicode.h index 346b744..294c2f8 100644 --- a/include/ntapi/nt_unicode.h +++ b/include/ntapi/nt_unicode.h @@ -41,7 +41,7 @@ typedef struct _nt_unicode_conversion_params_utf8_to_utf16 { size_t dst_size_in_bytes; size_t code_points; size_t bytes_written; - void * addr_failed; + const unsigned char * addr_failed; uintptr_t leftover_count; uintptr_t leftover_bytes; } nt_unicode_conversion_params_utf8_to_utf16, nt_strconv_mbtonative; @@ -54,7 +54,7 @@ typedef struct _nt_unicode_conversion_params_utf8_to_utf32 { size_t dst_size_in_bytes; size_t code_points; size_t bytes_written; - void * addr_failed; + const unsigned char * addr_failed; uintptr_t leftover_count; uintptr_t leftover_bytes; } nt_unicode_conversion_params_utf8_to_utf32, nt_strconv_mbtowide; @@ -67,7 +67,7 @@ typedef struct _nt_unicode_conversion_params_utf16_to_utf8 { size_t dst_size_in_bytes; size_t code_points; size_t bytes_written; - void * addr_failed; + const wchar16_t * addr_failed; uintptr_t leftover_count; uintptr_t leftover_bytes; } nt_unicode_conversion_params_utf16_to_utf8, nt_strconv_nativetomb; @@ -80,7 +80,7 @@ typedef struct _nt_unicode_conversion_params_utf16_to_utf32 { size_t dst_size_in_bytes; size_t code_points; size_t bytes_written; - void * addr_failed; + const wchar16_t * addr_failed; uintptr_t leftover_count; uintptr_t leftover_bytes; } nt_unicode_conversion_params_utf16_to_utf32, nt_strconv_nativetowide; @@ -105,7 +105,7 @@ typedef int32_t __stdcall ntapi_uc_validate_unicode_stream_utf8( __in const unsigned char * ch, __in size_t size_in_bytes __optional, __out size_t * code_points __optional, - __out void ** addr_failed __optional, + __out const unsigned char ** addr_failed __optional, __in ntapi_uc_utf8_callback_fn ** callback_fn __optional, __in nt_utf8_callback_args * callback_args __optional); @@ -114,7 +114,7 @@ typedef int32_t __stdcall ntapi_uc_validate_unicode_stream_utf16( __in const wchar16_t * wch, __in size_t size_in_bytes __optional, __out size_t * code_points __optional, - __out void ** addr_failed __optional, + __out const wchar16_t ** addr_failed __optional, __in ntapi_uc_utf16_callback_fn ** callback_fn __optional, __in nt_utf16_callback_args * callback_args __optional); diff --git a/src/unicode/ntapi_uc_unicode_conversion_from_utf16.c b/src/unicode/ntapi_uc_unicode_conversion_from_utf16.c index eb8196c..f089ec0 100644 --- a/src/unicode/ntapi_uc_unicode_conversion_from_utf16.c +++ b/src/unicode/ntapi_uc_unicode_conversion_from_utf16.c @@ -272,7 +272,15 @@ int32_t __stdcall __ntapi_uc_convert_unicode_stream_utf16_to_utf8( switch (status) { case NT_STATUS_SUCCESS: + params->addr_failed = 0; + params->leftover_bytes = 0; + params->leftover_count = 0; + return status; + case NT_STATUS_BUFFER_TOO_SMALL: + params->addr_failed = args.src; + params->leftover_bytes = 0; + params->leftover_count = 0; return status; default: diff --git a/src/unicode/ntapi_uc_unicode_conversion_from_utf8.c b/src/unicode/ntapi_uc_unicode_conversion_from_utf8.c index 48eacb2..9543b71 100644 --- a/src/unicode/ntapi_uc_unicode_conversion_from_utf8.c +++ b/src/unicode/ntapi_uc_unicode_conversion_from_utf8.c @@ -273,7 +273,15 @@ int32_t __stdcall __ntapi_uc_convert_unicode_stream_utf8_to_utf16( switch (status) { case NT_STATUS_SUCCESS: + params->addr_failed = 0; + params->leftover_bytes = 0; + params->leftover_count = 0; + return status; + case NT_STATUS_BUFFER_TOO_SMALL: + params->addr_failed = args.src; + params->leftover_bytes = 0; + params->leftover_count = 0; return status; default: diff --git a/src/unicode/ntapi_uc_unicode_validation.c b/src/unicode/ntapi_uc_unicode_validation.c index dbdf4e1..35b2d50 100644 --- a/src/unicode/ntapi_uc_unicode_validation.c +++ b/src/unicode/ntapi_uc_unicode_validation.c @@ -108,7 +108,7 @@ int32_t __stdcall __ntapi_uc_validate_unicode_stream_utf8( __in const unsigned char * ch, __in size_t size_in_bytes __optional, __out size_t * code_points __optional, - __out void ** addr_failed __optional, + __out const unsigned char ** addr_failed __optional, __in ntapi_uc_utf8_callback_fn ** callback_fn __optional, __in nt_utf8_callback_args * callback_args __optional) { @@ -247,7 +247,7 @@ int32_t __stdcall __ntapi_uc_validate_unicode_stream_utf16( __in const wchar16_t * wch, __in size_t size_in_bytes __optional, __out size_t * code_points __optional, - __out void ** addr_failed __optional, + __out const wchar16_t ** addr_failed __optional, __in ntapi_uc_utf16_callback_fn ** callback_fn __optional, __in nt_utf16_callback_args * callback_args __optional) { |