X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fzip%2Fiowin32.c;h=0681294c68f1abc9693c19dbdbe8fc5b5eab5749;hb=4b19c6f46ee4ba9aeb067e0384a5c2b1a1b1b9b1;hp=53a96e650cc5c965d1a14482fd58ef6bcb50d85a;hpb=fb81506227581bcc04cd4835b8e3f41a109d1f97;p=rocksndiamonds.git

diff --git a/src/libgame/zip/iowin32.c b/src/libgame/zip/iowin32.c
index 53a96e65..0681294c 100644
--- a/src/libgame/zip/iowin32.c
+++ b/src/libgame/zip/iowin32.c
@@ -37,7 +37,6 @@
 #  endif
 #endif
 
-voidpf   ZCALLBACK win32_open_file_func     (voidpf opaque, const char *filename, int mode);
 uint32_t ZCALLBACK win32_read_file_func     (voidpf opaque, voidpf stream, void* buf, uint32_t size);
 uint32_t ZCALLBACK win32_write_file_func    (voidpf opaque, voidpf stream, const void *buf, uint32_t size);
 uint64_t ZCALLBACK win32_tell64_file_func   (voidpf opaque, voidpf stream);
@@ -101,38 +100,6 @@ static voidpf win32_build_iowin(HANDLE hFile)
     return (voidpf)iowin;
 }
 
