Update C sources

gen2brain · Oct 16, 2023 · 6545023 · 6545023
1 parent 3daefaf
commit 6545023
Show file tree

Hide file tree

Showing 34 changed files with 3,046 additions and 1,624 deletions.
diff --git a/unarrc/external/unarr/_7z/_7z.c b/unarrc/external/unarr/_7z/_7z.c
@@ -33,7 +33,7 @@ static void CSeekStream_CreateVTable(struct CSeekStream *in_stream, ar_stream *s
 }
 
 #ifndef USE_7Z_CRC32
-UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size)
+UInt32 Z7_FASTCALL CrcCalc(const void *data, size_t size)
 {
     return ar_crc32(0, data, size);
 }
@@ -173,7 +173,7 @@ ar_archive *ar_open_7z_archive(ar_stream *stream)
     _7z->look_stream.realStream = &_7z->in_stream.super;
     _7z->look_stream.buf = ISzAlloc_Alloc(&gSzAlloc, 1 << 18);
     _7z->look_stream.bufSize = 1 << 18;
-    LookToRead2_Init(&_7z->look_stream);
+    LookToRead2_INIT(&_7z->look_stream);
 
 
 #ifdef USE_7Z_CRC32

diff --git a/unarrc/external/unarr/_7z/_7z.h b/unarrc/external/unarr/_7z/_7z.h
@@ -41,7 +41,7 @@ struct ar_archive_7z_s {
 };
 
 #ifndef USE_7Z_CRC32
-UInt32 MY_FAST_CALL CrcCalc(const void *data, size_t size);
+UInt32 Z7_FASTCALL CrcCalc(const void *data, size_t size);
 #endif
 
 #endif
diff --git a/unarrc/external/unarr/lzmasdk/7z.h b/unarrc/external/unarr/lzmasdk/7z.h
@@ -1,8 +1,8 @@
 /* 7z.h -- 7z interface
-2018-07-02 : Igor Pavlov : Public domain */
+2023-04-02 : Igor Pavlov : Public domain */
 
-#ifndef __7Z_H
-#define __7Z_H
+#ifndef ZIP7_INC_7Z_H
+#define ZIP7_INC_7Z_H
 
 #include "7zTypes.h"
 
@@ -98,7 +98,7 @@ typedef struct
 UInt64 SzAr_GetFolderUnpackSize(const CSzAr *p, UInt32 folderIndex);
 
 SRes SzAr_DecodeFolder(const CSzAr *p, UInt32 folderIndex,
-    ILookInStream *stream, UInt64 startPos,
+    ILookInStreamPtr stream, UInt64 startPos,
     Byte *outBuffer, size_t outSize,
     ISzAllocPtr allocMain);
 
@@ -174,7 +174,7 @@ UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16
 
 SRes SzArEx_Extract(
     const CSzArEx *db,
-    ILookInStream *inStream,
+    ILookInStreamPtr inStream,
     UInt32 fileIndex,         /* index of file */
     UInt32 *blockIndex,       /* index of solid block */
     Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */
@@ -196,7 +196,7 @@ SZ_ERROR_INPUT_EOF
 SZ_ERROR_FAIL
 */
 
-SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream,
+SRes SzArEx_Open(CSzArEx *p, ILookInStreamPtr inStream,
     ISzAllocPtr allocMain, ISzAllocPtr allocTemp);
 
 EXTERN_C_END