1
0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2025-02-17 11:08:41 +01:00

Small fixes, fixed compilation

This commit is contained in:
Valentin Radu 2021-10-30 07:17:25 +03:00
parent 2f8b33be5e
commit 3099b59e6e
5 changed files with 44 additions and 10 deletions

View File

@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 22000,258,32,0
PRODUCTVERSION 22000,258,32,0
FILEVERSION 22000,282,32,0
PRODUCTVERSION 22000,282,32,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "VALINET Solutions SRL"
VALUE "FileDescription", "ExplorerPatcher"
VALUE "FileVersion", "22000.258.32.0"
VALUE "FileVersion", "22000.282.32.0"
VALUE "InternalName", "ExplorerPatcher.dll"
VALUE "LegalCopyright", "Copyright (C) 2006-2021 VALINET Solutions SRL. All rights reserved."
VALUE "OriginalFilename", "ExplorerPatcher.dll"
VALUE "ProductName", "ExplorerPatcher"
VALUE "ProductVersion", "22000.258.32.0"
VALUE "ProductVersion", "22000.282.32.0"
END
END
BLOCK "VarFileInfo"

View File

@ -183,6 +183,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)libs\funchook\include;$(SolutionDir)libs\libvalinet;$(SolutionDir)libs\funchook\distorm\include;$(SolutionDir)libs\Detours\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CallingConvention>StdCall</CallingConvention>
<ForcedIncludeFiles>$(SolutionDir)debug.h</ForcedIncludeFiles>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

View File

@ -2674,6 +2674,37 @@ void WINAPI LoadSettings(BOOL bIsExplorer)
&bAllocConsole,
&dwSize
);
DWORD bMemcheck = FALSE;
dwSize = sizeof(DWORD);
RegQueryValueExW(
hKey,
TEXT("Memcheck"),
0,
NULL,
&bMemcheck,
&dwSize
);
if (bMemcheck)
{
#if defined(DEBUG) | defined(_DEBUG)
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDOUT);
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDOUT);
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDOUT);
_CrtDumpMemoryLeaks();
#endif
bMemcheck = FALSE;
RegSetValueExW(
hKey,
TEXT("Memcheck"),
0,
REG_DWORD,
&bMemcheck,
sizeof(DWORD)
);
}
dwSize = sizeof(DWORD);
RegQueryValueExW(
hKey,

View File

@ -166,7 +166,7 @@
"IncludeWallpaper"=dword:00000001
;b Always show on primary monitor
"PrimaryOnly"=dword:00000000
;b Show windows only on current monitor
;b Show windows only from current monitor
"PerMonitor"=dword:00000000
;c 3 Theme
;x 2 Mica (default)
@ -285,6 +285,8 @@
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ExplorerPatcher]
;b Enable console *
"AllocConsole"=dword:00000000
;b Dump memory leaks
"Memcheck"=dword:00000000
;c 12 Supplimentary delay at logon *
;x 0 None (default)
;x 300 300 ms

View File

@ -423,16 +423,16 @@ void* ReadFromFile(wchar_t* wszFileName, DWORD* dwSize)
HANDLE hImage = CreateFileW(wszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (hImage)
{
DWORD dwFileSize;
LARGE_INTEGER dwFileSize;
GetFileSizeEx(hImage, &dwFileSize);
if (dwFileSize)
if (dwFileSize.LowPart)
{
void* pImage = malloc(dwFileSize);
void* pImage = malloc(dwFileSize.LowPart);
if (pImage)
{
DWORD dwNumberOfBytesRead = 0;
ReadFile(hImage, pImage, dwFileSize, &dwNumberOfBytesRead, NULL);
if (dwFileSize == dwNumberOfBytesRead)
ReadFile(hImage, pImage, dwFileSize.LowPart, &dwNumberOfBytesRead, NULL);
if (dwFileSize.LowPart == dwNumberOfBytesRead)
{
ok = pImage;
*dwSize = dwNumberOfBytesRead;