From dd2085d7a0db00d3f4da06803f3ad3b33f3e67a7 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 17 Nov 2018 18:03:58 +0200 Subject: [PATCH] Use 64-bit unral.dll directly. --- zfile_archive.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/zfile_archive.cpp b/zfile_archive.cpp index c21b7a5d..62cdd8c3 100644 --- a/zfile_archive.cpp +++ b/zfile_archive.cpp @@ -708,7 +708,7 @@ static int canrar (void) return israr < 0 ? 0 : 1; } -static int CALLBACK RARCallbackProc (UINT msg, LONG UserData, LONG P1, LONG P2) +static int CALLBACK RARCallbackProc (UINT msg, LPARAM UserData, LPARAM P1, LPARAM P2) { if (msg == UCM_PROCESSDATA) { zfile_fwrite ((uae_u8*)P1, 1, P2, rarunpackzf); @@ -732,9 +732,6 @@ static void archive_close_rar (void *ctx) struct zvolume *archive_directory_rar (struct zfile *z) { -#ifdef WIN64 - return archive_directory_arcacc (z, ArchiveFormatRAR); -#else struct zvolume *zv; struct RARContext *rc; struct zfile *zftmp; @@ -774,12 +771,10 @@ struct zvolume *archive_directory_rar (struct zfile *z) zv->archive = zftmp; zv->method = ArchiveFormatRAR; return zv; -#endif } static struct zfile *archive_access_rar (struct znode *zn) { -#ifndef WIN64 struct RARContext *rc = (struct RARContext*)zn->volume->handle; int i; struct zfile *zf = NULL; @@ -810,12 +805,9 @@ static struct zfile *archive_access_rar (struct znode *zn) end: pRARCloseArchive(rc->hArcData); return zf; -#else - return NULL; -#endif } -#endif +#endif /* ArchiveAccess */ -- 2.47.3