From 1e2788d87d8a749bd4447620efba0444fa3fe538 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 15 Mar 2022 08:43:57 +1100 Subject: [PATCH] Updated fltmgr.sys-FltBuildDefaultSecurityDescriptor patchset Warning fixes. --- ...-FltBuildDefaultSecurityDescriptor-t.patch | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch index f37f2789..6aa29e74 100644 --- a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch +++ b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch @@ -1,4 +1,4 @@ -From ba211cf9d8ca7a462c24a62334813c68d41b3fc0 Mon Sep 17 00:00:00 2001 +From 8b6a7baacf0a26c7de7524c5f6da37bf4f4c1120 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 30 Aug 2021 15:16:06 +1000 Subject: [PATCH] ntoskrnl.exe: Add FltBuildDefaultSecurityDescriptor test @@ -10,10 +10,10 @@ Signed-off-by: Alistair Leslie-Hughes 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in -index 052a8618a81..9028a392002 100644 +index ab1db85adbb..9c89e44e70a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in -@@ -2,7 +2,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES +@@ -1,7 +1,7 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid @@ -23,7 +23,7 @@ index 052a8618a81..9028a392002 100644 driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index dabb3b73f15..187f00c8bcb 100644 +index de61ed64fa4..a0cdbf0878a 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -32,6 +32,7 @@ @@ -50,19 +50,19 @@ index dabb3b73f15..187f00c8bcb 100644 + PSID sid1, sid2; + + status = FltBuildDefaultSecurityDescriptor(&sd, STANDARD_RIGHTS_ALL); -+ ok(status == STATUS_SUCCESS, "got %#x\n", status); ++ ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(sd != NULL, "Failed to return descriptor\n"); + + status = RtlGetGroupSecurityDescriptor(sd, &group, &isdefault); -+ ok(status == STATUS_SUCCESS, "got %#x\n", status); ++ ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(group == NULL, "group isn't NULL\n"); + + status = RtlGetOwnerSecurityDescriptor(sd, &owner, &isdefault); -+ ok(status == STATUS_SUCCESS, "got %#x\n", status); ++ ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(owner == NULL, "owner isn't NULL\n"); + + status = RtlGetDaclSecurityDescriptor(sd, &present, &acl, &isdefault); -+ ok(status == STATUS_SUCCESS, "got %#x\n", status); ++ ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(acl != NULL, "acl is NULL\n"); + ok(acl->AceCount == 2, "got %d\n", acl->AceCount); + @@ -77,21 +77,21 @@ index dabb3b73f15..187f00c8bcb 100644 + + /* SECURITY_BUILTIN_DOMAIN_RID */ + status = RtlGetAce(acl, 0, (void**)&ace); -+ ok(status == STATUS_SUCCESS, "got %#x\n", status); ++ ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "got %#x\n", ace->Header.AceType); + ok(ace->Header.AceFlags == 0, "got %#x\n", ace->Header.AceFlags); -+ ok(ace->Mask == STANDARD_RIGHTS_ALL, "got %#x\n", ace->Mask); ++ ok(ace->Mask == STANDARD_RIGHTS_ALL, "got %#lx\n", ace->Mask); + + ok(RtlEqualSid(sid1, (PSID)&ace->SidStart), "SID not equal\n"); + + /* SECURITY_LOCAL_SYSTEM_RID */ + status = RtlGetAce(acl, 1, (void**)&ace); -+ ok(status == STATUS_SUCCESS, "got %#x\n", status); ++ ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + ok(ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE, "got %#x\n", ace->Header.AceType); + ok(ace->Header.AceFlags == 0, "got %#x\n", ace->Header.AceFlags); -+ ok(ace->Mask == STANDARD_RIGHTS_ALL, "got %#x\n", ace->Mask); ++ ok(ace->Mask == STANDARD_RIGHTS_ALL, "got %#lx\n", ace->Mask); + + ok(RtlEqualSid(sid2, (PSID)&ace->SidStart), "SID not equal\n"); + @@ -113,5 +113,5 @@ index dabb3b73f15..187f00c8bcb 100644 IoMarkIrpPending(irp); IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp); -- -2.34.1 +2.35.1