Merge branch 'master' of github.com:Microsoft/WinObjC into github_master

microsoft · May 12, 2016 · a3ca025 · a3ca025
2 parents fb94f6d + 0f6d640
commit a3ca025
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Frameworks/Foundation/NSBundle.mm b/Frameworks/Foundation/NSBundle.mm
@@ -245,11 +245,11 @@ bool ScanFilename(BundleFile* dest, char* pDirectory, char* pFilename) {
         }
         dest->pszPlatform = copyWithoutExtension("~iphone", "");
         szTemp[strlen(szTemp) - 7] = 0;
-    } else if (hasExtension(szTemp, "~iPad")) {
+    } else if (hasExtension(szTemp, "~ipad")) {
         if (!isTabletDevice()) {
             return false;
         }
-        dest->pszPlatform = copyWithoutExtension("~iPad", "");
+        dest->pszPlatform = copyWithoutExtension("~ipad", "");
         szTemp[strlen(szTemp) - 5] = 0;
     }
 
@@ -867,9 +867,9 @@ - (NSString*)localizedStringForKey:(NSString*)key value:(NSString*)value table:(
             memmove(pPos, pPos + 7, strlen(pPos + 7) + 1);
         }
     } else {
-        if (strstr(szPath, "~iPad") != NULL) {
-            char* pPos = strstr(szPath, "~iPad");
-            memmove(pPos, pPos + 4, strlen(pPos + 4) + 1);
+        if (strstr(szPath, "~ipad") != NULL) {
+            char* pPos = strstr(szPath, "~ipad");
+            memmove(pPos, pPos + 5, strlen(pPos + 5) + 1);
         }
     }
 
@@ -907,7 +907,7 @@ - (NSString*)localizedStringForKey:(NSString*)key value:(NSString*)value table:(
         if (!isTabletDevice()) {
             ret = makePath(self, name, extension, directory, localization, sublocal, @"~iphone");
         } else {
-            ret = makePath(self, name, extension, directory, localization, sublocal, @"~iPad");
+            ret = makePath(self, name, extension, directory, localization, sublocal, @"~ipad");
         }
 
         path = (char*)[ret UTF8String];

diff --git a/Frameworks/StarboardXaml/ApplicationMain.mm b/Frameworks/StarboardXaml/ApplicationMain.mm
@@ -48,6 +48,11 @@ int ApplicationMainStart(
     WOCDisplayMode* displayMode = [UIApplication displayMode];
     [displayMode _setWindowSize:CGSizeMake(windowWidth, windowHeight)];
 
+    if ([UIApplication respondsToSelector:@selector(setStartupDisplayMode:)]) {
+        [UIApplication setStartupDisplayMode:displayMode];
+        [displayMode _updateDisplaySettings];
+    }
+
     [NSBundle setMainBundlePath:@"."];
 
     NSDictionary* infoDict = [[NSBundle mainBundle] infoDictionary];
@@ -95,10 +100,6 @@ int ApplicationMainStart(
     }
 #endif
 
-    if ([UIApplication respondsToSelector:@selector(setStartupDisplayMode:)]) {
-        [UIApplication setStartupDisplayMode:displayMode];
-    }
-
     [displayMode _updateDisplaySettings];
 
     UIApplicationMainInit(argc, argv, principalClassName, delegateClassName, defaultOrientation);

diff --git a/Frameworks/UIKit/NSTextStorage.mm b/Frameworks/UIKit/NSTextStorage.mm
@@ -161,6 +161,7 @@ - (NSDictionary*)attributesAtIndex:(NSUInteger)location longestEffectiveRange:(N
 - (void)dealloc {
     [_layoutManagers release];
     [_defaultAttributes release];
+    [_composed release];
     [super dealloc];
 }