From 89a73b901229c8550c172c9556ff8442ae7ac4b8 Mon Sep 17 00:00:00 2001
From: Igor Pavlov <87184205+ip7z@users.noreply.github.com>
Date: Sun, 26 May 2024 00:00:00 +0000
Subject: 24.06

---
 CPP/7zip/Bundles/Alone/afxres.h           |  1 -
 CPP/7zip/Compress/DllExports2Compress.cpp | 10 ++++++++++
 CPP/7zip/UI/Console/MainAr.cpp            |  5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 delete mode 100644 CPP/7zip/Bundles/Alone/afxres.h

(limited to 'CPP')

diff --git a/CPP/7zip/Bundles/Alone/afxres.h b/CPP/7zip/Bundles/Alone/afxres.h
deleted file mode 100644
index c2fadd4..0000000
--- a/CPP/7zip/Bundles/Alone/afxres.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <winresrc.h>
diff --git a/CPP/7zip/Compress/DllExports2Compress.cpp b/CPP/7zip/Compress/DllExports2Compress.cpp
index a6ff690..f3b862d 100644
--- a/CPP/7zip/Compress/DllExports2Compress.cpp
+++ b/CPP/7zip/Compress/DllExports2Compress.cpp
@@ -8,6 +8,15 @@
 
 #include "../Common/RegisterCodec.h"
 
+extern "C"
+BOOL WINAPI DllMain(
+  #ifdef UNDER_CE
+  HANDLE
+  #else
+  HINSTANCE
+  #endif
+  /* hInstance */, DWORD /* dwReason */, LPVOID /*lpReserved*/);
+
 extern "C"
 BOOL WINAPI DllMain(
   #ifdef UNDER_CE
@@ -22,6 +31,7 @@ BOOL WINAPI DllMain(
 
 STDAPI CreateCoder(const GUID *clsid, const GUID *iid, void **outObject);
 
+STDAPI CreateObject(const GUID *clsid, const GUID *iid, void **outObject);
 STDAPI CreateObject(const GUID *clsid, const GUID *iid, void **outObject)
 {
   return CreateCoder(clsid, iid, outObject);
diff --git a/CPP/7zip/UI/Console/MainAr.cpp b/CPP/7zip/UI/Console/MainAr.cpp
index dca05a8..602ab64 100644
--- a/CPP/7zip/UI/Console/MainAr.cpp
+++ b/CPP/7zip/UI/Console/MainAr.cpp
@@ -63,7 +63,10 @@ static inline bool CheckIsa()
   {
     // some compilers (e2k) support SSE/AVX, but cpuid() can be unavailable or return lower isa support
 #ifdef MY_CPU_X86_OR_AMD64
-    #if defined(__AVX2__)
+    #if 0 && (defined(__AVX512F__) && defined(__AVX512VL__))
+      if (!CPU_IsSupported_AVX512F_AVX512VL())
+        return false;
+    #elif defined(__AVX2__)
       if (!CPU_IsSupported_AVX2())
         return false;
     #elif defined(__AVX__)
-- 
cgit v1.2.3-55-g6feb