diff --git a/Frameworks/UniversalDetector.framework/Headers b/Frameworks/UniversalDetector.framework/Headers deleted file mode 120000 index a177d2a6..00000000 --- a/Frameworks/UniversalDetector.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Frameworks/UniversalDetector.framework/Resources b/Frameworks/UniversalDetector.framework/Resources deleted file mode 120000 index 953ee36f..00000000 --- a/Frameworks/UniversalDetector.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Frameworks/UniversalDetector.framework/UniversalDetector b/Frameworks/UniversalDetector.framework/UniversalDetector deleted file mode 120000 index 8a32fbcc..00000000 --- a/Frameworks/UniversalDetector.framework/UniversalDetector +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/UniversalDetector \ No newline at end of file diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h b/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h deleted file mode 100644 index fdc6ccaf..00000000 --- a/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h +++ /dev/null @@ -1,27 +0,0 @@ -#import - -@interface UniversalDetector:NSObject -{ - void *detector; - NSString *charset; - float confidence; -} - -+(UniversalDetector *)detector; - --(id)init; --(void)dealloc; - --(void)analyzeData:(NSData *)data; --(void)analyzeBytes:(const char *)data length:(int)len; --(void)reset; - --(BOOL)done; --(NSString *)MIMECharset; --(float)confidence; - -#ifdef __APPLE__ --(NSStringEncoding)encoding; -#endif - -@end diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index 26bf8801..00000000 Binary files a/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist b/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index a8f679d3..00000000 --- a/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - BuildMachineOSBuild - 10J869 - CFBundleDevelopmentRegion - English - CFBundleExecutable - UniversalDetector - CFBundleIdentifier - org.mozilla.universalchardet - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - UniversalDetector - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 4A2002a - DTPlatformVersion - GM - DTSDKBuild - 10J869 - DTSDKName - - DTXcode - 0402 - DTXcodeBuild - 4A2002a - - diff --git a/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector b/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector deleted file mode 100755 index cdd8e449..00000000 Binary files a/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector and /dev/null differ diff --git a/Frameworks/UniversalDetector.framework/Versions/Current b/Frameworks/UniversalDetector.framework/Versions/Current deleted file mode 120000 index 8c7e5a66..00000000 --- a/Frameworks/UniversalDetector.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/CSHandle.h b/Frameworks/XADMaster.framework/Versions/A/Headers/CSHandle.h index b4799b55..4a7af8b9 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/CSHandle.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/CSHandle.h @@ -73,6 +73,13 @@ extern NSString *CSNotSupportedException; -(uint32_t)readUInt32LE; -(uint64_t)readUInt64LE; +-(int16_t)readInt16InBigEndianOrder:(BOOL)isbigendian; +-(int32_t)readInt32InBigEndianOrder:(BOOL)isbigendian; +-(int64_t)readInt64InBigEndianOrder:(BOOL)isbigendian; +-(uint16_t)readUInt16InBigEndianOrder:(BOOL)isbigendian; +-(uint32_t)readUInt32InBigEndianOrder:(BOOL)isbigendian; +-(uint64_t)readUInt64InBigEndianOrder:(BOOL)isbigendian; + -(uint32_t)readID; -(uint32_t)readBits:(int)bits; diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/CSInputBuffer.h b/Frameworks/XADMaster.framework/Versions/A/Headers/CSInputBuffer.h index dd623e80..5d511876 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/CSInputBuffer.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/CSInputBuffer.h @@ -3,7 +3,7 @@ typedef struct CSInputBuffer { - CSHandle *parent; + __unsafe_unretained CSHandle *parent; off_t startoffs; BOOL eof; @@ -25,6 +25,11 @@ void CSInputBufferFree(CSInputBuffer *self); void CSInputSetMemoryBuffer(CSInputBuffer *self,uint8_t *buffer,int length,off_t startoffs); +static inline CSHandle *CSInputHandle(CSInputBuffer *self) +{ + return self->parent; +} + // Buffer and file positioning diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/Checksums.h b/Frameworks/XADMaster.framework/Versions/A/Headers/Checksums.h index a242afd9..befa68a8 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/Checksums.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/Checksums.h @@ -1,5 +1,6 @@ #import "CSHandle.h" #import "CSSubHandle.h" +#import "CSStreamHandle.h" @interface CSHandle (Checksums) @@ -15,6 +16,13 @@ @end +@interface CSStreamHandle (Checksums) + +-(BOOL)hasChecksum; +-(BOOL)isChecksumCorrect; + +@end + #define CSChecksumWrapperHandle XADChecksumWrapperHandle @interface CSChecksumWrapperHandle:CSHandle diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h index 2ef7a38c..228c38ef 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h @@ -1,6 +1,7 @@ #import #import "XADArchiveParser.h" +#import "XADUnarchiver.h" #import "XADException.h" typedef int XADAction; @@ -22,16 +23,18 @@ extern NSString *XADFinderFlags; @interface XADArchive:NSObject { XADArchiveParser *parser; + XADUnarchiver *unarchiver; id delegate; NSTimeInterval update_interval; XADError lasterror; NSMutableArray *dataentries,*resourceentries; - NSMutableArray *deferredentries; NSMutableDictionary *namedict; off_t extractsize,totalsize; + int extractingentry; + BOOL extractingresource; NSString *immediatedestination; BOOL immediatesubarchives,immediatefailed; off_t immediatesize; @@ -95,7 +98,6 @@ extern NSString *XADFinderFlags; -(NSDictionary *)combinedParserDictionaryForEntry:(int)n; -(NSString *)nameOfEntry:(int)n; --(XADString *)rawNameOfEntry:(int)n; -(BOOL)entryHasSize:(int)n; -(off_t)uncompressedSizeOfEntry:(int)n; -(off_t)compressedSizeOfEntry:(int)n; @@ -113,6 +115,7 @@ extern NSString *XADFinderFlags; -(CSHandle *)resourceHandleForEntry:(int)n; -(CSHandle *)resourceHandleForEntry:(int)n error:(XADError *)error; -(NSData *)contentsOfEntry:(int)n; +-(NSData *)contentsOfEntry:(int)n withLength:(NSInteger)length; //-(NSData *)resourceContentsOfEntry:(int)n; -(BOOL)extractTo:(NSString *)destination; @@ -121,18 +124,22 @@ extern NSString *XADFinderFlags; -(BOOL)extractEntries:(NSIndexSet *)entryset to:(NSString *)destination subArchives:(BOOL)sub; -(BOOL)extractEntry:(int)n to:(NSString *)destination; -(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer; --(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer resourceFork:(BOOL)resfork; +-(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer +resourceFork:(BOOL)resfork; +-(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer +dataFork:(BOOL)datafork resourceFork:(BOOL)resfork; +//-(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer +//dataFork:(BOOL)datafork resourceFork:(BOOL)resfork; -(BOOL)extractArchiveEntry:(int)n to:(NSString *)destination; --(BOOL)_extractEntry:(int)n as:(NSString *)destfile; --(BOOL)_extractFileEntry:(int)n as:(NSString *)destfile; --(BOOL)_extractDirectoryEntry:(int)n as:(NSString *)destfile; --(BOOL)_extractLinkEntry:(int)n as:(NSString *)destfile; --(BOOL)_ensureDirectoryExists:(NSString *)directory; --(BOOL)_changeAllAttributesForEntry:(int)n atPath:(NSString *)path deferDirectories:(BOOL)defer resourceFork:(BOOL)resfork; +-(BOOL)_extractEntry:(int)n as:(NSString *)destfile deferDirectories:(BOOL)defer +dataFork:(BOOL)datafork resourceFork:(BOOL)resfork; -(void)updateAttributesForDeferredDirectories; +//Tim Oliver +- (BOOL)extractContentsOfEntry:(int)n toPath:(NSString *)destination; + // Deprecated +(NSArray *)volumesForFile:(NSString *)filename; @@ -184,8 +191,8 @@ extern NSString *XADFinderFlags; #define XADOverwrite XADOverwriteAction #define XADRename XADRenameAction -typedef XADError xadERROR; -typedef off_t xadSize; +//typedef XADError xadERROR; +//typedef off_t xadSize; #define XADERR_NO XADNoError #if 0 diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchiveParser.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchiveParser.h index fe08366d..c1db7b6b 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchiveParser.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchiveParser.h @@ -5,30 +5,21 @@ #import "XADRegex.h" #import "CSHandle.h" #import "XADSkipHandle.h" +#import "XADResourceFork.h" #import "Checksums.h" extern NSString *XADFileNameKey; +extern NSString *XADCommentKey; extern NSString *XADFileSizeKey; extern NSString *XADCompressedSizeKey; +extern NSString *XADCompressionNameKey; + extern NSString *XADLastModificationDateKey; extern NSString *XADLastAccessDateKey; extern NSString *XADLastAttributeChangeDateKey; +extern NSString *XADLastBackupDateKey; extern NSString *XADCreationDateKey; -extern NSString *XADFileTypeKey; -extern NSString *XADFileCreatorKey; -extern NSString *XADFinderFlagsKey; -extern NSString *XADFinderInfoKey; -extern NSString *XADPosixPermissionsKey; -extern NSString *XADPosixUserKey; -extern NSString *XADPosixGroupKey; -extern NSString *XADPosixUserNameKey; -extern NSString *XADPosixGroupNameKey; -extern NSString *XADDOSFileAttributesKey; -extern NSString *XADWindowsFileAttributesKey; -extern NSString *XADAmigaProtectionBitsKey; -extern NSString *XADIsEncryptedKey; -extern NSString *XADIsCorruptedKey; extern NSString *XADIsDirectoryKey; extern NSString *XADIsResourceForkKey; extern NSString *XADIsArchiveKey; @@ -41,16 +32,33 @@ extern NSString *XADIsBlockDeviceKey; extern NSString *XADDeviceMajorKey; extern NSString *XADDeviceMinorKey; extern NSString *XADIsFIFOKey; +extern NSString *XADIsEncryptedKey; +extern NSString *XADIsCorruptedKey; -extern NSString *XADCommentKey; +extern NSString *XADExtendedAttributesKey; +extern NSString *XADFileTypeKey; +extern NSString *XADFileCreatorKey; +extern NSString *XADFinderFlagsKey; +extern NSString *XADFinderInfoKey; +extern NSString *XADPosixPermissionsKey; +extern NSString *XADPosixUserKey; +extern NSString *XADPosixGroupKey; +extern NSString *XADPosixUserNameKey; +extern NSString *XADPosixGroupNameKey; +extern NSString *XADDOSFileAttributesKey; +extern NSString *XADWindowsFileAttributesKey; +extern NSString *XADAmigaProtectionBitsKey; + +extern NSString *XADIndexKey; extern NSString *XADDataOffsetKey; extern NSString *XADDataLengthKey; extern NSString *XADSkipOffsetKey; extern NSString *XADSkipLengthKey; -extern NSString *XADCompressionNameKey; extern NSString *XADIsSolidKey; +extern NSString *XADFirstSolidIndexKey; extern NSString *XADFirstSolidEntryKey; +extern NSString *XADNextSolidIndexKey; extern NSString *XADNextSolidEntryKey; extern NSString *XADSolidObjectKey; extern NSString *XADSolidOffsetKey; @@ -59,57 +67,96 @@ extern NSString *XADSolidLengthKey; // Archive properties only extern NSString *XADArchiveNameKey; extern NSString *XADVolumesKey; +extern NSString *XADVolumeScanningFailedKey; extern NSString *XADDiskLabelKey; @interface XADArchiveParser:NSObject { CSHandle *sourcehandle; XADSkipHandle *skiphandle; + XADResourceFork *resourcefork; id delegate; NSString *password; + NSString *passwordencodingname; + BOOL caresaboutpasswordencoding; NSMutableDictionary *properties; XADStringSource *stringsource; + int currindex; + id parsersolidobj; NSMutableDictionary *firstsoliddict,*prevsoliddict; id currsolidobj; CSHandle *currsolidhandle; + BOOL forcesolid; BOOL shouldstop; - - NSAutoreleasePool *autopool; } +(void)initialize; +(Class)archiveParserClassForHandle:(CSHandle *)handle firstBytes:(NSData *)header -name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props; +resourceFork:(XADResourceFork *)fork name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props; +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name; ++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name error:(XADError *)errorptr; ++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XADResourceFork *)fork name:(NSString *)name; ++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XADResourceFork *)fork name:(NSString *)name error:(XADError *)errorptr; +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name; ++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name error:(XADError *)errorptr; ++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header resourceFork:(XADResourceFork *)fork name:(NSString *)name; ++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header resourceFork:(XADResourceFork *)fork name:(NSString *)name error:(XADError *)errorptr; +(XADArchiveParser *)archiveParserForPath:(NSString *)filename; - --(id)initWithHandle:(CSHandle *)handle name:(NSString *)name; ++(XADArchiveParser *)archiveParserForPath:(NSString *)filename error:(XADError *)errorptr; ++(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum; ++(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum error:(XADError *)errorptr; ++(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry resourceForkDictionary:(NSDictionary *)forkentry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum; ++(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry resourceForkDictionary:(NSDictionary *)forkentry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum error:(XADError *)errorptr; + +-(id)init; -(void)dealloc; --(NSDictionary *)properties; +-(CSHandle *)handle; +-(void)setHandle:(CSHandle *)newhandle; +-(XADResourceFork *)resourceFork; +-(void)setResourceFork:(XADResourceFork *)newfork; -(NSString *)name; +-(void)setName:(NSString *)newname; -(NSString *)filename; +-(void)setFilename:(NSString *)filename; -(NSArray *)allFilenames; --(BOOL)isEncrypted; +-(void)setAllFilenames:(NSArray *)newnames; -(id)delegate; -(void)setDelegate:(id)newdelegate; +-(NSDictionary *)properties; +-(NSString *)currentFilename; + +-(BOOL)isEncrypted; -(NSString *)password; -(BOOL)hasPassword; -(void)setPassword:(NSString *)newpassword; +-(NSString *)encodingName; +-(float)encodingConfidence; +-(void)setEncodingName:(NSString *)encodingname; +-(BOOL)caresAboutPasswordEncoding; +-(NSString *)passwordEncodingName; +-(void)setPasswordEncodingName:(NSString *)encodingname; -(XADStringSource *)stringSource; -(XADString *)linkDestinationForDictionary:(NSDictionary *)dict; +-(XADString *)linkDestinationForDictionary:(NSDictionary *)dict error:(XADError *)errorptr; +-(NSDictionary *)extendedAttributesForDictionary:(NSDictionary *)dict; -(NSData *)finderInfoForDictionary:(NSDictionary *)dict; +-(BOOL)wasStopped; + +-(BOOL)hasChecksum; +-(BOOL)testChecksum; +-(XADError)testChecksumWithoutExceptions; + // Internal functions @@ -119,7 +166,6 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext; -(BOOL)shouldKeepParsing; --(CSHandle *)handle; -(CSHandle *)handleAtDataOffsetForDictionary:(NSDictionary *)dict; -(XADSkipHandle *)skipHandle; -(CSHandle *)zeroLengthHandleWithChecksum:(BOOL)checksum; @@ -134,8 +180,6 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext; -(void)addEntryWithDictionary:(NSMutableDictionary *)dict; -(void)addEntryWithDictionary:(NSMutableDictionary *)dict retainPosition:(BOOL)retainpos; --(void)addEntryWithDictionary:(NSMutableDictionary *)dict cyclePools:(BOOL)cyclepools; --(void)addEntryWithDictionary:(NSMutableDictionary *)dict retainPosition:(BOOL)retainpos cyclePools:(BOOL)cyclepools; -(XADString *)XADStringWithString:(NSString *)string; -(XADString *)XADStringWithData:(NSData *)data; @@ -158,6 +202,9 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext; -(NSData *)encodedPassword; -(const char *)encodedCStringPassword; +-(void)reportInterestingFileWithReason:(NSString *)reason,...; + + // Subclasses implement these: @@ -166,6 +213,8 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext; name:(NSString *)name; +(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props; ++(BOOL)recognizeFileWithHandle:(CSHandle *)handle firstBytes:(NSData *)data +resourceFork:(XADResourceFork *)fork name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props; +(NSArray *)volumesForHandle:(CSHandle *)handle firstBytes:(NSData *)data name:(NSString *)name; @@ -175,6 +224,13 @@ name:(NSString *)name; -(CSHandle *)handleForSolidStreamWithObject:(id)obj wantChecksum:(BOOL)checksum; +// Exception-free wrappers for subclass methods: +// parseWithoutExceptions will in addition return XADBreakError if the delegate +// requested parsing to stop. + +-(XADError)parseWithoutExceptions; +-(CSHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum error:(XADError *)errorptr; + @end @interface NSObject (XADArchiveParserDelegate) @@ -182,6 +238,7 @@ name:(NSString *)name; -(void)archiveParser:(XADArchiveParser *)parser foundEntryWithDictionary:(NSDictionary *)dict; -(BOOL)archiveParsingShouldStop:(XADArchiveParser *)parser; -(void)archiveParserNeedsPassword:(XADArchiveParser *)parser; +-(void)archiveParser:(XADArchiveParser *)parser findsFileInterestingForReason:(NSString *)reason; @end diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADException.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADException.h index f7cc602c..c2d6b615 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADException.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADException.h @@ -5,11 +5,11 @@ typedef int XADError; #define XADNoError 0x0000 /* no error */ #define XADUnknownError 0x0001 /* unknown error */ #define XADInputError 0x0002 /* input data buffers border exceeded */ -#define XADOutputError 0x0003 /* output data buffers border exceeded */ +#define XADOutputError 0x0003 /* failed to write to file */ #define XADBadParametersError 0x0004 /* function called with illegal parameters */ #define XADOutOfMemoryError 0x0005 /* not enough memory available */ #define XADIllegalDataError 0x0006 /* data is corrupted */ -#define XADNotSupportedError 0x0007 /* command is not supported */ +#define XADNotSupportedError 0x0007 /* file not fully supported */ #define XADResourceError 0x0008 /* required resource missing */ #define XADDecrunchError 0x0009 /* error on decrunching */ #define XADFiletypeError 0x000A /* unknown file type */ @@ -28,6 +28,7 @@ typedef int XADError; #define XADFileDirectoryError 0x0017 /* name of file exists as directory */ #define XADShortBufferError 0x0018 /* buffer was too short */ #define XADEncodingError 0x0019 /* text encoding was defective */ +#define XADLinkError 0x001a /* could not create link */ #define XADSubArchiveError 0x10000 @@ -46,6 +47,7 @@ extern NSString *XADExceptionName; +(void)raisePasswordException; +(void)raiseChecksumException; +(void)raiseDataFormatException; ++(void)raiseOutOfMemoryException; +(void)raiseExceptionWithXADError:(XADError)errnum; +(XADError)parseException:(id)exception; diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADPath.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADPath.h index 183c89d7..58f92f1c 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADPath.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADPath.h @@ -5,40 +5,73 @@ #define XADEitherPathSeparator "/\\" #define XADNoPathSeparator "" -@interface XADPath:NSObject +@interface XADPath:NSObject { - NSArray *components; - XADStringSource *source; + XADPath *parent; + + NSArray *cachedcanonicalcomponents; + NSString *cachedencoding; } ++(XADPath *)emptyPath; ++(XADPath *)pathWithString:(NSString *)string; ++(XADPath *)pathWithStringComponents:(NSArray *)components; ++(XADPath *)separatedPathWithString:(NSString *)string; ++(XADPath *)decodedPathWithData:(NSData *)bytedata encodingName:(NSString *)encoding separators:(const char *)separators; ++(XADPath *)analyzedPathWithData:(NSData *)bytedata source:(XADStringSource *)stringsource +separators:(const char *)pathseparators; + -(id)init; --(id)initWithComponents:(NSArray *)pathcomponents; --(id)initWithString:(NSString *)pathstring; --(id)initWithBytes:(const char *)bytes length:(int)length -encodingName:(NSString *)encoding separators:(const char *)separators; --(id)initWithBytes:(const char *)bytes length:(int)length -separators:(const char *)separators source:(XADStringSource *)stringsource; --(id)initWithBytes:(const char *)bytes length:(int)length encodingName:(NSString *)encoding -separators:(const char *)separators source:(XADStringSource *)stringsource; +-(id)initWithParent:(XADPath *)parentpath; +-(id)initWithPath:(XADPath *)path parent:(XADPath *)parentpath; -(void)dealloc; --(XADString *)lastPathComponent; --(XADString *)firstPathComponent; +-(BOOL)isAbsolute; +-(BOOL)isEmpty; +-(BOOL)isEqual:(id)other; +-(BOOL)isCanonicallyEqual:(id)other; +-(BOOL)isCanonicallyEqual:(id)other encodingName:(NSString *)encoding; +-(BOOL)hasPrefix:(XADPath *)other; +-(BOOL)hasCanonicalPrefix:(XADPath *)other; +-(BOOL)hasCanonicalPrefix:(XADPath *)other encodingName:(NSString *)encoding; + +-(int)depth; // Note: Does not take . or .. paths into account. +-(int)depthWithEncodingName:(NSString *)encoding; +-(NSArray *)pathComponents; +-(NSArray *)pathComponentsWithEncodingName:(NSString *)encoding; +-(NSArray *)canonicalPathComponents; +-(NSArray *)canonicalPathComponentsWithEncodingName:(NSString *)encoding; +-(void)_addPathComponentsToArray:(NSMutableArray *)components encodingName:(NSString *)encoding; + +-(NSString *)lastPathComponent; +-(NSString *)lastPathComponentWithEncodingName:(NSString *)encoding; +-(NSString *)firstPathComponent; +-(NSString *)firstPathComponentWithEncodingName:(NSString *)encoding; +-(NSString *)firstCanonicalPathComponent; +-(NSString *)firstCanonicalPathComponentWithEncodingName:(NSString *)encoding; -(XADPath *)pathByDeletingLastPathComponent; +-(XADPath *)pathByDeletingLastPathComponentWithEncodingName:(NSString *)encoding; -(XADPath *)pathByDeletingFirstPathComponent; --(XADPath *)pathByAppendingPathComponent:(XADString *)component; +-(XADPath *)pathByDeletingFirstPathComponentWithEncodingName:(NSString *)encoding; + +-(XADPath *)pathByAppendingXADStringComponent:(XADString *)component; -(XADPath *)pathByAppendingPath:(XADPath *)path; --(XADPath *)safePath; +-(XADPath *)_copyWithParent:(XADPath *)newparent; --(BOOL)isAbsolute; --(BOOL)hasPrefix:(XADPath *)other; +// These are safe for filesystem use, and adapted to the current platform. +-(NSString *)sanitizedPathString; +-(NSString *)sanitizedPathStringWithEncodingName:(NSString *)encoding; +// XADString interface. +// NOTE: These are not guaranteed to be safe for usage as filesystem paths, +// only for display! +-(BOOL)canDecodeWithEncodingName:(NSString *)encoding; -(NSString *)string; -(NSString *)stringWithEncodingName:(NSString *)encoding; --(NSData *)data; // NOTE: not guaranteed to be safe for usage as a filesystem path, only for display! --(int)depth; +-(NSData *)data; +-(void)_appendPathToData:(NSMutableData *)data; -(BOOL)encodingIsKnown; -(NSString *)encodingName; @@ -46,13 +79,88 @@ separators:(const char *)separators source:(XADStringSource *)stringsource; -(XADStringSource *)source; --(BOOL)isEqual:(id)other; --(NSUInteger)hash; --(id)copyWithZone:(NSZone *)zone; - #ifdef __APPLE__ +-(BOOL)canDecodeWithEncoding:(NSStringEncoding)encoding; -(NSString *)stringWithEncoding:(NSStringEncoding)encoding; +-(NSString *)sanitizedPathStringWithEncoding:(NSStringEncoding)encoding; -(NSStringEncoding)encoding; #endif +// Other interfaces. +-(NSUInteger)hash; +-(id)copyWithZone:(NSZone *)zone; + +// Deprecated. +-(XADPath *)safePath; // Deprecated. Use sanitizedPathString: instead. + +// Subclass methods. +-(BOOL)_isPartAbsolute; +-(BOOL)_isPartEmpty; +-(int)_depthOfPartWithEncodingName:(NSString *)encoding; +-(void)_addPathComponentsOfPartToArray:(NSMutableArray *)array encodingName:(NSString *)encoding; +-(NSString *)_lastPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(NSString *)_firstPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(XADPath *)_pathByDeletingLastPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(XADPath *)_pathByDeletingFirstPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(BOOL)_canDecodePartWithEncodingName:(NSString *)encoding; +-(void)_appendPathForPartToData:(NSMutableData *)data; +-(XADStringSource *)_sourceForPart; + +@end + + +@interface XADStringPath:XADPath +{ + NSString *string; +} + +-(id)initWithComponentString:(NSString *)pathstring; +-(id)initWithComponentString:(NSString *)pathstring parent:(XADPath *)parentpath; +-(id)initWithPath:(XADStringPath *)path parent:(XADPath *)parentpath; +-(void)dealloc; + +-(BOOL)_isPartAbsolute; +-(BOOL)_isPartEmpty; +-(int)_depthOfPartWithEncodingName:(NSString *)encoding; +-(void)_addPathComponentsOfPartToArray:(NSMutableArray *)array encodingName:(NSString *)encoding; +-(NSString *)_lastPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(NSString *)_firstPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(XADPath *)_pathByDeletingLastPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(XADPath *)_pathByDeletingFirstPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(BOOL)_canDecodePartWithEncodingName:(NSString *)encoding; +-(void)_appendPathForPartToData:(NSMutableData *)data; +-(XADStringSource *)_sourceForPart; + +-(BOOL)isEqual:(id)other; +-(NSUInteger)hash; + @end + +@interface XADRawPath:XADPath +{ + NSData *data; + XADStringSource *source; + const char *separators; +} + +-(id)initWithData:(NSData *)bytedata source:(XADStringSource *)stringsource +separators:(const char *)pathseparators; +-(id)initWithData:(NSData *)bytedata source:(XADStringSource *)stringsource +separators:(const char *)pathseparators parent:(XADPath *)parentpath; +-(id)initWithPath:(XADRawPath *)path parent:(XADPath *)parentpath; +-(void)dealloc; + +-(BOOL)_isPartAbsolute; +-(BOOL)_isPartEmpty; +-(int)_depthOfPartWithEncodingName:(NSString *)encoding; +-(void)_addPathComponentsOfPartToArray:(NSMutableArray *)array encodingName:(NSString *)encoding; +-(NSString *)_lastPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(NSString *)_firstPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(XADPath *)_pathByDeletingLastPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(XADPath *)_pathByDeletingFirstPathComponentOfPartWithEncodingName:(NSString *)encoding; +-(BOOL)_canDecodePartWithEncodingName:(NSString *)encoding; +-(void)_appendPathForPartToData:(NSMutableData *)data; +-(XADStringSource *)_sourceForPart; + +@end + diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADRegex.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADRegex.h index 7c64f52d..bd04ffc6 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADRegex.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADRegex.h @@ -1,5 +1,10 @@ #import + +#ifdef _WIN32 +#import "regex.h" +#else #import +#endif @interface XADRegex:NSObject { diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADString.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADString.h index b430adb2..a9f2defe 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADString.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADString.h @@ -51,6 +51,7 @@ extern NSString *XADMacOSCroatianStringEncodingName; @protocol XADString +-(BOOL)canDecodeWithEncodingName:(NSString *)encoding; -(NSString *)string; -(NSString *)stringWithEncodingName:(NSString *)encoding; -(NSData *)data; @@ -62,6 +63,7 @@ extern NSString *XADMacOSCroatianStringEncodingName; -(XADStringSource *)source; #ifdef __APPLE__ +-(BOOL)canDecodeWithEncoding:(NSStringEncoding)encoding; -(NSString *)stringWithEncoding:(NSStringEncoding)encoding; -(NSStringEncoding)encoding; #endif @@ -70,20 +72,27 @@ extern NSString *XADMacOSCroatianStringEncodingName; -@interface XADString:NSObject +@interface XADString:NSObject { NSData *data; NSString *string; XADStringSource *source; } -+(XADString *)XADStringWithString:(NSString *)knownstring; ++(XADString *)XADStringWithString:(NSString *)string; ++(XADString *)analyzedXADStringWithData:(NSData *)bytedata source:(XADStringSource *)stringsource; ++(XADString *)decodedXADStringWithData:(NSData *)bytedata encodingName:(NSString *)encoding; + ++(NSString *)escapedStringForData:(NSData *)data encodingName:(NSString *)encoding; ++(NSString *)escapedStringForBytes:(const void *)bytes length:(size_t)length encodingName:(NSString *)encoding; ++(NSString *)escapedASCIIStringForBytes:(const void *)bytes length:(size_t)length; ++(NSData *)escapedASCIIDataForString:(NSString *)string; -(id)initWithData:(NSData *)bytedata source:(XADStringSource *)stringsource; --(id)initWithData:(NSData *)bytedata encodingName:(NSString *)encoding; -(id)initWithString:(NSString *)knownstring; -(void)dealloc; +-(BOOL)canDecodeWithEncodingName:(NSString *)encoding; -(NSString *)string; -(NSString *)stringWithEncodingName:(NSString *)encoding; -(NSData *)data; @@ -104,6 +113,7 @@ extern NSString *XADMacOSCroatianStringEncodingName; -(id)copyWithZone:(NSZone *)zone; #ifdef __APPLE__ +-(BOOL)canDecodeWithEncoding:(NSStringEncoding)encoding; -(NSString *)stringWithEncoding:(NSStringEncoding)encoding; -(NSStringEncoding)encoding; #endif @@ -112,10 +122,18 @@ extern NSString *XADMacOSCroatianStringEncodingName; @interface XADString (PlatformSpecific) ++(BOOL)canDecodeData:(NSData *)data encodingName:(NSString *)encoding; ++(BOOL)canDecodeBytes:(const void *)bytes length:(size_t)length encodingName:(NSString *)encoding; +(NSString *)stringForData:(NSData *)data encodingName:(NSString *)encoding; ++(NSString *)stringForBytes:(const void *)bytes length:(size_t)length encodingName:(NSString *)encoding; +(NSData *)dataForString:(NSString *)string encodingName:(NSString *)encoding; +(NSArray *)availableEncodingNames; +#ifdef __APPLE__ ++(NSString *)encodingNameForEncoding:(NSStringEncoding)encoding; ++(NSStringEncoding)encodingForEncodingName:(NSString *)encoding; +#endif + @end @@ -125,7 +143,7 @@ extern NSString *XADMacOSCroatianStringEncodingName; { UniversalDetector *detector; NSString *fixedencodingname; - BOOL mac; + BOOL mac,hasanalyzeddata; #ifdef __APPLE__ NSStringEncoding fixedencoding; @@ -135,8 +153,9 @@ extern NSString *XADMacOSCroatianStringEncodingName; -(id)init; -(void)dealloc; --(BOOL)analyzeDataAndCheckForASCII:(NSData *)data; +-(void)analyzeData:(NSData *)data; +-(BOOL)hasAnalyzedData; -(NSString *)encodingName; -(float)confidence; -(UniversalDetector *)detector; diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADUnarchiver.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADUnarchiver.h index 2cb77077..791f667b 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/XADUnarchiver.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/XADUnarchiver.h @@ -6,6 +6,7 @@ #define XADMacOSXForkStyle 1 #define XADHiddenAppleDoubleForkStyle 2 #define XADVisibleAppleDoubleForkStyle 3 +#define XADHFVExplorerAppleDoubleForkStyle 4 #ifdef __APPLE__ #define XADDefaultForkStyle XADMacOSXForkStyle @@ -22,12 +23,14 @@ double updateinterval; id delegate; + BOOL shouldstop; - NSMutableArray *deferreddirectories; + NSMutableArray *deferreddirectories,*deferredlinks; } +(XADUnarchiver *)unarchiverForArchiveParser:(XADArchiveParser *)archiveparser; +(XADUnarchiver *)unarchiverForPath:(NSString *)path; ++(XADUnarchiver *)unarchiverForPath:(NSString *)path error:(XADError *)errorptr; -(id)initWithArchiveParser:(XADArchiveParser *)archiveparser; -(void)dealloc; @@ -37,12 +40,6 @@ -(id)delegate; -(void)setDelegate:(id)newdelegate; -//-(NSString *)password; -//-(void)setPassword:(NSString *)password; - -//-(NSStringEncoding)encoding; -//-(void)setEncoding:(NSStringEncoding)encoding; - -(NSString *)destination; -(void)setDestination:(NSString *)destpath; @@ -61,55 +58,67 @@ -(XADError)extractEntryWithDictionary:(NSDictionary *)dict forceDirectories:(BOOL)force; -(XADError)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path; -(XADError)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path forceDirectories:(BOOL)force; + -(XADError)finishExtractions; +-(XADError)_fixDeferredLinks; +-(XADError)_fixDeferredDirectories; + +-(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict +wantChecksum:(BOOL)checksum error:(XADError *)errorptr; +-(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict +resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum error:(XADError *)errorptr; -(XADError)_extractFileEntryWithDictionary:(NSDictionary *)dict as:(NSString *)destpath; --(XADError)_extractResourceForkEntryWithDictionary:(NSDictionary *)dict asAppleDoubleFile:(NSString *)destpath; -(XADError)_extractDirectoryEntryWithDictionary:(NSDictionary *)dict as:(NSString *)destpath; -(XADError)_extractLinkEntryWithDictionary:(NSDictionary *)dict as:(NSString *)destpath; -(XADError)_extractArchiveEntryWithDictionary:(NSDictionary *)dict to:(NSString *)destpath name:(NSString *)filename; --(XADError)_extractEntryWithDictionary:(NSDictionary *)dict toHandle:(CSHandle *)fh; +-(XADError)_extractResourceForkEntryWithDictionary:(NSDictionary *)dict asAppleDoubleFile:(NSString *)destpath; -(XADError)_updateFileAttributesAtPath:(NSString *)path forEntryWithDictionary:(NSDictionary *)dict deferDirectories:(BOOL)defer; -(XADError)_ensureDirectoryExists:(NSString *)path; -@end - +-(XADError)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle; +-(XADError)runExtractorWithDictionary:(NSDictionary *)dict +outputTarget:(id)target selector:(SEL)sel argument:(id)arg; -@interface XADUnarchiver (PlatformSpecific) +-(NSString *)adjustPathString:(NSString *)path forEntryWithDictionary:(NSDictionary *)dict; --(XADError)_extractResourceForkEntryWithDictionary:(NSDictionary *)dict asPlatformSpecificForkForFile:(NSString *)destpath; --(XADError)_createPlatformSpecificLinkToPath:(NSString *)link from:(NSString *)path; --(XADError)_updatePlatformSpecificFileAttributesAtPath:(NSString *)path forEntryWithDictionary:(NSDictionary *)dict; +-(BOOL)_shouldStop; @end + @interface NSObject (XADUnarchiverDelegate) -(void)unarchiverNeedsPassword:(XADUnarchiver *)unarchiver; --(NSString *)unarchiver:(XADUnarchiver *)unarchiver pathForExtractingEntryWithDictionary:(NSDictionary *)dict; --(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path; +-(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldExtractEntryWithDictionary:(NSDictionary *)dict suggestedPath:(NSString **)pathptr; -(void)unarchiver:(XADUnarchiver *)unarchiver willExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path; -(void)unarchiver:(XADUnarchiver *)unarchiver didExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path error:(XADError)error; -(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldCreateDirectory:(NSString *)directory; +-(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldDeleteFileAndCreateDirectory:(NSString *)directory; -(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldExtractArchiveEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path; -(void)unarchiver:(XADUnarchiver *)unarchiver willExtractArchiveEntryWithDictionary:(NSDictionary *)dict withUnarchiver:(XADUnarchiver *)subunarchiver to:(NSString *)path; -(void)unarchiver:(XADUnarchiver *)unarchiver didExtractArchiveEntryWithDictionary:(NSDictionary *)dict withUnarchiver:(XADUnarchiver *)subunarchiver to:(NSString *)path error:(XADError)error; --(NSString *)unarchiver:(XADUnarchiver *)unarchiver linkDestinationForEntryWithDictionary:(NSDictionary *)dict from:(NSString *)path; -//-(XADAction)unarchiver:(XADUnarchiver *)unarchiver creatingDirectoryDidFailForEntry:(int)n; +-(NSString *)unarchiver:(XADUnarchiver *)unarchiver destinationForLink:(XADString *)link from:(NSString *)path; -(BOOL)extractionShouldStopForUnarchiver:(XADUnarchiver *)unarchiver; -(void)unarchiver:(XADUnarchiver *)unarchiver extractionProgressForEntryWithDictionary:(NSDictionary *)dict fileFraction:(double)fileprogress estimatedTotalFraction:(double)totalprogress; -@end +-(void)unarchiver:(XADUnarchiver *)unarchiver findsFileInterestingForReason:(NSString *)reason; +@end -double _XADUnarchiverGetTime(); +@interface NSObject (XADUnarchiverDelegateDeprecated) +// Deprecated. +-(NSString *)unarchiver:(XADUnarchiver *)unarchiver pathForExtractingEntryWithDictionary:(NSDictionary *)dict; +-(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path; +-(NSString *)unarchiver:(XADUnarchiver *)unarchiver linkDestinationForEntryWithDictionary:(NSDictionary *)dict from:(NSString *)path; +@end diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/xadmaster.h b/Frameworks/XADMaster.framework/Versions/A/Headers/xadmaster.h index 310a960e..9c0227db 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Headers/xadmaster.h +++ b/Frameworks/XADMaster.framework/Versions/A/Headers/xadmaster.h @@ -1,1029 +1,18 @@ -#ifndef LIBRARIES_XADMASTER_H -#define LIBRARIES_XADMASTER_H +// +// XADMaster.h +// XADMaster +// +// Created by Tim Oliver on 8/05/2016. +// Copyright © 2016 Tim Oliver. All rights reserved. +// -/* $Id: xadmaster.h.in,v 1.24 2005/06/23 14:54:42 stoecker Exp $ - xadmaster.library defines and structures +#import - XAD library system for archive handling - Copyright (C) 1998 and later by Dirk Stöcker +//! Project version number for XADMaster. +FOUNDATION_EXPORT double XADMasterVersionNumber; - This library 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 2.1 of the License, or (at your option) any later version. +//! Project version string for XADMaster. +FOUNDATION_EXPORT const unsigned char XADMasterVersionString[]; - This library 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. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -typedef uint32_t xadUINT32; -typedef int32_t xadINT32; -typedef uint16_t xadUINT16; -typedef int16_t xadINT16; -typedef uint8_t xadUINT8; -typedef int8_t xadINT8; -typedef uint64_t xadSize; -typedef int64_t xadSignSize; - -typedef void * xadPTR; -typedef unsigned char xadSTRING; -typedef xadSTRING * xadSTRPTR; -typedef unsigned int xadUINT; -typedef int xadINT; -typedef xadINT xadERROR; -typedef xadINT xadBOOL; - -#define XADFALSE 0 -#define XADTRUE 1 -#define XADMEMF_ANY (0) -#define XADMEMF_CLEAR (1L << 16) -#define XADMEMF_PUBLIC (1L << 0) - -/* Portable define to put the xadMasterBase parameter as the first - * parameter of any function. This macro makes it simpler. */ -#define XADM xadMasterBase, - -typedef xadUINT32 xadTag; - -struct TagItem { - xadTag ti_Tag; - xadSize ti_Data; -}; - -#include -typedef int xadFileHandle; -typedef const struct TagItem * xadTAGPTR; - -/* is a tag's data a pointer, an int, or a 64-bit size? */ -#define TAG_PTR (0x80000000UL) -#define TAG_INT (0x40000000UL) -#define TAG_SIZ (0x20000000UL) - -/* end of taglist */ -#define TAG_DONE (TAG_INT + 0x10000000UL) -/* ignore this tag */ -#define TAG_IGNORE (TAG_INT + 0x10000001UL) -/* taglist continues at (struct TagItem *) ti_Data */ -#define TAG_MORE (TAG_PTR + 0x10000002UL) -/* ignore the next [(xadUINT32) ti_Data] tags */ -#define TAG_SKIP (TAG_INT + 0x10000003UL) - -/* a standard callback system */ -struct Hook { - /* h_MinNode, used for hook linking on Amiga, is not needed by XAD */ - xadUINT32 (*h_Entry)(); /* entry point of callback */ - /* h_SubEntry, used when h_Entry on Amiga is an asm stub, is not needed */ - xadPTR *h_Data; /* data parameter always passed to callback */ -}; - -/* NOTE: Nearly all structures need to be allocated using the - xadAllocObject function. */ - -/************************************************************************ -* * -* library base structure * -* * -************************************************************************/ - -struct xadMasterBase { - xadPTR dummy; -}; - -/************************************************************************ -* * -* tag-function call flags * -* * -************************************************************************/ - -/* input tags for xadGetInfo, only one can be specified per call */ -#define XAD_INSIZE (TAG_SIZ+ 1) /* input data size */ -#define XAD_INFILENAME (TAG_PTR+ 2) -#define XAD_INFILEHANDLE (TAG_PTR+ 3) -#define XAD_INMEMORY (TAG_PTR+ 4) -#define XAD_INHOOK (TAG_PTR+ 5) -#define XAD_INSPLITTED (TAG_PTR+ 6) /* (V2) */ -#define XAD_INDISKARCHIVE (TAG_PTR+ 7) /* (V4) */ -#define XAD_INXADSTREAM (TAG_PTR+ 8) /* (V8) */ -#define XAD_INDEVICE (TAG_PTR+ 9) /* (V11) */ - -/* output tags, only one can be specified per call, xadXXXXUnArc */ -#define XAD_OUTSIZE (TAG_SIZ+ 10) /* output data size */ -#define XAD_OUTFILENAME (TAG_PTR+ 11) -#define XAD_OUTFILEHANDLE (TAG_PTR+ 12) -#define XAD_OUTMEMORY (TAG_PTR+ 13) -#define XAD_OUTHOOK (TAG_PTR+ 14) -#define XAD_OUTDEVICE (TAG_PTR+ 15) -#define XAD_OUTXADSTREAM (TAG_PTR+ 16) /* (V8) */ - -/* object allocation tags for xadAllocObjectA */ -#define XAD_OBJNAMESIZE (TAG_INT+ 20) /* XADOBJ_FILEINFO, size of needed name space */ -#define XAD_OBJCOMMENTSIZE (TAG_INT+ 21) /* XADOBJ_FILEINFO, size of needed comment space */ -#define XAD_OBJPRIVINFOSIZE (TAG_INT+ 22) /* XADOBJ_FILEINFO & XADOBJ_DISKINFO, self use size */ -#define XAD_OBJBLOCKENTRIES (TAG_INT+ 23) /* XADOBJ_DISKINFO, number of needed entries */ - -/* tags for xadGetInfo, xadFileUnArc and xadDiskUnArc */ -#define XAD_NOEXTERN (TAG_INT+ 50) /* do not use extern clients */ -#define XAD_PASSWORD (TAG_PTR+ 51) /* password when needed */ -#define XAD_ENTRYNUMBER (TAG_INT+ 52) /* number of wanted entry */ -#define XAD_PROGRESSHOOK (TAG_PTR+ 53) /* the progress hook */ -#define XAD_OVERWRITE (TAG_INT+ 54) /* overwrite file ? */ -#define XAD_MAKEDIRECTORY (TAG_INT+ 55) /* create directory tree */ -#define XAD_IGNOREGEOMETRY (TAG_INT+ 56) /* ignore drive geometry ? */ -#define XAD_LOWCYLINDER (TAG_INT+ 57) /* lowest cylinder */ -#define XAD_HIGHCYLINDER (TAG_INT+ 58) /* highest cylinder */ -#define XAD_VERIFY (TAG_INT+ 59) /* verify for disk hook */ -#define XAD_NOKILLPARTIAL (TAG_INT+ 60) /* do not delete partial/corrupt files (V3.3) */ -#define XAD_FORMAT (TAG_INT+ 61) /* format output device (V5) */ -#define XAD_USESECTORLABELS (TAG_INT+ 62) /* sector labels are stored on disk (V9) */ -#define XAD_IGNOREFLAGS (TAG_INT+ 63) /* ignore the client, if certain flags are set (V11) */ -#define XAD_ONLYFLAGS (TAG_INT+ 64) /* ignore the client, if certain flags are NOT set (V11) */ -// GOA -#define XAD_CLIENT (TAG_INT+ 65) /* skip the recognition, use this client */ - - -/* input tags for xadConvertDates, only one can be passed */ -#define XAD_DATEUNIX (TAG_INT+ 70) /* unix date variable */ -#define XAD_DATEAMIGA (TAG_INT+ 71) /* Amiga date variable */ -#define XAD_DATEDATESTAMP (TAG_PTR+ 72) /* Amiga struct DateStamp */ -#define XAD_DATEXADDATE (TAG_PTR+ 73) /* struct xadDate */ -#define XAD_DATECLOCKDATA (TAG_PTR+ 74) /* Amiga struct ClockData */ -#define XAD_DATECURRENTTIME (TAG_INT+ 75) /* input is system time */ -#define XAD_DATEMSDOS (TAG_INT+ 76) /* MS-DOS packed format (V2) */ -#define XAD_DATEMAC (TAG_INT+ 77) /* Mac date variable (V8) */ -#define XAD_DATECPM (TAG_PTR+ 78) /* CP/M data structure (V10) */ -#define XAD_DATECPM2 (TAG_INT+ 79) /* CP/M data structure type 2 (V10) */ -#define XAD_DATEISO9660 (TAG_PTR+300) /* ISO9660 date structure (V11) */ - -/* output tags, there can be specified multiple tags for one call */ -#define XAD_GETDATEUNIX (TAG_PTR+ 80) /* unix date variable */ -#define XAD_GETDATEAMIGA (TAG_PTR+ 81) /* Amiga date variable */ -#define XAD_GETDATEDATESTAMP (TAG_PTR+ 82) /* Amiga struct DateStamp */ -#define XAD_GETDATEXADDATE (TAG_PTR+ 83) /* struct xadDate */ -#define XAD_GETDATECLOCKDATA (TAG_PTR+ 84) /* Amiga struct ClockData */ -#define XAD_GETDATEMSDOS (TAG_PTR+ 86) /* MS-DOS packed format (V2) */ -#define XAD_GETDATEMAC (TAG_PTR+ 87) /* Mac date variable (V8) */ -#define XAD_GETDATECPM (TAG_PTR+ 88) /* CP/M data structure (V10) */ -#define XAD_GETDATECPM2 (TAG_PTR+ 89) /* CP/M data structure type 2 (V10) */ -#define XAD_GETDATEISO9660 (TAG_PTR+320) /* ISO9660 date structure (V11) */ - -/* following tags need locale.library to be installed on Amiga */ -#define XAD_MAKEGMTDATE (TAG_INT+ 90) /* make local to GMT time */ -#define XAD_MAKELOCALDATE (TAG_INT+ 91) /* make GMT to local time */ - -/* tags for xadHookTagAccess (V3) */ -#define XAD_USESKIPINFO (TAG_INT+104) /* the hook uses xadSkipInfo (V3) */ -#define XAD_SECTORLABELS (TAG_PTR+105) /* pass sector labels with XADAC_WRITE (V9) */ - -#define XAD_GETCRC16 (TAG_PTR+120) /* pointer to xadUINT16 value (V3) */ -#define XAD_GETCRC32 (TAG_PTR+121) /* pointer to xadUINT32 value (V3) */ - -#define XAD_CRC16ID (TAG_INT+130) /* ID for crc calculation (V3) */ -#define XAD_CRC32ID (TAG_INT+131) /* ID for crc calculation (V3) */ - -/* tags for xadConvertProtection (V4) */ -#define XAD_PROTAMIGA (TAG_INT+160) /* Amiga type protection bits (V4) */ -#define XAD_PROTUNIX (TAG_INT+161) /* protection bits in UNIX mode (V4) */ -#define XAD_PROTMSDOS (TAG_INT+162) /* MSDOS type protection bits (V4) */ -#define XAD_PROTFILEINFO (TAG_PTR+163) /* input is a xadFileInfo structure (V11) */ - -#define XAD_GETPROTAMIGA (TAG_PTR+170) /* return Amiga protection bits (V4) */ -#define XAD_GETPROTUNIX (TAG_PTR+171) /* return UNIX protection bits (V11) */ -#define XAD_GETPROTMSDOS (TAG_PTR+172) /* return MSDOS protection bits (V11) */ -#define XAD_GETPROTFILEINFO (TAG_PTR+173) /* fill xadFileInfo protection fields (V11) */ - -/* tags for xadGetDiskInfo (V7) */ -#define XAD_STARTCLIENT (TAG_PTR+180) /* the client to start with (V7) */ -#define XAD_NOEMPTYERROR (TAG_INT+181) /* do not create XADERR_EMPTY (V8) */ - -/* tags for xadFreeHookAccess (V8) */ -#define XAD_WASERROR (TAG_INT+190) /* error occured, call abort method (V8) */ - -/* tags for miscellaneous stuff */ -#define XAD_ARCHIVEINFO (TAG_PTR+200) /* xadArchiveInfo for stream hooks (V8) */ -#define XAD_ERRORCODE (TAG_PTR+201) /* error code of function (V12) */ -#define XAD_EXTENSION (TAG_PTR+202) /* argument for xadGetDefaultName() (V13) */ - -/* tags for xadAddFileEntry and xadAddDiskEntry (V10) */ -#define XAD_SETINPOS (TAG_SIZ+240) /* set xai_InPos after call (V10) */ -#define XAD_INSERTDIRSFIRST (TAG_INT+241) /* insert dirs at list start (V10) */ - -/* tags for xadConvertName (V12) */ -#define XAD_PATHSEPERATOR (TAG_PTR+260) /* xadUINT16 *, default is {'/','\\',0} in source charset (V12) */ -#define XAD_CHARACTERSET (TAG_INT+261) /* the characterset of string (V12) */ -#define XAD_STRINGSIZE (TAG_INT+262) /* maximum size of following (V12) */ -#define XAD_CSTRING (TAG_PTR+263) /* zero-terminated string (V12) */ -#define XAD_PSTRING (TAG_PTR+264) /* lengthed Pascal string (V12) */ -#define XAD_XADSTRING (TAG_PTR+265) /* an xad string (V12) */ -#define XAD_ADDPATHSEPERATOR (TAG_INT+266) /* default is TRUE (V12) */ - -/* tags for xadGetFilename (V12) */ -#define XAD_NOLEADINGPATH (TAG_INT+280) /* default is FALSE (V12) */ -#define XAD_NOTRAILINGPATH (TAG_INT+281) /* default is FALSE (V12) */ -#define XAD_MASKCHARACTERS (TAG_PTR+282) /* default are #?()[]~%*:|",1-31,127-160 (V12) */ -#define XAD_MASKINGCHAR (TAG_INT+283) /* default is '_' (V12) */ -#define XAD_REQUIREDBUFFERSIZE (TAG_PTR+284) /* pointer which should hold buf size (V12) */ - -/* Places 300-339 used for dates! */ - -/************************************************************************ -* * -* objects for xadAllocObjectA * -* * -************************************************************************/ - -#define XADOBJ_ARCHIVEINFO 0x0001 /* struct xadArchiveInfo */ -#define XADOBJ_FILEINFO 0x0002 /* struct xadFileInfo */ -#define XADOBJ_DISKINFO 0x0003 /* struct xadDiskInfo */ -#define XADOBJ_HOOKPARAM 0x0004 /* struct HookParam */ -#define XADOBJ_DEVICEINFO 0x0005 /* struct xadDeviceInfo */ -#define XADOBJ_PROGRESSINFO 0x0006 /* struct xadProgressInfo */ -#define XADOBJ_TEXTINFO 0x0007 /* struct xadTextInfo */ -#define XADOBJ_SPLITFILE 0x0008 /* struct xadSplitFile (V2) */ -#define XADOBJ_SKIPINFO 0x0009 /* struct xadSkipInfo (V3) */ -#define XADOBJ_IMAGEINFO 0x000A /* struct xadImageInfo (V4) */ -#define XADOBJ_SPECIAL 0x000B /* struct xadSpecial (V11) */ - -/* result type of xadAllocVec */ -#define XADOBJ_MEMBLOCK 0x0100 /* memory of requested size and type */ -/* private type */ -#define XADOBJ_STRING 0x0101 /* a typed XAD string (V12) */ - -/************************************************************************ -* * -* modes for xadCalcCRC126 and xadCalcCRC32 * -* * -************************************************************************/ - -#define XADCRC16_ID1 0xA001 -#define XADCRC32_ID1 0xEDB88320 - -/************************************************************************ -* * -* hook related stuff * -* * -************************************************************************/ - -#define XADHC_READ 1 /* read data into buffer */ -#define XADHC_WRITE 2 /* write buffer data to file/memory */ -#define XADHC_SEEK 3 /* seek in file */ -#define XADHC_INIT 4 /* initialize the hook */ -#define XADHC_FREE 5 /* end up hook work, free stuff */ -#define XADHC_ABORT 6 /* an error occured, delete partial stuff */ -#define XADHC_FULLSIZE 7 /* complete input size is needed */ -#define XADHC_IMAGEINFO 8 /* return disk image info (V4) */ - -struct xadHookParam { - xadUINT32 xhp_Command; - xadSignSize xhp_CommandData; - xadPTR xhp_BufferPtr; - xadSize xhp_BufferSize; - xadSize xhp_DataPos; /* current seek position */ - xadPTR xhp_PrivatePtr; - xadTAGPTR xhp_TagList; /* allows to transport tags to hook (V9) */ -}; - -/* xadHookAccess commands */ -#define XADAC_READ 10 /* get data */ -#define XADAC_WRITE 11 /* write data */ -#define XADAC_COPY 12 /* copy input to output */ -#define XADAC_INPUTSEEK 13 /* seek in input file */ -#define XADAC_OUTPUTSEEK 14 /* seek in output file */ - -/************************************************************************ -* * -* support structures * -* * -************************************************************************/ - -/* Own date structure to cover all possible dates in a human friendly - format. xadConvertDates may be used to convert between different date - structures and variables. */ -struct xadDate { - xadUINT32 xd_Micros; /* values 0 to 999999 */ - xadINT32 xd_Year; /* values 1 to 2147483648 */ - xadUINT8 xd_Month; /* values 1 to 12 */ - xadUINT8 xd_WeekDay; /* values 1 to 7 */ - xadUINT8 xd_Day; /* values 1 to 31 */ - xadUINT8 xd_Hour; /* values 0 to 23 */ - xadUINT8 xd_Minute; /* values 0 to 59 */ - xadUINT8 xd_Second; /* values 0 to 59 */ -}; - -#define XADDAY_MONDAY 1 /* monday is the first day and */ -#define XADDAY_TUESDAY 2 -#define XADDAY_WEDNESDAY 3 -#define XADDAY_THURSDAY 4 -#define XADDAY_FRIDAY 5 -#define XADDAY_SATURDAY 6 -#define XADDAY_SUNDAY 7 /* sunday the last day of a week */ - -struct xadDeviceInfo { /* for XAD_OUTDEVICE tag */ - xadSTRPTR xdi_DeviceName; /* name of device */ - xadUINT32 xdi_Unit; /* unit of device */ - xadSTRPTR xdi_DOSName; /* instead of Device+Unit, dos name without ':' */ -}; - -struct xadSplitFile { /* for XAD_INSPLITTED */ - struct xadSplitFile *xsf_Next; - xadUINT32 xsf_Type; /* XAD_INFILENAME, XAD_INFILEHANDLE, XAD_INMEMORY, XAD_INHOOK */ - xadSize xsf_Size; /* necessary for XAD_INMEMORY, useful for others */ - xadSize xsf_Data; /* FileName, Filehandle, Hookpointer or Memory */ -}; - -struct xadSkipInfo { - struct xadSkipInfo *xsi_Next; - xadSize xsi_Position; /* position, where it should be skipped */ - xadSize xsi_SkipSize; /* size to skip */ -}; - -struct xadImageInfo { /* for XADHC_IMAGEINFO */ - xadUINT32 xii_SectorSize; /* usually 512 */ - xadUINT32 xii_FirstSector; /* of the image file */ - xadUINT32 xii_NumSectors; /* of the image file */ - xadUINT32 xii_TotalSectors; /* of this device type */ -}; -/* If the image file holds total data of disk xii_TotalSectors equals - xii_NumSectors and xii_FirstSector is zero. Addition of xii_FirstSector - and xii_NumSectors cannot exceed xii_TotalSectors value! -*/ - -/************************************************************************ -* * -* system information structure * -* * -************************************************************************/ -struct xadSystemInfo { - xadUINT16 xsi_Version; /* master library version */ - xadUINT16 xsi_Revision; /* master library revision */ - xadSize xsi_RecogSize; /* size for recognition */ -}; - -/************************************************************************ -* * -* information structures * -* * -************************************************************************/ - -struct xadArchiveInfo { - struct xadClient * xai_Client; /* pointer to unarchiving client */ - xadPTR xai_PrivateClient; /* private client data */ - xadSTRPTR xai_Password; /* password for crypted archives */ - xadUINT32 xai_Flags; /* read only XADAIF_ flags */ - xadUINT32 xai_LowCyl; /* lowest cylinder to unarchive */ - xadUINT32 xai_HighCyl; /* highest cylinder to unarchive */ - xadSize xai_InPos; /* input position, read only */ - xadSize xai_InSize; /* input size, read only */ - xadSize xai_OutPos; /* output position, read only */ - xadSize xai_OutSize; /* output file size, read only */ - struct xadFileInfo * xai_FileInfo; /* data pointer for file arcs */ - struct xadDiskInfo * xai_DiskInfo; /* data pointer for disk arcs */ - struct xadFileInfo * xai_CurFile; /* data pointer for current file arc */ - struct xadDiskInfo * xai_CurDisk; /* data pointer for current disk arc */ - xadERROR xai_LastError; /* last error, when XADAIF_FILECORRUPT (V2) */ - xadSize * xai_MultiVolume; /* array of start offsets from parts (V2) */ - struct xadSkipInfo * xai_SkipInfo; /* linked list of skip entries (V3) */ - struct xadImageInfo *xai_ImageInfo; /* for filesystem clients (V5) */ - xadSTRPTR xai_InName; /* Input archive name if available (V7) */ -}; -/* This structure is nearly complete private to either xadmaster or its -clients. An application program may access for reading only xai_Client, -xai_Flags, xai_FileInfo and xai_DiskInfo. For xai_Flags only XADAIF_CRYPTED -and XADAIF_FILECORRUPT are useful. All the other stuff is private and should -not be accessed! */ - -#define XADAIB_CRYPTED 0 /* archive entries are encrypted */ -#define XADAIB_FILECORRUPT 1 /* file is corrupt, but valid entries are in the list */ -#define XADAIB_FILEARCHIVE 2 /* unarchive file entry */ -#define XADAIB_DISKARCHIVE 3 /* unarchive disk entry */ -#define XADAIB_OVERWRITE 4 /* overwrite the file (PRIVATE) */ -#define XADAIB_MAKEDIRECTORY 5 /* create directory when missing (PRIVATE) */ -#define XADAIB_IGNOREGEOMETRY 6 /* ignore drive geometry (PRIVATE) */ -#define XADAIB_VERIFY 7 /* verify is turned on for disk hook (PRIVATE) */ -#define XADAIB_NOKILLPARTIAL 8 /* do not delete partial files (PRIVATE) */ -#define XADAIB_DISKIMAGE 9 /* is disk image extraction (V5) */ -#define XADAIB_FORMAT 10 /* format in disk hook (PRIVATE) */ -#define XADAIB_NOEMPTYERROR 11 /* do not create empty error (PRIVATE) */ -#define XADAIB_ONLYIN 12 /* in stuff only (PRIVATE) */ -#define XADAIB_ONLYOUT 13 /* out stuff only (PRIVATE) */ -#define XADAIB_USESECTORLABELS 14 /* use SectorLabels (PRIVATE) */ - -#define XADAIF_CRYPTED (1<) are currently not supported with normal - Amiga filesystem. But the clients support them, if archive format holds - such information. - - The protection bits (all 3 fields) should always be set using the - xadConvertProtection procedure. Call it with as much protection information - as possible. It extracts the relevant data at best (and also sets the 2 flags). - DO NOT USE these fields directly, but always through xadConvertProtection - call. -*/ - -#define XADFIB_CRYPTED 0 /* entry is crypted */ -#define XADFIB_DIRECTORY 1 /* entry is a directory */ -#define XADFIB_LINK 2 /* entry is a link */ -#define XADFIB_INFOTEXT 3 /* file is an information text */ -#define XADFIB_GROUPED 4 /* file is in a crunch group */ -#define XADFIB_ENDOFGROUP 5 /* crunch group ends here */ -#define XADFIB_NODATE 6 /* no date supported, CURRENT date is set */ -#define XADFIB_DELETED 7 /* file is marked as deleted (V3) */ -#define XADFIB_SEEKDATAPOS 8 /* before unarchiving the datapos is set (V3) */ -#define XADFIB_NOFILENAME 9 /* there was no filename, using internal one (V6) */ -#define XADFIB_NOUNCRUNCHSIZE 10 /* file size is unknown and thus set to zero (V6) */ -#define XADFIB_PARTIALFILE 11 /* file is only partial (V6) */ -#define XADFIB_MACDATA 12 /* file is Apple data fork (V7) */ -#define XADFIB_MACRESOURCE 13 /* file is Apple resource fork (V7) */ -#define XADFIB_EXTRACTONBUILD 14 /* allows extract file during scanning (V10) */ -#define XADFIB_UNIXPROTECTION 15 /* UNIX protection bits are present (V11) */ -#define XADFIB_DOSPROTECTION 16 /* MSDOS protection bits are present (V11) */ -#define XADFIB_ENTRYMAYCHANGE 17 /* this entry may change until GetInfo is finished (V11) */ -#define XADFIB_XADSTRFILENAME 18 /* the xfi_FileName fields is an XAD string (V12) */ -#define XADFIB_XADSTRLINKNAME 19 /* the xfi_LinkName fields is an XAD string (V12) */ -#define XADFIB_XADSTRCOMMENT 20 /* the xfi_Comment fields is an XAD string (V12) */ - -#define XADFIF_CRYPTED (1< +#import diff --git a/Frameworks/XADMaster.framework/Versions/A/Resources/Info.plist b/Frameworks/XADMaster.framework/Versions/A/Resources/Info.plist index 8958dd5f..724b65b2 100644 --- a/Frameworks/XADMaster.framework/Versions/A/Resources/Info.plist +++ b/Frameworks/XADMaster.framework/Versions/A/Resources/Info.plist @@ -3,36 +3,42 @@ BuildMachineOSBuild - 10J869 + 16B2657 CFBundleDevelopmentRegion - English + en CFBundleExecutable XADMaster CFBundleIdentifier - de.dstoecker.xadmaster + co.timoliver.XADMaster CFBundleInfoDictionaryVersion 6.0 CFBundleName XADMaster CFBundlePackageType FMWK + CFBundleShortVersionString + 1.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion - 2.7 (libxad 13.0, modified) + 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 4A2002a + 8C1002 DTPlatformVersion GM DTSDKBuild - 10J869 + 16C58 DTSDKName - + macosx10.12 DTXcode - 0402 + 0821 DTXcodeBuild - 4A2002a + 8C1002 diff --git a/Frameworks/XADMaster.framework/Versions/A/XADMaster b/Frameworks/XADMaster.framework/Versions/A/XADMaster index f4b3fa5b..8e79658c 100755 Binary files a/Frameworks/XADMaster.framework/Versions/A/XADMaster and b/Frameworks/XADMaster.framework/Versions/A/XADMaster differ diff --git a/SimpleComic.xcodeproj/project.pbxproj b/SimpleComic.xcodeproj/project.pbxproj index 72edb4f3..01c164bc 100644 --- a/SimpleComic.xcodeproj/project.pbxproj +++ b/SimpleComic.xcodeproj/project.pbxproj @@ -15,9 +15,7 @@ 281954EA0C1201E6001F5E95 /* TSSTManagedGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 281954E80C1201E5001F5E95 /* TSSTManagedGroup.m */; }; 281C0D700CEE6FBA009A9696 /* TSSTBezelWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 283C4D7B0C43DF5300DB4FE9 /* TSSTBezelWindow.m */; }; 283C4D5E0C43DE6900DB4FE9 /* TSSTImageUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 283C4D5C0C43DE6800DB4FE9 /* TSSTImageUtilities.m */; }; - 284348130DA95C4A00F602E2 /* UniversalDetector.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 284348050DA95C4300F602E2 /* UniversalDetector.framework */; }; 284348140DA95C4A00F602E2 /* XADMaster.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 284348060DA95C4300F602E2 /* XADMaster.framework */; }; - 284348CD0DA95C5300F602E2 /* UniversalDetector.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 284348050DA95C4300F602E2 /* UniversalDetector.framework */; }; 284348CE0DA95C5300F602E2 /* XADMaster.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 284348060DA95C4300F602E2 /* XADMaster.framework */; }; 284741461071B4820033BD88 /* TSSTGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 283C4D680C43DE8D00DB4FE9 /* TSSTGradientView.m */; }; 284D381B101249BE00A37AB2 /* DTToolbarItems.m in Sources */ = {isa = PBXBuildFile; fileRef = 284D381A101249BE00A37AB2 /* DTToolbarItems.m */; }; @@ -110,7 +108,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 284348130DA95C4A00F602E2 /* UniversalDetector.framework in CopyFiles */, 284348140DA95C4A00F602E2 /* XADMaster.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -148,7 +145,6 @@ 283C4D690C43DE8D00DB4FE9 /* TSSTGradientView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TSSTGradientView.h; sourceTree = ""; }; 283C4D7B0C43DF5300DB4FE9 /* TSSTBezelWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TSSTBezelWindow.m; path = "Custom Windows/Bezel/TSSTBezelWindow.m"; sourceTree = ""; }; 283C4D7C0C43DF5300DB4FE9 /* TSSTBezelWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TSSTBezelWindow.h; path = "Custom Windows/Bezel/TSSTBezelWindow.h"; sourceTree = ""; }; - 284348050DA95C4300F602E2 /* UniversalDetector.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniversalDetector.framework; path = Frameworks/UniversalDetector.framework; sourceTree = ""; }; 284348060DA95C4300F602E2 /* XADMaster.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XADMaster.framework; path = Frameworks/XADMaster.framework; sourceTree = ""; }; 284A53550DEA60E40003F9F4 /* TSSTBookmarkSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSSTBookmarkSplitView.h; sourceTree = ""; }; 284A53560DEA60E40003F9F4 /* TSSTBookmarkSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSSTBookmarkSplitView.m; sourceTree = ""; }; @@ -272,7 +268,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 284348CD0DA95C5300F602E2 /* UniversalDetector.framework in Frameworks */, 284348CE0DA95C5300F602E2 /* XADMaster.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 286236020AADDB6200B83E77 /* QuartzCore.framework in Frameworks */, @@ -318,7 +313,6 @@ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = { isa = PBXGroup; children = ( - 284348050DA95C4300F602E2 /* UniversalDetector.framework */, 284348060DA95C4300F602E2 /* XADMaster.framework */, 77C82804067257F0000B614F /* CoreData.framework */, 29B97325FDCFA39411CA2CEA /* Foundation.framework */,