Skip to content

Commit

Permalink
update lib7z to current
Browse files Browse the repository at this point in the history
  • Loading branch information
dinkc64 committed Nov 2, 2024
1 parent 615d36a commit bc6955d
Show file tree
Hide file tree
Showing 107 changed files with 48,164 additions and 29,036 deletions.
2 changes: 1 addition & 1 deletion makefile.burner_win32_rules
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ifdef INCLUDE_7Z_SUPPORT
depobj += un7z.o \
\
7zArcIn.o 7zBuf.o 7zBuf2.o 7zCrc.o 7zCrcOpt.o 7zDec.o 7zFile.o 7zStream.o Alloc.o Bcj2.o Bra.o Bra86.o BraIA64.o CpuArch.o \
Delta.o LzmaDec.o Lzma2Dec.o Ppmd7.o Ppmd7Dec.o Sha256.o Xz.o XzCrc64.o XzCrc64Opt.o XzDec.o
Delta.o LzFindOpt.o LzmaDec.o Lzma2Dec.o MtDec.o Ppmd7.o Ppmd7Dec.o Ppmd7aDec.o Sha256.o Sha1Opt.o Sha256Opt.o SwapBytes.o Threads.o Xxh64.o Xz.o XzCrc64.o XzCrc64Opt.o XzDec.o ZstdDec.o
endif

ifdef INCLUDE_AVI_RECORDING
Expand Down
8 changes: 4 additions & 4 deletions src/burner/un7z.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ WRes File_GetLength(CSzFile *p, UInt64 *length)

static SRes FileSeqInStream_Read(const ISeqInStream *pp, void *buf, size_t *size)
{
CFileSeqInStream *p = CONTAINER_FROM_VTBL(pp, CFileSeqInStream, vt);
CFileSeqInStream *p = Z7_CONTAINER_FROM_VTBL(pp, CFileSeqInStream, vt);
return File_Read(&p->file, buf, size) == 0 ? SZ_OK : SZ_ERROR_READ;
}

Expand All @@ -162,13 +162,13 @@ void FileSeqInStream_CreateVTable(CFileSeqInStream *p)

static SRes FileInStream_Read(const ISeekInStream *pp, void *buf, size_t *size)
{
CFileInStream *p = CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
CFileInStream *p = Z7_CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
return (File_Read(&p->file, buf, size) == 0) ? SZ_OK : SZ_ERROR_READ;
}

static SRes FileInStream_Seek(const ISeekInStream *pp, Int64 *pos, ESzSeek origin)
{
CFileInStream *p = CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
CFileInStream *p = Z7_CONTAINER_FROM_VTBL(pp, CFileInStream, vt);
return File_Seek(&p->file, pos, origin);
}

Expand Down Expand Up @@ -379,7 +379,7 @@ _7z_error _7z_file_open(const char *filename, _7z_file **_7z)
new_7z->lookStream.bufSize = 0;

new_7z->lookStream.realStream = &new_7z->archiveStream.vt;
LookToRead2_Init(&new_7z->lookStream);
LookToRead2_INIT(&new_7z->lookStream);

CrcGenerateTable();

Expand Down
Loading

2 comments on commit bc6955d

@barbudreadmon
Copy link
Collaborator

@barbudreadmon barbudreadmon commented on bc6955d Nov 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could be wrong but i think the new depobjs are built but not used.
I think some of it might be the zstd stuff talked about in #1613.

I also think -D_7ZIP_PPMD_SUPPPORT -D_7ZIP_ST which were previously enabled in the makefile need to be replaced by their -DZ7_... equivalent or removed (tbh i don't remember what they do).

@dinkc64
Copy link
Collaborator Author

@dinkc64 dinkc64 commented on bc6955d Nov 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, to make things easy to update to newer 7zip: I'd rather just copy everything over from the source. If you want to optimize out the unneeded files, feel free :)

Please sign in to comment.