Cool_Tools/ExplorerPatcher
1
0
Fork 0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2025-02-25 22:38:10 +01:00
Code Releases Wiki Activity

Updates: Revamped code with rich notification content and proper JSON parsing

Browse Source
This commit is contained in:
Amrsatrio 2024-07-14 14:52:26 +07:00
parent 4799b4bf25
commit 2b9c747212
9 changed files with 1451 additions and 1466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build.yml vendored
View File

@ -102,16 +102,16 @@ jobs:
if ls build/Release/ep_taskbar.*.amd64.dll 1> /dev/null 2>&1; then if ls build/Release/ep_taskbar.*.amd64.dll 1> /dev/null 2>&1; then
mkdir -p build/Release/x64 mkdir -p build/Release/x64
for file in build/Release/ep_taskbar.*.amd64.dll; do for file in build/Release/ep_taskbar.*.amd64.dll; do
cp "$file" "build/Release/x64/$(basename "$file" .amd64.dll).dll" mv "$file" "build/Release/x64/$(basename "$file" .amd64.dll).dll"
done done
fi fi
# if ls build/Release/ep_taskbar.*.arm64.dll 1> /dev/null 2>&1; then if ls build/Release/ep_taskbar.*.arm64.dll 1> /dev/null 2>&1; then
# mkdir -p build/Release/ARM64 mkdir -p build/Release/ARM64
# for file in build/Release/ep_taskbar.*.arm64.dll; do for file in build/Release/ep_taskbar.*.arm64.dll; do
# cp "$file" "build/Release/ARM64/$(basename "$file" .arm64.dll).dll" mv "$file" "build/Release/ARM64/$(basename "$file" .arm64.dll).dll"
# done done
# fi fi
- name: Build funchook amd64 - name: Build funchook amd64
shell: powershell shell: powershell

2
ExplorerPatcher/ExplorerPatcher.vcxproj
View File

@ -257,7 +257,7 @@
<ClCompile Include="TaskbarCenter.c"> <ClCompile Include="TaskbarCenter.c">
<ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="updates.c"> <ClCompile Include="updates.cpp">
<ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="utility.c"> <ClCompile Include="utility.c">

2
ExplorerPatcher/def.h
View File

@ -17,7 +17,7 @@
#else #else
#define SETUP_UTILITY_NAME "ep_setup.arm64.exe" #define SETUP_UTILITY_NAME "ep_setup.arm64.exe"
#endif #endif
#define TOAST_BUFSIZ 1024 #define TOAST_BUFSIZ 1536
#define SEH_REGPATH "Control Panel\\Quick Actions\\Control Center\\QuickActionsStateCapture\\ExplorerPatcher" #define SEH_REGPATH "Control Panel\\Quick Actions\\Control Center\\QuickActionsStateCapture\\ExplorerPatcher"
#define EP_SETUP_HELPER_SWITCH "/CreateExplorerShellUnelevatedAfterServicing" #define EP_SETUP_HELPER_SWITCH "/CreateExplorerShellUnelevatedAfterServicing"
#define EP_DWM_SERVICENAME "ep_dwm_" EP_CLSID_LITE #define EP_DWM_SERVICENAME "ep_dwm_" EP_CLSID_LITE

191
ExplorerPatcher/dllmain.c
View File

