Windows_Patcher/ExploerPatcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed #528 (2)

Browse Source
This commit is contained in:
Valentin Radu
2021-12-15 03:31:42 +02:00
parent c0372a0d6c
commit 9c31c090dd
2 changed files with 2 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ExplorerPatcher/dllmain.c
+1 -1
View File
@@ -3895,7 +3895,7 @@ void WINAPI LoadSettings(BOOL bIsExplorer)
&dwTemp,
&dwSize
);
if (dwTemp)
if (!IsAppRunningAsAdminMode() && dwTemp)
{
#ifdef _WIN64
LaunchPropertiesGUI(hModule);
ep_setup/ep_setup.c
+1 -76
View File
@@ -304,33 +304,6 @@ int WINAPI wWinMain(
WCHAR wszPath[MAX_PATH];
ZeroMemory(wszPath, MAX_PATH * sizeof(WCHAR));
if (argc >= 1 && !_wcsicmp(wargv[0], _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID)))
{
HANDLE hEvent0 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID));
HANDLE hEvent1 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID) L"_1");
if (hEvent0 && hEvent1)
{
SetEvent(hEvent1);
CloseHandle(hEvent1);
hEvent1 = NULL;
WaitForSingleObject(hEvent0, INFINITE);
CloseHandle(hEvent0);
hEvent0 = NULL;
StartExplorerWithDelay(1000);
}
if (hEvent1)
{
CloseHandle(hEvent1);
hEvent1 = NULL;
}
if (hEvent0)
{
CloseHandle(hEvent0);
hEvent0 = NULL;
}
return 0;
}
if (argc >= 1 && !_wcsicmp(wargv[0], L"/extract"))
{
if (argc >= 2)
@@ -422,22 +395,6 @@ int WINAPI wWinMain(
{
bOk = TRUE;
HANDLE hEvent0 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID));
HANDLE hEvent1 = CreateEventW(NULL, FALSE, FALSE, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID) L"_1");
HRESULT hr = CoInitialize(NULL);
if (SUCCEEDED(hr))
{
if (hEvent0 && hEvent1)
{
hr = ShellExecuteFromExplorer(wszOwnPath, _T(EP_SETUP_HELPER_SWITCH) L"_" _T(EP_CLSID), NULL, NULL, SW_SHOWNORMAL);
if (SUCCEEDED(hr))
{
WaitForSingleObject(hEvent1, INFINITE);
}
}
CoUninitialize();
}
HWND hShellTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL);
if (hShellTrayWnd)
{
@@ -717,39 +674,7 @@ int WINAPI wWinMain(
);
}
if (!hEvent0 || !hEvent1 || FAILED(hr))
{
if (!hShellTrayWnd)
{
if (bOk)
{
MessageBoxW(
NULL,
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);
}
}
else
{
SetEvent(hEvent0);
}
if (hEvent1)
{
CloseHandle(hEvent1);
hEvent1 = NULL;
}
if (hEvent0)
{
CloseHandle(hEvent0);
hEvent0 = NULL;
}
StartExplorerWithDelay(1000);
}
return GetLastError();