[ADVAPI32][RPCRT4][UMPNPMGR][WINLOGON] Fix buffer size retrieval for MakeSelfRelativeSD() (reactos#8395)

HBelusca · HBelusca · commit 8f3ac7ef588f · 2025-10-08T15:45:36.000+02:00
Based on Timo's observation in PR reactos#8387. And improve debug ERR strings for last-error values.
diff --git a/base/services/umpnpmgr/install.c b/base/services/umpnpmgr/install.c
@@ -369,6 +369,7 @@ CreatePnpInstallEventSecurity(
         goto Quit;
     }
 
+    /* Compute the size needed for the DACL and allocate it */
     DaclSize = sizeof(ACL) +
                sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(SystemSid) +
                sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(AdminsSid);
@@ -379,7 +380,6 @@ CreatePnpInstallEventSecurity(
         ErrCode = ERROR_OUTOFMEMORY;
         goto Quit;
     }
-
     if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION))
     {
         ErrCode = GetLastError();
@@ -428,48 +428,40 @@ CreatePnpInstallEventSecurity(
         goto Quit;
     }
 
-    if (!MakeSelfRelativeSD(&AbsoluteSd, NULL, &Size) && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+    /* Retrieve the size needed for the relative SD */
+    if (MakeSelfRelativeSD(&AbsoluteSd, NULL, &Size) ||
+        (GetLastError() != ERROR_INSUFFICIENT_BUFFER))
     {
-        RelativeSd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size);
-        if (RelativeSd == NULL)
-        {
-            ErrCode = ERROR_OUTOFMEMORY;
-            goto Quit;
-        }
+        ErrCode = GetLastError();
+        goto Quit;
+    }
 
-        if (!MakeSelfRelativeSD(&AbsoluteSd, RelativeSd, &Size))
-        {
-            ErrCode = GetLastError();
-            goto Quit;
-        }
+    /* Build the relative SD */
+    RelativeSd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size);
+    if (RelativeSd == NULL)
+    {
+        ErrCode = ERROR_OUTOFMEMORY;
+        goto Quit;
+    }
+    if (!MakeSelfRelativeSD(&AbsoluteSd, RelativeSd, &Size))
+    {
+        ErrCode = GetLastError();
+        HeapFree(GetProcessHeap(), 0, RelativeSd);
+        goto Quit;
     }
 
     *EventSd = RelativeSd;
     ErrCode = ERROR_SUCCESS;
 
 Quit:
     if (SystemSid)
-    {
         FreeSid(SystemSid);
-    }
 
     if (AdminsSid)
-    {
         FreeSid(AdminsSid);
-    }
 
     if (Dacl)
-    {
         HeapFree(GetProcessHeap(), 0, Dacl);
-    }
-
-    if (ErrCode != ERROR_SUCCESS)
-    {
-        if (RelativeSd)
-        {
-            HeapFree(GetProcessHeap(), 0, RelativeSd);
-        }
-    }
 
     return ErrCode;
 }
