aboutsummaryrefslogtreecommitdiff
path: root/CPP
diff options
context:
space:
mode:
authorIgor Pavlov <87184205+ip7z@users.noreply.github.com>2024-05-26 00:00:00 +0000
committerIgor Pavlov <87184205+ip7z@users.noreply.github.com>2024-05-27 12:41:10 +0500
commit89a73b901229c8550c172c9556ff8442ae7ac4b8 (patch)
tree00bf950adf3b20f36efe4ffa1065676869b040a5 /CPP
parentfc662341e6f85da78ada0e443f6116b978f79f22 (diff)
download7zip-89a73b901229c8550c172c9556ff8442ae7ac4b8.tar.gz
7zip-89a73b901229c8550c172c9556ff8442ae7ac4b8.tar.bz2
7zip-89a73b901229c8550c172c9556ff8442ae7ac4b8.zip
24.0624.06
Diffstat (limited to 'CPP')
-rw-r--r--CPP/7zip/Bundles/Alone/afxres.h1
-rw-r--r--CPP/7zip/Compress/DllExports2Compress.cpp10
-rw-r--r--CPP/7zip/UI/Console/MainAr.cpp5
3 files changed, 14 insertions, 2 deletions
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 @@
1#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
@@ -15,6 +15,15 @@ BOOL WINAPI DllMain(
15 #else 15 #else
16 HINSTANCE 16 HINSTANCE
17 #endif 17 #endif
18 /* hInstance */, DWORD /* dwReason */, LPVOID /*lpReserved*/);
19
20extern "C"
21BOOL WINAPI DllMain(
22 #ifdef UNDER_CE
23 HANDLE
24 #else
25 HINSTANCE
26 #endif
18 /* hInstance */, DWORD /* dwReason */, LPVOID /*lpReserved*/) 27 /* hInstance */, DWORD /* dwReason */, LPVOID /*lpReserved*/)
19{ 28{
20 return TRUE; 29 return TRUE;
@@ -22,6 +31,7 @@ BOOL WINAPI DllMain(
22 31
23STDAPI CreateCoder(const GUID *clsid, const GUID *iid, void **outObject); 32STDAPI CreateCoder(const GUID *clsid, const GUID *iid, void **outObject);
24 33
34STDAPI CreateObject(const GUID *clsid, const GUID *iid, void **outObject);
25STDAPI CreateObject(const GUID *clsid, const GUID *iid, void **outObject) 35STDAPI CreateObject(const GUID *clsid, const GUID *iid, void **outObject)
26{ 36{
27 return CreateCoder(clsid, iid, outObject); 37 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()
63 { 63 {
64 // some compilers (e2k) support SSE/AVX, but cpuid() can be unavailable or return lower isa support 64 // some compilers (e2k) support SSE/AVX, but cpuid() can be unavailable or return lower isa support
65#ifdef MY_CPU_X86_OR_AMD64 65#ifdef MY_CPU_X86_OR_AMD64
66 #if defined(__AVX2__) 66 #if 0 && (defined(__AVX512F__) && defined(__AVX512VL__))
67 if (!CPU_IsSupported_AVX512F_AVX512VL())
68 return false;
69 #elif defined(__AVX2__)
67 if (!CPU_IsSupported_AVX2()) 70 if (!CPU_IsSupported_AVX2())
68 return false; 71 return false;
69 #elif defined(__AVX__) 72 #elif defined(__AVX__)