Add/correct prototypes for some already defined functions in

dlls/advapi32/advapi32.spec

@@ -273,7 +273,7 @@
 @ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr)
 @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr)
 # @ stub GetSecurityInfoExA
-@ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr wstr wstr)
+@ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr)
 @ stdcall GetServiceDisplayNameA(ptr str ptr ptr)
 @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr)
 @ stdcall GetServiceKeyNameA(long str ptr ptr)

dlls/advapi32/security.c

@@ -637,15 +637,15 @@ GetLengthSid (PSID pSid)
  *  Failure: nonzero error code from Winerror.h
  */
 DWORD WINAPI BuildSecurityDescriptorA(
-    IN PTRUSTEE_A pOwner,
-    IN PTRUSTEE_A pGroup,
-    IN DWORD cCountOfAccessEntries,
-    IN PEXPLICIT_ACCESS_A pListOfAccessEntries,
-    IN DWORD cCountOfAuditEntries,
-    IN PEXPLICIT_ACCESS_A pListofAuditEntries,
+    IN PTRUSTEEA pOwner,
+    IN PTRUSTEEA pGroup,
+    IN ULONG cCountOfAccessEntries,
+    IN PEXPLICIT_ACCESSA pListOfAccessEntries,
+    IN ULONG cCountOfAuditEntries,
+    IN PEXPLICIT_ACCESSA pListofAuditEntries,
     IN PSECURITY_DESCRIPTOR pOldSD,
-    IN OUT PDWORD lpdwBufferLength,
-    OUT PSECURITY_DESCRIPTOR pNewSD)
+    IN OUT PULONG lpdwBufferLength,
+    OUT PSECURITY_DESCRIPTOR* pNewSD)
 { 
     FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
           cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
@@ -660,15 +660,15 @@ DWORD WINAPI BuildSecurityDescriptorA(
  * See BuildSecurityDescriptorA.
  */
 DWORD WINAPI BuildSecurityDescriptorW(
-    IN PTRUSTEE_W pOwner,
-    IN PTRUSTEE_W pGroup,
-    IN DWORD cCountOfAccessEntries,
-    IN PEXPLICIT_ACCESS_W pListOfAccessEntries,
-    IN DWORD cCountOfAuditEntries,
-    IN PEXPLICIT_ACCESS_W pListofAuditEntries,
+    IN PTRUSTEEW pOwner,
+    IN PTRUSTEEW pGroup,
+    IN ULONG cCountOfAccessEntries,
+    IN PEXPLICIT_ACCESSW pListOfAccessEntries,
+    IN ULONG cCountOfAuditEntries,
+    IN PEXPLICIT_ACCESSW pListofAuditEntries,
     IN PSECURITY_DESCRIPTOR pOldSD,
-    IN OUT PDWORD lpdwBufferLength,
-    OUT PSECURITY_DESCRIPTOR pNewSD)
+    IN OUT PULONG lpdwBufferLength,
+    OUT PSECURITY_DESCRIPTOR* pNewSD)
 { 
     FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
           cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
@@ -1616,9 +1616,9 @@ SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3,
  *   x1 []
  */
 BOOL WINAPI
-NotifyBootConfigStatus( DWORD x1 )
+NotifyBootConfigStatus( BOOL x1 )
 {
-	FIXME("(0x%08lx):stub\n",x1);
+	FIXME("(0x%08d):stub\n",x1);
 	return 1;
 }
 

include/aclapi.h

@@ -35,6 +35,12 @@ DWORD WINAPI GetExplicitEntriesFromAclW( PACL, PULONG, PEXPLICIT_ACCESS_W* );
 DWORD WINAPI GetSecurityInfo( HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
         PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);
 
+DWORD WINAPI GetSecurityInfoExA(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
+        LPCSTR, LPCSTR, PACTRL_ACCESSA*, PACTRL_AUDITA*, LPSTR*, LPSTR*);
+DWORD WINAPI GetSecurityInfoExW(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
+        LPCWSTR, LPCWSTR, PACTRL_ACCESSW*, PACTRL_AUDITW*, LPWSTR*, LPWSTR*);
+#define     GetSecurityInfoEx WINELIB_NAME_AW(GetSecurityInfoEx)
+
 DWORD WINAPI GetNamedSecurityInfoA(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION,
         PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);
 DWORD WINAPI GetNamedSecurityInfoW(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION,
@@ -66,6 +72,16 @@ TRUSTEE_TYPE WINAPI GetTrusteeTypeA( PTRUSTEEA );
 TRUSTEE_TYPE WINAPI GetTrusteeTypeW( PTRUSTEEW );
 #define     GetTrusteeType WINELIB_NAME_AW(GetTrusteeType)
 
+DWORD WINAPI BuildSecurityDescriptorA( PTRUSTEEA, PTRUSTEEA, ULONG, PEXPLICIT_ACCESS_A,
+                                       ULONG, PEXPLICIT_ACCESS_A,
+                                       PSECURITY_DESCRIPTOR, PULONG,
+                                       PSECURITY_DESCRIPTOR* );
+DWORD WINAPI BuildSecurityDescriptorW( PTRUSTEEW, PTRUSTEEW, ULONG, PEXPLICIT_ACCESS_W,
+                                       ULONG, PEXPLICIT_ACCESS_W,
+                                       PSECURITY_DESCRIPTOR, PULONG,
+                                       PSECURITY_DESCRIPTOR* );
+#define     BuildSecurityDescriptor WINELIB_NAME_AW(BuildSecurityDescriptor)
+
 void WINAPI BuildTrusteeWithNameA( PTRUSTEEA, LPSTR );
 void WINAPI BuildTrusteeWithNameW( PTRUSTEEW, LPWSTR );
 #define     BuildTrusteeWithName WINELIB_NAME_AW(BuildTrusteeWithName)

include/winsvc.h

@@ -295,6 +295,7 @@ BOOL        WINAPI GetServiceKeyNameA(SC_HANDLE,LPCSTR,LPSTR,LPDWORD);
 BOOL        WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,LPDWORD);
 #define     GetServiceKeyName WINELIB_NAME_AW(GetServiceKeyName)
 SC_LOCK     WINAPI LockServiceDatabase(SC_HANDLE);
+BOOL        WINAPI NotifyBootConfigStatus(BOOL);
 SC_HANDLE   WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD);
 SC_HANDLE   WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD);
 #define     OpenSCManager WINELIB_NAME_AW(OpenSCManager)

tools/winapi/win32.api

@@ -111,10 +111,8 @@ PBOOL
 PDWORD
 PEXPLICIT_ACCESSA
 PEXPLICIT_ACCESSA *
-PEXPLICIT_ACCESS_A
 PEXPLICIT_ACCESSW
 PEXPLICIT_ACCESSW *
-PEXPLICIT_ACCESS_W
 PGENERIC_MAPPING
 PHANDLE
 PHKEY
@@ -144,9 +142,7 @@ PTOKEN_GROUPS
 PTRACE_GUID_REGISTRATION
 PTRACEHANDLE
 PTRUSTEEA
-PTRUSTEE_A
 PTRUSTEEW
-PTRUSTEE_W
 PUCHAR
 PULONG
 PVOID