diff --git a/base/system/winlogon/security.c b/base/system/winlogon/security.c
@@ -67,10 +67,11 @@ ConvertToSelfRelative(
     PSECURITY_DESCRIPTOR RelativeSd;
     DWORD DescriptorLength = 0;
 
-    /* Determine the size for our buffer to allocate */
-    if (!MakeSelfRelativeSD(AbsoluteSd, NULL, &DescriptorLength) && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+    /* Determine the size for allocating our buffer */
+    if (MakeSelfRelativeSD(AbsoluteSd, NULL, &DescriptorLength) ||
+        (GetLastError() != ERROR_INSUFFICIENT_BUFFER))
     {
-        ERR("ConvertToSelfRelative(): Unexpected error code (error code %lu -- must be ERROR_INSUFFICIENT_BUFFER)\n", GetLastError());
+        ERR("ConvertToSelfRelative(): error %lu, expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
         return NULL;
     }
 
@@ -80,14 +81,14 @@ ConvertToSelfRelative(
                                  DescriptorLength);
     if (RelativeSd == NULL)
     {
-        ERR("ConvertToSelfRelative(): Failed to allocate buffer for relative SD!\n");
+        ERR("ConvertToSelfRelative(): Failed to allocate buffer for relative SD\n");
         return NULL;
     }
 
     /* Convert the security descriptor now */
     if (!MakeSelfRelativeSD(AbsoluteSd, RelativeSd, &DescriptorLength))
     {
-        ERR("ConvertToSelfRelative(): Failed to convert the security descriptor to a self relative format (error code %lu)\n", GetLastError());
+        ERR("ConvertToSelfRelative(): Failed to convert the security descriptor to a self relative format (error %lu)\n", GetLastError());
         RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd);
         return NULL;
     }
diff --git a/dll/win32/advapi32/misc/logon.c b/dll/win32/advapi32/misc/logon.c
@@ -164,7 +164,7 @@ CreateDefaultProcessSecurityCommon(
                                    TokenOwnerSize);
     if (OwnerOfToken == NULL)
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for token owner!\n");
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for token owner\n");
         return FALSE;
     }
 
@@ -200,7 +200,7 @@ CreateDefaultProcessSecurityCommon(
                                           PrimaryGroupSize);
     if (PrimaryGroupOfToken == NULL)
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for primary group token!\n");
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for primary group token\n");
         Success = FALSE;
         goto Quit;
     }
