diff options
Diffstat (limited to '')
| -rw-r--r-- | include/VBox/GuestHost/clipboard-helper.h | 8 | ||||
| -rw-r--r-- | include/VBox/VBoxGuestLibSharedFoldersInline.h | 5 | ||||
| -rw-r--r-- | include/VBox/intnet.h | 2 | ||||
| -rw-r--r-- | include/iprt/asmdefs.mac | 8 |
4 files changed, 18 insertions, 5 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/VBox/VBoxGuestLibSharedFoldersInline.h b/include/VBox/VBoxGuestLibSharedFoldersInline.h index 6bfdd982..7b8e3e6e 100644 --- a/include/VBox/VBoxGuestLibSharedFoldersInline.h +++ b/include/VBox/VBoxGuestLibSharedFoldersInline.h @@ -1502,10 +1502,11 @@ DECLINLINE(int) VbglR0SfHostReqReadLinkContigSimple(SHFLROOT idRoot, const char + SHFLSTRING_HEADER_SIZE + (uint32_t)cchPath); if (pReq) { + char * const pszReqPath = pReq->StrPath.String.ach; pReq->StrPath.u16Length = (uint16_t)cchPath; pReq->StrPath.u16Size = (uint16_t)cchPath + 1; - RT_BCOPY_UNFORTIFIED(pReq->StrPath.String.ach, pszPath, cchPath); - pReq->StrPath.String.ach[cchPath] = '\0'; + RT_BCOPY_UNFORTIFIED(pszReqPath, pszPath, cchPath); + pszReqPath[cchPath] = '\0'; { int vrc = VbglR0SfHostReqReadLinkContig(idRoot, pvBuf, PhysBuffer, cbBuffer, pReq); diff --git a/include/VBox/intnet.h b/include/VBox/intnet.h index 2e593067..c0708cfe 100644 --- a/include/VBox/intnet.h +++ b/include/VBox/intnet.h @@ -348,7 +348,7 @@ typedef struct INTNETSG uint16_t volatile fFlags; #if ARCH_BITS == 64 /** Alignment padding. */ - uint16_t uPadding; + uint32_t uPadding; #endif /** The number of segments allocated. */ uint16_t cSegsAlloc; 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 |