Merge remote-tracking branch 'origin/master' into github_master

microsoft · Jun 9, 2016 · 8e5b55d · 8e5b55d
2 parents 1200687 + 6fb1ecf
commit 8e5b55d
Show file tree

Hide file tree

Showing 179 changed files with 9,678 additions and 836 deletions.
diff --git a/Frameworks/CoreFoundation/Base.subproj/CFRuntime.c b/Frameworks/CoreFoundation/Base.subproj/CFRuntime.c
@@ -924,6 +924,12 @@ extern CFAllocatorRef __CFAllocatorGetAllocator(CFTypeRef);
 
 CFAllocatorRef CFGetAllocator(CFTypeRef cf) {
     if (NULL == cf) return kCFAllocatorSystemDefault;
+
+    // WINOBJC: Return something reasonable for ObjC objects
+    if (!__CF_IsCFObject(cf)) {
+        return kCFAllocatorDefault;
+    }
+
     if (__kCFAllocatorTypeID_CONST == __CFGenericTypeID_inline(cf)) {
     return __CFAllocatorGetAllocator(cf);
     }

diff --git a/Frameworks/Foundation/NSArray.mm b/Frameworks/Foundation/NSArray.mm
@@ -597,12 +597,13 @@ - (NSArray*)arrayByAddingObject:(NSObject*)obj {
 */
 - (NSArray*)arrayByAddingObjectsFromArray:(NSArray*)arr {
     std::vector<id> objects([self count] + [arr count]);
+    NSUInteger currentIndex = 0;
     for (NSUInteger i = 0; i < [self count]; i++) {
-        objects[i] = [self objectAtIndex:i];
+        objects[currentIndex++] = [self objectAtIndex:i];
     }
 
     for (NSUInteger i = 0; i < [arr count]; i++) {
-        objects[i] = [arr objectAtIndex:i];
+        objects[currentIndex++] = [arr objectAtIndex:i];
     }
 
     return [NSArray arrayWithObjects:objects.data() count:objects.size()];

diff --git a/Frameworks/Foundation/NSBundle.mm b/Frameworks/Foundation/NSBundle.mm
@@ -178,6 +178,11 @@ - (instancetype)initWithURL:(NSURL*)url {
  @Status Interoperable
 */
 - (instancetype)initWithPath:(NSString*)path {
+    if (path == nil) {
+        [self release];
+        return nil;
+    }
+
     return [self initWithURL:[NSURL fileURLWithPath:path]];
 }
 

diff --git a/Frameworks/Foundation/NSKVOSupport.mm b/Frameworks/Foundation/NSKVOSupport.mm
@@ -66,7 +66,9 @@ - (void)dealloc {
 #pragma region Keypath Observer
 @interface _NSKVOKeypathObserver () {
     long _changeDepth;
+    void* _rawObserver;
 }
+@property (nonatomic, readonly) void* _rawObserver;
 @end
 
 @implementation _NSKVOKeypathObserver
@@ -78,6 +80,7 @@ - (instancetype)initWithObject:(id)object
     if (self = [super init]) {
         _object = object;
         objc_storeWeak(&_observer, observer);
+        _rawObserver = _observer;
         _keypath = [keypath copy];
         _options = options;
         _context = context;
@@ -96,6 +99,13 @@ - (id)observer {
     return objc_loadWeak(&_observer);
 }
 
+- (void*)_rawObserver {
+    // We might need to remove an observer during its own deallocation;
+    // We therefore need the ability to grab the raw observer pointer during
+    // deregistration.
+    return _rawObserver;
+}
+
 - (bool)pushWillChange {
     return InterlockedIncrementNoFence(&_changeDepth) == 1;
 }
@@ -374,7 +384,7 @@ static void _removeKeypathObserver(id object, NSString* keypath, id observer, vo
     _NSKVOObservationInfo* observationInfo = (_NSKVOObservationInfo*)[object observationInfo];
     for (_NSKVOKeyObserver* keyObserver in [observationInfo observersForKey:key]) {
         _NSKVOKeypathObserver* keypathObserver = keyObserver.keypathObserver;
-        if ([keypathObserver.keypath isEqual:keypath] && keypathObserver.object == object &&
+        if (keypathObserver._rawObserver == observer && keypathObserver.object == object && [keypathObserver.keypath isEqual:keypath] &&
             (!context || keypathObserver.context == context)) {
             _removeKeyObserver(keyObserver);
             return;

diff --git a/Frameworks/Foundation/NSString.mm b/Frameworks/Foundation/NSString.mm
@@ -2362,11 +2362,6 @@ - (Boolean)_getCString:(char*)buffer maxLength:(NSUInteger)bufferSize encoding:(
     return [self getCString:buffer maxLength:bufferSize encoding:encoding];
 }
 
-- (const wchar_t*)rawCharacters {
-    // TODO 7143070 This is only here for compatibility with projections. remove once we get a new projections.
-    return (const wchar_t*)[self cStringUsingEncoding:NSUTF16StringEncoding];
-}
-
 - (int)_versionStringCompare:(NSString*)compStrAddr {
     TraceWarning(TAG, L"Warning: versionStringCompare not implemented");
     char* str = (char*)[self UTF8String];

diff --git a/Frameworks/Foundation/NSXMLPropertyList.mm b/Frameworks/Foundation/NSXMLPropertyList.mm
@@ -157,7 +157,10 @@ static id propertyListFromElement(xml_node<>* elem) {
         return dataFromElement(elem);
     } else if (strncmp(elem->name(), "date", elem->name_size()) == 0) {
         Str numStr(elem->value(), elem->value_size());
-        return [NSDate dateWithTimeIntervalSinceReferenceDate:atof(numStr.cstr())];
+        // YYYY '-' MM '-' DD 'T' hh ':' mm ':' ss 'Z'
+        NSDateFormatter* formatter = [[NSDateFormatter new] autorelease];
+        [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss'Z'"];
+        return [formatter dateFromString:@(numStr.cstr())];
     } else {
         TraceVerbose(TAG, L"Unrecognized element type!");
     }

diff --git a/Frameworks/UIKit/NSCoder+UIKitAdditions.mm b/Frameworks/UIKit/NSCoder+UIKitAdditions.mm
@@ -16,6 +16,7 @@
 
 #import "NSRaise.h"
 #include <StubReturn.h>
+#import <UIKit/NSValue+UIKitAdditions.h>
 #import <UIKit/UIGeometry.h>
 
 @implementation NSCoder (UIGeometryKeyedCoding)
@@ -147,28 +148,28 @@ - (void)encodeCGSize:(CGSize)size forKey:(NSString*)aKey {
  @Status Interoperable
 */
 - (void)encodeCGVector:(CGVector)vector forKey:(NSString*)key {
-    [self encodeObject:[NSValue valueWithBytes:&vector objCType:@encode(CGVector)] forKey:key];
+    [self encodeObject:[NSValue valueWithCGVector:vector] forKey:key];
 }
 
 /**
  @Status Interoperable
 */
 - (void)encodeUIEdgeInsets:(UIEdgeInsets)insets forKey:(NSString*)key {
-    [self encodeObject:[NSValue valueWithBytes:&insets objCType:@encode(UIEdgeInsets)] forKey:key];
+    [self encodeObject:[NSValue valueWithUIEdgeInsets:insets] forKey:key];
 }
 
 /**
  @Status Interoperable
 */
 - (void)encodeUIOffset:(UIOffset)offset forKey:(NSString*)key {
-    [self encodeObject:[NSValue valueWithBytes:&offset objCType:@encode(UIOffset)] forKey:key];
+    [self encodeObject:[NSValue valueWithUIOffset:offset] forKey:key];
 }
 
 /**
  @Status Interoperable
 */
 - (void)encodeCGAffineTransform:(CGAffineTransform)transform forKey:(NSString*)key {
-    [self encodeObject:[NSValue valueWithBytes:&transform objCType:@encode(CGAffineTransform)] forKey:key];
+    [self encodeObject:[NSValue valueWithCGAffineTransform:transform] forKey:key];
 }
 @end
 
@@ -224,7 +225,7 @@ - (CGVector)decodeCGVectorForKey:(NSString*)key {
     id value = [self decodeObjectForKey:key];
 
     if (value != nil) {
-        [value getValue:&ret];
+        ret = [value CGVectorValue];
     }
     return ret;
 }
@@ -237,7 +238,7 @@ - (UIEdgeInsets)decodeUIEdgeInsetsForKey:(NSString*)key {
     id value = [self decodeObjectForKey:key];
 
     if (value != nil) {
-        [value getValue:&ret];
+        ret = [value UIEdgeInsetsValue];
     }
     return ret;
 }
@@ -250,7 +251,7 @@ - (UIOffset)decodeUIOffsetForKey:(NSString*)key {
     id value = [self decodeObjectForKey:key];
 
     if (value != nil) {
-        [value getValue:&ret];
+        ret = [value UIOffsetValue];
     }
     return ret;
 }
@@ -263,7 +264,7 @@ - (CGAffineTransform)decodeCGAffineTransformForKey:(NSString*)key {
     id value = [self decodeObjectForKey:key];
 
     if (value != nil) {
-        [value getValue:&ret];
+        ret = [value CGAffineTransformValue];
     }
     return ret;
 }

diff --git a/Frameworks/UIKit/NSValue+UIKitAdditions.mm b/Frameworks/UIKit/NSValue+UIKitAdditions.mm
@@ -22,6 +22,10 @@ - (id)initWithCGSize:(CGSize)value {
     return [self initWithBytes:(void*)&value objCType:@encode(CGSize)];
 }
 
+- (id)initWithCGVector:(CGVector)value {
+    return [self initWithBytes:(void*)&value objCType:@encode(CGVector)];
+}
+
 - (id)initWithCGPoint:(CGPoint)value {
     return [self initWithBytes:(void*)&value objCType:@encode(CGPoint)];
 }
@@ -42,10 +46,18 @@ - (id)initWithCGAffineTransform:(CGAffineTransform)value {
     return [self initWithBytes:(void*)&value objCType:@encode(CGAffineTransform)];
 }
 
+- (id)initWithUIEdgeInsets:(UIEdgeInsets)value {
+    return [self initWithBytes:(void*)&value objCType:@encode(UIEdgeInsets)];
+}
+
 + (NSValue*)valueWithCGSize:(CGSize)value {
     return [[[self alloc] initWithCGSize:value] autorelease];
 }
 
++ (NSValue*)valueWithCGVector:(CGVector)value {
+    return [[[self alloc] initWithCGVector:value] autorelease];
+}
+
 + (NSValue*)valueWithCGPoint:(CGPoint)value {
     return [[[self alloc] initWithCGPoint:value] autorelease];
 }
@@ -66,6 +78,10 @@ + (NSValue*)valueWithCGAffineTransform:(CGAffineTransform)value {
     return [[[self alloc] initWithCGAffineTransform:value] autorelease];
 }
 
++ (NSValue*)valueWithUIEdgeInsets:(UIEdgeInsets)value {
+    return [[[self alloc] initWithUIEdgeInsets:value] autorelease];
+}
+
 - (CGSize)sizeValue {
     CGSize val;
     [self getValue:&val];
@@ -77,6 +93,19 @@ - (CGSize)CGSizeValue {
     [self getValue:&val];
     return val;
 }
+
+- (CGVector)vectorValue {
+    CGVector val;
+    [self getValue:&val];
+    return val;
+}
+
+- (CGVector)CGVectorValue {
+    CGVector val;
+    [self getValue:&val];
+    return val;
+}
+
 - (CGPoint)pointValue {
     CGPoint val;
     [self getValue:&val];
@@ -125,6 +154,18 @@ - (CGAffineTransform)CGAffineTransformValue {
     return val;
 }
 
+- (UIEdgeInsets)edgeInsetsValue {
+    UIEdgeInsets val;
+    [self getValue:&val];
+    return val;
+}
+
+- (UIEdgeInsets)UIEdgeInsetsValue {
+    UIEdgeInsets val;
+    [self getValue:&val];
+    return val;
+}
+
 @end
 
 void NSValueForceinclude() {

diff --git a/Frameworks/UIKit/StarboardXaml/ApplicationCompositor.cpp b/Frameworks/UIKit/StarboardXaml/ApplicationCompositor.cpp
@@ -29,16 +29,6 @@ using namespace Windows::Foundation;
 using namespace Windows::UI::Core;
 using namespace Windows::System::Threading;
 
-struct StartParameters {
-    int argc;
-    char** argv;
-    std::string principalClassName;
-    std::string delegateClassName;
-    float windowWidth, windowHeight;
-};
-
-StartParameters g_startParams = { 0, nullptr, std::string(), std::string(), 0.0f, 0.0f };
-
 void InitializeApp() {
     // Only init once.
     // No lock needed as this is only called from the UI thread.
@@ -64,27 +54,22 @@ void InitializeApp() {
 }
 
 extern "C" void RunApplicationMain(Platform::String^ principalClassName,
-                                     Platform::String^ delegateClassName,
-                                     float windowWidth,
-                                     float windowHeight) {
+                                   Platform::String^ delegateClassName,
+                                   float windowWidth,
+                                   float windowHeight,
+                                   ActivationType activationType,
+                                   Platform::String^ activationArg) {
     // Perform initialization
     InitializeApp();
 
-    // Store the start parameters to hand off to the run loop
-    g_startParams.argc = 0;
-    g_startParams.argv = nullptr;
-    g_startParams.principalClassName = Strings::WideToNarrow(principalClassName->Data());
-    g_startParams.delegateClassName = Strings::WideToNarrow(delegateClassName->Data());
-    g_startParams.windowWidth = windowWidth;
-    g_startParams.windowHeight = windowHeight;
-
     // Kick off iOS application main startup
-    ApplicationMainStart(g_startParams.argc,
-        g_startParams.argv,
-        g_startParams.principalClassName.c_str(),
-        g_startParams.delegateClassName.c_str(),
-        g_startParams.windowWidth,
-        g_startParams.windowHeight);
+    ApplicationMainStart(
+        Strings::WideToNarrow(principalClassName->Data()).c_str(),
+        Strings::WideToNarrow(delegateClassName->Data()).c_str(),
+        windowWidth,
+        windowHeight,
+        activationType,
+        Strings::WideToNarrow(activationArg->Data()).c_str());
 }
 
 // clang-format off
diff --git a/Frameworks/UIKit/StarboardXaml/ApplicationCompositor.h b/Frameworks/UIKit/StarboardXaml/ApplicationCompositor.h
@@ -13,11 +13,19 @@
 // THE SOFTWARE.
 //
 //******************************************************************************
+// clang-format does not seem to like C++/CX
+// clang-format off
 #pragma once
 
+#include "StarboardXaml.h"
+
 #ifdef __cplusplus_winrt
-extern "C" void RunApplicationMain(Platform::String ^ principalClassName,
-                                   Platform::String ^ delegateClassName,
+extern "C" void RunApplicationMain(Platform::String^ principalClassName,
+                                   Platform::String^ delegateClassName,
                                    float windowWidth,
-                                   float windowHeight);
-#endif
+                                   float windowHeight,
+                                   ActivationType type,
+                                   Platform::String^ activationArg);
+#endif
+
+// clang-format on
diff --git a/Frameworks/UIKit/StarboardXaml/ApplicationMain.h b/Frameworks/UIKit/StarboardXaml/ApplicationMain.h
@@ -15,8 +15,13 @@
 //******************************************************************************
 #pragma once
 
-// IOS application main startup path
-extern "C" int ApplicationMainStart(
-    int argc, char* argv[], const char* principalName, const char* delegateName, float windowWidth, float windowHeight);
+#include "StarboardXaml.h"
 
+// IOS application main startup path
+extern "C" int ApplicationMainStart(const char* principalName,
+                                    const char* delegateName,
+                                    float windowWidth,
+                                    float windowHeight,
+                                    ActivationType activationType,
+                                    const char* activationArg);
 void SetTemporaryFolder(const char* folder);