X-Git-Url: https://git.saurik.com/winterboard.git/blobdiff_plain/ff395230eb62fcb20271f3ed0444a02a44260691..f868c22c7ec85f54656e30bee0205b804b50f96b:/Library.mm diff --git a/Library.mm b/Library.mm index 6834da0..48cfefc 100644 --- a/Library.mm +++ b/Library.mm @@ -1,39 +1,23 @@ /* WinterBoard - Theme Manager for the iPhone - * Copyright (C) 2008-2011 Jay Freeman (saurik) + * Copyright (C) 2008-2014 Jay Freeman (saurik) */ +/* GNU Lesser General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * WinterBoard is free software: you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * WinterBoard is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with WinterBoard. If not, see . +**/ +/* }}} */ #include @@ -105,8 +89,6 @@ bool _itv; #include "WBMarkup.h" -extern "C" void __clear_cache (char *beg, char *end); - static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy); static id (*$objc_getAssociatedObject)(id object, void *key); static void (*$objc_removeAssociatedObjects)(id object); @@ -124,6 +106,7 @@ MSClassHook(NSString) MSClassHook(UIImage) MSMetaClassHook(UIImage) MSClassHook(UINavigationBar) +MSClassHook(UISharedArtwork) MSClassHook(UIToolbar) MSClassHook(UIStatusBarTimeItemView) MSClassHook(UIWebDocumentView) @@ -145,8 +128,11 @@ MSClassHook(SBCalendarApplicationIcon) MSClassHook(SBCalendarIconContentsView) MSClassHook(SBDockIconListView) MSClassHook(SBIcon) +MSClassHook(SBIconAccessoryImage) +MSMetaClassHook(SBIconAccessoryImage) MSClassHook(SBIconBadge) MSClassHook(SBIconBadgeFactory) +MSClassHook(SBIconBadgeImage) MSClassHook(SBIconContentView) MSClassHook(SBIconController) MSClassHook(SBIconLabel) @@ -184,6 +170,10 @@ static struct MSFixClass { MSFixClass() { static bool IsWild_; static bool Four_($SBDockIconListView != nil); +@interface NSObject (wb$SBIconAccessoryImage) ++ (Class) _imageClassForIcon:(SBIcon *)icon location:(int)location; +@end + @interface NSDictionary (WinterBoard) - (UIColor *) wb$colorForKey:(NSString *)key; - (BOOL) wb$boolForKey:(NSString *)key; @@ -219,12 +209,13 @@ 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 bool (*_UIPackedImageTableGetIdentifierForName)(NSString *, int *); static int (*_UISharedImageNameGetIdentifier)(NSString *); -static NSMutableDictionary *UIImages_ = [[NSMutableDictionary alloc] initWithCapacity:32]; -static NSMutableDictionary *PathImages_ = [[NSMutableDictionary alloc] initWithCapacity:16]; +static NSMutableDictionary *Images_ = [[NSMutableDictionary alloc] initWithCapacity:64]; static NSMutableDictionary *Cache_ = [[NSMutableDictionary alloc] initWithCapacity:64]; static NSMutableDictionary *Strings_ = [[NSMutableDictionary alloc] initWithCapacity:0]; static NSMutableDictionary *Bundles_ = [[NSMutableDictionary alloc] initWithCapacity:2]; @@ -324,7 +315,7 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { for (NSString *file in files) { path = [NSString stringWithFormat:@"%@/%@", theme, file]; if ([Manager_ fileExistsAtPath:path]) { - if ([[Manager_ pathContentOfSymbolicLinkAtPath:path] isEqualToString:@"/"]) + if ([[Manager_ destinationOfSymbolicLinkAtPath:path error:NULL] isEqualToString:@"/"]) path = nil; goto set; } @@ -341,7 +332,7 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) { } // }}} // $pathForFile$inBundle$() {{{ -static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui) { +static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool ui, bool use) { NSString *identifier = [bundle bundleIdentifier]; NSMutableArray *names = [NSMutableArray arrayWithCapacity:8]; @@ -369,6 +360,8 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u [names addObject:[NSString stringWithFormat:@"Bundles/com.apple.MobileSMS/%@", file]]; 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"]]; else if (!summer); remapResourceName(@"FSO_BG.png", @"StatusBar") remapResourceName(Four_ ? @"SBDockBG-old.png" : @"SBDockBG.png", @"Dock") @@ -376,7 +369,7 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u [names addObject:[NSString stringWithFormat:@"Fallback/%@", file]]; - if (NSString *path = $getTheme$($useScale$(names, ui))) + if (NSString *path = $getTheme$($useScale$(names, use))) return path; return nil; @@ -479,7 +472,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)) + if (NSString *path = $pathForFile$inBundle$([file substringFromIndex:(length + 1)], bundle, false, false)) return path; } } @@ -646,13 +639,13 @@ MSHook(NSString *, SBApplication$pathForIcon, SBApplication *self, SEL sel) { static UIImage *CachedImageAtPath(NSString *path) { path = [path stringByResolvingSymlinksInPath]; - UIImage *image = [PathImages_ objectForKey:path]; + UIImage *image = [Images_ objectForKey:path]; if (image != nil) return reinterpret_cast(image) == [NSNull null] ? nil : image; image = [[UIImage alloc] initWithContentsOfFile:path cache:true]; if (image != nil) image = [image autorelease]; - [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:path]; + [Images_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:path]; return image; } @@ -660,7 +653,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)) + if (NSString *path = $pathForFile$inBundle$(name, bundle, false, false)) return CachedImageAtPath(path); return __UIApplicationImageWithName(name); } @@ -688,7 +681,7 @@ MSInstanceMessageHook2(NSString *, NSBundle, pathForResource,ofType, NSString *, NSString *file = type == nil ? resource : [NSString stringWithFormat:@"%@.%@", resource, type]; if (Debug_) NSLog(@"WB:Debug: [NSBundle(%@) pathForResource:\"%@\"]", [self bundleIdentifier], file); - if (NSString *path = $pathForFile$inBundle$(file, self, false)) + if (NSString *path = $pathForFile$inBundle$(file, self, false, false)) return path; return MSOldCall(resource, type); } @@ -783,7 +776,7 @@ MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreak if (state == NULL) return MSOldCall(point, width, font, mode, spacing, emoji); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(point, width, font, mode, spacing, emoji); @@ -807,7 +800,7 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig if (state == NULL) return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation); @@ -848,7 +841,7 @@ MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,let if (state == NULL) return MSOldCall(font, width, mode, spacing); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(font, width, mode, spacing); @@ -869,7 +862,7 @@ MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { if (state == NULL) return MSOldCall(font); - if (--state->count_ == 0) + if (state->count_ != 0 && --state->count_ == 0) stringDrawingState_ = state->next_; if (state->info_ == nil) return MSOldCall(font); @@ -882,8 +875,23 @@ MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) { return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), base, info] forWidth:65535]; } +MSClassMessageHook2(UIImage *, SBIconAccessoryImage, checkoutAccessoryImageForIcon,location, id, icon, int, location) { + if ([self _imageClassForIcon:icon location:location] != $SBIconBadgeImage) + return MSOldCall(icon, location); + + WBStringDrawingState badgeState = {NULL, 0, @"" + , @"BadgeStyle"}; + + stringDrawingState_ = &badgeState; + + UIImage *image(MSOldCall(icon, location)); + + stringDrawingState_ = NULL; + return image; +} + MSInstanceMessageHook1(UIImage *, SBIconBadgeFactory, checkoutBadgeImageForText, NSString *, text) { - WBStringDrawingState badgeState = {NULL, -1, @"" + WBStringDrawingState badgeState = {NULL, 0, @"" , @"BadgeStyle"}; stringDrawingState_ = &badgeState; @@ -1057,6 +1065,17 @@ static UIImage *$getImage$(NSString *path) { return image; } +template +_finline UIImage *WBCacheImage(const Original_ &original, const Modified_ &modified, NSString *key) { + UIImage *image([Images_ objectForKey:key]); + if (image != nil) + return reinterpret_cast(image) == [NSNull null] ? original() : image; + if (NSString *path = modified()) + image = $getImage$(path); + [Images_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; + return image == nil ? original() : image; +} + static UIImage *$getDefaultDesktopImage$() { if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObjects:@"LockBackground.png", @"LockBackground.jpg", nil]))) return $getImage$(path); @@ -1288,9 +1307,23 @@ MSHook(void, SBAwayView$updateDesktopImage$, SBAwayView *self, SEL sel, UIImage [view setBackgroundColor:[UIColor clearColor]]; [self insertSubview:view aboveSubview:_backgroundView]; + + if ($objc_setAssociatedObject != NULL) + $objc_setAssociatedObject(self, @selector(wb$widgetView), view, OBJC_ASSOCIATION_RETAIN_NONATOMIC); } } +MSHook(void, SBAwayView$_addSubview$positioned$relativeTo$, SBAwayView *self, SEL sel, UIView *view, int positioned, UIView *relative) { + UIView *&_backgroundView(MSHookIvar(self, "_backgroundView")); + UIView *&_chargingView(MSHookIvar(self, "_chargingView")); + if (&_chargingView != NULL) + if (positioned == -2 && (relative == _backgroundView && _chargingView == nil || relative == _chargingView)) + if ($objc_getAssociatedObject != NULL) + if (UIView *widget = $objc_getAssociatedObject(self, @selector(wb$widgetView))) + relative = widget; + return _SBAwayView$_addSubview$positioned$relativeTo$(self, sel, view, positioned, relative); +} + /*extern "C" CGColorRef CGGStateGetSystemColor(void *); extern "C" CGColorRef CGGStateGetFillColor(void *); extern "C" CGColorRef CGGStateGetStrokeColor(void *); @@ -1667,7 +1700,7 @@ MSInstanceMessageHook3(NSString *, NSBundle, localizedStringForKey,value,table, return value; } else if (NSString *path = $pathForFile$inBundle$([NSString stringWithFormat:@"%@.lproj/%@.strings", language, file - ], self, false)) { + ], self, false, false)) { if ((strings = [[NSDictionary alloc] initWithContentsOfFile:path]) != nil) { [Strings_ setObject:[strings autorelease] forKey:name]; goto strings; @@ -1854,66 +1887,55 @@ MSInstanceMessageHook0(void, CKTranscriptController, loadView) { } // }}} +template +static UIImage *WBCacheUIImage(const Original_ &original, NSString *name, NSString *key) { + if ([name rangeOfString:@"."].location == NSNotFound) + 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; +} + // %hook _UIImageWithName() {{{ MSHook(UIImage *, _UIImageWithName, NSString *name) { - if (Debug_) - NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name); if (name == nil) return nil; - - int identifier; - bool packed; - - if (_UIPackedImageTableGetIdentifierForName != NULL) - packed = _UIPackedImageTableGetIdentifierForName(name, &identifier); - else if (_UISharedImageNameGetIdentifier != NULL) { - identifier = _UISharedImageNameGetIdentifier(name); - packed = identifier != -1; - } else { - identifier = -1; - packed = false; - } - if (Debug_) - NSLog(@"WB:Debug: _UISharedImageNameGetIdentifier(\"%@\") = %d", name, identifier); - - if (!packed) - return __UIImageWithName(name); - else { - NSNumber *key([NSNumber numberWithInt:identifier]); - UIImage *image([UIImages_ objectForKey:key]); - if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? __UIImageWithName(name) : image; - if (NSString *path = $pathForFile$inBundle$(name, _UIKitBundle(), true)) - image = $getImage$(path); - [UIImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - if (image != nil) - return image; - - image = __UIImageWithName(name); - - if (UIDebug_) { - NSString *path([@"/tmp/UIImages/" stringByAppendingString:name]); - if (![Manager_ fileExistsAtPath:path]) - [UIImagePNGRepresentation(image) writeToFile:path atomically:YES]; - } - - return image; - } + NSLog(@"WB:Debug: _UIImageWithName(\"%@\")", name); + return WBCacheUIImage( + [=](){ return __UIImageWithName(name); }, + name, [NSString stringWithFormat:@"I:%@", name]); } // }}} // %hook _UIImageWithNameInDomain() {{{ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { - NSString *key([NSString stringWithFormat:@"D:%zu%@%@", [domain length], domain, name]); - UIImage *image([PathImages_ objectForKey:key]); - if (image != nil) - return reinterpret_cast(image) == [NSNull null] ? __UIImageWithNameInDomain(name, domain) : image; if (Debug_) - NSLog(@"WB:Debug: UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain); - if (NSString *path = $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]]))) - image = $getImage$(path); - [PathImages_ setObject:(image == nil ? [NSNull null] : reinterpret_cast(image)) forKey:key]; - return image == nil ? __UIImageWithNameInDomain(name, domain) : image; + NSLog(@"WB:Debug: _UIImageWithNameInDomain(\"%@\", \"%@\")", name, domain); + return WBCacheImage( + [=](){ return __UIImageWithNameInDomain(name, domain); }, + [=](){ return $getTheme$($useScale$([NSArray arrayWithObject:[NSString stringWithFormat:@"Domains/%@/%@", domain, name]])); }, + [NSString stringWithFormat:@"D:%zu:%@%@", size_t([domain length]), domain, name]); +} +// }}} +// %hook _UIImageWithDeviceUsingCurrentIdiom() {{{ +MSHook(UIImage *, _UIImageWithNameUsingCurrentIdiom, NSString *name) { + if (Debug_) + NSLog(@"WB:Debug: _UIImageWithNameUsingCurrentIdiom(\"%@\")", name); + return WBCacheUIImage( + [=](){ return __UIImageWithNameUsingCurrentIdiom(name); }, + name, [NSString stringWithFormat:@"I:%@", name]); +} +// }}} +// %hook _UIImageWithDeviceSpecificName() {{{ +MSHook(UIImage *, _UIImageWithDeviceSpecificName, NSString *name) { + if (Debug_) + NSLog(@"WB:Debug: _UIImageWithDeviceSpecificName(\"%@\")", name); + return WBCacheUIImage( + [=](){ return __UIImageWithDeviceSpecificName(name); }, + name, [NSString stringWithFormat:@"S:%@", name]); } // }}} @@ -1930,16 +1952,10 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t // }}} #define AudioToolbox "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox" -#define UIKit "/System/Library/Frameworks/UIKit.framework/UIKit" - -bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long a0, char *a1, bool &a2); -MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a2) { - if (Debug_) - NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %p, %u)", a0, a1, a2); - bool value = __Z24GetFileNameForThisActionmPcRb(a0, a1, a2); +static bool GetFileNameForThisAction$(bool value, unsigned long a0, char *a1, unsigned long a2, bool &a3) { if (Debug_) - NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value); + NSLog(@"WB:Debug:GetFileNameForThisAction(%lu, %s, %lu, %u) = %u", a0, value ? a1 : NULL, a2, a3, value); if (value) { NSString *path = [NSString stringWithUTF8String:a1]; @@ -1957,6 +1973,16 @@ MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool return value; } +MSHook(bool, _Z24GetFileNameForThisActionmPcRb, unsigned long a0, char *a1, bool &a3) { + bool value(__Z24GetFileNameForThisActionmPcRb(a0, a1, a3)); + return GetFileNameForThisAction$(value, a0, a1, 0, a3); +} + +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); +} + static void ChangeWallpaper( CFNotificationCenterRef center, void *observer, @@ -1981,6 +2007,41 @@ static void ChangeWallpaper( } +MSHook(NSArray *, CPBitmapCreateImagesFromPath, NSString *path, NSDictionary **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]; + } + } + } + } + } + } return images; +} + +MSHook(void, BKSDisplayServicesSetSystemAppExitedImagePath, NSString *path) { + if (NSString *themed = $getTheme$($useScale$([NSArray arrayWithObject:@"SystemAppExited.png"]))) + path = themed; + _BKSDisplayServicesSetSystemAppExitedImagePath(path); +} + #define WBRename(name, sel, imp) \ MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp, &_ ## name ## $ ## imp) @@ -1989,6 +2050,9 @@ static void msset(Type_ &function, MSImageRef image, const char *name) { function = reinterpret_cast(MSFindSymbol(image, name)); } +#define WBHookSymbol(image, function) \ + msset(function, image, "_" #function) + template static void nlset(Type_ &function, struct nlist *nl, size_t index) { struct nlist &name(nl[index]); @@ -2104,6 +2168,9 @@ static void SBInitialize() { //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$); WBRename(SBAwayView, updateDesktopImage:, updateDesktopImage$); + if (kCFCoreFoundationVersionNumber >= 700) + WBRename(SBAwayView, _addSubview:positioned:relativeTo:, _addSubview$positioned$relativeTo$); + WBRename(SBStatusBarContentsView, didMoveToSuperview, didMoveToSuperview); //WBRename(SBStatusBarContentsView, initWithStatusBar:mode:, initWithStatusBar$mode$); //WBRename(SBStatusBarController, setStatusBarMode:orientation:duration:animation:, setStatusBarMode$orientation$duration$animation$); @@ -2117,6 +2184,25 @@ static void SBInitialize() { English_ = [[NSDictionary alloc] initWithContentsOfFile:@"/System/Library/CoreServices/SpringBoard.app/English.lproj/LocalizedApplicationNames.strings"]; } +/*MSHook(int, open, const char *path, int oflag, mode_t mode) { + int fd(_open(path, oflag, mode)); + + static bool no(false); + if (no) return fd; + no = true; + + if (strstr(path, "/icon") != NULL) + MSHookProcess(-1, ""); + + if (fd == -1 && errno == EFAULT) + NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd); + else + NSLog(@"open(\"%s\", %#x, %#o) = %d\n", path, oflag, mode, fd); + + no = false; + return fd; +}*/ + MSInitialize { $objc_setAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject")); $objc_getAssociatedObject = reinterpret_cast(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject")); @@ -2162,10 +2248,8 @@ MSInitialize { if (name == nil) continue; - NSString *theme(nil); - #define testForTheme(format...) \ - if (theme == nil) { \ + { \ NSString *path = [NSString stringWithFormat:format]; \ if ([Manager_ fileExistsAtPath:path]) { \ [Themes_ addObject:path]; \ @@ -2190,10 +2274,29 @@ MSInitialize { [Info_ setObject:[info objectForKey:key] forKey:key]; // }}} + // AppSupport {{{ + if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport")) { + NSArray *(*CPBitmapCreateImagesFromPath)(NSString *, NSDictionary **, void *, void *); + msset(CPBitmapCreateImagesFromPath, image, "_CPBitmapCreateImagesFromPath"); + MSHookFunction(CPBitmapCreateImagesFromPath, MSHake(CPBitmapCreateImagesFromPath)); + } + // }}} // AudioToolbox {{{ if (MSImageRef image = MSGetImageByName(AudioToolbox)) { + bool (*_Z24GetFileNameForThisActionmPcRb)(unsigned long, char *, bool &); msset(_Z24GetFileNameForThisActionmPcRb, image, "__Z24GetFileNameForThisActionmPcRb"); MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); + + bool (*_Z24GetFileNameForThisActionmPcmRb)(unsigned long, char *, unsigned long, bool &); + msset(_Z24GetFileNameForThisActionmPcmRb, image, "__Z24GetFileNameForThisActionmPcmRb"); + MSHookFunction(_Z24GetFileNameForThisActionmPcmRb, &$_Z24GetFileNameForThisActionmPcmRb, &__Z24GetFileNameForThisActionmPcmRb); + } + // }}} + // BackBoardServices {{{ + if (MSImageRef image = MSGetImageByName("/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices")) { + void (*BKSDisplayServicesSetSystemAppExitedImagePath)(NSString *path); + msset(BKSDisplayServicesSetSystemAppExitedImagePath, image, "_BKSDisplayServicesSetSystemAppExitedImagePath"); + MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath)); } // }}} // GraphicsServices {{{ @@ -2202,10 +2305,17 @@ MSInitialize { } // }}} // ImageIO {{{ - if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO")) { - void *(*CGImageReadCreateWithFile)(NSString *, int); - msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile"); - MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile)); + MSImageRef imageio = MSGetImageByName("/System/Library/Frameworks/ImageIO.framework/ImageIO"); + if (imageio == NULL) + imageio = MSGetImageByName("/System/Library/PrivateFrameworks/ImageIO.framework/ImageIO"); + if (MSImageRef image = imageio) { + void *(*CGImageReadCreateWithFile)(NSString *, int) = NULL; + if (kCFCoreFoundationVersionNumber > 700) // XXX: iOS 6.x + CGImageReadCreateWithFile = NULL; + else { + msset(CGImageReadCreateWithFile, image, "_CGImageReadCreateWithFile"); + MSHookFunction(CGImageReadCreateWithFile, MSHake(CGImageReadCreateWithFile)); + } if (CGImageReadCreateWithFile == NULL) { void *(*CGImageSourceCreateWithFile)(NSString *, NSDictionary *); @@ -2226,7 +2336,7 @@ MSInitialize { CFNotificationCenterAddObserver( CFNotificationCenterGetDarwinNotifyCenter(), - NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, 0 + NULL, &ChangeWallpaper, (CFStringRef) @"com.saurik.winterboard.lockbackground", NULL, CFNotificationSuspensionBehaviorCoalesce ); if ($getTheme$([NSArray arrayWithObject:@"Wallpaper.mp4"]) != nil) { @@ -2242,32 +2352,33 @@ MSInitialize { } // }}} // UIKit {{{ - if ([NSBundle bundleWithIdentifier:@"com.apple.UIKit"] != nil) { + if (MSImageRef image = MSGetImageByName("/System/Library/Frameworks/UIKit.framework/UIKit")) { class_addMethod($NSString, @selector(drawAtPoint:withStyle:), (IMP) &NSString$drawAtPoint$withStyle$, "v20@0:4{CGPoint=ff}8@16"); class_addMethod($NSString, @selector(drawInRect:withStyle:), (IMP) &NSString$drawInRect$withStyle$, "v28@0:4{CGRect={CGSize=ff}{CGSize=ff}}8@24"); class_addMethod($NSString, @selector(sizeWithStyle:forWidth:), (IMP) &NSString$sizeWithStyle$forWidth$, "{CGSize=ff}16@0:4@8f12"); - struct nlist nl[6]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName"; - nl[1].n_un.n_name = (char *) "__UIImageWithNameInDomain"; - nl[2].n_un.n_name = (char *) "__UIKitBundle"; - nl[3].n_un.n_name = (char *) "__UIPackedImageTableGetIdentifierForName"; - nl[4].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; - nlist(UIKit, nl); - - nlset(_UIApplicationImageWithName, nl, 0); - nlset(_UIImageWithNameInDomain, nl, 1); - nlset(_UIKitBundle, nl, 2); - nlset(_UIPackedImageTableGetIdentifierForName, nl, 3); - nlset(_UISharedImageNameGetIdentifier, nl, 4); - - MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); - MSHookFunction(_UIImageWithName, &$_UIImageWithName, &__UIImageWithName); - MSHookFunction(_UIImageWithNameInDomain, &$_UIImageWithNameInDomain, &__UIImageWithNameInDomain); + WBHookSymbol(image, _UIKitBundle); + WBHookSymbol(image, _UIPackedImageTableGetIdentifierForName); + WBHookSymbol(image, _UISharedImageNameGetIdentifier); + + MSHookFunction(_UIImageWithName, MSHake(_UIImageWithName)); + + WBHookSymbol(image, _UIApplicationImageWithName); + MSHookFunction(_UIApplicationImageWithName, MSHake(_UIApplicationImageWithName)); + + WBHookSymbol(image, _UIImageWithNameInDomain); + MSHookFunction(_UIImageWithNameInDomain, MSHake(_UIImageWithNameInDomain)); + + WBHookSymbol(image, _UIImageWithNameUsingCurrentIdiom); + MSHookFunction(_UIImageWithNameUsingCurrentIdiom, MSHake(_UIImageWithNameUsingCurrentIdiom)); + + WBHookSymbol(image, _UIImageWithDeviceSpecificName); + MSHookFunction(_UIImageWithDeviceSpecificName, MSHake(_UIImageWithDeviceSpecificName)); } // }}} + //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: