From 1de5731e1ef958798c91f946e4ee1d4e6f03a933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 25 Dec 2016 15:47:51 +0000 Subject: [PATCH] [ADVAPI32][LSA][IDL]: Fix the parameter type of some functions + fix associated LSA IDL file (ref: https://msdn.microsoft.com/en-us/library/cc234411.aspx ) svn path=/trunk/; revision=73484 --- reactos/dll/win32/advapi32/sec/lsa.c | 16 +++++++------- reactos/dll/win32/lsasrv/lsarpc.c | 6 +++--- reactos/sdk/include/reactos/idl/lsa.idl | 28 ++++++++++++------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/reactos/dll/win32/advapi32/sec/lsa.c b/reactos/dll/win32/advapi32/sec/lsa.c index c4ed1fb9918..b9b6be91360 100644 --- a/reactos/dll/win32/advapi32/sec/lsa.c +++ b/reactos/dll/win32/advapi32/sec/lsa.c @@ -1653,6 +1653,7 @@ LsaRemoveAccountRights(IN LSA_HANDLE PolicyHandle, IN PLSA_UNICODE_STRING UserRights, IN ULONG CountOfRights) { + NTSTATUS Status; LSAPR_USER_RIGHT_SET UserRightSet; TRACE("LsaRemoveAccountRights(%p %p %d %p %lu)\n", @@ -1663,18 +1664,18 @@ LsaRemoveAccountRights(IN LSA_HANDLE PolicyHandle, RpcTryExcept { - LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle, - (PRPC_SID)AccountSid, - AllRights, - &UserRightSet); + Status = LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle, + (PRPC_SID)AccountSid, + AllRights, + &UserRightSet); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - I_RpcMapWin32Status(RpcExceptionCode()); + Status = I_RpcMapWin32Status(RpcExceptionCode()); } RpcEndExcept; - return STATUS_SUCCESS; + return Status; } @@ -1734,7 +1735,6 @@ LsaRetrievePrivateData(IN LSA_HANDLE PolicyHandle, } RpcEndExcept; - if (EncryptedData == NULL) { *PrivateData = NULL; @@ -1813,7 +1813,7 @@ WINAPI LsaSetForestTrustInformation(IN LSA_HANDLE PolicyHandle, IN PLSA_UNICODE_STRING TrustedDomainName, IN PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - IN BOOL CheckOnly, + IN BOOLEAN CheckOnly, OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { NTSTATUS Status; diff --git a/reactos/dll/win32/lsasrv/lsarpc.c b/reactos/dll/win32/lsasrv/lsarpc.c index ee5e77f6165..d59203a9df2 100644 --- a/reactos/dll/win32/lsasrv/lsarpc.c +++ b/reactos/dll/win32/lsasrv/lsarpc.c @@ -1624,7 +1624,7 @@ done: /* Function 20 */ NTSTATUS WINAPI LsarRemovePrivilegesFromAccount( LSAPR_HANDLE AccountHandle, - BOOL AllPrivileges, + BOOLEAN AllPrivileges, PLSAPR_PRIVILEGE_SET Privileges) { PLSA_DB_OBJECT AccountObject; @@ -3080,7 +3080,7 @@ done: NTSTATUS WINAPI LsarRemoveAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, - BOOL AllRights, + BOOLEAN AllRights, PLSAPR_USER_RIGHT_SET UserRights) { PLSA_DB_OBJECT PolicyObject; @@ -3988,7 +3988,7 @@ NTSTATUS WINAPI LsarSetForestTrustInformation( PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - BOOL CheckOnly, + BOOLEAN CheckOnly, PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { UNIMPLEMENTED; diff --git a/reactos/sdk/include/reactos/idl/lsa.idl b/reactos/sdk/include/reactos/idl/lsa.idl index c96a49ad897..93c2bc3d6b0 100644 --- a/reactos/sdk/include/reactos/idl/lsa.idl +++ b/reactos/sdk/include/reactos/idl/lsa.idl @@ -64,7 +64,7 @@ typedef struct _SECURITY_QUALITY_OF_SERVICE { DWORD Length; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; - BYTE EffectiveOnly; + BOOLEAN EffectiveOnly; } SECURITY_QUALITY_OF_SERVICE, *PSECURITY_QUALITY_OF_SERVICE; cpp_quote("#endif") @@ -304,12 +304,12 @@ typedef struct _POLICY_MODIFICATION_INFO { } POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO; typedef struct _POLICY_AUDIT_FULL_SET_INFO { - BOOL ShutDownOnFull; + BOOLEAN ShutDownOnFull; } POLICY_AUDIT_FULL_SET_INFO, *PPOLICY_AUDIT_FULL_SET_INFO; typedef struct _POLICY_AUDIT_FULL_QUERY_INFO { - BOOL ShutDownOnFull; - BOOL LogIsFull; + BOOLEAN ShutDownOnFull; + BOOLEAN LogIsFull; } POLICY_AUDIT_FULL_QUERY_INFO, *PPOLICY_AUDIT_FULL_QUERY_INFO; cpp_quote("#endif") @@ -582,13 +582,13 @@ typedef struct _LSA_FOREST_TRUST_COLLISION_INFORMATION { cpp_quote("#endif") [ - uuid(12345778-1234-abcd-ef00-0123456789ab), - version(0.0), - pointer_default(unique), - endpoint("ncacn_np:[\\pipe\\lsarpc]") - #ifndef __midl - ,explicit_handle - #endif + uuid(12345778-1234-abcd-ef00-0123456789ab), + version(0.0), + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\lsarpc]") +#ifndef __midl + ,explicit_handle +#endif ] interface lsarpc { @@ -724,7 +724,7 @@ interface lsarpc /* Function 20 */ NTSTATUS __stdcall LsarRemovePrivilegesFromAccount( [in] LSAPR_HANDLE AccountHandle, - [in] BOOL AllPrivileges, + [in] BOOLEAN AllPrivileges, [in, unique] PLSAPR_PRIVILEGE_SET Privileges); /* Function 21 */ @@ -836,7 +836,7 @@ cpp_quote("#if _WIN32_WINNT >= 0x0351") NTSTATUS __stdcall LsarRemoveAccountRights( [in] LSAPR_HANDLE PolicyHandle, [in] PRPC_SID AccountSid, - [in] BOOL AllRights, + [in] BOOLEAN AllRights, [in] PLSAPR_USER_RIGHT_SET UserRights); /* Function 39 */ @@ -1059,7 +1059,7 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] PLSA_UNICODE_STRING TrustedDomainName, [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, [in] PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - [in] BOOL CheckOnly, + [in] BOOLEAN CheckOnly, [out] PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo); /* Function 75 */