Rebase against 1b9d48a7b01e2b715af46bc1f8d5fe6f1529782c.

This commit is contained in:
Alistair Leslie-Hughes
2022-03-04 11:02:37 +11:00
parent 9fa3c96cff
commit 0648126dae
22 changed files with 141 additions and 143 deletions

View File

@@ -274,7 +274,7 @@ index 176ce6061e6..57d0904af23 100644
+{
+ struct FileSecurity *This = impl_from_ISecurityInformation(iface);
+
+ TRACE("(%p, %u, %p, %u)\n", This, info, sd, default_sd);
+ TRACE("(%p, %lu, %p, %u)\n", This, info, sd, default_sd);
+
+ if (default_sd)
+ FIXME("Returning a default sd is not implemented\n");
@@ -292,7 +292,7 @@ index 176ce6061e6..57d0904af23 100644
+ PSID owner, group;
+ ACL *dacl, *sacl;
+
+ TRACE("(%p, %u, %p)\n", This, info, sd);
+ TRACE("(%p, %lu, %p)\n", This, info, sd);
+
+ if (!GetSecurityDescriptorOwner(sd, &owner, &defaulted))
+ return E_FAIL;
@@ -319,7 +319,7 @@ index 176ce6061e6..57d0904af23 100644
+{
+ struct FileSecurity *This = impl_from_ISecurityInformation(iface);
+
+ TRACE("(%p, %s, %x, %p, %p, %p)\n", This, debugstr_guid(type), flags, access, count, default_access);
+ TRACE("(%p, %s, %lx, %p, %p, %p)\n", This, debugstr_guid(type), flags, access, count, default_access);
+
+ if (This->directory)
+ {