Browse Source

Fixed a stack corruption (#546)

pull/886/head 22000.348.40.9_9bfef43
Valentin Radu 4 years ago
parent
commit
9bfef43934
  1. 2
      ExplorerPatcher/GUI.c
  2. 7
      ep_setup/ep_setup.c
  3. 2
      libs/sws

2
ExplorerPatcher/GUI.c

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

7
ep_setup/ep_setup.c

@ -441,7 +441,7 @@ int WINAPI wWinMain( @@ -441,7 +441,7 @@ int WINAPI wWinMain(
HWND hShellTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL);
if (hShellTrayWnd)
{
INT res = -1;
PDWORD_PTR res = -1;
if (!SendMessageTimeoutW(hShellTrayWnd, 1460, 0, 0, SMTO_ABORTIFHUNG, 2000, &res) && res)
{
HANDLE hExplorerRestartThread = CreateThread(NULL, 0, BeginExplorerRestart, NULL, 0, NULL);
@ -720,14 +720,17 @@ int WINAPI wWinMain( @@ -720,14 +720,17 @@ int WINAPI wWinMain(
if (!hEvent0 || !hEvent1 || FAILED(hr))
{
if (!hShellTrayWnd)
{
if (bOk)
{
MessageBoxW(
NULL,
L"" _T(PRODUCT_NAME) L" has been installed successfully. Start Explorer to have it load up.",
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
{
StartExplorerWithDelay(1000);

2
libs/sws

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit c3a6fea725426910b0b60ea8228aafe9a5d4368d
Subproject commit 812529c4f04378b6009f6deb7f8a85a46aa1de05
Loading…
Cancel
Save