From 02d6107c97b48888362e7c6a70dcac323c89d741 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Sun, 17 Dec 2023 21:23:58 +0100
Subject: ZipArchive: Update to the 4.6.9 release

---
 zip/ZipArchive/std_mfc.h | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'zip/ZipArchive/std_mfc.h')

diff --git a/zip/ZipArchive/std_mfc.h b/zip/ZipArchive/std_mfc.h
index 0e93cb1..fbe5068 100644
--- a/zip/ZipArchive/std_mfc.h
+++ b/zip/ZipArchive/std_mfc.h
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////
-// This source file is part of the ZipArchive library source distribution and
-// is Copyrighted 2000 - 2007 by Artpol Software - Tadeusz Dracz
+// This source file is part of the ZipArchive Library Open Source distribution 
+// and is Copyrighted 2000 - 2022 by Artpol Software - Tadeusz Dracz
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -9,22 +9,33 @@
 // 
 // For the licensing details refer to the License.txt file.
 //
-// Web Site: http://www.artpol-software.com
+// Web Site: https://www.artpol-software.com
 ////////////////////////////////////////////////////////////////////////////////
 
 #ifndef ZIPARCHIVE_STDAFX_DOT_H
 	#error Do not include this file directly. Include stdafx.h instead
 #endif
 
-#if _MSC_VER > 1000
-#ifndef WINVER
-	#define WINVER 0x0400
-#endif
+#if _MSC_VER > 1000	
+	#if _MSC_VER < 1500		
+		#if !defined WINVER && !defined _WIN32_WINNT
+			#if _MSC_VER < 1300		
+				#define WINVER 0x0400
+			#else
+				#define WINVER 0x0501
+			#endif
+		#endif
+	#else
+		// Including this header for earlier versions of Visual Studio will cause 
+		// warning messages with Platform SDK, but is safe otherwise.
+		#include "sdkddkver.h"
+	#endif
 #pragma once
 #endif
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define NO_WARN_MBCS_MFC_DEPRECATION
 
 #ifndef VC_EXTRALEAN
 	#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
@@ -34,8 +45,9 @@
 #include <afxwin.h>
 
 typedef BOOL ZBOOL;
+typedef FILETIME ZFILETIME;
 
-#if _MSC_VER >= 1300 || defined ZIP_FILE_USES_STL
+#if _MSC_VER >= 1300 || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_WIN || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_STL
 	#define ZIP_FILE_USIZE ULONGLONG
 	#define ZIP_FILE_SIZE LONGLONG
 	#define ZIP_FILE_SIZEMAX _I64_MAX	
@@ -43,4 +55,8 @@ typedef BOOL ZBOOL;
 	#define ZIP_FILE_USIZE DWORD
 	#define ZIP_FILE_SIZE LONG
 	#define ZIP_FILE_SIZEMAX MAXLONG		
+#endif
+
+#ifndef _NOEXCEPT // for OS X
+	#define _NOEXCEPT
 #endif
\ No newline at end of file
-- 
cgit v1.2.3