Re-Implementation of reverse string via CFString

Frameworks/CoreText/CTLine.mm

@@ -16,16 +16,46 @@
 
 #import <CoreText/CTLine.h>
 #import <StubReturn.h>
-#import "NSStringInternal.h"
 #import "CoreTextInternal.h"
 #import "CGContextInternal.h"
 #import "DWriteWrapper_CoreText.h"
 #import <CoreText/CTTypesetter.h>
+#import <CoreFoundation/CFString.h>
 
+#include <memory>
 #import <algorithm>
 #import <numeric>
+#import <cwchar>
 #import <vector>
 
+static CFStringRef __CTCreateReversedString(CFStringRef string) {
+    if (string == nullptr) {
+        return nullptr;
+    }
+
+    CFIndex length = CFStringGetLength(string);
+    CFIndex usedBufLen;
+    CFStringGetBytes(string, CFRangeMake(0, length), kCFStringEncodingUTF16, 0, false, nullptr, length, &usedBufLen);
+
+    if (length < 2) {
+        return CFStringCreateCopy(kCFAllocatorDefault, string);
+    }
+
+    CFIndex bufLen = (usedBufLen / sizeof(UniChar));
+    std::unique_ptr<UniChar[]> characters(new UniChar[bufLen + 1]);
+    characters[bufLen] = L'\0';
+
+    CFStringGetBytes(
+        string, CFRangeMake(0, length), kCFStringEncodingUTF16, 0, false, reinterpret_cast<UInt8*>(characters.get()), usedBufLen, nullptr);
+
+    wchar_t* result = _wcsrev(reinterpret_cast<wchar_t*>(characters.get()));
+    if (result == nullptr) {
+        return nullptr;
+    }
+
+    return CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, characters.release(), bufLen, nullptr);
+}
+
 static NSMutableAttributedString* _getTruncatedStringFromSourceLine(CTLineRef line,
                                                                     CTLineTruncationType truncationType,
                                                                     double widthToExtract);
@@ -187,8 +217,9 @@ CTLineRef CTLineCreateTruncatedLine(CTLineRef sourceLine, double width, CTLineTr
         CFDictionaryRef attribs = CTRunGetAttributes(run);
 
         if (truncationType == kCTLineTruncationStart) {
-            NSString* reverse = [runString _reverseString];
-            NSAttributedString* string = [[NSAttributedString alloc] initWithString:reverse attributes:(NSDictionary*)attribs];
+            auto reverse = woc::MakeStrongCF<CFStringRef>(__CTCreateReversedString(static_cast<CFStringRef>(runString)));
+            NSAttributedString* string =
+                [[NSAttributedString alloc] initWithString:static_cast<NSString*>(reverse.get()) attributes:(NSDictionary*)attribs];
             [ret insertAttributedString:string atIndex:0];
             [string release];
         } else if (truncationType == kCTLineTruncationEnd) {

Frameworks/CoreText/CTUtilities.mm

@@ -1,6 +1,6 @@
 //******************************************************************************
 //
-// Copyright (c) 2016 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
 //
@@ -23,4 +23,4 @@
 */
 uint32_t CTGetCoreTextVersion() {
     return kCTVersionNumber10_5;
-}
+}

Frameworks/Foundation/NSString.mm

@@ -1,6 +1,6 @@
 //******************************************************************************
 //
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
 //
@@ -2200,25 +2200,4 @@ - (int)_versionStringCompare:(NSString*)compStrAddr {
 
     return result;
 }
-
-- (NSString*)_reverseString {
-    NSUInteger length = [self length];
-    if (length < 2) {
-        return self;
-    }
-
-    std::vector<char> characters(length + 1);
-    [self getCString:&characters[0] maxLength:length];
-    for (int i = 0; i < length / 2; ++i) {
-        char character = characters[length - i - 1];
-        characters[length - i - 1] = characters[i];
-        characters[i] = character;
-    }
-    characters[length] = '\0';
-
-    NSString* ret = [[[NSString alloc] initWithCString:&characters[0]] autorelease];
-
-    return ret;
-}
-
 @end

Frameworks/include/CFFoundationInternal.h

@@ -1,6 +1,6 @@
 //******************************************************************************
 //
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
 //

Frameworks/include/NSStringInternal.h

@@ -1,6 +1,6 @@
 //******************************************************************************
 //
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
 //
@@ -22,7 +22,6 @@
 
 @interface NSString ()
 - (int)_versionStringCompare:(NSString*)compStrAddr;
-- (NSString*)_reverseString;
 @end
 
 @interface NSString (WinObjCHSTRINGAdditions)

build/Tests/UnitTests/Foundation.WindowsOnly/Foundation.WindowsOnly.UnitTests.vcxproj

@@ -237,7 +237,6 @@
     <ClangCompile Include="$(StarboardBasePath)\tests\unittests\Foundation\WindowsOnly\NSObjectInternalTests.mm" />
     <ClangCompile Include="$(StarboardBasePath)\tests\unittests\Foundation\WindowsOnly\NSPointerFunctionsInternalTests.mm" />
     <ClangCompile Include="$(StarboardBasePath)\tests\unittests\Foundation\WindowsOnly\NSRecursiveLockInternalTests.mm" />
-    <ClangCompile Include="$(StarboardBasePath)\tests\unittests\Foundation\WindowsOnly\NSStringInternalTests.mm" />
     <ClangCompile Include="$(StarboardBasePath)\tests\unittests\Foundation\WindowsOnly\NSPointerArrayInternalTests.mm" />
     <ClangCompile Include="$(StarboardBasePath)\tests\unittests\Foundation\WindowsOnly\ArchivalInternalTests.mm" />
   </ItemGroup>

include/CoreText/CTUtilities.h

@@ -1,6 +1,6 @@
 //******************************************************************************
 //
-// Copyright (c) 2016 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
 //
@@ -16,13 +16,12 @@
 #pragma once
 
 #import <CoreText/CoreTextExport.h>
-
-#include <stdint.h>
+#import <stdint.h>
 
 CORETEXT_EXPORT uint32_t CTGetCoreTextVersion();
 
 #define kCTVersionNumber10_5 0x00020000
 #define kCTVersionNumber10_5_2 0x00020001
 #define kCTVersionNumber10_5_3 0x00020002
 #define kCTVersionNumber10_5_5 0x00020003
-#define kCTVersionNumber10_6 0x00030000
+#define kCTVersionNumber10_6 0x00030000