Fixed prototypes of a couple of ntdll functions.

Replaced the CallWin32ToNt macro by a proper function. PBOOL cannot be cast to PBOOLEAN, we need to use an intermediate variable.

Fixed prototypes of a couple of ntdll functions.
1d36d129 · Alexandre Julliard · ba8200bf · 1d36d129 · 1d36d129 · 1d36d129
Commit 1d36d129 authored Dec 22, 2004 by Alexandre Julliard
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

security.c dlls/advapi32/security.c +0 -0

sec.c dlls/ntdll/sec.c +4 -4

winternl.h include/winternl.h +2 -2

No files found.
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -61,7 +61,7 @@ static WINE_EXCEPTION_FILTER(page_fault)
 *  RtlAllocateAndInitializeSid		[NTDLL.@]
 *
 */
-BOOLEAN WINAPI RtlAllocateAndInitializeSid (
+NTSTATUS WINAPI RtlAllocateAndInitializeSid (
 	PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
 	BYTE nSubAuthorityCount,
 	DWORD nSubAuthority0, DWORD nSubAuthority1,
@@ -78,7 +78,7 @@ BOOLEAN WINAPI RtlAllocateAndInitializeSid (

 	if (!(*pSid = RtlAllocateHeap( GetProcessHeap(), 0,
                                       RtlLengthRequiredSid(nSubAuthorityCount))))
-	  return FALSE;
+	    return STATUS_NO_MEMORY;

 	((SID*)*pSid)->Revision = SID_REVISION;

@@ -1147,12 +1147,12 @@ NtAccessCheck(
 	OUT PPRIVILEGE_SET PrivilegeSet,
 	OUT PULONG ReturnLength,
 	OUT PULONG GrantedAccess,
-	OUT PBOOLEAN AccessStatus)
+	OUT NTSTATUS *AccessStatus)
 {
 	FIXME("(%p, %p, %08lx, %p, %p, %p, %p, %p), stub\n",
          SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping,
          PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus);
-	*AccessStatus = TRUE;
+	*AccessStatus = STATUS_SUCCESS;
 	return STATUS_SUCCESS;
 }


--- a/include/winternl.h
+++ b/include/winternl.h
@@ -1339,7 +1339,7 @@ void      WINAPI LdrInitializeThunk(HANDLE,ULONG,ULONG,ULONG);
 NTSTATUS  WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*);
 void      WINAPI LdrShutdownProcess(void);
 void      WINAPI LdrShutdownThread(void);
-NTSTATUS  WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,PBOOLEAN);
+NTSTATUS  WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*);
 NTSTATUS  WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG);
 NTSTATUS  WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
 NTSTATUS  WINAPI NtAlertThread(HANDLE ThreadHandle);
@@ -1464,7 +1464,7 @@ NTSTATUS  WINAPI RtlAddAccessDeniedAce(PACL,DWORD,DWORD,PSID);
 NTSTATUS  WINAPI RtlAddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
 PVOID     WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
 DWORD     WINAPI RtlAdjustPrivilege(DWORD,DWORD,DWORD,DWORD);
-BOOLEAN   WINAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *);
+NTSTATUS  WINAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *);
 RTL_HANDLE * WINAPI RtlAllocateHandle(RTL_HANDLE_TABLE *,ULONG *);
 PVOID     WINAPI RtlAllocateHeap(HANDLE,ULONG,ULONG);
 DWORD     WINAPI RtlAnsiStringToUnicodeSize(const STRING *);