Merge 8bd2f0710b into 9df1e546cd

CHANGELOG.md

@@ -8,12 +8,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.13.7 / 5.68.7] - 2024-04-
 
 ### Added
-- added DropAdmin and improved related checkboxes #3851  https://github.com/sandboxie-plus/Sandboxie/pull/3851 (thanks offhub)
-- added file version info doe SbieDll.dll and SbieSvc.exe to the Plus About dialog
+- added file version information for SbieDll.dll and SbieSvc.exe in the Sandboxie Plus About dialog
+
+### Changed
+- when creating reparse points (symlinks/junctions), the target path remains the TruePath [#3852](https://github.com/sandboxie-plus/Sandboxie/issues/3852)
+  - the old behaviour can be restored with "BoxReparseTarget=y"
+  - this change should work fine with the recent improvements in handling reparse points
+- improved checkboxes about DropAdminRights in SandMan [#3851](https://github.com/sandboxie-plus/Sandboxie/pull/3851) (thanks offhub)
 
 ### Fixed
- - fixed issue with start agent option [#3844](https://github.com/sandboxie-plus/Sandboxie/pull/3844) (thanks offhub)
- - fixed issue with Delete V2 introduced in 1.13.5
+- fixed issue with start agent option [#3844](https://github.com/sandboxie-plus/Sandboxie/pull/3844) (thanks offhub)
+- fixed issue with Delete V2 introduced in 1.13.5
+
 
 
 
@@ -21,7 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - added "BlockInterferenceControl=y" option to prevent sandboxed processes from forcing windows on top and moving the mounse pointer (thanks Yeyixiao)
-  - Note: this option may cause issues in games hence do not enable it for gaming boxes.
+  - Note: this option may cause issues in games hence do not enable it for gaming boxes
 - added support for hard links [#3826](https://github.com/sandboxie-plus/Sandboxie/issues/3826)
 - added mechanism to terminate stuck sandboxed processes from the driver
 - added Make the trigger list editable [#3742](https://github.com/sandboxie-plus/Sandboxie/issues/3742)
@@ -40,7 +46,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed When I change the BlockDNS and BlockPorts options, the Apply button is not activated [#3807](https://github.com/sandboxie-plus/Sandboxie/issues/3807)
 - fixed troubleshooting wizard broke with new Qt [#3810](https://github.com/sandboxie-plus/Sandboxie/discussions/3810)
 - fixed Settings dialog now showing the right ram disk letter
-- fixed issues with updater broke with new Qt due to missing SSL support [3810](https://github.com/sandboxie-plus/Sandboxie/discussions/3810)
+- fixed issues with updater broke with new Qt due to missing SSL support [#3810](https://github.com/sandboxie-plus/Sandboxie/discussions/3810)
 - fixed Enabling "DropAdminRights/FakeAdminRights" adds "BlockInterferePower and ForceProtectionOnMount" to the INI [#3825](https://github.com/sandboxie-plus/Sandboxie/issues/3825)
 - fixed KeePass "Out of Memory" crash due to "BlockScreenCapture=y" [#3768](https://github.com/sandboxie-plus/Sandboxie/issues/3768)
 - fixed Sandboxie 1.13.4 with IsBlockCapture=y not working on Windows 7 [#3769](https://github.com/sandboxie-plus/Sandboxie/issues/3769)

Sandboxie/core/dll/file_link.c

@@ -962,7 +962,7 @@ _FX NTSTATUS File_OpenForAddTempLink(HANDLE* handle, WCHAR *path, BOOLEAN OpenRe
             handle, (OpenReparsePoint ? FILE_GENERIC_READ : FILE_READ_ATTRIBUTES) | SYNCHRONIZE, &objattrs,
             &IoStatusBlock, NULL, 0, FILE_SHARE_VALID_FLAGS,
             FILE_OPEN, 
-            FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | (OpenReparsePoint ? FILE_OPEN_REPARSE_POINT : 0),
+            /*FILE_DIRECTORY_FILE |*/ FILE_SYNCHRONOUS_IO_NONALERT | (OpenReparsePoint ? FILE_OPEN_REPARSE_POINT : 0),
             NULL, 0);
 
         Dll_PopTlsNameBuffer(TlsData);
@@ -983,7 +983,7 @@ _FX NTSTATUS File_OpenForAddTempLink(HANDLE* handle, WCHAR *path, BOOLEAN OpenRe
             handle, (OpenReparsePoint ? FILE_GENERIC_READ : FILE_READ_ATTRIBUTES)  | SYNCHRONIZE, &objattrs,
             &IoStatusBlock, NULL, 0, FILE_SHARE_VALID_FLAGS,
             FILE_OPEN, 
-            FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | (OpenReparsePoint ? FILE_OPEN_REPARSE_POINT : 0),
+            /*FILE_DIRECTORY_FILE |*/ FILE_SYNCHRONOUS_IO_NONALERT | (OpenReparsePoint ? FILE_OPEN_REPARSE_POINT : 0),
             NULL, 0);
     }
 

Sandboxie/core/dll/file_pipe.c

@@ -1152,11 +1152,17 @@ _FX NTSTATUS File_NtFsControlFile(
     handle = File_GetProxyPipe(FileHandle, NULL);
     if (! handle) {
 
+		status = STATUS_BAD_INITIAL_PC;
+
         if (IoControlCode == FSCTL_SET_REPARSE_POINT) {
 
-            status = File_SetReparsePoint(
-                                FileHandle, InputBuffer, InputBufferLength);
-            SetLastError(LastError);
+            BOOLEAN BoxReparseTarget = SbieApi_QueryConfBool(NULL, L"BoxReparseTarget", FALSE);
+            if(BoxReparseTarget) {
+
+                status = File_SetReparsePoint(
+                                    FileHandle, InputBuffer, InputBufferLength);
+                SetLastError(LastError);
+            }
 
         } else if (IoControlCode == FSCTL_PIPE_WAIT) {
 
@@ -1172,8 +1178,7 @@ _FX NTSTATUS File_NtFsControlFile(
             else
                 status = STATUS_ACCESS_DENIED;
 
-        } else
-            status = STATUS_BAD_INITIAL_PC;
+        }
 
         if (status == STATUS_BAD_INITIAL_PC) {
 

Sandboxie/core/dll/gui.c

@@ -416,7 +416,18 @@ _FX BOOLEAN Gui_Init(HMODULE module)
     GUI_IMPORT___(ClipCursor);
     GUI_IMPORT___(GetClipCursor);
     GUI_IMPORT___(GetCursorPos);
-    GUI_IMPORT___(SetCursorPos);
+	GUI_IMPORT___(SetCursorPos);
+
+	GUI_IMPORT___(SetTimer);
+	HMODULE temp = module;
+	module = Dll_Kernel32;
+	GUI_IMPORT___(Sleep);
+	GUI_IMPORT___(SleepEx);
+	GUI_IMPORT___(GetTickCount);
+	GUI_IMPORT___(GetTickCount64);
+	GUI_IMPORT___(QueryUnbiasedInterruptTime);
+	GUI_IMPORT___(QueryPerformanceCounter);
+	module = temp;
 
     GUI_IMPORT___(MsgWaitForMultipleObjects);
     GUI_IMPORT_AW(PeekMessage);

Sandboxie/core/dll/gui_p.h

@@ -100,6 +100,29 @@ typedef void (*P_SwitchToThisWindow)(HWND hWnd, BOOL fAlt);
 
 typedef HWND(*P_SetActiveWindow)(HWND hWnd);
 
+typedef DWORD(*P_GetTickCount)();
+
+typedef ULONGLONG (*P_GetTickCount64)();
+
+typedef BOOL(*P_QueryUnbiasedInterruptTime)(
+	PULONGLONG UnbiasedTime
+	);
+
+typedef void(*P_Sleep)(DWORD dwMiSecond);
+
+typedef DWORD(*P_SleepEx)(DWORD dwMiSecond, BOOL bAlert);
+
+typedef BOOL (*P_QueryPerformanceCounter)(
+	LARGE_INTEGER* lpPerformanceCount
+);
+
+typedef UINT_PTR (*P_SetTimer)(
+	 HWND      hWnd,
+	           UINT_PTR  nIDEvent,
+	          UINT      uElapse,
+	 TIMERPROC lpTimerFunc
+);
+
 typedef BOOL (*P_GetCursorPos)(LPPOINT lpPoint);
 
 typedef BOOL (*P_SetCursorPos)(int x, int y);
@@ -618,6 +641,14 @@ GUI_SYS_VAR_2(PostMessage)
 GUI_SYS_VAR_2(PostThreadMessage)
 GUI_SYS_VAR_2(DispatchMessage)
 
+GUI_SYS_VAR(Sleep)
+GUI_SYS_VAR(SleepEx)
+GUI_SYS_VAR(GetTickCount)
+GUI_SYS_VAR(QueryUnbiasedInterruptTime)
+GUI_SYS_VAR(GetTickCount64)
+GUI_SYS_VAR(QueryPerformanceCounter)
+GUI_SYS_VAR(SetTimer)
+
 GUI_SYS_VAR(MapWindowPoints)
 GUI_SYS_VAR(ClientToScreen)
 GUI_SYS_VAR(ScreenToClient)

Sandboxie/core/dll/guimisc.c

@@ -121,6 +121,27 @@ static BOOL Gui_ShutdownBlockReasonCreate(HWND hWnd, LPCWSTR pwszReason);
 
 static EXECUTION_STATE Gui_SetThreadExecutionState(EXECUTION_STATE esFlags);
 
+static DWORD Gui_GetTickCount();
+
+static ULONGLONG Gui_GetTickCount64();
+
+static BOOL Gui_QueryUnbiasedInterruptTime(
+	PULONGLONG UnbiasedTime
+	);
+
+static void Gui_Sleep(DWORD dwMiSecond);
+
+static DWORD Gui_SleepEx(DWORD dwMiSecond, BOOL bAlert);
+
+static BOOL Gui_QueryPerformanceCounter(
+	LARGE_INTEGER* lpPerformanceCount
+	);
+static UINT_PTR Gui_SetTimer(
+	 HWND      hWnd,
+	           UINT_PTR  nIDEvent,
+	           UINT      uElapse,
+	 TIMERPROC lpTimerFunc
+);
 
 //---------------------------------------------------------------------------
 
@@ -286,7 +307,7 @@ _FX BOOLEAN Gui_InitMisc(HMODULE module)
 	__sys_GetThreadDpiAwarenessContext = (P_GetThreadDpiAwarenessContext)
 		Ldr_GetProcAddrNew(DllName_user32, L"GetThreadDpiAwarenessContext","GetThreadDpiAwarenessContext");
 
-
+	HMODULE current = module;
     if (SbieApi_QueryConfBool(NULL, L"BlockInterferePower", FALSE)) {
 
         SBIEDLL_HOOK_GUI(ShutdownBlockReasonCreate);
@@ -295,7 +316,26 @@ _FX BOOLEAN Gui_InitMisc(HMODULE module)
 
         SBIEDLL_HOOK(Gui_, SetThreadExecutionState);
     }
-
+	if (SbieApi_QueryConfBool(NULL, L"UseChangeSpeed", FALSE))
+	{
+		module = current;
+		P_SetTimer SetTimer = Ldr_GetProcAddrNew(DllName_user32, "SetTimer", "SetTimer");
+		if (SetTimer)
+			SBIEDLL_HOOK(Gui_, SetTimer);
+		module = Dll_Kernel32;
+		SBIEDLL_HOOK(Gui_, GetTickCount);
+		P_GetTickCount64 GetTickCount64 = Ldr_GetProcAddrNew(Dll_Kernel32, "GetTickCount64", "GetTickCount64");
+		if (GetTickCount64)
+			SBIEDLL_HOOK(Gui_, GetTickCount64);
+		P_QueryUnbiasedInterruptTime QueryUnbiasedInterruptTime = Ldr_GetProcAddrNew(Dll_Kernel32, "QueryUnbiasedInterruptTime", "QueryUnbiasedInterruptTime");
+		if (QueryUnbiasedInterruptTime)
+			SBIEDLL_HOOK(Gui_, QueryUnbiasedInterruptTime);
+		SBIEDLL_HOOK(Gui_, QueryPerformanceCounter);
+		SBIEDLL_HOOK(Gui_, Sleep);
+		SBIEDLL_HOOK(Gui_, SleepEx);
+		
+	}
+	
     return TRUE;
 }
 
@@ -1699,3 +1739,45 @@ _FX void Gui_SwitchToThisWindow(HWND hWnd, BOOL fAlt)
 		return;
 	__sys_SwitchToThisWindow(hWnd, fAlt);
 }
+
+_FX DWORD Gui_GetTickCount() {
+	return __sys_GetTickCount() * SbieApi_QueryConfNumber(NULL, L"AddTickSpeed", 1) / SbieApi_QueryConfNumber(NULL,L"LowTickSpeed", 1);
+}
+
+_FX ULONGLONG Gui_GetTickCount64() {
+	return __sys_GetTickCount64() * SbieApi_QueryConfNumber(NULL, L"AddTickSpeed", 1) / SbieApi_QueryConfNumber(NULL, L"LowTickSpeed", 1);
+}
+
+_FX BOOL Gui_QueryUnbiasedInterruptTime(
+	PULONGLONG UnbiasedTime
+) {
+	BOOL rtn = __sys_QueryUnbiasedInterruptTime(UnbiasedTime);
+	*UnbiasedTime *= SbieApi_QueryConfNumber(NULL, L"AddTickSpeed", 1) / SbieApi_QueryConfNumber(NULL, L"LowTickSpeed", 1);
+	return rtn;
+}
+
+_FX void Gui_Sleep(DWORD dwMiSecond) {
+	__sys_Sleep(dwMiSecond * SbieApi_QueryConfNumber(NULL, L"AddSleepSpeed", 1) / SbieApi_QueryConfNumber(NULL, L"LowSleepSpeed", 1));
+}
+
+_FX DWORD Gui_SleepEx(DWORD dwMiSecond, BOOL bAlert) {
+	return __sys_SleepEx(dwMiSecond * SbieApi_QueryConfNumber(NULL, L"AddSleepSpeed", 1) / SbieApi_QueryConfNumber(NULL, L"LowSleepSpeed", 1),bAlert);
+}
+
+_FX BOOL Gui_QueryPerformanceCounter(
+	LARGE_INTEGER* lpPerformanceCount
+) {
+	BOOL rtn = __sys_QueryPerformanceCounter(lpPerformanceCount);
+	lpPerformanceCount->QuadPart = lpPerformanceCount->QuadPart*SbieApi_QueryConfNumber(NULL, L"AddTickSpeed", 1)/ SbieApi_QueryConfNumber(NULL, L"LowTickSpeed", 1);
+	return rtn;
+}
+
+_FX UINT_PTR Gui_SetTimer(
+	HWND      hWnd,
+	UINT_PTR  nIDEvent,
+	UINT      uElapse,
+	TIMERPROC lpTimerFunc
+)
+{
+	return __sys_SetTimer(hWnd, nIDEvent, uElapse * SbieApi_QueryConfNumber(NULL, L"AddTimerSpeed", 1) / SbieApi_QueryConfNumber(NULL, L"LowTimerSpeed", 1), lpTimerFunc);
+}

SandboxiePlus/SandMan/SandMan.vcxproj

@@ -160,7 +160,7 @@
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>QSbieAPI.lib;MiscHelpers.lib;ntdll.lib;QtSingleApp.lib;UGlobalHotkey.lib;comctl32.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>QSbieAPI.lib;MiscHelpers.lib;ntdll.lib;QtSingleApp.lib;UGlobalHotkey.lib;comctl32.lib;bcrypt.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">