[PATCH v2 0/2] MR3972: include: Correct conflicting definitions of PSID and PSECURITY_DESCRIPTOR.

[Alex Henrie (＠alexhenrie)]

--
  v2: include: Correct conflicting definition of PSECURITY_DESCRIPTOR.

https://gitlab.winehq.org/wine/wine/-/merge_requests/3972

[PATCH v2 1/2] include: Correct conflicting definition of PSID.

[Alex Henrie]

From: Alex Henrie

In the Windows SDK, PSID is void* and PISID is SID*. Both types are
defined in both winnt.h and wtypesbase.idl.
---
 include/wtypes.idl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/wtypes.idl b/include/wtypes.idl
index 0db3a397d41..89477880616 100644
--- a/include/wtypes.idl
+++ b/include/wtypes.idl
@@ -110,7 +110,9 @@ typedef struct _SID {
   UCHAR SubAuthorityCount;
   SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
   [size_is(SubAuthorityCount)] ULONG SubAuthority[*];
-} SID, *PSID;
+} SID, *PISID;
+
+typedef void *PSID;

typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;

[PATCH v2 2/2] include: Correct conflicting definition of PSECURITY_DESCRIPTOR.

[Alex Henrie]

From: Alex Henrie

In the Windows SDK, PSECURITY_DESCRIPTOR is void* and
PISECURITY_DESCRIPTOR is SECURITY_DESCRIPTOR*. PSECURITY_DESCRIPTOR is
defined in winnt.h and PISECURITY_DESCRIPTOR is defined in
wbasetypes.idl.
---
 include/wtypes.idl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wtypes.idl b/include/wtypes.idl
index 89477880616..d08148dc840 100644
--- a/include/wtypes.idl
+++ b/include/wtypes.idl
@@ -133,7 +133,7 @@ typedef struct _SECURITY_DESCRIPTOR {
   PSID Group;
   PACL Sacl;
   PACL Dacl;
-} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
+} SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR;

typedef struct _SECURITY_ATTRIBUTES
 {