Cool_Tools/ExplorerPatcher
1
0
Fork 0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2024-11-13 18:50:46 +01:00
Code Releases Wiki Activity

Fixed a stack corruption (#546)

Browse Source
This commit is contained in:
Valentin Radu 2021-12-12 20:33:22 +02:00
parent f431e07718
commit 9bfef43934
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ExplorerPatcher/GUI.c
View File

@ -774,7 +774,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
{ {
WCHAR wszPath[MAX_PATH]; WCHAR wszPath[MAX_PATH];
ZeroMemory(wszPath, MAX_PATH * sizeof(WCHAR)); ZeroMemory(wszPath, MAX_PATH * sizeof(WCHAR));
INT64 res = -1; PDWORD_PTR res = -1;
if (!SendMessageTimeoutW(hShellTrayWnd, 1460, 0, 0, SMTO_ABORTIFHUNG, 2000, &res) && res) if (!SendMessageTimeoutW(hShellTrayWnd, 1460, 0, 0, SMTO_ABORTIFHUNG, 2000, &res) && res)
{ {
HANDLE hExplorerRestartThread = CreateThread(NULL, 0, BeginExplorerRestart, NULL, 0, NULL); HANDLE hExplorerRestartThread = CreateThread(NULL, 0, BeginExplorerRestart, NULL, 0, NULL);

17
ep_setup/ep_setup.c
View File

@ -441,7 +441,7 @@ int WINAPI wWinMain(
HWND hShellTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); HWND hShellTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL);
if (hShellTrayWnd) if (hShellTrayWnd)
{ {
INT res = -1; PDWORD_PTR res = -1;
if (!SendMessageTimeoutW(hShellTrayWnd, 1460, 0, 0, SMTO_ABORTIFHUNG, 2000, &res) && res) if (!SendMessageTimeoutW(hShellTrayWnd, 1460, 0, 0, SMTO_ABORTIFHUNG, 2000, &res) && res)
{ {
HANDLE hExplorerRestartThread = CreateThread(NULL, 0, BeginExplorerRestart, NULL, 0, NULL); HANDLE hExplorerRestartThread = CreateThread(NULL, 0, BeginExplorerRestart, NULL, 0, NULL);
@ -721,12 +721,15 @@ int WINAPI wWinMain(
{ {
if (!hShellTrayWnd) if (!hShellTrayWnd)
{ {
MessageBoxW( if (bOk)
NULL, {
L"" _T(PRODUCT_NAME) L" has been installed successfully. Start Explorer to have it load up.", MessageBoxW(
_T(PRODUCT_NAME), NULL,
MB_ICONINFORMATION | MB_OK | MB_DEFBUTTON1 L"" _T(PRODUCT_NAME) L" has been installed successfully. Start File Explorer to have it load up.",
); _T(PRODUCT_NAME),
MB_ICONINFORMATION | MB_OK | MB_DEFBUTTON1
);
}
} }
else else
{ {

2
libs/sws

@ -1 +1 @@
Subproject commit c3a6fea725426910b0b60ea8228aafe9a5d4368d Subproject commit 812529c4f04378b6009f6deb7f8a85a46aa1de05