"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Common/libzip/zip_source_win32a.c" between
VeraCrypt_1.21_Source.tar.bz2 and VeraCrypt_1.22_Source.tar.bz2

About: VeraCrypt is a free disk encryption software (based on TrueCrypt).

zip_source_win32a.c  (VeraCrypt_1.21_Source.tar.bz2):zip_source_win32a.c  (VeraCrypt_1.22_Source.tar.bz2)
/* /*
zip_source_win32a.c -- create data source from Windows file (ANSI) zip_source_win32a.c -- create data source from Windows file (ANSI)
Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives. This file is part of libzip, a library to manipulate ZIP archives.
The authors can be contacted at <libzip@nih.at> The authors can be contacted at <libzip@nih.at>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
1. Redistributions of source code must retain the above copyright 1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the the documentation and/or other materials provided with the
distribution. distribution.
3. The names of the authors may not be used to endorse or promote 3. The names of the authors may not be used to endorse or promote
products derived from this software without specific prior products derived from this software without specific prior
written permission. written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* 0x0501 => Windows XP; needs to be at least this value because of GetFileSizeE
x */
#if !defined(MS_UWP) && !defined(_WIN32_WINNT)
#define _WIN32_WINNT 0x0501
#endif
#include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include "zipint.h" #include "zipint.h"
#include "zipwin32.h" #include "zipwin32.h"
static void * _win32_strdup_a(const void *str); static void *_win32_strdup_a(const void *str);
static HANDLE _win32_open_a(_zip_source_win32_read_file_t *ctx); static HANDLE _win32_open_a(_zip_source_win32_read_file_t *ctx);
static HANDLE _win32_create_temp_a(_zip_source_win32_read_file_t *ctx, void **te mp, zip_uint32_t value, PSECURITY_ATTRIBUTES sa); static HANDLE _win32_create_temp_a(_zip_source_win32_read_file_t *ctx, void **te mp, zip_uint32_t value, PSECURITY_ATTRIBUTES sa);
static int _win32_rename_temp_a(_zip_source_win32_read_file_t *ctx); static int _win32_rename_temp_a(_zip_source_win32_read_file_t *ctx);
static int _win32_remove_a(const void *fname); static int _win32_remove_a(const void *fname);
// clang-format off
static _zip_source_win32_file_ops_t win32_ops_a = { static _zip_source_win32_file_ops_t win32_ops_a = {
_win32_strdup_a, _win32_strdup_a,
_win32_open_a, _win32_open_a,
_win32_create_temp_a, _win32_create_temp_a,
_win32_rename_temp_a, _win32_rename_temp_a,
_win32_remove_a _win32_remove_a
}; };
// clang-format on
ZIP_EXTERN zip_source_t * ZIP_EXTERN zip_source_t *
zip_source_win32a(zip_t *za, const char *fname, zip_uint64_t start, zip_int64_t zip_source_win32a(zip_t *za, const char *fname, zip_uint64_t start, zip_int64_t
len) len) {
{
if (za == NULL) if (za == NULL)
return NULL; return NULL;
return zip_source_win32a_create(fname, start, len, &za->error); return zip_source_win32a_create(fname, start, len, &za->error);
} }
ZIP_EXTERN zip_source_t * ZIP_EXTERN zip_source_t *
zip_source_win32a_create(const char *fname, zip_uint64_t start, zip_int64_t leng zip_source_win32a_create(const char *fname, zip_uint64_t start, zip_int64_t leng
th, zip_error_t *error) th, zip_error_t *error) {
{
if (fname == NULL || length < -1) { if (fname == NULL || length < -1) {
zip_error_set(error, ZIP_ER_INVAL, 0); zip_error_set(error, ZIP_ER_INVAL, 0);
return NULL; return NULL;
} }
return _zip_source_win32_handle_or_name(fname, INVALID_HANDLE_VALUE, start, length, 1, NULL, &win32_ops_a, error); return _zip_source_win32_handle_or_name(fname, INVALID_HANDLE_VALUE, start, length, 1, NULL, &win32_ops_a, error);
} }
static void * static void *
_win32_strdup_a(const void *str) _win32_strdup_a(const void *str) {
{
return strdup((const char *)str); return strdup((const char *)str);
} }
static HANDLE static HANDLE
_win32_open_a(_zip_source_win32_read_file_t *ctx) _win32_open_a(_zip_source_win32_read_file_t *ctx) {
{
return CreateFileA(ctx->fname, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WR ITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); return CreateFileA(ctx->fname, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WR ITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
} }
static HANDLE static HANDLE
_win32_create_temp_a(_zip_source_win32_read_file_t *ctx, void **temp, zip_uint32 _win32_create_temp_a(_zip_source_win32_read_file_t *ctx, void **temp, zip_uint32
_t value, PSECURITY_ATTRIBUTES sa) _t value, PSECURITY_ATTRIBUTES sa) {
{ size_t len;
int len;
len = strlen((const char *)ctx->fname) + 10; len = strlen((const char *)ctx->fname) + 10;
if (*temp == NULL) { if (*temp == NULL) {
if ((*temp = malloc(sizeof(char) * len)) == NULL) { if ((*temp = malloc(sizeof(char) * len)) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0); zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0);
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
} }
if (sprintf((char *)*temp, "%s.%08x", (const char *)ctx->fname, value) != le n - 1) { if (sprintf((char *)*temp, "%s.%08x", (const char *)ctx->fname, value) != le n - 1) {
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
return CreateFileA((const char *)*temp, GENERIC_READ | GENERIC_WRITE, FILE_S HARE_READ, sa, CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_TEMPORARY, NUL L); return CreateFileA((const char *)*temp, GENERIC_READ | GENERIC_WRITE, FILE_S HARE_READ, sa, CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_TEMPORARY, NUL L);
} }
static int static int
_win32_rename_temp_a(_zip_source_win32_read_file_t *ctx) _win32_rename_temp_a(_zip_source_win32_read_file_t *ctx) {
{
if (!MoveFileExA(ctx->tmpname, ctx->fname, MOVEFILE_REPLACE_EXISTING)) if (!MoveFileExA(ctx->tmpname, ctx->fname, MOVEFILE_REPLACE_EXISTING))
return -1; return -1;
return 0; return 0;
} }
static int static int
_win32_remove_a(const void *fname) _win32_remove_a(const void *fname) {
{
DeleteFileA((const char *)fname); DeleteFileA((const char *)fname);
return 0; return 0;
} }
 End of changes. 15 change blocks. 
47 lines changed or deleted 50 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)