diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:06 +0000 |
| commit | d9533c342dd90bb3404ecfba87ad3703e038bb6d (patch) | |
| tree | 01cfef67ccc5acb2f347a1af9b2168be816a0afa /include | |
| parent | Adding debian version 7.0.18-dfsg-2. (diff) | |
| download | virtualbox-d9533c342dd90bb3404ecfba87ad3703e038bb6d.tar.xz virtualbox-d9533c342dd90bb3404ecfba87ad3703e038bb6d.zip | |
Merging upstream version 7.0.20-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/VBox/GuestHost/clipboard-helper.h | 8 | ||||
| -rw-r--r-- | include/iprt/asmdefs.mac | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/VBox/GuestHost/clipboard-helper.h b/include/VBox/GuestHost/clipboard-helper.h index 97600993..13df9227 100644 --- a/include/VBox/GuestHost/clipboard-helper.h +++ b/include/VBox/GuestHost/clipboard-helper.h @@ -58,7 +58,11 @@ enum }; /** - * Returns the length (in UTF-8 characters) of an UTF-16 string with LF EOL. + * Returns calculated length (in UTF-8 characters) of normalized UTF-16 string with CRLF EOL. + * + * This function should be used in order to calculate number of UTF-8 characters + * in normalized UTF-16. Normalized string is expected to have LF characters replaced + * with CRLF sequences. * * @returns VBox status code. * @param pcwszSrc UTF-16 string to return size for. @@ -66,7 +70,7 @@ enum * @param pchLen Where to return the length (in UTF-8 characters). * Does not include terminator. */ -int ShClUtf16LFLenUtf8(PCRTUTF16 pcwszSrc, size_t cwcSrc, size_t *pchLen); +int ShClUtf16CalcNormalizedEolToCRLFLength(PCRTUTF16 pcwszSrc, size_t cwcSrc, size_t *pchLen); /** * Returns the length (in UTF-8 characters) of an UTF-16 string with CRLF EOL. diff --git a/include/iprt/asmdefs.mac b/include/iprt/asmdefs.mac index 1fd057bb..73d4ccfd 100644 --- a/include/iprt/asmdefs.mac +++ b/include/iprt/asmdefs.mac @@ -1264,7 +1264,11 @@ BEGINPROC_EXPORTED %1, 0 ; %macro RT_NOCRT_BEGINPROC 1 %ifdef RT_WITH_NOCRT_ALIASES + %ifdef IN_RT_STATIC +BEGINPROC RT_NOCRT(%1), 1 ; Do our own IBT_ENDBRxx after aliasing/ + %else BEGINPROC_EXPORTED RT_NOCRT(%1), 1 ; Do our own IBT_ENDBRxx after aliasing/ + %endif %ifdef ASM_FORMAT_ELF ; ELF %ifdef RT_WITH_NOCRT_UNDERSCORE_ALIASES @@ -1285,7 +1289,11 @@ GLOBALNAME %1 %endif IBT_ENDBRxx %else ; !RT_WITH_NOCRT_ALIASES + %ifdef IN_RT_STATIC +BEGINPROC RT_NOCRT(%1), 0 + %else BEGINPROC_EXPORTED RT_NOCRT(%1), 0 + %endif %endif ; !RT_WITH_NOCRT_ALIASES %endmacro ; RT_NOCRT_BEGINPROC |