arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00
Code Issues Releases Wiki Activity

fix unrar deps errors when cross-compiling with mingw

Browse Source
This commit is contained in:
Gabriele Gristina 2023-05-19 22:02:44 +02:00
parent 5ec8c96840
commit ca53e78f7d
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/unrar/isnt.cpp vendored
View File

@ -26,7 +26,7 @@ DWORD WinNT()
// Replace it with documented Windows 11 check when available. // Replace it with documented Windows 11 check when available.
#include <comdef.h> #include <comdef.h>
#include <Wbemidl.h> #include <wbemidl.h>
#pragma comment(lib, "wbemuuid.lib") #pragma comment(lib, "wbemuuid.lib")
static bool WMI_IsWindows10() static bool WMI_IsWindows10()
@ -40,8 +40,10 @@ static bool WMI_IsWindows10()
return false; return false;
IWbemServices *pSvc = NULL; IWbemServices *pSvc = NULL;
hres = pLoc->ConnectServer(_bstr_t(L"ROOT\\CIMV2"),NULL,NULL,NULL,NULL,0,0,&pSvc); BSTR bstr_root_cimv2 = SysAllocString(L"ROOT\\CIMV2");
hres = pLoc->ConnectServer(bstr_root_cimv2,NULL,NULL,NULL,0,0,0,&pSvc);
if (FAILED(hres)) if (FAILED(hres))
{ {
@ -60,7 +62,11 @@ static bool WMI_IsWindows10()
} }
IEnumWbemClassObject *pEnumerator = NULL; IEnumWbemClassObject *pEnumerator = NULL;
hres = pSvc->ExecQuery(bstr_t("WQL"), bstr_t("SELECT * FROM Win32_OperatingSystem"),
BSTR bstr_wql = SysAllocString(L"WQL");
BSTR bstr_sql = SysAllocString(L"SELECT * FROM Win32_OperatingSystem");
hres = pSvc->ExecQuery(bstr_wql, bstr_sql,
WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator); WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator);
if (FAILED(hres)) if (FAILED(hres))

7
deps/unrar/os.hpp vendored
View File

@ -41,6 +41,11 @@
#define _UNICODE // Set _T() macro to convert from narrow to wide strings. #define _UNICODE // Set _T() macro to convert from narrow to wide strings.
#endif #endif
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#if 0 #if 0
// 2021.09.05: Allow newer Vista+ APIs like IFileOpenDialog for WinRAR, // 2021.09.05: Allow newer Vista+ APIs like IFileOpenDialog for WinRAR,
// but still keep SFX modules XP compatible. // but still keep SFX modules XP compatible.
@ -61,7 +66,7 @@
#include <prsht.h> #include <prsht.h>
#include <shlwapi.h> #include <shlwapi.h>
#pragma comment(lib, "Shlwapi.lib") #pragma comment(lib, "Shlwapi.lib")
#include <PowrProf.h> #include <powrprof.h>
#pragma comment(lib, "PowrProf.lib") #pragma comment(lib, "PowrProf.lib")
#include <shellapi.h> #include <shellapi.h>
#include <shlobj.h> #include <shlobj.h>

8
deps/unrar/scantree.cpp vendored
View File

@ -215,9 +215,11 @@ bool ScanTree::GetNextMask()
UnixSlashToDos(CurMask,CurMask,ASIZE(CurMask)); UnixSlashToDos(CurMask,CurMask,ASIZE(CurMask));
#endif #endif
// We prefer to scan entire disk if mask like \\server\share\ or c:\ /*
// is specified regardless of recursion mode. Use \\server\share\*.* We prefer to scan entire disk if mask like \\server\share\ or c:\
// or c:\*.* mask to scan only the root directory. is specified regardless of recursion mode. Use \\server\share\*.*
or c:\*.* mask to scan only the root directory.
*/
if (CurMask[0]=='\\' && CurMask[1]=='\\') if (CurMask[0]=='\\' && CurMask[1]=='\\')
{ {
const wchar *Slash=wcschr(CurMask+2,'\\'); const wchar *Slash=wcschr(CurMask+2,'\\');

1
src/Makefile
View File

@ -752,6 +752,7 @@ LFLAGS_CROSS_WIN += -lpsapi
LFLAGS_CROSS_WIN += -lws2_32 LFLAGS_CROSS_WIN += -lws2_32
LFLAGS_CROSS_WIN += -lpowrprof LFLAGS_CROSS_WIN += -lpowrprof
LFLAGS_CROSS_WIN += -static -static-libgcc -static-libstdc++ LFLAGS_CROSS_WIN += -static -static-libgcc -static-libstdc++
LFLAGS_CROSS_WIN += -lole32 -loleaut32 -lwbemuuid
## ##
## Targets ## Targets