mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

fix

This commit is contained in:
DavidXanatos 2024-03-03 15:25:02 +01:00
parent acaa67149b
commit 746585ae9b
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Sandboxie/core/dll/gui.c
View File

@ -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);

6
Sandboxie/core/dll/gui_p.h
View File

@ -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);

44
Sandboxie/core/dll/guimisc.c
View File

@ -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);
}