From 746585ae9bb6c93ee5a64373a667ba2244254b1d Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Sun, 3 Mar 2024 15:25:02 +0100
Subject: [PATCH] fix

---
 Sandboxie/core/dll/gui.c     |  1 -
 Sandboxie/core/dll/gui_p.h   |  6 ++---
 Sandboxie/core/dll/guimisc.c | 44 +++++++++++++++++-------------------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Sandboxie/core/dll/gui.c b/Sandboxie/core/dll/gui.c
index 640531ce..31b56dc0 100644
--- a/Sandboxie/core/dll/gui.c
+++ b/Sandboxie/core/dll/gui.c
@@ -385,7 +385,6 @@ _FX BOOLEAN Gui_Init(HMODULE module)
 	GUI_IMPORT___(GetDC)
 	GUI_IMPORT___(GetDCEx)
     GUI_IMPORT___(GetWindowThreadProcessId);
-	GUI_IMPORT___(SetThreadExecutionState);
     GUI_IMPORT___(SetThreadDesktop);
     GUI_IMPORT___(SwitchDesktop);
     GUI_IMPORT___(UserHandleGrantAccess);
diff --git a/Sandboxie/core/dll/gui_p.h b/Sandboxie/core/dll/gui_p.h
index f943d7a5..219ef2af 100644
--- a/Sandboxie/core/dll/gui_p.h
+++ b/Sandboxie/core/dll/gui_p.h
@@ -416,11 +416,11 @@ typedef HDC(*P_GetWindowDC)(HWND hWnd);
 
 typedef HDC(*P_GetDC)(HWND hWnd);
 
-typedef HDC(*P_GetDCEx)(HWND hWnd,HRGN hrgnClip,DWORD flags);
+typedef HDC(*P_GetDCEx)(HWND hWnd, HRGN hrgnClip,DWORD flags);
 
-typedef BOOL (*P_PrintWindow)(HWND hwnd,HDC  hdcBlt,UINT nFlags);
+typedef BOOL (*P_PrintWindow)(HWND hwnd, HDC hdcBlt,UINT nFlags);
 
-typedef BOOL (*P_ShutdownBlockReasonCreate)(HWND    hWnd,LPCWSTR pwszReason);
+typedef BOOL (*P_ShutdownBlockReasonCreate)(HWND hWnd, LPCWSTR pwszReason);
 
 typedef EXECUTION_STATE (*P_SetThreadExecutionState)(EXECUTION_STATE esFlags);
 
diff --git a/Sandboxie/core/dll/guimisc.c b/Sandboxie/core/dll/guimisc.c
index ce29a9b9..9483c6bc 100644
--- a/Sandboxie/core/dll/guimisc.c
+++ b/Sandboxie/core/dll/guimisc.c
@@ -103,18 +103,14 @@ static HDC Gui_GetDC(HWND hWnd);
 
 static HDC Gui_GetWindowDC(HWND hWnd);
 
-static HDC Gui_GetDCEx(HWND hWnd, HRGN  hrgnClip, DWORD flags);
+static HDC Gui_GetDCEx(HWND hWnd, HRGN hrgnClip, DWORD flags);
 
-static BOOL Gui_PrintWindow(HWND hwnd,HDC  hdcBlt,UINT nFlags);
+static BOOL Gui_PrintWindow(HWND hwnd, HDC hdcBlt, UINT nFlags);
 
-static BOOL Gui_ShutdownBlockReasonCreate(
-	 HWND    hWnd,
-	 LPCWSTR pwszReason
-);
+static BOOL Gui_ShutdownBlockReasonCreate(HWND hWnd, LPCWSTR pwszReason);
+
+static EXECUTION_STATE Gui_SetThreadExecutionState(EXECUTION_STATE esFlags);
 
-static EXECUTION_STATE Gui_SetThreadExecutionState(
-	 EXECUTION_STATE esFlags
-);
 
 //---------------------------------------------------------------------------
 
@@ -197,8 +193,6 @@ _FX BOOLEAN Gui_InitMisc(HMODULE module)
 		SBIEDLL_HOOK_GUI(GetDC);
 		SBIEDLL_HOOK_GUI(GetDCEx);
 		SBIEDLL_HOOK_GUI(PrintWindow);
-		SBIEDLL_HOOK_GUI(ShutdownBlockReasonCreate);
-		SBIEDLL_HOOK_GUI(SetThreadExecutionState);
         if (Dll_OsBuild >= 6000) {
 
             //
@@ -271,6 +265,16 @@ _FX BOOLEAN Gui_InitMisc(HMODULE module)
 	__sys_GetThreadDpiAwarenessContext = (P_GetThreadDpiAwarenessContext)
 		Ldr_GetProcAddrNew(DllName_user32, L"GetThreadDpiAwarenessContext","GetThreadDpiAwarenessContext");
 
+
+    if (SbieApi_QueryConfBool(NULL, "BlockInterferePower", FALSE)) {
+
+        SBIEDLL_HOOK_GUI(ShutdownBlockReasonCreate);
+
+        module = Dll_Kernel32;
+
+        SBIEDLL_HOOK(Gui_, SetThreadExecutionState);
+    }
+
     return TRUE;
 }
 
@@ -1592,12 +1596,9 @@ _FX BOOL Gui_PrintWindow(HWND hwnd, HDC  hdcBlt, UINT nFlags)
 
 _FX BOOL Gui_ShutdownBlockReasonCreate(HWND hWnd, LPCWSTR pwszReason) 
 {
-	if (SbieApi_QueryConfBool(NULL, "BlockInterferePower", FALSE)) {
-	
-		SetLastError(ERROR_ACCESS_DENIED);
-		return 0;
-	}
-	return __sys_ShutdownBlockReasonCreate(hWnd, pwszReason);
+	SetLastError(ERROR_ACCESS_DENIED);
+	return 0;
+	//return __sys_ShutdownBlockReasonCreate(hWnd, pwszReason);
 }
 
 
@@ -1608,10 +1609,7 @@ _FX BOOL Gui_ShutdownBlockReasonCreate(HWND hWnd, LPCWSTR pwszReason)
 
 _FX EXECUTION_STATE Gui_SetThreadExecutionState(EXECUTION_STATE esFlags) 
 {
-	if (SbieApi_QueryConfBool(NULL, "BlockInterferePower", FALSE)) {
-	
-		SetLastError(ERROR_ACCESS_DENIED);
-		return 0;
-	}
-	return __sys_SetThreadExecutionState(esFlags);
+	SetLastError(ERROR_ACCESS_DENIED);
+	return 0;
+	//return __sys_SetThreadExecutionState(esFlags);
 }