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]];
+ if (Scale_ != 1) {
+ [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, Scale_, idiom, extension]];
+ [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, Scale_, extension]];
}
+ for (unsigned scale(3); scale >= 2; --scale)
+ if (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
}
// }}}
// $pathForFile$inBundle$() {{{
-static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSBundle *bundle) {
- NSString *identifier = [bundle bundleIdentifier];
-
+static void $pathForFile$inBundle$(NSMutableArray *names, NSString *file, NSString *identifier, NSString *folder) {
if (identifier != nil)
[names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
- if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
+ if (folder != nil) {
[names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
NSString *base([folder stringByDeletingPathExtension]);
if ([base hasSuffix:@"~iphone"])
#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, [WBBundle bundleWithIdentifier:@"com.apple.UIKit"]);
+ $pathForFile$inBundle$(names, file, @"com.apple.UIKit", @"UIKit.framework");
else if ([identifier isEqualToString:@"com.apple.uikit.LegacyArtwork"])
- $pathForFile$inBundle$(names, file, [WBBundle bundleWithIdentifier:@"com.apple.UIKit"]);
+ $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"])
- $pathForFile$inBundle$(names, file, [WBBundle bundleWithIdentifier:@"com.apple.MobileSMS"]);
+ $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, NSBundle *bundle, bool use) {
+static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSURL *url, bool use) {
NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
- $pathForFile$inBundle$(names, file, bundle);
+ $pathForFile$inBundle$(names, file, identifier, [url lastPathComponent]);
[names addObject:[NSString stringWithFormat:@"Fallback/%@", file]];
if (NSString *path = $getTheme$($useScale$(names, use)))
return path;
return nil;
}
+
+// 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);
+}
// }}}
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);
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);
@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;
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);
return bundle;
}
++ (NSBundle *) wb$bundleWithFile:(NSString *)path {
+ if ([path hasPrefix:@"/Library/Themes"])
+ return nil;
+ return [self _wb$bundleWithFile:path];
+}
+
@end
// }}}
// -[NSString wb$themedPath] {{{
@implementation NSString (WinterBoard)
- (NSString *) wb$themedPath {
- if ([self hasPrefix:@"/Library/Themes/"])
- return self;
-
if (Debug_)
NSLog(@"WB:Debug:Bypass(\"%@\")", self);
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))
- 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);
}
// }}}
}
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;
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]);
// }}}
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);
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]]);
if (![Manager_ fileExistsAtPath:path])
[UIImagePNGRepresentation(image) writeToFile:path atomically:YES];
} return image;
- }, [=](){ return $pathForFile$inBundle$(name, bundle, true); }, key);
+ },
+ key);
}
// %hook _UIImageWithName() {{{
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() {{{
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]);
}
// }}}
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) {{{
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) {{{
(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']);
}
// }}}
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,
}
-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, 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) {
no = true;
if (strstr(path, "/icon") != NULL)
- MSHookProcess(-1, "");
+ *reinterpret_cast<void *volatile *>(NULL) = NULL;
if (fd == -1 && errno == EFAULT)
NSLog(@"open(%p, %#x, %#o) = %d\n", path, oflag, mode, fd);
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;
// 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));
}
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 {{{
MSHookFunction(BKSDisplayServicesSetSystemAppExitedImagePath, MSHake(BKSDisplayServicesSetSystemAppExitedImagePath));
}
// }}}
+ // Foundation {{{
+ if (true) {
+ MSHookFunction(CFBundleCopyResourceURL, MSHake(CFBundleCopyResourceURL));
+ }
+ // }}}
// GraphicsServices {{{
if (true) {
MSHookFunction(&GSFontCreateWithName, &$GSFontCreateWithName, &_GSFontCreateWithName);
projects / winterboard.git / blobdiff