Update XADMaster and UniversalDetector frameworks

upstream: MacPaw/XADMaster@4030ab7
OpenEmu · Nov 2, 2019 · 8e0ecdc · 8e0ecdc
1 parent 68f9d23
commit 8e0ecdc
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 17 deletions.
diff --git a/OpenEmu/UniversalDetector.framework/Versions/A/Resources/Info.plist b/OpenEmu/UniversalDetector.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>17G65</string>
+	<string>18G1012</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -27,16 +27,18 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10A255</string>
+	<string>11B52</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18A384</string>
+	<string>19B81</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1000</string>
+	<string>1120</string>
 	<key>DTXcodeBuild</key>
-	<string>10A255</string>
+	<string>11B52</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7</string>
 </dict>
 </plist>
diff --git a/OpenEmu/UniversalDetector.framework/Versions/A/UniversalDetector b/OpenEmu/UniversalDetector.framework/Versions/A/UniversalDetector
diff --git a/OpenEmu/XADMaster.framework/Versions/A/Headers/CRC.h b/OpenEmu/XADMaster.framework/Versions/A/Headers/CRC.h
@@ -23,12 +23,17 @@
 uint32_t XADCRC(uint32_t prevcrc,uint8_t byte,const uint32_t *table);
 uint32_t XADCalculateCRC(uint32_t prevcrc,const uint8_t *buffer,int length,const uint32_t *table);
 
+// Version approximately 2x (up to 6x times) faster
+// This one expects 16x256 tables passed in at the moment only XADCRCTable_sliced16_edb88320 is pregenerated
+uint32_t XADCalculateCRCFast(uint32_t prevcrc,const uint8_t *buffer,int length, const uint32_t (*table)[256]);
+
 uint64_t XADCRC64(uint64_t prevcrc,uint8_t byte,const uint64_t *table);
 uint64_t XADCalculateCRC64(uint64_t prevcrc,const uint8_t *buffer,int length,const uint64_t *table);
 
 int XADUnReverseCRC16(int val);
 
 extern const uint32_t XADCRCTable_a001[256];
+extern const uint32_t XADCRCTable_sliced16_edb88320[16][256];
 extern const uint32_t XADCRCReverseTable_1021[256];
 extern const uint32_t XADCRCTable_edb88320[256];
 extern const uint64_t XADCRCTable_c96c5795d7870f42[256];
diff --git a/OpenEmu/XADMaster.framework/Versions/A/Headers/CSHandle.h b/OpenEmu/XADMaster.framework/Versions/A/Headers/CSHandle.h
@@ -142,10 +142,10 @@ extern NSString *CSNotSupportedException;
 
 -(void)writeInt16LE:(int16_t)val;
 -(void)writeInt32LE:(int32_t)val;
-//-(void)writeInt64LE:(int64_t)val;
+-(void)writeInt64LE:(int64_t)val;
 -(void)writeUInt16LE:(uint16_t)val;
 -(void)writeUInt32LE:(uint32_t)val;
-//-(void)writeUInt64LE:(uint64_t)val;
+-(void)writeUInt64LE:(uint64_t)val;
 
 -(void)writeID:(uint32_t)val;
 
@@ -189,6 +189,9 @@ static inline void CSSetUInt16BE(uint8_t *b,uint16_t n) { b[0]=(n>>8)&0xff; b[1]
 static inline void CSSetUInt32BE(uint8_t *b,uint32_t n) { b[0]=(n>>24)&0xff; b[1]=(n>>16)&0xff; b[2]=(n>>8)&0xff; b[3]=n&0xff; }
 static inline void CSSetInt16LE(uint8_t *b,int16_t n) { b[1]=(n>>8)&0xff; b[0]=n&0xff; }
 static inline void CSSetInt32LE(uint8_t *b,int32_t n) { b[3]=(n>>24)&0xff; b[2]=(n>>16)&0xff; b[1]=(n>>8)&0xff; b[0]=n&0xff; }
+static inline void CSSetInt64LE(uint8_t *b,int64_t n) { b[7]=(n>>56)&0xff; b[6]=(n>>48)&0xff; b[5]=(n>>40)&0xff; b[4]=(n>>32)&0xff; b[3]=(n>>24)&0xff; b[2]=(n>>16)&0xff; b[1]=(n>>8)&0xff; b[0]=(n>>0)&0xff;}
 static inline void CSSetUInt16LE(uint8_t *b,uint16_t n) { b[1]=(n>>8)&0xff; b[0]=n&0xff; }
 static inline void CSSetUInt32LE(uint8_t *b,uint32_t n) { b[3]=(n>>24)&0xff; b[2]=(n>>16)&0xff; b[1]=(n>>8)&0xff; b[0]=n&0xff; }
+static inline void CSSetUInt64LE(uint8_t *b,uint64_t n) { b[7]=(n>>56)&0xff; b[6]=(n>>48)&0xff; b[5]=(n>>40)&0xff; b[4]=(n>>32)&0xff; b[3]=(n>>24)&0xff; b[2]=(n>>16)&0xff; b[1]=(n>>8)&0xff; b[0]=(n>>0)&0xff;}
+
 
diff --git a/OpenEmu/XADMaster.framework/Versions/A/Headers/XADArchiveParser.h b/OpenEmu/XADMaster.framework/Versions/A/Headers/XADArchiveParser.h
@@ -90,6 +90,9 @@ extern NSString *XADVolumesKey;
 extern NSString *XADVolumeScanningFailedKey;
 extern NSString *XADDiskLabelKey;
 
+extern NSString *XADSignatureOffset;
+extern NSString *XADParserClass;
+
 @interface XADArchiveParser:NSObject
 {
 	CSHandle *sourcehandle;
@@ -118,6 +121,9 @@ extern NSString *XADDiskLabelKey;
 +(void)initialize;
 +(Class)archiveParserClassForHandle:(CSHandle *)handle firstBytes:(NSData *)header
 resourceFork:(XADResourceFork *)fork name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props;
++ (Class)archiveParserFromParsersWithFloatingSignature:(NSArray *)parsers forHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name propertiesToAdd:(NSMutableDictionary *)props;
++ (BOOL)isValidParserClass:(Class)parserClass forHandle:(CSHandle *)handle firstBytes:(NSData *)header 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;
@@ -235,8 +241,6 @@ 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;
 

diff --git a/OpenEmu/XADMaster.framework/Versions/A/Headers/XADRegex.h b/OpenEmu/XADMaster.framework/Versions/A/Headers/XADRegex.h
@@ -106,4 +106,4 @@
 -(void)replaceEveryPattern:(NSString *)pattern usingSelector:(SEL)selector onObject:(id)object;
 -(void)replaceEveryPattern:(NSString *)pattern usingSelector:(SEL)selector onObject:(id)object options:(int)options;
 
-@end*/
+@end*/
diff --git a/OpenEmu/XADMaster.framework/Versions/A/Resources/Info.plist b/OpenEmu/XADMaster.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>17G65</string>
+	<string>18G1012</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -27,16 +27,18 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10A255</string>
+	<string>11B52</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18A384</string>
+	<string>19B81</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1000</string>
+	<string>1120</string>
 	<key>DTXcodeBuild</key>
-	<string>10A255</string>
+	<string>11B52</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7</string>
 </dict>
 </plist>
diff --git a/OpenEmu/XADMaster.framework/Versions/A/XADMaster b/OpenEmu/XADMaster.framework/Versions/A/XADMaster