@ -246,197 +246,6 @@ HRESULT WINAPI _DllGetClassObject(
DEFINE_GUID(CLSID_EPStart10, DEFINE_GUID(CLSID_EPStart10,
0x9717d01, 0x5d10, 0x4fb5, 0xbd, 0x5, 0x46, 0x38, 0xb, 0x51, 0x65, 0xaa); 0x9717d01, 0x5d10, 0x4fb5, 0xbd, 0x5, 0x46, 0x38, 0xb, 0x51, 0x65, 0xaa);
#pragma region "Updates"
#if WITH_MAIN_PATCHER
DWORD CheckForUpdatesThread(LPVOID timeout)
{
HRESULT hr = S_OK;
HSTRING_HEADER header_AppIdHString;
HSTRING AppIdHString = NULL;
HSTRING_HEADER header_ToastNotificationManagerHString;
HSTRING ToastNotificationManagerHString = NULL;
__x_ABI_CWindows_CUI_CNotifications_CIToastNotificationManagerStatics* toastStatics = NULL;
__x_ABI_CWindows_CUI_CNotifications_CIToastNotifier* notifier = NULL;
HSTRING_HEADER header_ToastNotificationHString;
HSTRING ToastNotificationHString = NULL;
__x_ABI_CWindows_CUI_CNotifications_CIToastNotificationFactory* notifFactory = NULL;
__x_ABI_CWindows_CUI_CNotifications_CIToastNotification* toast = NULL;
while (TRUE)
{
HWND hShell_TrayWnd = FindWindowExW(
NULL,
NULL,
L"Shell_TrayWnd",
NULL
);
if (hShell_TrayWnd)
{
Sleep(timeout);
break;
}
Sleep(100);
}
printf("[Updates] Starting daemon.\n");
if (SUCCEEDED(hr))
{
hr = RoInitialize(RO_INIT_MULTITHREADED);
}
if (SUCCEEDED(hr))
{
hr = WindowsCreateStringReference(
APPID,
(UINT32)(sizeof(APPID) / sizeof(TCHAR) - 1),
&header_AppIdHString,
&AppIdHString
);
}
if (SUCCEEDED(hr))
{
hr = WindowsCreateStringReference(
RuntimeClass_Windows_UI_Notifications_ToastNotificationManager,
(UINT32)(sizeof(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager) / sizeof(wchar_t) - 1),
&header_ToastNotificationManagerHString,
&ToastNotificationManagerHString
);
}
if (SUCCEEDED(hr))
{
hr = RoGetActivationFactory(
ToastNotificationManagerHString,
&UIID_IToastNotificationManagerStatics,
(LPVOID*)&toastStatics
);
}
if (SUCCEEDED(hr))
{
hr = toastStatics->lpVtbl->CreateToastNotifierWithId(
toastStatics,
AppIdHString,
&notifier
);
}
if (SUCCEEDED(hr))
{
hr = WindowsCreateStringReference(
RuntimeClass_Windows_UI_Notifications_ToastNotification,
(UINT32)(sizeof(RuntimeClass_Windows_UI_Notifications_ToastNotification) / sizeof(wchar_t) - 1),
&header_ToastNotificationHString,
&ToastNotificationHString
);
}
if (SUCCEEDED(hr))
{
hr = RoGetActivationFactory(
ToastNotificationHString,
&UIID_IToastNotificationFactory,
(LPVOID*)&notifFactory
);
}
HANDLE hEvents[2];
hEvents[0] = CreateEventW(NULL, FALSE, FALSE, L"EP_Ev_CheckForUpdates_" _T(EP_CLSID));
hEvents[1] = CreateEventW(NULL, FALSE, FALSE, L"EP_Ev_InstallUpdates_" _T(EP_CLSID));
if (hEvents[0] && hEvents[1])
{
if (bShowUpdateToast)
{
ShowUpdateSuccessNotification(hModule, notifier, notifFactory, &toast);
HKEY hKey = NULL;
RegCreateKeyExW(
HKEY_CURRENT_USER,
TEXT(REGPATH),
0,
NULL,
REG_OPTION_NON_VOLATILE,
KEY_READ | KEY_WOW64_64KEY | KEY_WRITE,
NULL,
&hKey,
NULL
);
if (hKey == NULL || hKey == INVALID_HANDLE_VALUE)
{
hKey = NULL;
}
if (hKey)
{
bShowUpdateToast = FALSE;
RegSetValueExW(
hKey,
TEXT("IsUpdatePending"),
0,
REG_DWORD,
&bShowUpdateToast,
sizeof(DWORD)
);
RegCloseKey(hKey);
}
}
if (dwUpdatePolicy != UPDATE_POLICY_MANUAL)
{
InstallUpdatesIfAvailable(hModule, notifier, notifFactory, &toast, UPDATES_OP_DEFAULT, bAllocConsole, dwUpdatePolicy);
}
DWORD dwRet = 0;
while (TRUE)
{
switch (WaitForMultipleObjects(2, hEvents, FALSE, INFINITE))
{
case WAIT_OBJECT_0:
{
InstallUpdatesIfAvailable(hModule, notifier, notifFactory, &toast, UPDATES_OP_CHECK, bAllocConsole, dwUpdatePolicy);
break;
}
case WAIT_OBJECT_0 + 1:
{
InstallUpdatesIfAvailable(hModule, notifier, notifFactory, &toast, UPDATES_OP_INSTALL, bAllocConsole, dwUpdatePolicy);
break;
}
default:
{
break;
}
}
}
CloseHandle(hEvents[0]);
CloseHandle(hEvents[1]);
}
if (toast)
{
toast->lpVtbl->Release(toast);
}
if (notifFactory)
{
notifFactory->lpVtbl->Release(notifFactory);
}
if (ToastNotificationHString)
{
WindowsDeleteString(ToastNotificationHString);
}
if (notifier)
{
notifier->lpVtbl->Release(notifier);
}
if (toastStatics)
{
toastStatics->lpVtbl->Release(toastStatics);
}
if (ToastNotificationManagerHString)
{
WindowsDeleteString(ToastNotificationManagerHString);
}
if (AppIdHString)
{
WindowsDeleteString(AppIdHString);
}
}
#endif
#pragma endregion
#pragma region "Generics" #pragma region "Generics"
#if WITH_MAIN_PATCHER #if WITH_MAIN_PATCHER
HWND GetMonitorInfoFromPointForTaskbarFlyoutActivation(POINT ptCursor, DWORD dwFlags, LPMONITORINFO lpMi) HWND GetMonitorInfoFromPointForTaskbarFlyoutActivation(POINT ptCursor, DWORD dwFlags, LPMONITORINFO lpMi)

1245
ExplorerPatcher/updates.c
View File

File diff suppressed because it is too large Load Diff

1426
ExplorerPatcher/updates.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

29
ExplorerPatcher/updates.h
View File

@ -8,6 +8,10 @@
#include "utility.h" #include "utility.h"
#include "../ep_gui/resources/EPSharedResources.h" #include "../ep_gui/resources/EPSharedResources.h"
#ifdef __cplusplus
extern "C" {
#endif
extern HMODULE hModule; extern HMODULE hModule;
#define UPDATES_VERBOSE_OUTPUT #define UPDATES_VERBOSE_OUTPUT
@ -20,6 +24,7 @@ extern HMODULE hModule;
#define UPDATES_OP_DEFAULT 0 #define UPDATES_OP_DEFAULT 0
#define UPDATES_OP_CHECK 1 #define UPDATES_OP_CHECK 1
#define UPDATES_OP_INSTALL 2 #define UPDATES_OP_INSTALL 2
#define UPDATES_OP_INSTALL_NO_CONFIRM 3
#define UPDATES_USER_AGENT "ExplorerPatcher" #define UPDATES_USER_AGENT "ExplorerPatcher"
#define UPDATES_FORM_HEADERS "Content-Type: text/plain;\r\n" #define UPDATES_FORM_HEADERS "Content-Type: text/plain;\r\n"
@ -31,24 +36,10 @@ extern HMODULE hModule;
#define UPDATES_RELEASE_INFO_URL_STABLE "https://github.com/valinet/ExplorerPatcher/releases/latest" #define UPDATES_RELEASE_INFO_URL_STABLE "https://github.com/valinet/ExplorerPatcher/releases/latest"
#define UPDATES_RELEASE_INFO_URL_STAGING "https://api.github.com/repos/valinet/ExplorerPatcher/releases?per_page=1" #define UPDATES_RELEASE_INFO_URL_STAGING "https://api.github.com/repos/valinet/ExplorerPatcher/releases?per_page=1"
typedef struct IsUpdateAvailableParameters DWORD CheckForUpdatesThread(LPVOID params);
{
HINTERNET hInternet; #ifdef __cplusplus
HANDLE hEvent; }
}; #endif
BOOL IsUpdatePolicy(LPCWSTR wszDataStore, DWORD dwUpdatePolicy);
BOOL ShowUpdateSuccessNotification(
HMODULE hModule,
__x_ABI_CWindows_CUI_CNotifications_CIToastNotifier* notifier,
__x_ABI_CWindows_CUI_CNotifications_CIToastNotificationFactory* notifFactory,
__x_ABI_CWindows_CUI_CNotifications_CIToastNotification** toast
);
BOOL InstallUpdatesIfAvailable(
HMODULE hModule,
__x_ABI_CWindows_CUI_CNotifications_CIToastNotifier* notifier,
__x_ABI_CWindows_CUI_CNotifications_CIToastNotificationFactory* notifFactory,
__x_ABI_CWindows_CUI_CNotifications_CIToastNotification** toast,
DWORD dwOperation, DWORD bAllocConsole, DWORD dwUpdatePolicy
);
#endif #endif

2
ep_gui/resources/EPSharedResources.h
View File

@ -16,6 +16,8 @@
#define IDS_UPDATES_DLFAILED_B 312 #define IDS_UPDATES_DLFAILED_B 312
#define IDS_UPDATES_INSTALLEDVER 313 #define IDS_UPDATES_INSTALLEDVER 313
#define IDS_UPDATES_PROMPT 314 #define IDS_UPDATES_PROMPT 314
#define IDS_UPDATES_AVAILABLE_A 315
#define IDS_UPDATES_DOWNLOADING_0 316
// 351-400 // 351-400

4
ep_gui/resources/lang/ep_gui.en-US.rc
View File

@ -8,12 +8,14 @@ BEGIN
IDS_UPDATES_CHECKING_T "Checking for updates…" IDS_UPDATES_CHECKING_T "Checking for updates…"
IDS_UPDATES_AVAILABLE_T "Version %d.%d.%d.%d is available" IDS_UPDATES_AVAILABLE_T "Version %d.%d.%d.%d is available"
IDS_UPDATES_AVAILABLE_T_U "New version available" IDS_UPDATES_AVAILABLE_T_U "New version available"
IDS_UPDATES_AVAILABLE_B "You can update by right clicking the taskbar, choosing ""Properties"", then ""Updates"". Click here to learn more about this update." IDS_UPDATES_AVAILABLE_B "Click here to learn more about this update."
IDS_UPDATES_AVAILABLE_A "Update now"
IDS_UPDATES_ISLATEST_T "No updates are available" IDS_UPDATES_ISLATEST_T "No updates are available"
IDS_UPDATES_ISLATEST_B "Please check back later." IDS_UPDATES_ISLATEST_B "Please check back later."
IDS_UPDATES_CHECKFAILED_T "Unable to check for updates" IDS_UPDATES_CHECKFAILED_T "Unable to check for updates"
IDS_UPDATES_CHECKFAILED_B "Make sure that you are connected to the Internet and that the remote server is online." IDS_UPDATES_CHECKFAILED_B "Make sure that you are connected to the Internet and that the remote server is online."
IDS_UPDATES_DOWNLOADING_T "Downloading and installing updates…" IDS_UPDATES_DOWNLOADING_T "Downloading and installing updates…"
IDS_UPDATES_DOWNLOADING_0 "Preparing…"
IDS_UPDATES_SUCCESS_T "Update successful" IDS_UPDATES_SUCCESS_T "Update successful"
IDS_UPDATES_DLFAILED_T "Update failed" IDS_UPDATES_DLFAILED_T "Update failed"
IDS_UPDATES_DLFAILED_B "The has cancelled the process or an error has occured when attempting to install this update." IDS_UPDATES_DLFAILED_B "The has cancelled the process or an error has occured when attempting to install this update."