Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Fixed is_library_file() for older Windows versions.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-05-08 20:39:23 +02:00
parent 7f1bad6ca1
commit 3302895145
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/OSSupport_Win32.cpp
View File

@ -1000,27 +1000,46 @@ void MUtils::OS::sleep_ms(const size_t &duration)
// EXECUTABLE CHECK // EXECUTABLE CHECK
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
static bool libraryAsImageResourceSupported()
{
OSVERSIONINFOEXW osvi;
memset(&osvi, 0, sizeof(OSVERSIONINFOEXW));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
if(GetVersionExW((LPOSVERSIONINFOW)&osvi))
{
if(osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
{
return (osvi.dwMajorVersion >= 6U);
}
}
return false;
}
bool MUtils::OS::is_executable_file(const QString &path) bool MUtils::OS::is_executable_file(const QString &path)
{ {
bool bIsExecutable = false;
DWORD binaryType; DWORD binaryType;
if(GetBinaryType(MUTILS_WCHR(QDir::toNativeSeparators(path)), &binaryType)) if(GetBinaryType(MUTILS_WCHR(QDir::toNativeSeparators(path)), &binaryType))
{ {
bIsExecutable = (binaryType == SCS_32BIT_BINARY || binaryType == SCS_64BIT_BINARY); return ((binaryType == SCS_32BIT_BINARY) || (binaryType == SCS_64BIT_BINARY));
} }
return bIsExecutable;
const DWORD errorCode = GetLastError();
qWarning("GetBinaryType() failed with error: 0x%08X", errorCode);
return false;
} }
bool MUtils::OS::is_library_file(const QString &path) bool MUtils::OS::is_library_file(const QString &path)
{ {
bool bIsLibrary = false; const DWORD flags = libraryAsImageResourceSupported() ? (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE) : (LOAD_LIBRARY_AS_DATAFILE | DONT_RESOLVE_DLL_REFERENCES);
const HMODULE hMod = LoadLibraryEx(MUTILS_WCHR(QDir::toNativeSeparators(path)), NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (const HMODULE hMod = LoadLibraryEx(MUTILS_WCHR(QDir::toNativeSeparators(path)), NULL, flags))
if (hMod)
{ {
bIsLibrary = true;
FreeLibrary(hMod); FreeLibrary(hMod);
return true;
} }
return bIsLibrary;
const DWORD errorCode = GetLastError();
qWarning("LoadLibraryEx() failed with error: 0x%08X", errorCode);
return false;
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////