Permalink
Browse files

merging back from 64-bit branch

git-svn-id: http://otx.osxninja.com/builds/trunk@487 5968870d-8a1b-0410-8ef2-9208d525af3e
  • Loading branch information...
otxdev
otxdev committed Jul 4, 2008
1 parent 4da554d commit 66f6d4feda2c9f34a56c25b644c5cddc3f6263d0
Showing with 23,573 additions and 14,178 deletions.
  1. +21 −19 English.lproj/MainMenu.nib/classes.nib
  2. +1,972 −2,817 English.lproj/MainMenu.nib/designable.nib
  3. +5 −3 English.lproj/MainMenu.nib/info.nib
  4. BIN English.lproj/MainMenu.nib/keyedobjects.nib
  5. +31 −34 main.m
  6. +110 −25 otx.xcodeproj/project.pbxproj
  7. +10 −9 otx_Prefix.pch
  8. +112 −97 source/AppController.h
  9. +1,644 −1,370 source/AppController.m
  10. +23 −27 source/CLIController.h
  11. +463 −547 source/CLIController.m
  12. +34 −0 source/Categories/Arch64Specifics.h
  13. +106 −0 source/Categories/Arch64Specifics.m
  14. +10 −8 source/Categories/ArchSpecifics.h
  15. +26 −24 source/Categories/ArchSpecifics.m
  16. +30 −0 source/Categories/List64Utils.h
  17. +206 −0 source/Categories/List64Utils.m
  18. +15 −13 source/Categories/ListUtils.h
  19. +148 −146 source/Categories/ListUtils.m
  20. +32 −0 source/Categories/Objc64Accessors.h
  21. +244 −0 source/Categories/Objc64Accessors.m
  22. +21 −19 source/Categories/ObjcAccessors.h
  23. +234 −232 source/Categories/ObjcAccessors.m
  24. +45 −0 source/Categories/Object64Loader.h
  25. +782 −0 source/Categories/Object64Loader.m
  26. +7 −5 source/Categories/ObjectLoader.h
  27. +626 −653 source/Categories/ObjectLoader.m
  28. +12 −10 source/Categories/Searchers.h
  29. +115 −119 source/Categories/Searchers.m
  30. +23 −0 source/Categories/Searchers64.h
  31. +77 −0 source/Categories/Searchers64.m
  32. +5 −2 source/Categories/SysUtils.h
  33. +48 −7 source/Categories/SysUtils.m
  34. +29 −27 source/DropBox.h
  35. +90 −90 source/DropBox.m
  36. +55 −53 source/ObjcSwap.c
  37. +47 −155 source/Optimizations.h
  38. +124 −0 source/Optimizations32.h
  39. +124 −0 source/Optimizations64.h
  40. +368 −0 source/Processors/Exe32Processor.h
  41. +2,238 −0 source/Processors/Exe32Processor.m
  42. +363 −0 source/Processors/Exe64Processor.h
  43. +2,337 −0 source/Processors/Exe64Processor.m
  44. +147 −450 source/Processors/ExeProcessor.h
  45. +124 −2,221 source/Processors/ExeProcessor.m
  46. +31 −0 source/Processors/PPC64Processor.h
  47. +2,181 −0 source/Processors/PPC64Processor.m
  48. +64 −57 source/Processors/PPCProcessor.h
  49. +1,737 −1,750 source/Processors/PPCProcessor.m
  50. +55 −0 source/Processors/X8664Processor.h
  51. +2,848 −0 source/Processors/X8664Processor.m
  52. +46 −38 source/Processors/X86Processor.h
  53. +2,647 −2,669 source/Processors/X86Processor.m
  54. +13 −11 source/Protocols/Deobfuscator.h
  55. +5 −3 source/Protocols/ErrorReporter.h
  56. +9 −8 source/Protocols/ProgressReporter.h
  57. +19 −19 source/SharedDefs.h
  58. +3 −5 source/SmoothViewAnimation.h
  59. +40 −36 source/SmoothViewAnimation.m
  60. +226 −42 source/StolenDefs.h
  61. +313 −313 source/SyscallStrings.h
  62. +35 −27 source/SystemIncludes.h
  63. +18 −18 source/UserDefaultKeys.h

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Binary file not shown.
View
65 main.m
@@ -1,54 +1,51 @@
/*
- main.m
+ main.m
- This file is in the public domain.
+ This file is in the public domain.
*/
+#import <Cocoa/Cocoa.h>
+
#ifdef OTX_CLI
- #import "CLIController.h"
+ #import "CLIController.h"
#else
- #import <AppKit/NSApplication.h>
+ #import <AppKit/NSApplication.h>
#endif
-// ============================================================================
+BOOL gCancel = NO;
int main(
- int argc,
- char* argv[])
+ int argc,
+ char* argv[])
{
- if (OS_IS_PRE_TIGER)
- {
- fprintf(stderr, "otx requires Mac OS X 10.4 or higher.\n");
- return -1;
- }
+ if (OS_IS_PRE_TIGER)
+ {
+ fprintf(stderr, "otx requires Mac OS X 10.4 or higher.\n");
+ return -1;
+ }
- int result = 1;
+ int result = 1;
// OTX_CLI is defined in the CLI target settings. Much thanx to Slava Karpenko
// and Mike Solomon for telling me about the -D flag.
#ifdef OTX_CLI
-
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- CLIController* controller =
- [[CLIController alloc] initWithArgs: argv count: argc];
-
- if (controller)
- {
- [controller processFile];
- [controller release];
-
- result = noErr;
- }
- else
- result = -1;
-
- [pool release];
-
+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ CLIController* controller =
+ [[CLIController alloc] initWithArgs: argv count: argc];
+
+ if (controller)
+ {
+ [controller processFile];
+ [controller release];
+ result = noErr;
+ }
+ else
+ result = -1;
+
+ [pool release];
#else
-
- result = NSApplicationMain(argc, (const char**)argv);
-
+ result = NSApplicationMain(argc, (const char**)argv);
#endif
- return result;
+ return result;
}

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,17 +1,18 @@
/*
- otx_Prefix.pch
+ otx_Prefix.pch
- This file is in the public domain.
+ This file is in the public domain.
*/
-#ifndef NSAppKitVersionNumber10_4
- #define NSAppKitVersionNumber10_4 824
+#ifdef __OBJC__
+ #import <Cocoa/Cocoa.h>
+ extern BOOL gCancel;
#endif
-#ifdef __OBJC__
- #import <Cocoa/Cocoa.h>
+#ifndef NSAppKitVersionNumber10_4
+ #define NSAppKitVersionNumber10_4 824
#endif
-#define OS_IS_PRE_TIGER NSAppKitVersionNumber < NSAppKitVersionNumber10_4
-#define OS_IS_POST_TIGER floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4
-#define OS_IS_TIGER (!OS_IS_PRE_TIGER) && (!OS_IS_POST_TIGER)
+#define OS_IS_PRE_TIGER NSAppKitVersionNumber < NSAppKitVersionNumber10_4
+#define OS_IS_POST_TIGER floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4
+#define OS_IS_TIGER (!OS_IS_PRE_TIGER) && (!OS_IS_POST_TIGER)
Oops, something went wrong.

0 comments on commit 66f6d4f

Please sign in to comment.