-static voidpf ZCALLBACK win32_open64_file_func(voidpf opaque, const void *filename, int mode)
-{
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes;
-    HANDLE hFile = NULL;
-    WIN32FILE_IOWIN *iowin = NULL;
-
-    win32_translate_open_mode(mode, &dwDesiredAccess, &dwCreationDisposition, &dwShareMode, &dwFlagsAndAttributes);
-
-    if ((filename != NULL) && (dwDesiredAccess != 0))
-    {
-#ifdef IOWIN32_USING_WINRT_API
-#ifdef UNICODE
-        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP, 0, (const char*)filename, -1, filenameW, FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#endif
-#else
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-    }
-
-    iowin = win32_build_iowin(hFile);
-    if (iowin == NULL)
-        return NULL;
-    iowin->filenameLength = _tcslen(filename) + 1;
-    iowin->filename = (void*)malloc(iowin->filenameLength * sizeof(TCHAR));
-    _tcsncpy(iowin->filename, filename, iowin->filenameLength);
-    return iowin;
-}
-
 static voidpf ZCALLBACK win32_open64_file_funcA(voidpf opaque, const void *filename, int mode)
 {
     DWORD dwDesiredAccess, dwCreationDisposition, dwShareMode, dwFlagsAndAttributes ;
@@ -161,117 +128,6 @@ static voidpf ZCALLBACK win32_open64_file_funcA(voidpf opaque, const void *filen
     return iowin;
 }
 
-static voidpf ZCALLBACK win32_open64_file_funcW(voidpf opaque, const void *filename, int mode)
-{
-    DWORD dwDesiredAccess, dwCreationDisposition, dwShareMode, dwFlagsAndAttributes;
-    HANDLE hFile = NULL;
-    WIN32FILE_IOWIN *iowin = NULL;
-
-    win32_translate_open_mode(mode, &dwDesiredAccess, &dwCreationDisposition, &dwShareMode, &dwFlagsAndAttributes);
-
-    if ((filename != NULL) && (dwDesiredAccess != 0))
-    {
-#ifdef IOWIN32_USING_WINRT_API
-        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-    }
-
-    iowin = win32_build_iowin(hFile);
-    if (iowin == NULL)
-        return NULL;
-    if (iowin->filename == NULL)
-    {
-        iowin->filenameLength = wcslen(filename) + 1;
-        iowin->filename = (void*)malloc(iowin->filenameLength * sizeof(WCHAR));
-        wcsncpy(iowin->filename, filename, iowin->filenameLength);
-    }
-    return iowin;
-}
-
-voidpf ZCALLBACK win32_open_file_func(voidpf opaque, const char *filename, int mode)
-{
-    DWORD dwDesiredAccess, dwCreationDisposition, dwShareMode, dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-    WIN32FILE_IOWIN *iowin = NULL;
-
-    win32_translate_open_mode(mode, &dwDesiredAccess, &dwCreationDisposition, &dwShareMode, &dwFlagsAndAttributes);
-
-    if ((filename != NULL) && (dwDesiredAccess != 0))
-    {
-#ifdef IOWIN32_USING_WINRT_API
-#ifdef UNICODE
-        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP, 0, (const char*)filename, -1, filenameW, FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#endif
-#else
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-    }
-
-    iowin = win32_build_iowin(hFile);
-    if (iowin == NULL)
-        return NULL;
-    iowin->filenameLength = _tcslen((TCHAR*)filename) + 1;
-    iowin->filename = (void*)malloc(iowin->filenameLength * sizeof(TCHAR));
-    _tcsncpy(iowin->filename, (TCHAR*)filename, iowin->filenameLength);
-    return iowin;
-}
-
-static voidpf ZCALLBACK win32_opendisk64_file_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
-{
-    WIN32FILE_IOWIN *iowin = NULL;
-    TCHAR *diskFilename = NULL;
-    voidpf ret = NULL;
-    int i = 0;
-
-    if (stream == NULL)
-        return NULL;
-    iowin = (WIN32FILE_IOWIN*)stream;
-    diskFilename = (TCHAR*)malloc(iowin->filenameLength * sizeof(TCHAR));
-    _tcsncpy(diskFilename, iowin->filename, iowin->filenameLength);
-    for (i = iowin->filenameLength - 1; i >= 0; i -= 1)
-    {
-        if (diskFilename[i] != _T('.'))
-            continue;
-        _sntprintf(&diskFilename[i], iowin->filenameLength - i, _T(".z%02d"), number_disk + 1);
-        break;
-    }
-    if (i >= 0)
-        ret = win32_open64_file_func(opaque, (char*)diskFilename, mode);
-    free(diskFilename);
-    return ret;
-}
-
-static voidpf ZCALLBACK win32_opendisk64_file_funcW(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
-{
-    WIN32FILE_IOWIN *iowin = NULL;
-    WCHAR *diskFilename = NULL;
-    voidpf ret = NULL;
-    int i = 0;
-
-    if (stream == NULL)
-        return NULL;
-    iowin = (WIN32FILE_IOWIN*)stream;
-    diskFilename = (WCHAR*)malloc((iowin->filenameLength + 10) * sizeof(WCHAR));
-    wcsncpy(diskFilename, iowin->filename, iowin->filenameLength);
-    for (i = iowin->filenameLength - 1; i >= 0; i -= 1)
-    {
-        if (diskFilename[i] != L'.')
-            continue;
-        _snwprintf(&diskFilename[i], (iowin->filenameLength + 10) - i, L".z%02d", number_disk + 1);
-        break;
-    }
-    if (i >= 0)
-        ret = win32_open64_file_funcW(opaque, diskFilename, mode);
-    free(diskFilename);
-    return ret;
-}
-
 static voidpf ZCALLBACK win32_opendisk64_file_funcA(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
 {
     WIN32FILE_IOWIN *iowin = NULL;
@@ -297,31 +153,6 @@ static voidpf ZCALLBACK win32_opendisk64_file_funcA(voidpf opaque, voidpf stream
     return ret;
 }
 
-static voidpf ZCALLBACK win32_opendisk_file_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
-{
-    WIN32FILE_IOWIN *iowin = NULL;
-    TCHAR *diskFilename = NULL;
-    voidpf ret = NULL;
-    int i = 0;
-
-    if (stream == NULL)
-        return NULL;
-    iowin = (WIN32FILE_IOWIN*)stream;
-    diskFilename = (TCHAR*)malloc(iowin->filenameLength * sizeof(TCHAR));
-    _tcsncpy(diskFilename, iowin->filename, iowin->filenameLength);
-    for (i = iowin->filenameLength - 1; i >= 0; i -= 1)
-    {
-        if (diskFilename[i] != _T('.'))
-            continue;
-        _sntprintf(&diskFilename[i], iowin->filenameLength - i, _T(".z%02d"), number_disk + 1);
-        break;
-    }
-    if (i >= 0)
-        ret = win32_open_file_func(opaque, (char*)diskFilename, mode);
-    free(diskFilename);
-    return ret;
-}
-
 uint32_t ZCALLBACK win32_read_file_func(voidpf opaque, voidpf stream, void* buf, uint32_t size)
 {
     DWORD ret = 0;
@@ -383,28 +214,6 @@ static BOOL win32_setfilepointer_internal(HANDLE hFile, LARGE_INTEGER pos, LARGE
 #endif
 }
 
-static long ZCALLBACK win32_tell_file_func(voidpf opaque, voidpf stream)
-{
-    long ret = -1;
-    HANDLE hFile = NULL;
-    if (stream != NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
-    if (hFile != NULL)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = 0;
-        if (!win32_setfilepointer_internal(hFile, pos, &pos, FILE_CURRENT))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream)->error = (int)dwErr;
-            ret = -1;
-        }
-        else
-            ret = (long)pos.LowPart;
-    }
-    return ret;
-}
-
 uint64_t ZCALLBACK win32_tell64_file_func(voidpf opaque, voidpf stream)
 {
     uint64_t ret = (uint64_t)-1;
@@ -428,46 +237,6 @@ uint64_t ZCALLBACK win32_tell64_file_func(voidpf opaque, voidpf stream)
     return ret;
 }
 
-static long ZCALLBACK win32_seek_file_func(voidpf opaque, voidpf stream, uint32_t offset, int origin)
-{
-    DWORD dwMoveMethod = 0xFFFFFFFF;
-    HANDLE hFile = NULL;
-    long ret = -1;
-
-    if (stream != NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
-
-    switch (origin)
-    {
-        case ZLIB_FILEFUNC_SEEK_CUR:
-            dwMoveMethod = FILE_CURRENT;
-            break;
-        case ZLIB_FILEFUNC_SEEK_END:
-            dwMoveMethod = FILE_END;
-            break;
-        case ZLIB_FILEFUNC_SEEK_SET:
-            dwMoveMethod = FILE_BEGIN;
-            break;
-        default:
-            return -1;
-    }
-
-    if (hFile != NULL)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = offset;
-        if (!win32_setfilepointer_internal(hFile, pos, NULL, dwMoveMethod))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream)->error = (int)dwErr;
-            ret = -1;
-        }
-        else
-            ret = 0;
-    }
-    return ret;
-}
-
 long ZCALLBACK win32_seek64_file_func(voidpf opaque, voidpf stream, uint64_t offset, int origin)
 {
     DWORD dwMoveMethod = 0xFFFFFFFF;
@@ -536,32 +305,6 @@ int ZCALLBACK win32_error_file_func(voidpf opaque, voidpf stream)
     return ret;
 }
 
-void fill_win32_filefunc(zlib_filefunc_def *pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen_file = win32_open_file_func;
-    pzlib_filefunc_def->zopendisk_file = win32_opendisk_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
-    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_win32_filefunc64(zlib_filefunc64_def *pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
-    pzlib_filefunc_def->zopendisk64_file = win32_opendisk64_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
 void fill_win32_filefunc64A(zlib_filefunc64_def *pzlib_filefunc_def)
 {
     pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
@@ -575,17 +318,4 @@ void fill_win32_filefunc64A(zlib_filefunc64_def *pzlib_filefunc_def)
     pzlib_filefunc_def->opaque = NULL;
 }
 
-void fill_win32_filefunc64W(zlib_filefunc64_def *pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
-    pzlib_filefunc_def->zopendisk64_file = win32_opendisk64_file_funcW;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
 #endif // _WIN32