diff --git a/sdk/include/reactos/idl/lsa.idl b/sdk/include/reactos/idl/lsa.idl
index a7be25b1ea2..9e049bd680a 100644
--- a/sdk/include/reactos/idl/lsa.idl
+++ b/sdk/include/reactos/idl/lsa.idl
@@ -609,34 +609,46 @@ typedef struct _CREDPR_TARGET_INFORMATION
 interface lsarpc
 {
     /* Function 0 */
-    NTSTATUS __stdcall LsarClose(
+    NTSTATUS
+    __stdcall
+    LsarClose(
         [in, out] LSAPR_HANDLE *ObjectHandle);
 
     /* Function 1 */
-    NTSTATUS __stdcall LsarDelete(
+    NTSTATUS
+    __stdcall
+    LsarDelete(
         [in] LSAPR_HANDLE ObjectHandle);
 
     /* Function 2 */
-    NTSTATUS __stdcall LsarEnumeratePrivileges(
+    NTSTATUS
+    __stdcall
+    LsarEnumeratePrivileges(
         [in] LSAPR_HANDLE PolicyHandle,
         [in, out] DWORD *EnumerationContext,
         [out] PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer,
         [in] DWORD PreferedMaximumLength);
 
     /* Function 3 */
-    NTSTATUS __stdcall LsarQuerySecurityObject(
+    NTSTATUS
+    __stdcall
+    LsarQuerySecurityObject(
         [in] LSAPR_HANDLE ObjectHandle,
         [in] SECURITY_INFORMATION SecurityInformation,
         [out] PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor);
 
     /* Function 4 */
-    NTSTATUS __stdcall LsarSetSecurityObject(
+    NTSTATUS
+    __stdcall
+    LsarSetSecurityObject(
         [in] LSAPR_HANDLE ObjectHandle,
         [in] SECURITY_INFORMATION SecurityInformation,
         [in] PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor);
 
     /* Function 5 */
-    NTSTATUS __stdcall LsarChangePassword(
+    NTSTATUS
+    __stdcall
+    LsarChangePassword(
         [in] PRPC_UNICODE_STRING String1,
         [in] PRPC_UNICODE_STRING String2,
         [in] PRPC_UNICODE_STRING String3,
@@ -644,58 +656,76 @@ interface lsarpc
         [in] PRPC_UNICODE_STRING String5);
 
     /* Function 6 */
-    NTSTATUS __stdcall LsarOpenPolicy(
+    NTSTATUS
+    __stdcall
+    LsarOpenPolicy(
         [in, unique] PLSAPR_SERVER_NAME SystemName,
         [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *PolicyHandle);
 
     /* Function 7 */
-    NTSTATUS __stdcall LsarQueryInformationPolicy(
+    NTSTATUS
+    __stdcall
+    LsarQueryInformationPolicy(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation);
 
     /* Function 8 */
-    NTSTATUS __stdcall LsarSetInformationPolicy(
+    NTSTATUS
+    __stdcall
+    LsarSetInformationPolicy(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation);
 
     /* Function 9 */
-    NTSTATUS __stdcall LsarClearAuditLog(
+    NTSTATUS
+    __stdcall
+    LsarClearAuditLog(
         [in] LSAPR_HANDLE ObjectHandle);
 
     /* Function 10 */
-    NTSTATUS __stdcall LsarCreateAccount(
+    NTSTATUS
+    __stdcall
+    LsarCreateAccount(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID AccountSid,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *AccountHandle);
 
     /* Function 11 */
-    NTSTATUS __stdcall LsarEnumerateAccounts(
+    NTSTATUS
+    __stdcall
+    LsarEnumerateAccounts(
         [in] LSAPR_HANDLE PolicyHandle,
         [in, out] DWORD *EnumerationContext,
         [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer,
         [in] DWORD PreferedMaximumLength);
 
     /* Function 12 */
-    NTSTATUS __stdcall LsarCreateTrustedDomain(
+    NTSTATUS
+    __stdcall
+    LsarCreateTrustedDomain(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSAPR_TRUST_INFORMATION TrustedDomainInformation,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *TrustedDomainHandle);
 
     /* Function 13 */
-    NTSTATUS __stdcall LsarEnumerateTrustedDomains(
+    NTSTATUS
+    __stdcall
+    LsarEnumerateTrustedDomains(
         [in] LSAPR_HANDLE PolicyHandle,
         [in, out] DWORD *EnumerationContext,
         [out] PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer,
         [in] DWORD PreferedMaximumLength);
 
     /* Function 14 */
-    NTSTATUS __stdcall LsarLookupNames(
+    NTSTATUS
+    __stdcall
+    LsarLookupNames(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] DWORD Count,
         [in, size_is(Count)] PRPC_UNICODE_STRING Names,
@@ -705,7 +735,9 @@ interface lsarpc
         [in, out] DWORD *MappedCount);
 
     /* Function 15 */
-    NTSTATUS __stdcall LsarLookupSids(
+    NTSTATUS
+    __stdcall
+    LsarLookupSids(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer,
         [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains,
@@ -714,89 +746,119 @@ interface lsarpc
         [in, out] DWORD *MappedCount);
 
     /* Function 16 */
-    NTSTATUS __stdcall LsarCreateSecret(
+    NTSTATUS
+    __stdcall
+    LsarCreateSecret(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING SecretName,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *SecretHandle);
 
     /* Function 17 */
-    NTSTATUS __stdcall LsarOpenAccount(
+    NTSTATUS
+    __stdcall
+    LsarOpenAccount(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID AccountSid,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *AccountHandle);
 
     /* Function 18 */
-    NTSTATUS __stdcall LsarEnumeratePrivilegesAccount(
+    NTSTATUS
+    __stdcall
+    LsarEnumeratePrivilegesAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [out] PLSAPR_PRIVILEGE_SET *Privileges);
 
     /* Function 19 */
-    NTSTATUS __stdcall LsarAddPrivilegesToAccount(
+    NTSTATUS
+    __stdcall
+    LsarAddPrivilegesToAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [in] PLSAPR_PRIVILEGE_SET Privileges);
 
     /* Function 20 */
-    NTSTATUS __stdcall LsarRemovePrivilegesFromAccount(
+    NTSTATUS
+    __stdcall
+    LsarRemovePrivilegesFromAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [in] BOOLEAN AllPrivileges,
         [in, unique] PLSAPR_PRIVILEGE_SET Privileges);
 
     /* Function 21 */
-    NTSTATUS __stdcall LsarGetQuotasForAccount(
+    NTSTATUS
+    __stdcall
+    LsarGetQuotasForAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [out] PQUOTA_LIMITS QuotaLimits);
 
     /* Function 22 */
-    NTSTATUS __stdcall LsarSetQuotasForAccount(
+    NTSTATUS
+    __stdcall
+    LsarSetQuotasForAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [in] PQUOTA_LIMITS QuotaLimits);
 
     /* Function 23 */
-    NTSTATUS __stdcall LsarGetSystemAccessAccount(
+    NTSTATUS
+    __stdcall
+    LsarGetSystemAccessAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [out] ACCESS_MASK *SystemAccess);
 
     /* Function 24 */
-    NTSTATUS __stdcall LsarSetSystemAccessAccount(
+    NTSTATUS
+    __stdcall
+    LsarSetSystemAccessAccount(
         [in] LSAPR_HANDLE AccountHandle,
         [in] ACCESS_MASK SystemAccess);
 
     /* Function 25 */
-    NTSTATUS __stdcall LsarOpenTrustedDomain(
+    NTSTATUS
+    __stdcall
+    LsarOpenTrustedDomain(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID TrustedDomainSid,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *TrustedDomainHandle);
 
     /* Function 26 */
-    NTSTATUS __stdcall LsarQueryInfoTrustedDomain(
+    NTSTATUS
+    __stdcall
+    LsarQueryInfoTrustedDomain(
         [in] LSAPR_HANDLE TrustedDomainHandle,
         [in] TRUSTED_INFORMATION_CLASS InformationClass,
         [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation);
 
     /* Function 27 */
-    NTSTATUS __stdcall LsarSetInformationTrustedDomain(
+    NTSTATUS
+    __stdcall
+    LsarSetInformationTrustedDomain(
         [in] LSAPR_HANDLE TrustedDomainHandle,
         [in] TRUSTED_INFORMATION_CLASS InformationClass,
         [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation);
 
     /* Function 28 */
-    NTSTATUS __stdcall LsarOpenSecret(
+    NTSTATUS
+    __stdcall
+    LsarOpenSecret(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING SecretName,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *SecretHandle);
 
     /* Function 29 */
-    NTSTATUS __stdcall LsarSetSecret(
+    NTSTATUS
+    __stdcall
+    LsarSetSecret(
         [in] LSAPR_HANDLE SecretHandle,
         [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue,
         [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedOldValue);
 
     /* Function 30 */
-    NTSTATUS __stdcall LsarQuerySecret(
+    NTSTATUS
+    __stdcall
+    LsarQuerySecret(
         [in] LSAPR_HANDLE SecretHandle,
         [in, out, unique] PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue,
         [in, out, unique] PLARGE_INTEGER CurrentValueSetTime,
@@ -804,19 +866,25 @@ interface lsarpc
         [in, out, unique] PLARGE_INTEGER OldValueSetTime);
 
     /* Function 31 */
-    NTSTATUS __stdcall LsarLookupPrivilegeValue(
+    NTSTATUS
+    __stdcall
+    LsarLookupPrivilegeValue(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING Name,
         [out] PLUID Value);
 
     /* Function 32 */
-    NTSTATUS __stdcall LsarLookupPrivilegeName(
+    NTSTATUS
+    __stdcall
+    LsarLookupPrivilegeName(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLUID Value,
         [out] PRPC_UNICODE_STRING *Name);
 
     /* Function 33 */
-    NTSTATUS __stdcall LsarLookupPrivilegeDisplayName(
+    NTSTATUS
+    __stdcall
+    LsarLookupPrivilegeDisplayName(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING Name,
         [in] USHORT ClientLanguage,
@@ -825,76 +893,100 @@ interface lsarpc
         [out] USHORT *LanguageReturned);
 
     /* Function 34 */
-    NTSTATUS __stdcall LsarDeleteObject(
+    NTSTATUS
+    __stdcall
+    LsarDeleteObject(
         [in, out] LSAPR_HANDLE *ObjectHandle);
 
 cpp_quote("#if _WIN32_WINNT >= 0x0351")
 
     /* Function 35 */
-    NTSTATUS __stdcall LsarEnumerateAccountsWithUserRight(
+    NTSTATUS
+    __stdcall
+    LsarEnumerateAccountsWithUserRight(
         [in] LSAPR_HANDLE PolicyHandle,
         [in, unique] PRPC_UNICODE_STRING UserRight,
         [out] PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer);
 
     /* Function 36 */
-    NTSTATUS __stdcall LsarEnumerateAccountRights(
+    NTSTATUS
+    __stdcall
+    LsarEnumerateAccountRights(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID AccountSid,
         [out] PLSAPR_USER_RIGHT_SET UserRights);
 
     /* Function 37 */
-    NTSTATUS __stdcall LsarAddAccountRights(
+    NTSTATUS
+    __stdcall
+    LsarAddAccountRights(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID AccountSid,
         [in] PLSAPR_USER_RIGHT_SET UserRights);
 
     /* Function 38 */
-    NTSTATUS __stdcall LsarRemoveAccountRights(
+    NTSTATUS
+    __stdcall
+    LsarRemoveAccountRights(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID AccountSid,
         [in] BOOLEAN AllRights,
         [in] PLSAPR_USER_RIGHT_SET UserRights);
 
     /* Function 39 */
-    NTSTATUS __stdcall LsarQueryTrustedDomainInfo(
+    NTSTATUS
+    __stdcall
+    LsarQueryTrustedDomainInfo(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID TrustedDomainSid,
         [in] TRUSTED_INFORMATION_CLASS InformationClass,
         [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation);
 
     /* Function 40 */
-    NTSTATUS __stdcall LsarSetTrustedDomainInfo(
+    NTSTATUS
+    __stdcall
+    LsarSetTrustedDomainInfo(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID TrustedDomainSid,
         [in] TRUSTED_INFORMATION_CLASS InformationClass,
         [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation);
 
     /* Function 41 */
-    NTSTATUS __stdcall LsarDeleteTrustedDomain(
+    NTSTATUS
+    __stdcall
+    LsarDeleteTrustedDomain(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_SID TrustedDomainSid);
 
     /* Function 42 */
-    NTSTATUS __stdcall LsarStorePrivateData(
+    NTSTATUS
+    __stdcall
+    LsarStorePrivateData(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING KeyName,
         [in, unique] PLSAPR_CR_CIPHER_VALUE EncryptedData);
 
     /* Function 43 */
-    NTSTATUS __stdcall LsarRetrievePrivateData(
+    NTSTATUS
+    __stdcall
+    LsarRetrievePrivateData(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING KeyName,
         [in, out] PLSAPR_CR_CIPHER_VALUE *EncryptedData);
 
     /* Function 44 */
-    NTSTATUS __stdcall LsarOpenPolicy2(
+    NTSTATUS
+    __stdcall
+    LsarOpenPolicy2(
         [in, unique, string] PLSAPR_SERVER_NAME SystemName,
         [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *PolicyHandle);
 
     /* Function 45 */
-    NTSTATUS __stdcall LsarGetUserName(
+    NTSTATUS
+    __stdcall
+    LsarGetUserName(
         [in, unique, string] PLSAPR_SERVER_NAME SystemName,
         [in, out] PRPC_UNICODE_STRING *UserName,
         [in, out, unique] PRPC_UNICODE_STRING *DomainName);
@@ -902,40 +994,52 @@ cpp_quote("#if _WIN32_WINNT >= 0x0351")
 cpp_quote("#if _WIN32_WINNT >= 0x0500")
 
     /* Function 46 */
-    NTSTATUS __stdcall LsarQueryInformationPolicy2(
+    NTSTATUS
+    __stdcall
+    LsarQueryInformationPolicy2(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [out, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION *PolicyInformation);
 
     /* Function 47 */
-    NTSTATUS __stdcall LsarSetInformationPolicy2(
+    NTSTATUS
+    __stdcall
+    LsarSetInformationPolicy2(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [in, switch_is(InformationClass)] PLSAPR_POLICY_INFORMATION PolicyInformation);
 
     /* Function 48 */
-    NTSTATUS __stdcall LsarQueryTrustedDomainInfoByName(
+    NTSTATUS
+    __stdcall
+    LsarQueryTrustedDomainInfoByName(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING TrustedDomainName,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [out, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO *PolicyInformation);
 
     /* Function 49 */
-    NTSTATUS __stdcall LsarSetTrustedDomainInfoByName(
+    NTSTATUS
+    __stdcall
+    LsarSetTrustedDomainInfoByName(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING TrustedDomainName,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [in, switch_is(InformationClass)] PLSAPR_TRUSTED_DOMAIN_INFO PolicyInformation);
 
     /* Function 50 */
-    NTSTATUS __stdcall LsarEnumerateTrustedDomainsEx(
+    NTSTATUS
+    __stdcall
+    LsarEnumerateTrustedDomainsEx(
         [in] LSAPR_HANDLE PolicyHandle,
         [in, out] DWORD *EnumerationContext,
         [out] PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer,
         [in] DWORD PreferedMaximumLength);
 
     /* Function 51 */
-    NTSTATUS __stdcall LsarCreateTrustedDomainEx(
+    NTSTATUS
+    __stdcall
+    LsarCreateTrustedDomainEx(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation,
         [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation,
@@ -943,34 +1047,46 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500")
         [out] LSAPR_HANDLE *TrustedDomainHandle);
 
     /* Function 52 */
-    NTSTATUS __stdcall LsarSetPolicyReplicationHandle(
+    NTSTATUS
+    __stdcall
+    LsarSetPolicyReplicationHandle(
         [in, out] PLSAPR_HANDLE PolicyHandle);
 
     /* Function 53 */
-    NTSTATUS __stdcall LsarQueryDomainInformationPolicy(
+    NTSTATUS
+    __stdcall
+    LsarQueryDomainInformationPolicy(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [out, switch_is(InformationClass)] PLSAPR_POLICY_DOMAIN_INFORMATION *PolicyInformation);
 
     /* Function 54 */
-    NTSTATUS __stdcall LsarSetDomainInformationPolicy(
+    NTSTATUS
+    __stdcall
+    LsarSetDomainInformationPolicy(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] POLICY_INFORMATION_CLASS InformationClass,
         [in, switch_is(InformationClass)] PLSAPR_POLICY_DOMAIN_INFORMATION PolicyInformation);
 
     /* Function 55 */
-    NTSTATUS __stdcall LsarOpenTrustedDomainByName(
+    NTSTATUS
+    __stdcall
+    LsarOpenTrustedDomainByName(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PRPC_UNICODE_STRING TrustedDomainName,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *TrustedDomainHandle);
 
     /* Function 56 */
-    NTSTATUS __stdcall LsarTestCall(
+    NTSTATUS
+    __stdcall
+    LsarTestCall(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 57 */
-    NTSTATUS __stdcall LsarLookupSids2(
+    NTSTATUS
+    __stdcall
+    LsarLookupSids2(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer,
         [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains,
@@ -981,7 +1097,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500")
         [in] DWORD ClientRevision);
 
     /* Function 58 */
-    NTSTATUS __stdcall LsarLookupNames2(
+    NTSTATUS
+    __stdcall
+    LsarLookupNames2(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] DWORD Count,
         [in, size_is(Count)] PRPC_UNICODE_STRING Names,
@@ -993,7 +1111,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500")
         [in] DWORD ClientRevision);
 
     /* Function 59 */
-    NTSTATUS __stdcall LsarCreateTrustedDomainEx2(
+    NTSTATUS
+    __stdcall
+    LsarCreateTrustedDomainEx2(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation,
         [in] PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation,
@@ -1003,23 +1123,33 @@ cpp_quote("#if _WIN32_WINNT >= 0x0500")
 cpp_quote("#if _WIN32_WINNT >= 0x0501")
 
     /* Function 60 */
-    NTSTATUS __stdcall CredrWrite(
+    NTSTATUS
+    __stdcall
+    CredrWrite(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 61 */
-    NTSTATUS __stdcall CredrRead(
+    NTSTATUS
+    __stdcall
+    CredrRead(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 62 */
-    NTSTATUS __stdcall CredrEnumerate(
+    NTSTATUS
+    __stdcall
+    CredrEnumerate(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 63 */
-    NTSTATUS __stdcall CredrWriteDomainCredentials(
+    NTSTATUS
+    __stdcall
+    CredrWriteDomainCredentials(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 64 */
-    NTSTATUS __stdcall CredrReadDomainCredentials(
+    NTSTATUS
+    __stdcall
+    CredrReadDomainCredentials(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 65 */
@@ -1047,7 +1177,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501")
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 68 */
-    NTSTATUS __stdcall LsarLookupNames3(
+    NTSTATUS
+    __stdcall
+    LsarLookupNames3(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] DWORD Count,
         [in, size_is(Count)] PRPC_UNICODE_STRING Names,
@@ -1067,26 +1199,36 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501")
         [out, size_is(MaximumPersistCount)] DWORD *MaximumPersist); /* FIXME */
 
     /* Function 70 */
-    NTSTATUS __stdcall LsarRegisterAuditEvent(
+    NTSTATUS
+    __stdcall
+    LsarRegisterAuditEvent(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 71 */
-    NTSTATUS __stdcall LsarGenAuditEvent(
+    NTSTATUS
+    __stdcall
+    LsarGenAuditEvent(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 72 */
-    NTSTATUS __stdcall LsarUnregisterAuditEvent(
+    NTSTATUS
+    __stdcall
+    LsarUnregisterAuditEvent(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 73 */
-    NTSTATUS __stdcall LsarQueryForestTrustInformation(
+    NTSTATUS
+    __stdcall
+    LsarQueryForestTrustInformation(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSA_UNICODE_STRING TrustedDomainName,
         [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType,
         [out] PLSA_FOREST_TRUST_INFORMATION *ForestTrustInfo);
 
     /* Function 74 */
-    NTSTATUS __stdcall LsarSetForestTrustInformation(
+    NTSTATUS
+    __stdcall
+    LsarSetForestTrustInformation(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSA_UNICODE_STRING TrustedDomainName,
         [in] LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType,
@@ -1105,7 +1247,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501")
         [in] DWORD Flags); /* FIXME */
 
     /* Function 76 */
-    NTSTATUS __stdcall LsarLookupSids3(
+    NTSTATUS
+    __stdcall
+    LsarLookupSids3(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer,
         [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains,
@@ -1116,7 +1260,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501")
         [in] DWORD ClientRevision);
 
     /* Function 77 */
-    NTSTATUS __stdcall LsarLookupNames4(
+    NTSTATUS
+    __stdcall
+    LsarLookupNames4(
         [in] LSAPR_HANDLE PolicyHandle,
         [in] DWORD Count,
         [in, size_is(Count)] PRPC_UNICODE_STRING Names,
@@ -1128,22 +1274,30 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501")
         [in] DWORD ClientRevision);
 
     /* Function 78 */
-    NTSTATUS __stdcall LsarOpenPolicySce(
+    NTSTATUS
+    __stdcall
+    LsarOpenPolicySce(
         [in, unique] PLSAPR_SERVER_NAME SystemName,
         [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes,
         [in] ACCESS_MASK DesiredAccess,
         [out] LSAPR_HANDLE *PolicyHandle);
 
     /* Function 79 */
-    NTSTATUS __stdcall LsarAdtRegisterSecurityEventSource(
+    NTSTATUS
+    __stdcall
+    LsarAdtRegisterSecurityEventSource(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 80 */
-    NTSTATUS __stdcall LsarAdtUnregisterSecurityEventSource(
+    NTSTATUS
+    __stdcall
+    LsarAdtUnregisterSecurityEventSource(
         [in] handle_t hBinding); /* FIXME */
 
     /* Function 81 */
-    NTSTATUS __stdcall LsarAdtReportSecurityEvent(
+    NTSTATUS
+    __stdcall
+    LsarAdtReportSecurityEvent(
         [in] handle_t hBinding); /* FIXME */
 
 cpp_quote("#endif /* _WIN32_WINNT >= 0x0501 */")
diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl
index 32568a41386..fb5d86ce329 100644
--- a/sdk/include/reactos/idl/wkssvc.idl
+++ b/sdk/include/reactos/idl/wkssvc.idl
@@ -361,7 +361,7 @@ interface wkssvc
     /* Function 0 */
     unsigned long
     __stdcall
-    NetrWkstaGetInfo (
+    NetrWkstaGetInfo(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in] unsigned long Level,
         [out, switch_is(Level)] LPWKSTA_INFO WkstaInfo);
@@ -369,7 +369,7 @@ interface wkssvc
     /* Function 1 */
     unsigned long
     __stdcall
-    NetrWkstaSetInfo (
+    NetrWkstaSetInfo(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in] unsigned long Level,
         [in, switch_is(Level)] LPWKSTA_INFO WkstaInfo,
@@ -378,7 +378,7 @@ interface wkssvc
     /* Function 2 */
     unsigned long
     __stdcall
-    NetrWkstaUserEnum (
+    NetrWkstaUserEnum(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in, out] LPWKSTA_USER_ENUM_STRUCT UserInfo,
         [in] unsigned long PreferredMaximumLength,
@@ -396,7 +396,7 @@ interface wkssvc
     /* Function 4 */
     unsigned long
     __stdcall
-    NetrWkstaUserSetInfo (
+    NetrWkstaUserSetInfo(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused,
         [in] unsigned long Level,
         [in, switch_is(Level)] LPWKSTA_USER_INFO UserInfo,
@@ -405,7 +405,7 @@ interface wkssvc
     /* Function 5 */
     unsigned long
     __stdcall
-    NetrWkstaTransportEnum (
+    NetrWkstaTransportEnum(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in, out] LPWKSTA_TRANSPORT_ENUM_STRUCT TransportInfo,
         [in] unsigned long PreferredMaximumLength,
@@ -415,7 +415,7 @@ interface wkssvc
     /* Function 6 */
     unsigned long
     __stdcall
-    NetrWkstaTransportAdd (
+    NetrWkstaTransportAdd(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in] unsigned long Level,
         [in] LPWKSTA_TRANSPORT_INFO_0 TransportInfo,
@@ -424,7 +424,7 @@ interface wkssvc
     /* Function 7 */
     unsigned long
     __stdcall
-    NetrWkstaTransportDel (
+    NetrWkstaTransportDel(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in, string, unique] wchar_t *TransportName,
         [in] unsigned long ForceLevel);
@@ -432,7 +432,7 @@ interface wkssvc
     /* Function 8 */
     unsigned long
     __stdcall
-    NetrUseAdd (
+    NetrUseAdd(
         [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName,
         [in] unsigned long Level,
         [in, switch_is(Level)] LPUSE_INFO InfoStruct,
@@ -441,7 +441,7 @@ interface wkssvc
     /* Function 9 */
     unsigned long
     __stdcall
-    NetrUseGetInfo (
+    NetrUseGetInfo(
         [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName,
         [in, string] wchar_t *UseName,
         [in] unsigned long Level,
@@ -450,7 +450,7 @@ interface wkssvc
     /* Function 10 */
     unsigned long
     __stdcall
-    NetrUseDel (
+    NetrUseDel(
         [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName,
         [in, string] wchar_t *UseName,
         [in] unsigned long ForceLevel);
@@ -458,7 +458,7 @@ interface wkssvc
     /* Function 11 */
     unsigned long
     __stdcall
-    NetrUseEnum (
+    NetrUseEnum(
         [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName,
         [in, out] LPUSE_ENUM_STRUCT InfoStruct,
         [in] unsigned long PreferredMaximumLength,