X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/734230a96f618263c185fbc66d8a8073ede26722..f4fced4e1671514225c3dc3ba1ef57365c5c0f2c:/Library.mm diff --git a/Library.mm b/Library.mm index dbc1995..8e23695 100644 --- a/Library.mm +++ b/Library.mm @@ -103,6 +103,7 @@ Class $MPVideoView; MSClassHook(NSBundle) MSClassHook(NSString) +MSClassHook(_UIAssetManager) MSClassHook(UIImage) MSMetaClassHook(UIImage) MSClassHook(UINavigationBar) @@ -199,6 +200,11 @@ static bool Four_($SBDockIconListView != nil); @end +@interface _UIAssetManager : NSObject +- (NSBundle *) bundle; +- (NSString *) carFileName; +@end + static BOOL (*_GSFontGetUseLegacyFontMetrics)(); #define $GSFontGetUseLegacyFontMetrics() \ (_GSFontGetUseLegacyFontMetrics == NULL ? YES : _GSFontGetUseLegacyFontMetrics()) @@ -211,8 +217,6 @@ static bool SpringBoard_; static UIImage *(*_UIApplicationImageWithName)(NSString *name); static UIImage *(*_UIImageWithNameInDomain)(NSString *name, NSString *domain); -static UIImage *(*_UIImageWithNameUsingCurrentIdiom)(NSString *name); -static UIImage *(*_UIImageWithDeviceSpecificName)(NSString *name); static NSBundle *(*_UIKitBundle)(); static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64]; @@ -226,6 +230,39 @@ static NSMutableArray *Themes_; static NSDictionary *English_; static NSMutableDictionary *Info_; +// @interface WBBundle {{{ +@interface WBBundle : NSBundle { + NSString *identifier_; +} + ++ (WBBundle *) bundleWithIdentifier:(NSString *)identifier; + +@end + +@implementation WBBundle + +- (void) dealloc { + [identifier_ release]; + return [super dealloc]; +} + ++ (WBBundle *) bundleWithIdentifier:(NSString *)identifier { + return [[[self alloc] initWithIdentifier:identifier] autorelease]; +} + +- (id) initWithIdentifier:(NSString *)identifier { + if ((self = [super init]) != nil) { + identifier_ = [identifier retain]; + } return self; +} + +- (NSString *) bundleIdentifier { + return identifier_; +} + +@end +// }}} + // $getTheme$() {{{ static NSMutableDictionary *Themed_ = [[NSMutableDictionary alloc] initWithCapacity:128]; @@ -243,7 +280,11 @@ static unsigned $getScale$(NSString *path) { StripName("~iphone"); StripName("~ipad"); - return [name hasSuffix:@"@2x"] ? 2 : 1; + if ([name hasSuffix:@"@3x"]) + return 3; + if ([name hasSuffix:@"@2x"]) + return 2; + return 1; } static NSArray *$useScale$(NSArray *files, bool use = true) { @@ -264,16 +305,16 @@ static NSArray *$useScale$(NSArray *files, bool use = true) { NSString *extension([file pathExtension]); if (use) { - if (Scale_ == 2) { - [scaled addObject:[NSString stringWithFormat:@"%@@2x~%@.%@", base, idiom, extension]]; - [scaled addObject:[NSString stringWithFormat:@"%@@2x.%@", base, extension]]; + for (unsigned scale(2); scale <= Scale_; ++scale) { + [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 (!IsWild_) <- support old themes [scaled addObject:file]; - } else if ([base hasSuffix: @"@2x"]) { + } else if ([base hasSuffix: @"@2x"] || [base hasSuffix:@"@3x"]) { [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]]; [scaled addObject:file]; @@ -329,9 +370,7 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { } // }}} // $pathForFile$inBundle$() {{{ -static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSString *folder, bool ui, bool use) { - NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; - +static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSString *identifier, NSString *folder) { if (identifier != nil) [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]]; if (folder != nil) { @@ -342,37 +381,50 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NS if ([base hasSuffix:@"~ipad"]) [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 5)], [folder pathExtension], file]]; } - if (ui) - [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]]; #define remapResourceName(oldname, newname) \ else if ([file isEqualToString:(oldname)]) \ - [names addObject:[NSString stringWithFormat:@"%@.png", newname]]; \ + [names addObject:oldname ".png"]; bool summer(SpringBoard_ && SummerBoard_); if (identifier == nil); + else if ([identifier isEqualToString:@"com.apple.uikit.Artwork"]) + $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework"); + else if ([identifier isEqualToString:@"com.apple.uikit.LegacyArtwork"]) + $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework"); + else if ([identifier isEqualToString:@"com.apple.UIKit"]) + [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]]; else if ([identifier isEqualToString:@"com.apple.chatkit"]) - [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]]; + $pathForFile$inBundle$(names, file, @"com.apple.MobileSMS", @"MobileSMS.app"); else if ([identifier isEqualToString:@"com.apple.calculator"]) [names addObject:[NSString stringWithFormat:@"Files/Applications/Calculator.app/%@", file]]; else if ([identifier isEqualToString:@"com.apple.Maps"] && [file isEqualToString:@"Icon-57@2x.png"]) - [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.Maps/icon.png"]]; + $pathForFile$inBundle$(names, @"icon.png", identifier, folder); else if (!summer); remapResourceName(@"FSO_BG.png", @"StatusBar") remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock") remapResourceName(@"SBWeatherCelsius.png", @"Icons/Weather") +} +static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSURL *url, bool use) { + NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; + $pathForFile$inBundle$(names, file, identifier, [url lastPathComponent]); [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]]; - if (NSString *path = $getTheme$($useScale$(names, use))) return path; - return nil; } -static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) { - return $pathForFile$inBundle$(file, [bundle bundleIdentifier], [[bundle bundlePath] lastPathComponent], ui, use); +// XXX: this cannot be merged due to WBBundle +static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool use) { + return $pathForFile$inBundle$(file, [bundle bundleIdentifier], [bundle bundleURL], use); +} + +static NSString *$pathForFile$inBundle$(NSString *file, CFBundleRef bundle, bool use) { + NSString *identifier((NSString *) CFBundleGetIdentifier(bundle)); + NSURL *url([(NSURL *) CFBundleCopyBundleURL(bundle) autorelease]); + return $pathForFile$inBundle$(file, identifier, url, use); } // }}} @@ -381,7 +433,12 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { NSString *path = [self path]; NSString *folder = [path lastPathComponent]; NSString *dname = [self displayName]; - NSString *didentifier = [self displayIdentifier]; + + NSString *didentifier; + if ([self respondsToSelector:@selector(displayIdentifier)]) + didentifier = [self displayIdentifier]; + else + didentifier = nil; if (Debug_) NSLog(@"WB:Debug: [SBApplication(%@:%@:%@:%@) pathForIcon]", identifier, folder, dname, didentifier); @@ -398,7 +455,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if (NSString *name = Name) \ [names addObject:[NSString stringWithFormat:@"Icons%@/%@.png", suffix, name]]; - if (![didentifier isEqualToString:identifier]) + if (didentifier != nil && ![didentifier isEqualToString:identifier]) testForIcon(didentifier); testForIcon(identifier); @@ -434,7 +491,11 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if (path == nil || [path length] == 0 || [path isEqualToString:@"/"]) return nil; - NSBundle *bundle([Bundles_ objectForKey:path]); + NSBundle *bundle; + @synchronized (Bundles_) { + bundle = [Bundles_ objectForKey:path]; + } + if (reinterpret_cast(bundle) == [NSNull null]) return nil; else if (bundle == nil) { @@ -444,7 +505,10 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { bundle = [NSBundle wb$bundleWithFile:path]; if (Debug_) NSLog(@"WB:Debug:PathBundle(%@, %@)", path, bundle); - [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast(bundle)) forKey:path]; + + @synchronized (Bundles_) { + [Bundles_ setObject:(bundle == nil ? [NSNull null] : reinterpret_cast(bundle)) forKey:path]; + } } return bundle; @@ -472,7 +536,7 @@ static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") { if ([file hasPrefix:prefix]) { NSUInteger length([prefix length]); if (length != [file length]) - if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false)) + if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false)) return path; } } @@ -653,7 +717,7 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSBundle *bundle = [NSBundle mainBundle]; if (Debug_) NSLog(@"WB:Debug: _UIApplicationImageWithName(\"%@\", %@)", name, bundle); - if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false)) + if (NSString *path = $pathForFile$inBundle$(name, bundle, false)) return CachedImageAtPath(path); return __UIApplicationImageWithName(name); } @@ -676,16 +740,22 @@ MSHook(UIImage *, _UIApplicationImageWithName, NSString *name) { NSLog(@"WB:Error: [%s forwardInvocation:(%s)]", class_getName([self class]), sel_getName(sel)); \ } -// %hook -[NSBundle pathForResource:ofType:] {{{ -MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, resource, NSString *, type) { - NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type]; - if ([file isEqualToString:@"Info.plist"]) - return MSOldCall(resource, type); - if (Debug_) - NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file); - if (NSString *path = $pathForFile$inBundle$(file, self, false, false)) - return path; - return MSOldCall(resource, type); +// %hook CFBundleCopyResourceURL {{{ +MSHook(CFURLRef, CFBundleCopyResourceURL, CFBundleRef bundle, CFStringRef resourceName, CFStringRef resourceType, CFStringRef subDirName) { + NSString *file((NSString *) resourceName); + if (resourceType != NULL) + file = [NSString stringWithFormat:@"%@.%@", file, resourceType]; + if (subDirName != NULL) + file = [NSString stringWithFormat:@"%@/%@", subDirName, resourceType]; + + 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); } // }}} @@ -1158,7 +1228,7 @@ static UIImage *$getImage$(NSString *path) { } template -_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(image) == [NSNull null] ? original() : image; @@ -1206,20 +1276,6 @@ MSInstanceMessageHook0(id, SBUIController, init) { if (paper != nil) paper = [paper stringByDeletingLastPathComponent]; - { - size_t size; - sysctlbyname("hw.machine", NULL, &size, NULL, 0); - char *machine = new char[size]; - - if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) { - perror("sysctlbyname(\"hw.machine\", ?)"); - delete [] machine; - machine = NULL; - } - - IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0; - } - if (Debug_) NSLog(@"WB:Debug:Info = %@", [Info_ description]); @@ -1792,7 +1848,7 @@ MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table, return value; } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings", language, file - ], self, false, false)) { + ], self, false)) { if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) { [Strings_ setObject:[strings autorelease] forKey:name]; goto strings; @@ -1989,15 +2045,27 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) { // }}} template -static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) { - if ([name rangeOfString:@"."].location == NSNotFound) +static UIImage *WBCacheImage(NSBundle *bundle, NSString *name, const Original_ &original, NSString *key) { + if (name == nil) + return original(); + NSUInteger period([name rangeOfString:@"."].location); + NSUInteger length([name length]); + if (period == NSNotFound || length < 4 || period > length - 4) name = [name stringByAppendingString:@".png"]; - UIImage *image(WBCacheImage(original, [=](){ return $pathForFile$inBundle$(name, _UIKitBundle(), true, true); }, key)); - if (image != nil && UIDebug_) { - NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]); - if (![Manager_ fileExistsAtPath:path]) - [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; - } return image; + + 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]]); + [Manager_ createDirectoryAtPath:path withIntermediateDirectories:YES attributes:@{NSFilePosixPermissions: @0777} error:NULL]; + path = [NSString stringWithFormat:@"%@/%@", path, name]; + if (![Manager_ fileExistsAtPath:path]) + [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; + } return image; + }, + key); } // %hook _UIImageWithName() {{{ @@ -2006,9 +2074,9 @@ MSHook(UIImage *, _UIImageWithName, NSString *name) { return nil; if (Debug_) NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name); - return WBCacheUIImage( + return WBCacheImage(_UIKitBundle(), name, [=](){ return __UIImageWithName(name); }, - name, [NSString stringWithFormat:@"I:%@", name]); + [NSString stringWithFormat:@"I:%@", name]); } // }}} // %hook _UIImageWithNameInDomain() {{{ @@ -2016,27 +2084,79 @@ 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]); } // }}} -// %hook _UIImageWithDeviceUsingCurrentIdiom() {{{ -MSHook(UIImage *, _UIImageWithNameUsingCurrentIdiom, NSString *name) { + +// UISharedArtwork (iOS 6) {{{ +MSInstanceMessageHook2(UISharedArtwork *, UISharedArtwork, initWithName,inBundle, NSString *, name, NSBundle *, bundle) { + if ((self = MSOldCall(name, bundle)) != nil) { + $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + } return self; +} + +MSInstanceMessageHook2(UIImage *, UISharedArtwork, imageNamed,device, NSString *, name, NSInteger, device) { + NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle))); if (Debug_) - NSLog(@"WB:Debug: _UIImageWithNameUsingCurrentIdiom(\"%@\")", name); - return WBCacheUIImage( - [=](){ return __UIImageWithNameUsingCurrentIdiom(name); }, - name, [NSString stringWithFormat:@"I:%@", name]); + NSLog(@"WB:Debug: -[UISharedArtwork(%@) imageNamed:@\"%@\" device:%li]", [bundle bundleIdentifier], name, (long) device); + return WBCacheImage(bundle, name, + [=](){ return MSOldCall(name, device); }, + [NSString stringWithFormat:@"M:%p:%@:%li", self, name, (long) device]); } // }}} -// %hook _UIImageWithDeviceSpecificName() {{{ -MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) { +// _UIAssetManager (iOS 7) {{{ +MSInstanceMessageHook3(_UIAssetManager *, _UIAssetManager, initWithName,inBundle,idiom, NSString *, name, NSBundle *, bundle, NSInteger, idiom) { + if ((self = MSOldCall(name, bundle, idiom)) != nil) { + $objc_setAssociatedObject(self, @selector(wb$bundle), bundle, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + } return self; +} + +MSInstanceMessageHook5(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtype,cachingOptions, NSString *, name, CGFloat, scale, NSInteger, idiom, NSUInteger, subtype, NSUInteger, caching) { + NSBundle *bundle($objc_getAssociatedObject(self, @selector(wb$bundle))); if (Debug_) - NSLog(@"WB:Debug: _UIImageWithDeviceSpecificName(\"%@\")", name); - return WBCacheUIImage( - [=](){ return __UIImageWithDeviceSpecificName(name); }, - name, [NSString stringWithFormat:@"S:%@", name]); + NSLog(@"WB:Debug: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu]", + [bundle bundleIdentifier], [self carFileName], + name, scale, (long) idiom, + (unsigned long) subtype, + (unsigned long) caching + ); + + if (bundle == _UIKitBundle()) { + NSString *name([self carFileName]); + if (false); + else if ([name isEqualToString:@"UIKit_NewArtwork"]) + bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.Artwork"]; + else if ([name isEqualToString:@"UIKit_OriginalArtwork"]) + bundle = [WBBundle bundleWithIdentifier:@"com.apple.uikit.LegacyArtwork"]; + } + + return WBCacheImage(bundle, name, + [=](){ return MSOldCall(name, scale, idiom, subtype, caching); }, + [NSString stringWithFormat:@"M:%p:%@:%g:%li:%lu", self, name, scale, (long) idiom, (unsigned long) subtype]); +} +// }}} +// _UIAssetManager (iOS 8) {{{ +struct SizeClassPair { + NSInteger first; + NSInteger second; +}; + +MSInstanceMessageHook7(UIImage *, _UIAssetManager, imageNamed,scale,idiom,subtype,cachingOptions,sizeClassPair,attachCatalogImage, NSString *, name, CGFloat, scale, NSInteger, idiom, NSUInteger, subtype, NSUInteger, caching, SizeClassPair, size, BOOL, attach) { + NSBundle *bundle([self bundle]); + if (Debug_) + NSLog(@"WB:Debug: -[_UIAssetManager(%@/%@) imageNamed:@\"%@\" scale:%g idiom:%li subtype:%lu cachingOptions:%lu sizeClassPair:[%li %li] attachCatalogImage:%s]", + [bundle bundleIdentifier], [self carFileName], + name, scale, (long) idiom, + (unsigned long) subtype, + (unsigned long) caching, + (long) size.first, (long) size.second, + attach ? "YES" : "NO" + ); + return WBCacheImage(bundle, name, + [=](){ return MSOldCall(name, scale, idiom, subtype, caching, size, attach); }, + [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']); } // }}} @@ -2079,10 +2199,17 @@ MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool return GetFileNameForThisAction$(value, a0, a1, 0, a3); } +#ifdef __LP64__ +MSHook(bool, _Z24GetFileNameForThisActionjPcjRb, unsigned int a0, char *a1, unsigned int a2, bool &a3) { + bool value(__Z24GetFileNameForThisActionjPcjRb(a0, a1, a2, a3)); + return GetFileNameForThisAction$(value, a0, a1, a2, a3); +} +#else MSHook(bool, _Z24GetFileNameForThisActionmPcmRb, unsigned long a0, char *a1, unsigned long a2, bool &a3) { bool value(__Z24GetFileNameForThisActionmPcmRb(a0, a1, a2, a3)); return GetFileNameForThisAction$(value, a0, a1, a2, a3); } +#endif static void ChangeWallpaper( CFNotificationCenterRef center, @@ -2108,33 +2235,47 @@ static void ChangeWallpaper( } -MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **names, void *arg2, void *arg3) { +MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, CFTypeRef *names, void *arg2, void *arg3) { NSArray *images(_CPBitmapCreateImagesFromPath(path, names, arg2, arg3)); - if (images != NULL && *names != nil && CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) { - if (NSBundle *bundle = [NSBundle wb$bundleWithFile:path]) { - NSMutableArray *copy([images mutableCopy]); - [images release]; - images = copy; - - NSString *file([path stringByResolvingSymlinksInPath]); - NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]); - if ([file hasPrefix:prefix]) { - NSUInteger length([prefix length]); - if (length != [file length]) { - NSEnumerator *enumerator([*names keyEnumerator]); - while (NSString *name = [enumerator nextObject]) { - NSString *png([name stringByAppendingString:@".png"]); - if (NSString *themed = $pathForFile$inBundle$(png, bundle, false, true)) { - NSUInteger index([[*names objectForKey:name] intValue]); - UIImage *image($getImage$(themed)); - CGImageRef cg([image CGImage]); - [copy replaceObjectAtIndex:index withObject:(id)cg]; - } - } - } - } + if (images == nil) + return nil; + if (*names == nil) + return images; + + NSBundle *bundle([NSBundle wb$bundleWithFile:path]); + if (bundle == nil) + return images; + + NSString *file([path stringByResolvingSymlinksInPath]); + NSString *prefix([[bundle bundlePath] stringByResolvingSymlinksInPath]); + // XXX: why do I care about this? + if (![file hasPrefix:prefix]) + return images; + + NSMutableArray *copy([images mutableCopy]); + [images release]; + images = copy; + + NSDictionary *indexes; + NSEnumerator *enumerator; + + if (CFGetTypeID((CFTypeRef) *names) == CFDictionaryGetTypeID()) { + indexes = (NSDictionary *) *names; + enumerator = [indexes keyEnumerator]; + } else { + indexes = nil; + enumerator = [(NSArray *) *names objectEnumerator]; + } + + for (NSUInteger index(0); NSString *name = [enumerator nextObject]; ++index) + if (NSString *themed = $pathForFile$inBundle$([name stringByAppendingString:@".png"], bundle, true)) { + if (indexes != nil) + index = [[indexes objectForKey:name] intValue]; + if (UIImage *image = $getImage$(themed)) + [copy replaceObjectAtIndex:index withObject:(id)[image CGImage]]; } - } return images; + + return images; } MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) { @@ -2292,7 +2433,7 @@ static void SBInitialize() { no = true; if (strstr(path, "/icon") != NULL) - MSHookProcess(-1, ""); + *reinterpret_cast(NULL) = NULL; if (fd == -1 && errno == EFAULT) NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd); @@ -2318,9 +2459,24 @@ MSInitialize { dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics"); + // Initialize IsWild_ {{{ + size_t size; + sysctlbyname("hw.machine", NULL, &size, NULL, 0); + char *machine = new char[size]; + + if (sysctlbyname("hw.machine", machine, &size, NULL, 0) == -1) { + perror("sysctlbyname(\"hw.machine\", ?)"); + delete [] machine; + machine = NULL; + } + + IsWild_ = machine != NULL && strncmp(machine, "iPad", 4) == 0; + // }}} // Load Settings.plist {{{ if (NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithFormat:@"/User/Library/Preferences/com.saurik.WinterBoard.plist"]]) { - if (NSNumber *value = [settings objectForKey:@"SummerBoard"]) + if (kCFCoreFoundationVersionNumber >= 1000) + SummerBoard_ = false; + else if (NSNumber *value = [settings objectForKey:@"SummerBoard"]) SummerBoard_ = [value boolValue]; else SummerBoard_ = true; @@ -2376,7 +2532,7 @@ MSInitialize { // AppSupport {{{ if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) { - NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *); + NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, CFTypeRef *, void *, void *); msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath"); MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath)); } @@ -2387,9 +2543,15 @@ MSInitialize { msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb"); MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); +#ifdef __LP64__ + bool (*_Z24GetFileNameForThisActionjPcjRb)(unsigned int, char *, unsigned int, bool &); + msset(_Z24GetFileNameForThisActionjPcjRb, image, "__Z24GetFileNameForThisActionjPcjRb"); + MSHookFunction(_Z24GetFileNameForThisActionjPcjRb, &$_Z24GetFileNameForThisActionjPcjRb, &__Z24GetFileNameForThisActionjPcjRb); +#else bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &); msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb"); MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb); +#endif } // }}} // BackBoardServices {{{ @@ -2399,6 +2561,11 @@ MSInitialize { MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath)); } // }}} + // Foundation {{{ + if (true) { + MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL)); + } + // }}} // GraphicsServices {{{ if (true) { MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName); @@ -2430,7 +2597,7 @@ MSInitialize { // }}} // SpringBoard {{{ if (SpringBoard_) { - Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; + Wallpapers_ = [[NSArray arrayWithObjects:@"Wallpaper.mp4", @"Wallpaper@3x.png", @"Wallpaper@3x.jpg", @"Wallpaper@2x.png", @"Wallpaper@2x.jpg", @"Wallpaper.png", @"Wallpaper.jpg", @"Wallpaper.html", nil] retain]; Papered_ = $getTheme$(Wallpapers_) != nil; Docked_ = $getTheme$([NSArray arrayWithObjects:@"Dock.png", nil]) != nil; @@ -2465,7 +2632,8 @@ MSInitialize { WBHookSymbol(image, _UIKitBundle); - MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName)); + if (kCFCoreFoundationVersionNumber < 700) + MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName)); WBHookSymbol(image, _UIApplicationImageWithName); MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName)); @@ -2473,12 +2641,6 @@ MSInitialize { WBHookSymbol(image, _UIImageWithNameInDomain); MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain)); - WBHookSymbol(image, _UIImageWithNameUsingCurrentIdiom); - MSHookFunction(_UIImageWithNameUsingCurrentIdiom, MSHake(_UIImageWithNameUsingCurrentIdiom)); - - WBHookSymbol(image, _UIImageWithDeviceSpecificName); - MSHookFunction(_UIImageWithDeviceSpecificName, MSHake(_UIImageWithDeviceSpecificName)); - SEL includeEmoji(@selector(_legacy_drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:)); if (![@"" respondsToSelector:includeEmoji]) includeEmoji = @selector(drawAtPoint:forWidth:withFont:lineBreakMode:letterSpacing:includeEmoji:); @@ -2498,13 +2660,5 @@ MSInitialize { //MSHookFunction(reinterpret_cast(&open), MSHake(open)); - if (UIDebug_ && ![Manager_ fileExistsAtPath:@"/tmp/UIImages"]) { - NSError *error(nil); - if (![Manager_ createDirectoryAtPath:@"/tmp/UIImages" withIntermediateDirectories:NO attributes:[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithShort:0777], NSFilePosixPermissions, - nil] error:&error]) - NSLog(@"WB:Error: cannot create /tmp/UIImages (%@)", error); - } - [pool release]; }