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

microsoft · Nov 19, 2015 · 9c384e0 · 9c384e0
2 parents d161064 + ab60acf
commit 9c384e0
Show file tree

Hide file tree

Showing 150 changed files with 10,088 additions and 1,419 deletions.
diff --git a/Frameworks/CoreFoundation/CFArray.mm b/Frameworks/CoreFoundation/CFArray.mm
@@ -432,6 +432,13 @@ void CFArrayInsertValueAtIndex(CFMutableArrayRef array, CFIndex index, const voi
     _LazyArrOffset.member(array)->addObjectAtIndex((id)value, index);
 }
 
+/**
+ @Status Interoperable
+*/
+void CFArraySetValueAtIndex(CFMutableArrayRef self,CFIndex index,const void *value) {
+    _LazyArrOffset.member(self)->replaceObject((id)value, index);
+}
+
 /**
  @Status Interoperable
 */

diff --git a/Frameworks/Foundation/NSAssertionHandler.mm b/Frameworks/Foundation/NSAssertionHandler.mm
@@ -14,7 +14,56 @@
 //
 //******************************************************************************
 
-#import <Foundation/Foundation.h>
+#include "Starboard.h"
+#import <Foundation/NSAssertionHandler.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSThread.h>
+#import <Foundation/NSString.h>
+
+const NSString* NSAssertionHandlerKey = @"NSAssertionHandlerKey";
 
 @implementation NSAssertionHandler
-@end
+
++ (NSAssertionHandler*)currentHandler {
+    id currentHandlerForThread = [[[NSThread currentThread] threadDictionary] objectForKey:NSAssertionHandlerKey];
+
+    if (currentHandlerForThread == nil) {
+        if ((currentHandlerForThread = [[[self alloc] init] autorelease]) != nil) {
+            [[[NSThread currentThread] threadDictionary] setObject:currentHandlerForThread forKey:NSAssertionHandlerKey];
+        }
+    }
+
+    return currentHandlerForThread;
+}
+
+- (void)handleFailureInMethod:(SEL)selector
+                       object:(id)object
+                         file:(NSString*)fileName
+                   lineNumber:(NSInteger)line
+                  description:(NSString*)format, ... {
+    NSLog(@"*** Assertion failure in %c[%@ %@], %@:%ld",
+          (object == [object class]) ? '+' : '-',
+          NSStringFromClass([object class]),
+          NSStringFromSelector(selector),
+          fileName,
+          (long)line);
+
+    va_list arguments;
+    va_start(arguments, format);
+    [NSException raise:NSInternalInconsistencyException format:format arguments:arguments];
+    va_end(arguments);
+}
+
+- (void)handleFailureInFunction:(NSString*)functionName
+                           file:(NSString*)fileName
+                     lineNumber:(NSInteger)line
+                    description:(NSString*)format, ... {
+    NSLog(@"*** Assertion failure in %@, %@:%ld", functionName, fileName, (long)line);
+
+    va_list arguments;
+    va_start(arguments, format);
+    [NSException raise:NSInternalInconsistencyException format:format arguments:arguments];
+    va_end(arguments);
+}
+
+@end
diff --git a/Frameworks/Foundation/NSBundle.mm b/Frameworks/Foundation/NSBundle.mm
@@ -667,8 +667,6 @@ + (NSBundle*)bundleWithPath:(NSString*)path {
 }
 
 + (NSBundle*)bundleWithURL:(NSURL*)url {
-    EbrDebugLog("bundleWithURL: %s\n", [[url absoluteString] UTF8String]);
-
     if ([url isFileURL]) {
         return [[self alloc] initWithPath:[url path]];
     } else {
@@ -678,6 +676,18 @@ + (NSBundle*)bundleWithURL:(NSURL*)url {
     }
 }
 
+/**
+ @Status Interoperable
+*/
+- (instancetype)initWithUrl:(NSURL*)url {
+    if ([url isFileURL]) {
+        return [self initwithPath:[url path]];
+    }
+
+    EbrDebugLog("bad URL\n");
+    return nil;
+}
+
 /**
  @Status Interoperable
 */

diff --git a/Frameworks/Foundation/NSCondition.mm b/Frameworks/Foundation/NSCondition.mm
@@ -205,9 +205,6 @@ - (BOOL)tryLock {
     return pthread_mutex_trylock(&_mutex) == 0;
 }
 
-/**
- @Status Interoperable
-*/
 - (void)lockWhenCondition:(NSInteger)condition {
     int rc;
 

diff --git a/Frameworks/Foundation/NSDictionary.h b/Frameworks/Foundation/NSDictionary.h
@@ -17,6 +17,11 @@
 #ifndef __NSDICTIONARY_H
 #define __NSDICTIONARY_H
 
+typedef NS_ENUM(NSUInteger, NSEnumerationOptions) {
+    NSEnumerationConcurrent = 1,
+    NSEnumerationReverse
+};
+
 class __CFDictionary;
 #define __CFDICTIONARY_SIZE_BYTES (0x54)
 @interface NSDictionary : NSObject {
@@ -63,6 +68,7 @@ class __CFDictionary;
 - (NSString*)stringFromQueryComponents;
 - (void)getObjects:(id*)objects andKeys:(id*)keys;
 - (void)enumerateKeysAndObjectsUsingBlock:(id)block;
+- (void)enumerateKeysAndObjectsWithOptions:(NSEnumerationOptions)options usingBlock:(void (^)(id, id, BOOL*))block;
 - (NSArray*)objectsForKeys:(NSArray*)keys notFoundMarker:(id)notFoundMarker;
 + (instancetype)dictionaryWithObjectsAndKeys:(id)firstObj, ...;
 + (instancetype)dictionaryWithObjects:(id*)vals forKeys:(id*)keys count:(unsigned)count;

diff --git a/Frameworks/Foundation/NSDictionary.mm b/Frameworks/Foundation/NSDictionary.mm
@@ -52,7 +52,7 @@ static int _NSDict_SortedKeysHelper(id key1, id key2, void* context) {
 
 @implementation NSDictionary : NSObject
 
-+ (BOOL)automaticallyNotifiersObserversForKey:(NSString*)key {
++ (BOOL)automaticallyNotifiesObserversForKey:(NSString*)key {
     // This class uses setObject:forKey: as a setter, and has no key-specific setters.
     return NO;
 }
@@ -799,6 +799,14 @@ - (void)enumerateKeysAndObjectsUsingBlock:(void (^)(id, id, BOOL*))block {
     }
 }
 
+/**
+   @Status Caveat
+   @Notes enumeration options are not implemented.
+*/
+- (void)enumerateKeysAndObjectsWithOptions:(NSEnumerationOptions)options usingBlock:(void (^)(id, id, BOOL*))block {
+    [self enumerateKeysAndObjectsUsingBlock:block];
+}
+
 /**
  @Status Interoperable
 */

diff --git a/Frameworks/Foundation/NSFileManager.h b/Frameworks/Foundation/NSFileManager.h