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

Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie into sandboxie-plus-master

This commit is contained in:
Stephan Troyer 2020-11-29 22:33:57 +01:00
parent 546d46cd9b 76ca6187c4
commit 8b519f063b
8 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sandboxie/core/drv/SboxDrv.vcxproj
View File

@ -134,6 +134,7 @@
<DisableSpecificWarnings> <DisableSpecificWarnings>
</DisableSpecificWarnings> </DisableSpecificWarnings>
<AdditionalOptions>/Wv:18 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Wv:18 %(AdditionalOptions)</AdditionalOptions>
<PreprocessorDefinitions>POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Native</SubSystem> <SubSystem>Native</SubSystem>
@ -200,6 +201,7 @@
<ClCompile> <ClCompile>
<DisableSpecificWarnings> <DisableSpecificWarnings>
</DisableSpecificWarnings> </DisableSpecificWarnings>
<PreprocessorDefinitions>POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Native</SubSystem> <SubSystem>Native</SubSystem>

4
Sandboxie/core/drv/SboxDrv.vcxproj.filters
View File

@ -40,9 +40,6 @@
<ClCompile Include="gui_xp.c"> <ClCompile Include="gui_xp.c">
<Filter>xp</Filter> <Filter>xp</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="key_flt.c">
<Filter>xp</Filter>
</ClCompile>
<ClCompile Include="key_xp.c"> <ClCompile Include="key_xp.c">
<Filter>xp</Filter> <Filter>xp</Filter>
</ClCompile> </ClCompile>
@ -74,6 +71,7 @@
<ClCompile Include="..\..\common\list.c"> <ClCompile Include="..\..\common\list.c">
<Filter>common</Filter> <Filter>common</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="key_flt.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="alpc.h" /> <ClInclude Include="alpc.h" />

3
Sandboxie/core/drv/api.c
View File

@ -137,8 +137,7 @@ _FX BOOLEAN Api_Init(void)
// initialize Fast IO dispatch pointers // initialize Fast IO dispatch pointers
// //
Api_FastIoDispatch = ExAllocatePoolWithTag( Api_FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, sizeof(FAST_IO_DISPATCH), tzuk);
NonPagedPool, sizeof(FAST_IO_DISPATCH), tzuk);
if (! Api_FastIoDispatch) { if (! Api_FastIoDispatch) {
Log_Status(MSG_API_DEVICE, 0, STATUS_INSUFFICIENT_RESOURCES); Log_Status(MSG_API_DEVICE, 0, STATUS_INSUFFICIENT_RESOURCES);
return FALSE; return FALSE;

3
Sandboxie/core/drv/conf_user.c
View File

@ -91,8 +91,7 @@ _FX BOOLEAN Conf_Init_User(void)
{ {
List_Init(&Conf_Users); List_Init(&Conf_Users);
Conf_Users_Event = Conf_Users_Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), tzuk);
ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), tzuk);
if (! Conf_Users_Event) { if (! Conf_Users_Event) {
Log_Msg0(MSG_1104); Log_Msg0(MSG_1104);
return FALSE; return FALSE;

2
Sandboxie/core/drv/driver.c
View File

@ -142,6 +142,8 @@ _FX NTSTATUS DriverEntry(
{ {
BOOLEAN ok = TRUE; BOOLEAN ok = TRUE;
ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
// //
// initialize global driver variables // initialize global driver variables
// //

2
Sandboxie/core/drv/ipc.c
View File

@ -1323,7 +1323,7 @@ _FX NTSTATUS Ipc_Api_CreateDirOrLink(PROCESS *proc, ULONG64 *parms)
NTSTATUS status; NTSTATUS status;
HANDLE handle; HANDLE handle;
UNICODE_STRING64 *user_uni; UNICODE_STRING64 *user_uni;
WCHAR *user_buf, *objname_buf = L"", *target_buf; WCHAR *user_buf, *objname_buf = NULL, *target_buf;
ULONG user_len, objname_len, target_len; ULONG user_len, objname_len, target_len;
OBJECT_ATTRIBUTES objattrs; OBJECT_ATTRIBUTES objattrs;
UNICODE_STRING objname, target; UNICODE_STRING objname, target;

3
Sandboxie/core/drv/mem.c
View File

@ -130,8 +130,7 @@ _FX void Mem_FreeString(WCHAR *string)
_FX BOOLEAN Mem_GetLockResource(PERESOURCE *ppResource, BOOLEAN InitMsg) _FX BOOLEAN Mem_GetLockResource(PERESOURCE *ppResource, BOOLEAN InitMsg)
{ {
*ppResource = ExAllocatePoolWithTag( *ppResource = ExAllocatePoolWithTag(NonPagedPool, sizeof(ERESOURCE), tzuk);
NonPagedPool, sizeof(ERESOURCE), tzuk);
if (*ppResource) { if (*ppResource) {
ExInitializeResourceLite(*ppResource); ExInitializeResourceLite(*ppResource);
return TRUE; return TRUE;

3
Sandboxie/core/drv/process_low.c
View File

@ -58,8 +58,7 @@ static KEVENT *Process_Low_Event = NULL;
_FX BOOLEAN Process_Low_Init(void) _FX BOOLEAN Process_Low_Init(void)
{ {
Process_Low_Event = Process_Low_Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), tzuk);
ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), tzuk);
if (! Process_Low_Event) { if (! Process_Low_Event) {
Log_Msg0(MSG_1104); Log_Msg0(MSG_1104);
return FALSE; return FALSE;