@@ -225,7 +225,7 @@ CreateDefaultProcessSecurityCommon(
                                   0, 0, 0, 0, 0, 0, 0,
                                   &SystemSid))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to create Local System SID (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to create Local System SID (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
@@ -245,15 +245,15 @@ CreateDefaultProcessSecurityCommon(
                            DaclSize);
     if (Dacl == NULL)
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for DACL!\n");
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for DACL\n");
         Success = FALSE;
         goto Quit;
     }
 
     /* Initialize the DACL */
     if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize DACL (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize DACL (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
@@ -264,7 +264,7 @@ CreateDefaultProcessSecurityCommon(
                              GENERIC_ALL,
                              OwnerSid))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for owner (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for owner (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
@@ -275,39 +275,39 @@ CreateDefaultProcessSecurityCommon(
                              GENERIC_ALL,
                              SystemSid))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for SYSTEM (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for SYSTEM (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
 
     /* Initialize the descriptor in absolute format */
     if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize absolute security descriptor (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize absolute security descriptor (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
 
     /* Set the DACL to the security descriptor */
     if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up DACL to absolute security descriptor (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up DACL to absolute security descriptor (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
 
     /* Set the owner for this descriptor */
     if (!SetSecurityDescriptorOwner(&AbsoluteSd, OwnerSid, FALSE))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up owner to absolute security descriptor (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up owner to absolute security descriptor (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
 
     /* Set the primary group for this descriptor */
     if (!SetSecurityDescriptorGroup(&AbsoluteSd, PrimaryGroupSid, FALSE))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up group to absolute security descriptor (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to set up group to absolute security descriptor (error %lu)\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
@@ -318,9 +318,10 @@ CreateDefaultProcessSecurityCommon(
      * to hold the descriptor in a converted self
      * relative format.
      */
-    if (!MakeSelfRelativeSD(&AbsoluteSd, NULL, &RelativeSDSize) && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+    if (MakeSelfRelativeSD(&AbsoluteSd, NULL, &RelativeSDSize) ||
+        (GetLastError() != ERROR_INSUFFICIENT_BUFFER))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Unexpected error code (error code %d -- must be ERROR_INSUFFICIENT_BUFFER)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): error %lu, expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
         Success = FALSE;
         goto Quit;
     }
@@ -331,15 +332,16 @@ CreateDefaultProcessSecurityCommon(
                                  RelativeSDSize);
     if (RelativeSD == NULL)
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for self relative descriptor!\n");
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate relative SD\n");
         Success = FALSE;
         goto Quit;
     }
 
     /* Convert to a self relative format now */
     if (!MakeSelfRelativeSD(&AbsoluteSd, RelativeSD, &RelativeSDSize))
     {
-        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate relative SD, buffer too smal (error code %d)\n", GetLastError());
+        ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate relative SD (error %lu)\n", GetLastError());
+        RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSD);
         Success = FALSE;
         goto Quit;
     }
@@ -362,14 +364,6 @@ CreateDefaultProcessSecurityCommon(
     if (Dacl != NULL)
         RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl);
 
-    if (Success == FALSE)
-    {
-        if (RelativeSD != NULL)
-        {
-            RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSD);
-        }
-    }
-
     return Success;
 }
 
@@ -412,7 +406,7 @@ InsertProcessSecurityCommon(
                                  DACL_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION,
                                  ProcessSecurity))
     {
-        ERR("InsertProcessSecurityCommon(): Failed to set security for process (error code %d)\n", GetLastError());
+        ERR("InsertProcessSecurityCommon(): Failed to set security for process (error %lu)\n", GetLastError());
         return FALSE;
     }
 
@@ -421,7 +415,7 @@ InsertProcessSecurityCommon(
                                  DACL_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION,
                                  ThreadSecurity))
     {
-        ERR("InsertProcessSecurityCommon(): Failed to set security for thread (error code %d)\n", GetLastError());
+        ERR("InsertProcessSecurityCommon(): Failed to set security for thread (error %lu)\n", GetLastError());
         return FALSE;
     }
 
@@ -730,7 +724,7 @@ CreateProcessAsUserCommon(
          */
         if (!CreateDefaultProcessSecurityCommon(hToken, &DefaultSd))
         {
-            ERR("Failed to create common security descriptor for the token for new process!\n");
+            ERR("Failed to create common security descriptor for the token for new process\n");
             Success = FALSE;
             goto Quit;
         }
@@ -865,7 +859,7 @@ CreateProcessAsUserCommon(
                                          ProcessSd,
                                          ThreadSd))
         {
-            ERR("Failed to set new security information for process and thread!\n");
+            ERR("Failed to set new security information for process and thread\n");
             NtClose(hTokenDup);
             Success = FALSE;
             goto Quit;
@@ -881,7 +875,7 @@ CreateProcessAsUserCommon(
      * ourselves as job done. The newly created process will use
      * the default security context at this point anyway.
      */
-    TRACE("No token supplied, the process will use default security context!\n");
+    TRACE("No token supplied, the process will use default security context\n");
     Success = TRUE;
 
 Quit:
diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,11 @@ ConvertToSelfRelative(`
`67`	`67`	`PSECURITY_DESCRIPTOR RelativeSd;`
`68`	`68`	`DWORD DescriptorLength = 0;`
`69`	`69`
`70`		`- /* Determine the size for our buffer to allocate */`
`71`		`- if (!MakeSelfRelativeSD(AbsoluteSd, NULL, &DescriptorLength) && GetLastError() != ERROR_INSUFFICIENT_BUFFER)`
	`70`	`+ /* Determine the size for allocating our buffer */`
	`71`	`+ if (MakeSelfRelativeSD(AbsoluteSd, NULL, &DescriptorLength) \|\|`
	`72`	`+ (GetLastError() != ERROR_INSUFFICIENT_BUFFER))`
`72`	`73`	`{`
`73`		`- ERR("ConvertToSelfRelative(): Unexpected error code (error code %lu -- must be ERROR_INSUFFICIENT_BUFFER)\n", GetLastError());`
	`74`	`+ ERR("ConvertToSelfRelative(): error %lu, expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());`
`74`	`75`	`return NULL;`
`75`	`76`	`}`
`76`	`77`
`@@ -80,14 +81,14 @@ ConvertToSelfRelative(`
`80`	`81`	`DescriptorLength);`
`81`	`82`	`if (RelativeSd == NULL)`
`82`	`83`	`{`
`83`		`- ERR("ConvertToSelfRelative(): Failed to allocate buffer for relative SD!\n");`
	`84`	`+ ERR("ConvertToSelfRelative(): Failed to allocate buffer for relative SD\n");`
`84`	`85`	`return NULL;`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`/* Convert the security descriptor now */`
`88`	`89`	`if (!MakeSelfRelativeSD(AbsoluteSd, RelativeSd, &DescriptorLength))`
`89`	`90`	`{`
`90`		`- ERR("ConvertToSelfRelative(): Failed to convert the security descriptor to a self relative format (error code %lu)\n", GetLastError());`
	`91`	`+ ERR("ConvertToSelfRelative(): Failed to convert the security descriptor to a self relative format (error %lu)\n", GetLastError());`
`91`	`92`	`RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd);`
`92`	`93`	`return NULL;`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ CreateDefaultProcessSecurityCommon(`
`164`	`164`	`TokenOwnerSize);`
`165`	`165`	`if (OwnerOfToken == NULL)`
`166`	`166`	`{`
`167`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for token owner!\n");`
	`167`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for token owner\n");`
`168`	`168`	`return FALSE;`
`169`	`169`	`}`
`170`	`170`
`@@ -200,7 +200,7 @@ CreateDefaultProcessSecurityCommon(`
`200`	`200`	`PrimaryGroupSize);`
`201`	`201`	`if (PrimaryGroupOfToken == NULL)`
`202`	`202`	`{`
`203`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for primary group token!\n");`
	`203`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for primary group token\n");`
`204`	`204`	`Success = FALSE;`
`205`	`205`	`goto Quit;`
`206`	`206`	`}`
`@@ -225,7 +225,7 @@ CreateDefaultProcessSecurityCommon(`
`225`	`225`	`0, 0, 0, 0, 0, 0, 0,`
`226`	`226`	`&SystemSid))`
`227`	`227`	`{`
`228`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to create Local System SID (error code %d)\n", GetLastError());`
	`228`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to create Local System SID (error %lu)\n", GetLastError());`
`229`	`229`	`Success = FALSE;`
`230`	`230`	`goto Quit;`
`231`	`231`	`}`
`@@ -245,15 +245,15 @@ CreateDefaultProcessSecurityCommon(`
`245`	`245`	`DaclSize);`
`246`	`246`	`if (Dacl == NULL)`
`247`	`247`	`{`
`248`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for DACL!\n");`
	`248`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for DACL\n");`
`249`	`249`	`Success = FALSE;`
`250`	`250`	`goto Quit;`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`/* Initialize the DACL */`
`254`	`254`	`if (!InitializeAcl(Dacl, DaclSize, ACL_REVISION))`
`255`	`255`	`{`
`256`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize DACL (error code %d)\n", GetLastError());`
	`256`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize DACL (error %lu)\n", GetLastError());`
`257`	`257`	`Success = FALSE;`
`258`	`258`	`goto Quit;`
`259`	`259`	`}`
`@@ -264,7 +264,7 @@ CreateDefaultProcessSecurityCommon(`
`264`	`264`	`GENERIC_ALL,`
`265`	`265`	`OwnerSid))`
`266`	`266`	`{`
`267`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for owner (error code %d)\n", GetLastError());`
	`267`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for owner (error %lu)\n", GetLastError());`
`268`	`268`	`Success = FALSE;`
`269`	`269`	`goto Quit;`
`270`	`270`	`}`
`@@ -275,39 +275,39 @@ CreateDefaultProcessSecurityCommon(`
`275`	`275`	`GENERIC_ALL,`
`276`	`276`	`SystemSid))`
`277`	`277`	`{`
`278`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for SYSTEM (error code %d)\n", GetLastError());`
	`278`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to set up ACE for SYSTEM (error %lu)\n", GetLastError());`
`279`	`279`	`Success = FALSE;`
`280`	`280`	`goto Quit;`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`/* Initialize the descriptor in absolute format */`
`284`	`284`	`if (!InitializeSecurityDescriptor(&AbsoluteSd, SECURITY_DESCRIPTOR_REVISION))`
`285`	`285`	`{`
`286`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize absolute security descriptor (error code %d)\n", GetLastError());`
	`286`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to initialize absolute security descriptor (error %lu)\n", GetLastError());`
`287`	`287`	`Success = FALSE;`
`288`	`288`	`goto Quit;`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`/* Set the DACL to the security descriptor */`
`292`	`292`	`if (!SetSecurityDescriptorDacl(&AbsoluteSd, TRUE, Dacl, FALSE))`
`293`	`293`	`{`
`294`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to set up DACL to absolute security descriptor (error code %d)\n", GetLastError());`
	`294`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to set up DACL to absolute security descriptor (error %lu)\n", GetLastError());`
`295`	`295`	`Success = FALSE;`
`296`	`296`	`goto Quit;`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`/* Set the owner for this descriptor */`
`300`	`300`	`if (!SetSecurityDescriptorOwner(&AbsoluteSd, OwnerSid, FALSE))`
`301`	`301`	`{`
`302`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to set up owner to absolute security descriptor (error code %d)\n", GetLastError());`
	`302`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to set up owner to absolute security descriptor (error %lu)\n", GetLastError());`
`303`	`303`	`Success = FALSE;`
`304`	`304`	`goto Quit;`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`/* Set the primary group for this descriptor */`
`308`	`308`	`if (!SetSecurityDescriptorGroup(&AbsoluteSd, PrimaryGroupSid, FALSE))`
`309`	`309`	`{`
`310`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to set up group to absolute security descriptor (error code %d)\n", GetLastError());`
	`310`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to set up group to absolute security descriptor (error %lu)\n", GetLastError());`
`311`	`311`	`Success = FALSE;`
`312`	`312`	`goto Quit;`
`313`	`313`	`}`
`@@ -318,9 +318,10 @@ CreateDefaultProcessSecurityCommon(`
`318`	`318`	`* to hold the descriptor in a converted self`
`319`	`319`	`* relative format.`
`320`	`320`	`*/`
`321`		`- if (!MakeSelfRelativeSD(&AbsoluteSd, NULL, &RelativeSDSize) && GetLastError() != ERROR_INSUFFICIENT_BUFFER)`
	`321`	`+ if (MakeSelfRelativeSD(&AbsoluteSd, NULL, &RelativeSDSize) \|\|`
	`322`	`+ (GetLastError() != ERROR_INSUFFICIENT_BUFFER))`
`322`	`323`	`{`
`323`		`- ERR("CreateDefaultProcessSecurityCommon(): Unexpected error code (error code %d -- must be ERROR_INSUFFICIENT_BUFFER)\n", GetLastError());`
	`324`	`+ ERR("CreateDefaultProcessSecurityCommon(): error %lu, expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());`
`324`	`325`	`Success = FALSE;`
`325`	`326`	`goto Quit;`
`326`	`327`	`}`
`@@ -331,15 +332,16 @@ CreateDefaultProcessSecurityCommon(`
`331`	`332`	`RelativeSDSize);`
`332`	`333`	`if (RelativeSD == NULL)`
`333`	`334`	`{`
`334`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate buffer for self relative descriptor!\n");`
	`335`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate relative SD\n");`
`335`	`336`	`Success = FALSE;`
`336`	`337`	`goto Quit;`
`337`	`338`	`}`
`338`	`339`
`339`	`340`	`/* Convert to a self relative format now */`
`340`	`341`	`if (!MakeSelfRelativeSD(&AbsoluteSd, RelativeSD, &RelativeSDSize))`
`341`	`342`	`{`
`342`		`- ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate relative SD, buffer too smal (error code %d)\n", GetLastError());`
	`343`	`+ ERR("CreateDefaultProcessSecurityCommon(): Failed to allocate relative SD (error %lu)\n", GetLastError());`
	`344`	`+ RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSD);`
`343`	`345`	`Success = FALSE;`
`344`	`346`	`goto Quit;`
`345`	`347`	`}`
`@@ -362,14 +364,6 @@ CreateDefaultProcessSecurityCommon(`
`362`	`364`	`if (Dacl != NULL)`
`363`	`365`	`RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl);`
`364`	`366`
`365`		`- if (Success == FALSE)`
`366`		`- {`
`367`		`- if (RelativeSD != NULL)`
`368`		`- {`
`369`		`- RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSD);`
`370`		`- }`
`371`		`- }`
`372`		`-`
`373`	`367`	`return Success;`
`374`	`368`	`}`
`375`	`369`
`@@ -412,7 +406,7 @@ InsertProcessSecurityCommon(`
`412`	`406`	`DACL_SECURITY_INFORMATION \| OWNER_SECURITY_INFORMATION \| GROUP_SECURITY_INFORMATION,`
`413`	`407`	`ProcessSecurity))`
`414`	`408`	`{`
`415`		`- ERR("InsertProcessSecurityCommon(): Failed to set security for process (error code %d)\n", GetLastError());`
	`409`	`+ ERR("InsertProcessSecurityCommon(): Failed to set security for process (error %lu)\n", GetLastError());`
`416`	`410`	`return FALSE;`
`417`	`411`	`}`
`418`	`412`
`@@ -421,7 +415,7 @@ InsertProcessSecurityCommon(`
`421`	`415`	`DACL_SECURITY_INFORMATION \| OWNER_SECURITY_INFORMATION \| GROUP_SECURITY_INFORMATION,`
`422`	`416`	`ThreadSecurity))`
`423`	`417`	`{`
`424`		`- ERR("InsertProcessSecurityCommon(): Failed to set security for thread (error code %d)\n", GetLastError());`
	`418`	`+ ERR("InsertProcessSecurityCommon(): Failed to set security for thread (error %lu)\n", GetLastError());`
`425`	`419`	`return FALSE;`
`426`	`420`	`}`
`427`	`421`
`@@ -730,7 +724,7 @@ CreateProcessAsUserCommon(`
`730`	`724`	`*/`
`731`	`725`	`if (!CreateDefaultProcessSecurityCommon(hToken, &DefaultSd))`
`732`	`726`	`{`
`733`		`- ERR("Failed to create common security descriptor for the token for new process!\n");`
	`727`	`+ ERR("Failed to create common security descriptor for the token for new process\n");`
`734`	`728`	`Success = FALSE;`
`735`	`729`	`goto Quit;`
`736`	`730`	`}`
`@@ -865,7 +859,7 @@ CreateProcessAsUserCommon(`
`865`	`859`	`ProcessSd,`
`866`	`860`	`ThreadSd))`
`867`	`861`	`{`
`868`		`- ERR("Failed to set new security information for process and thread!\n");`
	`862`	`+ ERR("Failed to set new security information for process and thread\n");`
`869`	`863`	`NtClose(hTokenDup);`
`870`	`864`	`Success = FALSE;`
`871`	`865`	`goto Quit;`
`@@ -881,7 +875,7 @@ CreateProcessAsUserCommon(`
`881`	`875`	`* ourselves as job done. The newly created process will use`
`882`	`876`	`* the default security context at this point anyway.`
`883`	`877`	`*/`
`884`		`- TRACE("No token supplied, the process will use default security context!\n");`
	`878`	`+ TRACE("No token supplied, the process will use default security context\n");`
`885`	`879`	`Success = TRUE;`
`886`	`880`
`887`	`881`	`Quit:`