Author: hbelusca
Date: Sun Dec 25 15:47:51 2016
New Revision: 73484
URL:
http://svn.reactos.org/svn/reactos?rev=73484&view=rev
Log:
[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 )
Modified:
trunk/reactos/dll/win32/advapi32/sec/lsa.c
trunk/reactos/dll/win32/lsasrv/lsarpc.c
trunk/reactos/sdk/include/reactos/idl/lsa.idl
Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Dec 25 15:47:51 2016
@@ -1653,6 +1653,7 @@
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 @@
RpcTryExcept
{
- LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle,
- (PRPC_SID)AccountSid,
- AllRights,
- &UserRightSet);
- }
- RpcExcept(EXCEPTION_EXECUTE_HANDLER)
- {
- I_RpcMapWin32Status(RpcExceptionCode());
- }
- RpcEndExcept;
-
- return STATUS_SUCCESS;
+ Status = LsarRemoveAccountRights((LSAPR_HANDLE)PolicyHandle,
+ (PRPC_SID)AccountSid,
+ AllRights,
+ &UserRightSet);
+ }
+ RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+ {
+ Status = I_RpcMapWin32Status(RpcExceptionCode());
+ }
+ RpcEndExcept;
+
+ return Status;
}
@@ -1733,7 +1734,6 @@
Status = I_RpcMapWin32Status(RpcExceptionCode());
}
RpcEndExcept;
-
if (EncryptedData == NULL)
{
@@ -1813,7 +1813,7 @@
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;
Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?…
==============================================================================
--- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Dec 25 15:47:51 2016
@@ -1624,7 +1624,7 @@
/* Function 20 */
NTSTATUS WINAPI LsarRemovePrivilegesFromAccount(
LSAPR_HANDLE AccountHandle,
- BOOL AllPrivileges,
+ BOOLEAN AllPrivileges,
PLSAPR_PRIVILEGE_SET Privileges)
{
PLSA_DB_OBJECT AccountObject;
@@ -3080,7 +3080,7 @@
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 @@
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;
Modified: trunk/reactos/sdk/include/reactos/idl/lsa.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/ls…
==============================================================================
--- trunk/reactos/sdk/include/reactos/idl/lsa.idl [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/reactos/idl/lsa.idl [iso-8859-1] Sun Dec 25 15:47:51 2016
@@ -64,7 +64,7 @@
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 @@
} 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 @@
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 @@
/* 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 @@
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 @@
[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 */