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

1.9.2

This commit is contained in:
DavidXanatos 2023-04-28 08:44:42 +02:00
parent 5163fc0e48
commit f8f78faffd
2 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Sandboxie/core/dll/proc.c
View File

@ -1016,34 +1016,34 @@ _FX BOOL Proc_CreateProcessInternalW(
// the system may have quoted the first part of the command line,
// store this final command line
//
if (TlsData->proc_command_line)
Dll_Free(TlsData->proc_command_line);
ULONG len = 0;
WCHAR* buf = NULL;
if (lpApplicationName) {
len = wcslen(lpApplicationName) + 2; // +1 for space, +1 for NULL
}
if (lpCommandLine) {
len += wcslen(lpCommandLine) + 1; // +1 for NULL
}
buf = Dll_Alloc(len * sizeof(WCHAR));
memset(buf, 0, len * sizeof(WCHAR));
if (lpApplicationName) {
wcscpy(buf, lpApplicationName);
wcscat(buf, L" ");
}
if (lpCommandLine) {
wcscat(buf, lpCommandLine);
}
TlsData->proc_command_line = buf;
//
//if (TlsData->proc_command_line)
// Dll_Free(TlsData->proc_command_line);
//
//ULONG len = 0;
//WCHAR* buf = NULL;
//
//if (lpApplicationName) {
// len = wcslen(lpApplicationName) + 2; // +1 for space, +1 for NULL
//}
//
//if (lpCommandLine) {
// len += wcslen(lpCommandLine) + 1; // +1 for NULL
//}
//
//buf = Dll_Alloc(len * sizeof(WCHAR));
//memset(buf, 0, len * sizeof(WCHAR));
//
//if (lpApplicationName) {
// wcscpy(buf, lpApplicationName);
// wcscat(buf, L" ");
//}
//
//if (lpCommandLine) {
// wcscat(buf, lpCommandLine);
//}
//
//TlsData->proc_command_line = buf;
}
else { // xp, 7, 8 and 10 before RS5
@ -1574,6 +1574,12 @@ finish:
if (Config_GetSettingsForImageName_bool(L"ApplyElevateCreateProcessFix", FALSE))
{
if (Dll_OsBuild >= 17677) { // 10 RS5 and later
if (TlsData->proc_image_is_copy && TlsData->proc_command_line)
lpCommandLine = TlsData->proc_command_line;
}
BOOL cancelled = FALSE;
if (SH32_DoRunAs(lpCommandLine ? lpCommandLine : lpApplicationName, lpCurrentDirectory,
lpProcessInformation, &cancelled)) {
@ -2214,7 +2220,7 @@ _FX NTSTATUS Proc_NtCreateUserProcess(
_In_opt_ POBJECT_ATTRIBUTES ThreadObjectAttributes,
_In_ ULONG ProcessFlags, // PROCESS_CREATE_FLAGS_*
_In_ ULONG ThreadFlags, // THREAD_CREATE_FLAGS_*
_In_opt_ PVOID ProcessParameters, // PRTL_USER_PROCESS_PARAMETERS
_In_opt_ PRTL_USER_PROCESS_PARAMETERS ProcessParameters,
_Inout_ PPS_CREATE_INFO CreateInfo,
_In_ PPS_ATTRIBUTE_LIST AttributeList)
{
@ -2260,6 +2266,11 @@ _FX NTSTATUS Proc_NtCreateUserProcess(
Proc_StoreImagePath(TlsData, FileHandle);
if (TlsData->proc_image_path && ProcessParameters && ProcessParameters->CommandLine.Buffer) {
Proc_FixBatchCommandLine(TlsData, ProcessParameters->CommandLine.Buffer, TlsData->proc_image_path);
}
NtClose(FileHandle);
}
}

15
Sandboxie/install/Templates.ini
View File

@ -409,10 +409,6 @@ NormalFilePath=\Device\Ndis
NormalFilePath=\Device\PcwDrv
# Smart App Control
NormalFilePath=\Device\SrpDevice
# shell & ui
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize\*
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\*
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\*
#
# Access rules for privacy enhanced boxes
@ -429,7 +425,16 @@ NormalFilePath=%SystemRoot%\*
NormalFilePath=%SbieHome%\*
NormalFilePath=%ProgramFiles%\*
NormalFilePath=%ProgramFiles% (x86)\*
# shell & ui
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize\*
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\*
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\*
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Classes
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\FileAssociations
NormalKeyPath=HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\Shell\Associations
#
# Access rules for app compartment boxes