From 9c64bab2dec3058f7f247ae70281020982845877 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Jul 2009 06:22:18 +0000 Subject: [PATCH] Fixed various 3.x bugs. --- Application.mm | 19 ++++++++++++- Icon-Small.png | Bin 0 -> 4412 bytes Library.mm | 75 ++++++++++++++++++++++++++++++++++++++----------- control | 2 +- makefile | 2 +- 5 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 Icon-Small.png diff --git a/Application.mm b/Application.mm index a65c77f..1996955 100644 --- a/Application.mm +++ b/Application.mm @@ -78,8 +78,25 @@ static BOOL changed_; - (void) applicationWillTerminate:(UIApplication *)application { if (changed_) { - if (![settings_ writeToFile:plist_ atomically:YES]) + NSString *description = nil; + NSData *data = [NSPropertyListSerialization dataFromPropertyList:settings_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&description]; + if (data == nil) { + NSLog(@"WB:Error:dataFromPropertyList:%@", description); + return; + } + + NSError *error = nil; + if (![data writeToFile:plist_ options:NSAtomicWrite error:&error]) { NSLog(@"WB:Error:writeToFile"); + return; + } + + unlink("/User/Library/Caches/com.apple.springboard-imagecache-icons"); + unlink("/User/Library/Caches/com.apple.springboard-imagecache-icons.plist"); + + unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons"); + unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons.plist"); + system("killall SpringBoard"); } } diff --git a/Icon-Small.png b/Icon-Small.png new file mode 100644 index 0000000000000000000000000000000000000000..02bb15b1a5cbc512c7807ff158b83477c991f0fa GIT binary patch literal 4412 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 #import // XXX: #import +#import #import #import #import @@ -127,6 +128,7 @@ Class $SBIconList; Class $SBIconModel; //Class $SBImageCache; Class $SBSearchView; +Class $SBSearchTableViewCell; Class $SBStatusBarContentsView; Class $SBStatusBarController; Class $SBStatusBarOperatorNameView; @@ -331,11 +333,16 @@ static NSString *$pathForIcon$(SBApplication *self) { @end -void DumpHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) { - NSLog(@"%*s|%2d:%s", indent * 3, "", index, class_getName([view class])); +void WBLogRect(const char *tag, struct CGRect rect) { + NSLog(@"%s:{%f,%f+%f,%f}", tag, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +void WBLogHierarchy(UIView *view, unsigned index = 0, unsigned indent = 0) { + CGRect frame([view frame]); + NSLog(@"%*s|%2d:%s : {%f,%f+%f,%f} (%@)", indent * 3, "", index, class_getName([view class]), frame.origin.x, frame.origin.y, frame.size.width, frame.size.height, [view backgroundColor]); index = 0; for (UIView *child in [view subviews]) - DumpHierarchy(child, index++, indent + 1); + WBLogHierarchy(child, index++, indent + 1); } UIImage *$cacheForImage$(UIImage *image) { @@ -418,6 +425,20 @@ MSHook(id, SBSearchView$initWithFrame$, id /* XXX: SBSearchView */ self, SEL sel } return self; } +MSHook(id, SBSearchTableViewCell$initWithStyle$reuseIdentifier$, SBSearchTableViewCell *self, SEL sel, int style, NSString *reuse) { + if ((self = _SBSearchTableViewCell$initWithStyle$reuseIdentifier$(self, sel, style, reuse)) != nil) { + [self setBackgroundColor:[UIColor clearColor]]; + } return self; +} + +MSHook(void, SBSearchTableViewCell$drawRect$, SBSearchTableViewCell *self, SEL sel, struct CGRect rect, BOOL selected) { + _SBSearchTableViewCell$drawRect$(self, sel, rect, selected); + float inset([self edgeInset]); + [[UIColor clearColor] set]; + UIRectFill(CGRectMake(0, 0, inset, rect.size.height)); + UIRectFill(CGRectMake(rect.size.width - inset, 0, inset, rect.size.height)); +} + MSHook(UIImage *, SBApplicationIcon$icon, SBApplicationIcon *self, SEL sel) { if (![Info_ wb$boolForKey:@"ComposeStoreIcons"]) if (NSString *path = $pathForIcon$([self application])) @@ -746,6 +767,8 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { if (image != nil) { WallpaperFile_ = [path retain]; WallpaperImage_ = [[UIImageView alloc] initWithImage:image]; + if (NSNumber *number = [Info_ objectForKey:@"WallpaperAlpha"]) + [WallpaperImage_ setAlpha:[number floatValue]]; [content addSubview:WallpaperImage_]; } @@ -792,7 +815,7 @@ MSHook(id, SBUIController$init, SBUIController *self, SEL sel) { } [content addSubview:layer]; - DumpHierarchy(_window); + WBLogHierarchy(_window); return self; } @@ -1188,7 +1211,7 @@ MSHook(void, mSMSMessageTranscriptController$loadView, mSMSMessageTranscriptCont MSHook(UIImage *, _UIImageWithName, NSString *name) { int id(_UISharedImageNameGetIdentifier(name)); if (Debug_) - NSLog(@"WB:Debug: _UIImageWithName(\"%@\", %d)", name, id); + NSLog(@"WB:Debug: _UIImageWithName(\"%@\": %d)", name, id); if (id == -1) return _UIImageAtPath(name, _UIKitBundle()); @@ -1228,6 +1251,8 @@ MSHook(UIImage *, _UIImageWithNameInDomain, NSString *name, NSString *domain) { } MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits traits, float size) { + if (Debug_) + NSLog(@"WB:Debug: GSFontCreateWithName(\"%s\", %f)", name, size); if (NSString *font = [Info_ objectForKey:[NSString stringWithFormat:@"FontName-%s", name]]) name = [font UTF8String]; return _GSFontCreateWithName(name, traits, size); @@ -1239,6 +1264,8 @@ MSHook(GSFontRef, GSFontCreateWithName, const char *name, GSFontSymbolicTraits t 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); if (Debug_) NSLog(@"WB:Debug:GetFileNameForThisAction(%u, %s, %u) = %u", a0, value ? a1 : NULL, a2, value); @@ -1286,6 +1313,20 @@ static void ChangeWallpaper( #define WBRename(name, sel, imp) \ _ ## name ## $ ## imp = MSHookMessage($ ## name, @selector(sel), &$ ## name ## $ ## imp) +template +static void nlset(Type_ &function, struct nlist *nl, size_t index) { + struct nlist &name(nl[index]); + uintptr_t value(name.n_value); + if ((name.n_desc & N_ARM_THUMB_DEF) != 0) + value |= 0x00000001; + function = reinterpret_cast(value); +} + +template +static void dlset(Type_ &function, const char *name) { + _GSFontGetUseLegacyFontMetrics = reinterpret_cast(dlsym(RTLD_DEFAULT, name)); +} + extern "C" void WBInitialize() { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; @@ -1293,11 +1334,11 @@ extern "C" void WBInitialize() { NSLog(@"WB:Notice: WinterBoard"); - _GSFontGetUseLegacyFontMetrics = reinterpret_cast(dlsym(RTLD_DEFAULT, "GSFontGetUseLegacyFontMetrics")); + dlset(_GSFontGetUseLegacyFontMetrics, "GSFontGetUseLegacyFontMetrics"); struct nlist nl[8]; - memset(nl, 0, sizeof(nl)); + memset(nl, 0, sizeof(nl)); nl[0].n_un.n_name = (char *) "__UIApplicationImageWithName"; nl[1].n_un.n_name = (char *) "__UIImageAtPath"; nl[2].n_un.n_name = (char *) "__UIImageRefAtPath"; @@ -1305,16 +1346,15 @@ extern "C" void WBInitialize() { nl[4].n_un.n_name = (char *) "__UIKitBundle"; nl[5].n_un.n_name = (char *) "__UISharedImageNameGetIdentifier"; nl[6].n_un.n_name = (char *) "__UISharedImageWithIdentifier"; - nlist(UIKit, nl); - _UIApplicationImageWithName = (UIImage *(*)(NSString *)) nl[0].n_value; - _UIImageAtPath = (UIImage *(*)(NSString *, NSBundle *)) nl[1].n_value; - _UIImageRefAtPath = (CGImageRef (*)(NSString *, bool, UIImageOrientation *)) nl[2].n_value; - _UIImageWithNameInDomain = (UIImage *(*)(NSString *, NSString *)) nl[3].n_value; - _UIKitBundle = (NSBundle *(*)()) nl[4].n_value; - _UISharedImageNameGetIdentifier = (int (*)(NSString *)) nl[5].n_value; - _UISharedImageWithIdentifier = (UIImage *(*)(int)) nl[6].n_value; + nlset(_UIApplicationImageWithName, nl, 0); + nlset(_UIImageAtPath, nl, 1); + nlset(_UIImageRefAtPath, nl, 2); + nlset(_UIImageWithNameInDomain, nl, 3); + nlset(_UIKitBundle, nl, 4); + nlset(_UISharedImageNameGetIdentifier, nl, 5); + nlset(_UISharedImageWithIdentifier, nl, 6); MSHookFunction(_UIApplicationImageWithName, &$_UIApplicationImageWithName, &__UIApplicationImageWithName); MSHookFunction(_UIImageRefAtPath, &$_UIImageRefAtPath, &__UIImageRefAtPath); @@ -1328,7 +1368,7 @@ extern "C" void WBInitialize() { memset(nl, 0, sizeof(nl)); nl[0].n_un.n_name = (char *) "__Z24GetFileNameForThisActionmPcRb"; nlist(AudioToolbox, nl); - _Z24GetFileNameForThisActionmPcRb = (bool (*)(unsigned long, char *, bool &)) nl[0].n_value; + nlset(_Z24GetFileNameForThisActionmPcRb, nl, 0); MSHookFunction(_Z24GetFileNameForThisActionmPcRb, &$_Z24GetFileNameForThisActionmPcRb, &__Z24GetFileNameForThisActionmPcRb); } @@ -1439,6 +1479,7 @@ extern "C" void WBInitialize() { $SBIconModel = objc_getClass("SBIconModel"); //$SBImageCache = objc_getClass("SBImageCache"); $SBSearchView = objc_getClass("SBSearchView"); + $SBSearchTableViewCell = objc_getClass("SBSearchTableViewCell"); $SBStatusBarContentsView = objc_getClass("SBStatusBarContentsView"); $SBStatusBarController = objc_getClass("SBStatusBarController"); $SBStatusBarOperatorNameView = objc_getClass("SBStatusBarOperatorNameView"); @@ -1471,6 +1512,8 @@ extern "C" void WBInitialize() { WBRename(SBIconModel, getCachedImagedForIcon:smallIcon:, getCachedImagedForIcon$smallIcon$); WBRename(SBSearchView, initWithFrame:, initWithFrame$); + WBRename(SBSearchTableViewCell, drawRect:, drawRect$); + WBRename(SBSearchTableViewCell, initWithStyle:reuseIdentifier:, initWithStyle$reuseIdentifier$); //WBRename(SBImageCache, initWithName:forImageWidth:imageHeight:initialCapacity:, initWithName$forImageWidth$imageHeight$initialCapacity$); diff --git a/control b/control index 9b151aa..55288c1 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ Priority: optional Section: System Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 0.9.2939-1 +Version: 0.9.2958-1 Description: more powerful, open-source SummerBoard Name: WinterBoard Depends: mobilesubstrate (>= 0.9.2660-1), killall diff --git a/makefile b/makefile index 883e5b2..6ac64bb 100644 --- a/makefile +++ b/makefile @@ -29,7 +29,7 @@ package: cp -a *.theme winterboard/Library/Themes find winterboard/Library/Themes -name .svn | while read -r line; do rm -rf "$${line}"; done cp -a control preinst prerm winterboard/DEBIAN - cp -a Test.sh icon.png WinterBoard.dylib WinterBoard UIImages Info.plist winterboard/Applications/WinterBoard.app + cp -a Test.sh Icon-Small.png icon.png WinterBoard.dylib WinterBoard UIImages Info.plist winterboard/Applications/WinterBoard.app dpkg-deb -b winterboard winterboard_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb .PHONY: all clean package -- 2.47.2