Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add UnRAR 7 compatibility #188

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Add UnRAR 7 compatibility #188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb20d00
Add unrar 7 compatibility.
krvi Jun 2, 2024
be4588f
Maintain backwards compatibility
krvi Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 61 additions & 1 deletion src/dllext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,21 @@ int PASCAL RARListArchiveEx(HANDLE hArcData, RARArchiveDataEx **NN)
}
else
{
#if RARVER_MAJOR >= 7
wcscpy(N->LinkTargetW,Arc.FileHead.RedirName.c_str());
#else
wcscpy(N->LinkTargetW,Arc.FileHead.RedirName);
#endif
N->LinkTargetFlags |= LINK_T_UNICODE; // Make sure UNICODE is set
}
}
else if (Arc.FileHead.RedirType == FSREDIR_FILECOPY)
{
#if RARVER_MAJOR >= 7
wcscpy(N->LinkTargetW,Arc.FileHead.RedirName.c_str());
#else
wcscpy(N->LinkTargetW,Arc.FileHead.RedirName);
#endif
N->LinkTargetFlags |= LINK_T_FILECOPY;
}
}
Expand Down Expand Up @@ -210,6 +218,13 @@ void PASCAL RARNextVolumeName(char *arch, bool oldstylevolume)
{
#if RARVER_MAJOR < 5
NextVolumeName(arch, NULL, 0, oldstylevolume);
#elif RARVER_MAJOR >= 7
wstring ArchiveW;
size_t len=strlen(arch);
ArchiveW.assign(arch,arch+len);
NextVolumeName(ArchiveW,oldstylevolume);
string NextArchive(ArchiveW.begin(),ArchiveW.end());
strcpy(arch,NextArchive.c_str());
#else
wchar NextName[NM];
CharToWide(arch, NextName, ASIZE(NextName));
Expand All @@ -223,6 +238,14 @@ void PASCAL RARVolNameToFirstName(char *arch, bool oldstylevolume)
{
#if RARVER_MAJOR < 5
VolNameToFirstName(arch, arch, !oldstylevolume);
#elif RARVER_MAJOR >=7
wstring ArcName;
size_t len=strlen(arch);
ArcName.assign(arch,arch+len);
VolNameToFirstName(ArcName, ArcName, !oldstylevolume);
string FirstName(ArcName.begin(),ArcName.end());
strcpy(arch,FirstName.c_str());
return;
#else
wchar ArcName[NM];
CharToWide(arch, ArcName, ASIZE(ArcName));
Expand All @@ -241,7 +264,6 @@ static size_t ListFileHeader(wchar *,Archive &);
void PASCAL RARGetFileInfo(HANDLE hArcData, const char *FileName, struct RARWcb *wcb)
{
#if RARVER_MAJOR > 4
char FileNameUtf[NM];
DataSet *Data = (DataSet *)hArcData;
Archive& Arc = Data->Arc;
struct RARHeaderDataEx h;
Expand All @@ -250,8 +272,17 @@ void PASCAL RARGetFileInfo(HANDLE hArcData, const char *FileName, struct RARWcb
wcb->bytes = 0;
while (!RARReadHeaderEx(hArcData, &h))
{
#if RARVER_MAJOR >= 7
size_t FileNameLen=Arc.FileHead.FileName.size()*sizeof(char32_t);
string FileNameUtf(FileNameLen,'\0');
WideToUtf(Arc.FileHead.FileName.c_str(),&FileNameUtf[0],FileNameLen);
FileNameUtf.resize(strlen(FileNameUtf.c_str()));
if (!strcmp(FileNameUtf.c_str(), FileName))
#else
char FileNameUtf[NM];
WideToUtf(Arc.FileHead.FileName,FileNameUtf,ASIZE(FileNameUtf));
if (!strcmp(FileNameUtf, FileName))
#endif
{
wcb->bytes = ListFileHeader(wcb->data, Arc);
return;
Expand Down Expand Up @@ -370,7 +401,11 @@ static void ListFileAttr(uint A,HOST_SYSTEM_TYPE HostType,wchar *AttrStr,size_t
static size_t ListFileHeader(wchar *wcs,Archive &Arc)
{
FileHeader &hd=Arc.FileHead;
#if RARVER_MAJOR >= 7
wstring *Name=&hd.FileName;
#else
wchar *Name=hd.FileName;
#endif
RARFORMAT Format=Arc.Format;

void *wcs_start = (void *)wcs;
Expand Down Expand Up @@ -435,21 +470,37 @@ static size_t ListFileHeader(wchar *wcs,Archive &Arc)
{
if (Format==RARFMT15)
{
#if RARVER_MAJOR >= 7
string LinkTargetA;
#else
char LinkTargetA[NM];
#endif
if (Arc.FileHead.Encrypted)
{
// Link data are encrypted. We would need to ask for password
// and initialize decryption routine to display the link target.
#if RARVER_MAJOR >= 7
LinkTargetA="*<-?->";
#else
strncpyz(LinkTargetA,"*<-?->",ASIZE(LinkTargetA));
#endif
}
else
{
int DataSize=(int)Min((size_t)hd.PackSize,ASIZE(LinkTargetA)-1);
#if RARVER_MAJOR >= 7
Arc.Read(&LinkTargetA,DataSize);
#else
Arc.Read(LinkTargetA,DataSize);
#endif
LinkTargetA[DataSize > 0 ? DataSize : 0] = 0;
}
#if RARVER_MAJOR >= 7
wstring LinkTarget(LinkTargetA.begin(),LinkTargetA.end());
#else
wchar LinkTarget[NM];
CharToWide(LinkTargetA,LinkTarget,ASIZE(LinkTarget));
#endif
wcs += msprintf(wcs, L"\n%12ls: %ls",St(MListTarget),LinkTarget);
}
else
Expand Down Expand Up @@ -489,8 +540,13 @@ static size_t ListFileHeader(wchar *wcs,Archive &Arc)
hd.FileHash.CRC32);
if (hd.FileHash.Type==HASH_BLAKE2)
{
#if RARVER_MAJOR >= 7
wstring BlakeStr;
BinToHex(hd.FileHash.Digest,BLAKE2_DIGEST_SIZE,BlakeStr);
#else
wchar BlakeStr[BLAKE2_DIGEST_SIZE*2+1];
BinToHex(hd.FileHash.Digest,BLAKE2_DIGEST_SIZE,NULL,BlakeStr,ASIZE(BlakeStr));
#endif
wcs += msprintf(wcs, L"\n%12ls: %ls",
hd.UseHashKey ? L"BLAKE2 MAC":hd.SplitAfter ? L"Pack-BLAKE2":L"BLAKE2",
BlakeStr);
Expand Down Expand Up @@ -531,7 +587,11 @@ static size_t ListFileHeader(wchar *wcs,Archive &Arc)

if (hd.Version)
{
#if RARVER_MAJOR >= 7
uint Version=ParseVersionFileName(*Name,false);
#else
uint Version=ParseVersionFileName(Name,false);
#endif
if (Version!=0)
wcs += msprintf(wcs, L"\n%12ls: %u",St(MListFileVer),Version);
}
Expand Down