X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/93df430801e1a92c96c4e20fce06a0699b64c323..31c7f1e65d127eda688c9b6425b989c061a8d31c:/Library.mm

diff --git a/Library.mm b/Library.mm
index d400f4c..219f4e7 100644
--- a/Library.mm
+++ b/Library.mm
@@ -298,25 +298,29 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
 
     NSString *idiom(IsWild_ ? @"ipad" : @"iphone");
 
-    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 4)]);
+    NSMutableArray *scaled([NSMutableArray arrayWithCapacity:([files count] * 6)]);
 
     for (NSString *file in files) {
         NSString *base([file stringByDeletingPathExtension]);
         NSString *extension([file pathExtension]);
 
-        if (use) {
-            for (unsigned scale(2); scale <= Scale_; ++scale) {
-                [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]];
-                [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]];
-            }
+#define WBScaleImage(scale) \
+    if (scale == 1) { \
+        [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; \
+        [scaled addObject:file]; \
+    } else { \
+        [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]]; \
+        [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]]; \
+    }
 
-            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
+        if (use) {
+            WBScaleImage(Scale_);
 
-            // if (!IsWild_) <- support old themes
-            [scaled addObject:file];
+            for (unsigned scale(3); scale >= 1; --scale)
+                if (scale != Scale_)
+                    WBScaleImage(scale);
         } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) {
-            [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
-            [scaled addObject:file];
+            WBScaleImage(1);
 
             // XXX: this actually can't be used, as the person loading the file doesn't realize that the @2x changed
             /*NSString *rest([base substringWithRange:NSMakeRange(0, [base length] - 3)]);
@@ -384,7 +388,7 @@ static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSStri
 
     #define remapResourceName(oldname, newname) \
         else if ([file isEqualToString:(oldname)]) \
-            [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \
+            [names addObject:oldname ".png"];
 
     bool summer(SpringBoard_ && SummerBoard_);
 
@@ -486,7 +490,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
 
 @implementation NSBundle (WinterBoard)
 
-+ (NSBundle *) wb$bundleWithFile:(NSString *)path {
++ (NSBundle *) _wb$bundleWithFile:(NSString *)path {
     path = [path stringByDeletingLastPathComponent];
     if (path == nil || [path length] == 0 || [path isEqualToString:@"/"])
         return nil;
@@ -502,7 +506,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
         if ([Manager_ fileExistsAtPath:[path stringByAppendingPathComponent:@"Info.plist"]])
             bundle = [NSBundle bundleWithPath:path];
         if (bundle == nil)
-            bundle = [NSBundle wb$bundleWithFile:path];
+            bundle = [NSBundle _wb$bundleWithFile:path];
         if (Debug_)
             NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle);
 
@@ -514,6 +518,12 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
     return bundle;
 }
 
++ (NSBundle *) wb$bundleWithFile:(NSString *)path {
+    if ([path hasPrefix:@"/Library/Themes"])
+        return nil;
+    return [self _wb$bundleWithFile:path];
+}
+
 @end
 // }}}
 // -[NSString wb$themedPath] {{{
@@ -524,9 +534,6 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {
 @implementation NSString (WinterBoard)
 
 - (NSString *) wb$themedPath {
-    if ([self hasPrefix:@"/Library/Themes/"])
-        return self;
-
     if (Debug_)
         NSLog(@"WB:Debug:Bypass(\"%@\")", self);
 
@@ -748,10 +755,13 @@ MSHook(CFURLRef, CFBundleCopyResourceURL, CFBundleRef bundle, CFStringRef resour
     if (subDirName != NULL)
         file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType];
 
-    if (Debug_)
-        NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName);
-    if (NSString *path = $pathForFile$inBundle$(file, bundle, false))
-        return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path];
+    if (![file hasSuffix:@".png"]) {
+        if (Debug_)
+            NSLog(@"WB:Debug: CFBundleCopyResourceURL(<%@>, \"%@\", \"%@\", \"%@\")", CFBundleGetIdentifier(bundle), resourceName, resourceType, subDirName);
+        if (NSString *path = $pathForFile$inBundle$(file, bundle, false))
+            return (CFURLRef) [[NSURL alloc] initFileURLWithPath:path];
+    }
+
     return _CFBundleCopyResourceURL(bundle, resourceName, resourceType, subDirName);
 }
 // }}}
@@ -1225,7 +1235,7 @@ static UIImage *$getImage$(NSString *path) {
 }
 
 template <typename Original_, typename Modified_>
-_finline UIImage *WBCacheImage(const Original_ &original, const Modified_ &modified, NSString *key) {
+_finline UIImage *WBCacheImage(const Modified_ &modified, const Original_ &original, NSString *key) {
     UIImage *image([Images_ objectForKey:key]);
     if (image != nil)
         return reinterpret_cast<id>(image) == [NSNull null] ? original() : image;
@@ -2042,7 +2052,7 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) {
 // }}}
 
 template <typename Original_>
-static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSString *name, NSString *key) {
+static UIImage *WBCacheImage(NSBundle *bundle, NSString *name, const Original_ &original, NSString *key) {
     if (name == nil)
         return original();
     NSUInteger period([name rangeOfString:@"."].location);
@@ -2050,7 +2060,9 @@ static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSSt
     if (period == NSNotFound || length < 4 || period > length - 4)
         name = [name stringByAppendingString:@".png"];
 
-    return WBCacheImage([bundle, &original, name](){
+    return WBCacheImage(
+        [=](){ return $pathForFile$inBundle$(name, bundle, true); },
+    [bundle, &original, name](){
         UIImage *image(original());
         if (image != nil && UIDebug_) {
             NSString *path([@"/tmp/WBImages/" stringByAppendingString:[bundle bundleIdentifier]]);
@@ -2059,7 +2071,8 @@ static UIImage *WBCacheUIImage(NSBundle *bundle, const Original_ &original, NSSt
             if (![Manager_ fileExistsAtPath:path])
                 [UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
         } return image;
-    }, [=](){ return $pathForFile$inBundle$(name, bundle, true); }, key);
+    },
+    key);
 }
 
 // %hook _UIImageWithName() {{{
@@ -2068,9 +2081,9 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) {
         return nil;
     if (Debug_)
         NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name);
-    return WBCacheUIImage(_UIKitBundle(),
+    return WBCacheImage(_UIKitBundle(), name,
         [=](){ return __UIImageWithName(name); },
-    name, [NSString stringWithFormat:@"I:%@", name]);
+    [NSString stringWithFormat:@"I:%@", name]);
 }
 // }}}
 // %hook _UIImageWithNameInDomain() {{{
@@ -2078,8 +2091,8 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) {
     if (Debug_)
         NSLog(@"WB:Debug: _UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain);
     return WBCacheImage(
-        [=](){ return __UIImageWithNameInDomain(name, domain); },
         [=](){ return $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])); },
+        [=](){ return __UIImageWithNameInDomain(name, domain); },
     [NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]);
 }
 // }}}
@@ -2095,9 +2108,9 @@ MSInstanceMessageHook2(UIImage *, UISharedArtwork, imageNamed,device, NSString *
     NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle)));
     if (Debug_)
         NSLog(@"WB:Debug: -[UISharedArtwork(%@) imageNamed:@\"%@\" device:%li]", [bundle bundleIdentifier], name, (long) device);
-    return WBCacheUIImage(bundle,
+    return WBCacheImage(bundle, name,
         [=](){ return MSOldCall(name, device); },
-    name, [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]);
+    [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]);
 }
 // }}}
 // _UIAssetManager (iOS 7) {{{
@@ -2126,9 +2139,9 @@ MSInstanceMessageHook5(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtyp
             bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.LegacyArtwork"];
     }
 
-    return WBCacheUIImage(bundle,
+    return WBCacheImage(bundle, name,
         [=](){ return MSOldCall(name, scale, idiom, subtype, caching); },
-    name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]);
+    [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]);
 }
 // }}}
 // _UIAssetManager (iOS 8) {{{
@@ -2148,9 +2161,9 @@ MSInstanceMessageHook7(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtyp
             (long) size.first, (long) size.second,
             attach ? "YES" : "NO"
         );
-    return WBCacheUIImage(bundle,
+    return WBCacheImage(bundle, name,
         [=](){ return MSOldCall(name, scale, idiom, subtype, caching, size, attach); },
-    name, [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu:%li:%li:%c", self, name, scale, (long) idiom, (unsigned long) subtype, (long) size.first, (long) size.second, attach ? 'Y' : 'N']);
+    [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu:%li:%li:%c", self, name, scale, (long) idiom, (unsigned long) subtype, (long) size.first, (long) size.second, attach ? 'Y' : 'N']);
 }
 // }}}
 
@@ -2265,9 +2278,8 @@ MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, CFTypeRef *names
         if (NSString *themed = $pathForFile$inBundle$([name stringByAppendingString:@".png"], bundle, true)) {
             if (indexes != nil)
                 index = [[indexes objectForKey:name] intValue];
-            UIImage *image($getImage$(themed));
-            CGImageRef cg([image CGImage]);
-            [copy replaceObjectAtIndex:index withObject:(id)cg];
+            if (UIImage *image = $getImage$(themed))
+                [copy replaceObjectAtIndex:index withObject:(id)[image CGImage]];
         }
 
     return images;
@@ -2558,6 +2570,7 @@ MSInitialize {
     // }}}
     // Foundation {{{
     if (true) {
+        if (![identifier isEqualToString:@"com.apple.backupd"]) // XXX: rethink
         MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
     }
     // }}}