Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 56645: [SAMSRV] - Convert to Wine debug messages. - Add server side stubs of the SAM RPC interface. The RPC server is not implemented yet.
by ekohl＠svn.reactos.org 20 May '12

20 May '12

Author: ekohl Date: Sun May 20 18:31:10 2012 New Revision: 56645 URL: http://svn.reactos.org/svn/reactos?rev=56645&view=rev Log: [SAMSRV] - Convert to Wine debug messages. - Add server side stubs of the SAM RPC interface. The RPC server is not implemented yet. Added: trunk/reactos/dll/win32/samsrv/samrpc.c (with props) trunk/reactos/dll/win32/samsrv/samsrv.h (with props) trunk/reactos/include/reactos/libs/samsrv/ (with props) trunk/reactos/include/reactos/libs/samsrv/samsrv.h (with props) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Sun May 20 18:31:10 2012 @@ -1,16 +1,24 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${REACTOS_SOURCE_DIR}/include/reactos/idl) -spec2def(samsrv.dll samsrv.spec) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl) + +spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE + samrpc.c samsrv.c samsrv.rc - ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) + ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def + ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c) add_library(samsrv SHARED ${SOURCE}) - set_module_type(samsrv win32dll ENTRYPOINT 0 UNICODE) -add_importlibs(samsrv kernel32 ntdll) +target_link_libraries(samsrv wine ${PSEH_LIB}) +add_importlibs(samsrv rpcrt4 kernel32 ntdll) add_dependencies(samsrv psdk) add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c (added) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun May 20 18:31:10 2012 @@ -1,0 +1,816 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/samsrv/samrpc.c + * PURPOSE: RPC interface functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +void __RPC_USER SAMPR_HANDLE_rundown(SAMPR_HANDLE hHandle) +{ +} + +/* Function 0 */ +NTSTATUS +NTAPI +SamrConnect(IN PSAMPR_SERVER_NAME ServerName, + OUT SAMPR_HANDLE *ServerHandle, + IN ACCESS_MASK DesiredAccess) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 1 */ +NTSTATUS +NTAPI +SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 2 */ +NTSTATUS +NTAPI +SamrSetSecurityObject(IN SAMPR_HANDLE ObjectHandle, + IN SECURITY_INFORMATION SecurityInformation, + IN PSAMPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 3 */ +NTSTATUS +NTAPI +SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, + IN SECURITY_INFORMATION SecurityInformation, + OUT PSAMPR_SR_SECURITY_DESCRIPTOR * SecurityDescriptor) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 4 */ +NTSTATUS +NTAPI +SamrShutdownSamServer(IN SAMPR_HANDLE ServerHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 5 */ +NTSTATUS +NTAPI +SamrLookupDomainInSamServer(IN SAMPR_HANDLE ServerHandle, + IN PRPC_UNICODE_STRING Name, + OUT PRPC_SID *DomainId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 6 */ +NTSTATUS +NTAPI +SamrEnumerateDomainsInSamServer(IN SAMPR_HANDLE ServerHandle, + IN OUT unsigned long *EnumerationContext, + OUT PSAMPR_ENUMERATION_BUFFER *Buffer, + IN unsigned long PreferedMaximumLength, + OUT unsigned long *CountReturned) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 7 */ +NTSTATUS +NTAPI +SamrOpenDomain(IN SAMPR_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN PRPC_SID DomainId, + OUT SAMPR_HANDLE *DomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 8 */ +NTSTATUS +NTAPI +SamrQueryInformationDomain(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 9 */ +NTSTATUS +NTAPI +SamrSetInformationDomain(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + IN PSAMPR_DOMAIN_INFO_BUFFER DomainInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 10 */ +NTSTATUS +NTAPI +SamrCreateGroupInDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_UNICODE_STRING Name, + IN ACCESS_MASK DesiredAccess, + OUT SAMPR_HANDLE *GroupHandle, + OUT unsigned long *RelativeId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 10 */ +NTSTATUS +NTAPI +SamrEnumerateGroupsInDomain(IN SAMPR_HANDLE DomainHandle, + IN OUT unsigned long *EnumerationContext, + OUT PSAMPR_ENUMERATION_BUFFER *Buffer, + IN unsigned long PreferedMaximumLength, + OUT unsigned long *CountReturned) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 12 */ +NTSTATUS +__stdcall +SamrCreateUserInDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_UNICODE_STRING Name, + IN ACCESS_MASK DesiredAccess, + OUT SAMPR_HANDLE *UserHandle, + OUT unsigned long *RelativeId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 13 */ +NTSTATUS +__stdcall +SamrEnumerateUsersInDomain(IN SAMPR_HANDLE DomainHandle, + IN OUT unsigned long *EnumerationContext, + IN unsigned long UserAccountControl, + OUT PSAMPR_ENUMERATION_BUFFER *Buffer, + IN unsigned long PreferedMaximumLength, + OUT unsigned long *CountReturned) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 14 */ +NTSTATUS +__stdcall +SamrCreateAliasInDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_UNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT SAMPR_HANDLE *AliasHandle, + OUT unsigned long *RelativeId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 15 */ +NTSTATUS +__stdcall +SamrEnumerateAliasesInDomain(IN SAMPR_HANDLE DomainHandle, + IN OUT unsigned long *EnumerationContext, + OUT PSAMPR_ENUMERATION_BUFFER *Buffer, + IN unsigned long PreferedMaximumLength, + OUT unsigned long *CountReturned) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 16 */ +NTSTATUS +__stdcall +SamrGetAliasMembership(IN SAMPR_HANDLE DomainHandle, + IN PSAMPR_PSID_ARRAY SidArray, + OUT PSAMPR_ULONG_ARRAY Membership) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 17 */ +NTSTATUS +__stdcall +SamrLookupNamesInDomain(IN SAMPR_HANDLE DomainHandle, + IN unsigned long Count, + IN RPC_UNICODE_STRING Names[], + OUT PSAMPR_ULONG_ARRAY RelativeIds, + OUT PSAMPR_ULONG_ARRAY Use) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 18 */ +NTSTATUS +__stdcall +SamrLookupIdsInDomain(IN SAMPR_HANDLE DomainHandle, + IN unsigned long Count, + IN unsigned long *RelativeIds, + OUT PSAMPR_RETURNED_USTRING_ARRAY Names, + OUT PSAMPR_ULONG_ARRAY Use) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 19 */ +NTSTATUS +__stdcall +SamrOpenGroup(IN SAMPR_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN unsigned long GroupId, + OUT SAMPR_HANDLE *GroupHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 20 */ +NTSTATUS +__stdcall +SamrQueryInformationGroup(IN SAMPR_HANDLE GroupHandle, + IN GROUP_INFORMATION_CLASS GroupInformationClass, + OUT PSAMPR_GROUP_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 21 */ +NTSTATUS +__stdcall +SamrSetInformationGroup(IN SAMPR_HANDLE GroupHandle, + IN GROUP_INFORMATION_CLASS GroupInformationClass, + IN PSAMPR_GROUP_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 22 */ +NTSTATUS +NTAPI +SamrAddMemberToGroup(IN SAMPR_HANDLE GroupHandle, + IN unsigned long MemberId, + IN unsigned long Attributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 21 */ +NTSTATUS +NTAPI +SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 24 */ +NTSTATUS +NTAPI +SamrRemoveMemberFromGroup(IN SAMPR_HANDLE GroupHandle, + IN unsigned long MemberId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 25 */ +NTSTATUS +NTAPI +SamrGetMembersInGroup(IN SAMPR_HANDLE GroupHandle, + OUT PSAMPR_GET_MEMBERS_BUFFER *Members) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 26 */ +NTSTATUS +NTAPI +SamrSetMemberAttributesOfGroup(IN SAMPR_HANDLE GroupHandle, + IN unsigned long MemberId, + IN unsigned long Attributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 27 */ +NTSTATUS +NTAPI +SamrOpenAlias(IN SAMPR_HANDLE DomainHandle, + IN ACCESS_MASK DesiredAccess, + IN unsigned long AliasId, + OUT SAMPR_HANDLE *AliasHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 28 */ +NTSTATUS +NTAPI +SamrQueryInformationAlias(IN SAMPR_HANDLE AliasHandle, + IN ALIAS_INFORMATION_CLASS AliasInformationClass, + OUT PSAMPR_ALIAS_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 29 */ +NTSTATUS +NTAPI +SamrSetInformationAlias(IN SAMPR_HANDLE AliasHandle, + IN ALIAS_INFORMATION_CLASS AliasInformationClass, + IN PSAMPR_ALIAS_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 30 */ +NTSTATUS +NTAPI +SamrDeleteAlias(IN OUT SAMPR_HANDLE *AliasHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 31 */ +NTSTATUS +NTAPI +SamrAddMemberToAlias(IN SAMPR_HANDLE AliasHandle, + IN PRPC_SID MemberId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 32 */ +NTSTATUS +NTAPI +SamrRemoveMemberFromAlias(IN SAMPR_HANDLE AliasHandle, + IN PRPC_SID MemberId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 33 */ +NTSTATUS +NTAPI +SamrGetMembersInAlias(IN SAMPR_HANDLE AliasHandle, + OUT PSAMPR_PSID_ARRAY_OUT Members) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 34 */ +NTSTATUS +NTAPI +SamrOpenUser(IN SAMPR_HANDLE DomainHandle, + IN unsigned long DesiredAccess, + IN unsigned long UserId, + OUT SAMPR_HANDLE *UserHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 35 */ +NTSTATUS +NTAPI +SamrDeleteUser(IN OUT SAMPR_HANDLE *UserHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 36 */ +NTSTATUS +NTAPI +SamrQueryInformationUser(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + OUT PSAMPR_USER_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 37 */ +NTSTATUS +NTAPI +SamrSetInformationUser(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + IN PSAMPR_USER_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 38 */ +NTSTATUS +NTAPI +SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle, + IN unsigned char LmPresent, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, + IN unsigned char NtPresent, + IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, + IN unsigned char NtCrossEncryptionPresent, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, + IN unsigned char LmCrossEncryptionPresent, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 39 */ +NTSTATUS +NTAPI +SamrGetGroupsForUser(IN SAMPR_HANDLE UserHandle, + OUT PSAMPR_GET_GROUPS_BUFFER *Groups) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 40 */ +NTSTATUS +NTAPI +SamrQueryDisplayInformation(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + IN unsigned long Index, + IN unsigned long EntryCount, + IN unsigned long PreferredMaximumLength, + OUT unsigned long *TotalAvailable, + OUT unsigned long *TotalReturned, + OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 41 */ +NTSTATUS +NTAPI +SamrGetDisplayEnumerationIndex(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + IN PRPC_UNICODE_STRING Prefix, + OUT unsigned long *Index) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 42 */ +NTSTATUS +NTAPI +SamrTestPrivateFunctionsDomain(IN SAMPR_HANDLE DomainHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 43 */ +NTSTATUS +NTAPI +SamrTestPrivateFunctionsUser(IN SAMPR_HANDLE UserHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 44 */ +NTSTATUS +NTAPI +SamrGetUserDomainPasswordInformation(IN SAMPR_HANDLE UserHandle, + OUT PUSER_DOMAIN_PASSWORD_INFORMATION PasswordInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 45 */ +NTSTATUS +NTAPI +SamrRemoveMemberFromForeignDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_SID MemberSid) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 46 */ +NTSTATUS +NTAPI +SamrQueryInformationDomain2(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_INFORMATION_CLASS DomainInformationClass, + OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 47 */ +NTSTATUS +NTAPI +SamrQueryInformationUser2(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + OUT PSAMPR_USER_INFO_BUFFER *Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 48 */ +NTSTATUS +NTAPI +SamrQueryDisplayInformation2(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + IN unsigned long Index, + IN unsigned long EntryCount, + IN unsigned long PreferredMaximumLength, + OUT unsigned long *TotalAvailable, + OUT unsigned long *TotalReturned, + OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 49 */ +NTSTATUS +NTAPI +SamrGetDisplayEnumerationIndex2(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + IN PRPC_UNICODE_STRING Prefix, + OUT unsigned long *Index) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 50 */ +NTSTATUS +NTAPI +SamrCreateUser2InDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_UNICODE_STRING Name, + IN unsigned long AccountType, + IN unsigned long DesiredAccess, + OUT SAMPR_HANDLE *UserHandle, + OUT unsigned long *GrantedAccess, + OUT unsigned long *RelativeId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 51 */ +NTSTATUS +NTAPI +SamrQueryDisplayInformation3(IN SAMPR_HANDLE DomainHandle, + IN DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + IN unsigned long Index, + IN unsigned long EntryCount, + IN unsigned long PreferredMaximumLength, + OUT unsigned long *TotalAvailable, + OUT unsigned long *TotalReturned, + OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 52 */ +NTSTATUS +NTAPI +SamrAddMultipleMembersToAlias(IN SAMPR_HANDLE AliasHandle, + IN PSAMPR_PSID_ARRAY MembersBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 53 */ +NTSTATUS +NTAPI +SamrRemoveMultipleMembersFromAlias(IN SAMPR_HANDLE AliasHandle, + IN PSAMPR_PSID_ARRAY MembersBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 54 */ +NTSTATUS +NTAPI +SamrOemChangePasswordUser2(IN handle_t BindingHandle, + IN PRPC_STRING ServerName, + IN PRPC_STRING UserName, + IN PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewLm) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 55 */ +NTSTATUS +NTAPI +SamrUnicodeChangePasswordUser2(IN handle_t BindingHandle, + IN PRPC_UNICODE_STRING ServerName, + IN PRPC_UNICODE_STRING UserName, + IN PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldNt, + IN PENCRYPTED_NT_OWF_PASSWORD OldNtOwfPasswordEncryptedWithNewNt, + IN unsigned char LmPresent, + IN PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewNt) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 56 */ +NTSTATUS +NTAPI +SamrGetDomainPasswordInformation(IN handle_t BindingHandle, + IN PRPC_UNICODE_STRING Unused, + OUT PUSER_DOMAIN_PASSWORD_INFORMATION PasswordInformation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 57 */ +NTSTATUS +NTAPI +SamrConnect2(IN PSAMPR_SERVER_NAME ServerName, + OUT SAMPR_HANDLE *ServerHandle, + IN ACCESS_MASK DesiredAccess) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 58 */ +NTSTATUS +NTAPI +SamrSetInformationUser2(IN SAMPR_HANDLE UserHandle, + IN USER_INFORMATION_CLASS UserInformationClass, + IN PSAMPR_USER_INFO_BUFFER Buffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 59 */ +NTSTATUS +NTAPI +SamrSetBootKeyInformation(IN handle_t BindingHandle) /* FIXME */ +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 60 */ +NTSTATUS +NTAPI +SamrGetBootKeyInformation(IN handle_t BindingHandle) /* FIXME */ +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 61 */ +NTSTATUS +NTAPI +SamrConnect3(IN handle_t BindingHandle) /* FIXME */ +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 62 */ +NTSTATUS +NTAPI +SamrConnect4(IN PSAMPR_SERVER_NAME ServerName, + OUT SAMPR_HANDLE *ServerHandle, + IN unsigned long ClientRevision, + IN ACCESS_MASK DesiredAccess) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 63 */ +NTSTATUS +NTAPI +SamrUnicodeChangePasswordUser3(IN handle_t BindingHandle) /* FIXME */ +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 64 */ +NTSTATUS +NTAPI +SamrConnect5(IN PSAMPR_SERVER_NAME ServerName, + IN ACCESS_MASK DesiredAccess, + IN unsigned long InVersion, + IN SAMPR_REVISION_INFO *InRevisionInfo, + OUT unsigned long *OutVersion, + OUT SAMPR_REVISION_INFO *OutRevisionInfo, + OUT SAMPR_HANDLE *ServerHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 65 */ +NTSTATUS +NTAPI +SamrRidToSid(IN SAMPR_HANDLE ObjectHandle, + IN unsigned long Rid, + OUT PRPC_SID *Sid) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 66 */ +NTSTATUS +NTAPI +SamrSetDSRMPassword(IN handle_t BindingHandle, + IN PRPC_UNICODE_STRING Unused, + IN unsigned long UserId, + IN PENCRYPTED_NT_OWF_PASSWORD EncryptedNtOwfPassword) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* Function 67 */ +NTSTATUS +NTAPI +SamrValidatePassword(IN handle_t Handle, + IN PASSWORD_POLICY_VALIDATION_TYPE ValidationType, + IN PSAM_VALIDATE_INPUT_ARG InputArg, + OUT PSAM_VALIDATE_OUTPUT_ARG *OutputArg) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/samrpc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/samrpc.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun May 20 18:31:10 2012 @@ -19,34 +19,29 @@ /* INCLUDES *****************************************************************/ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/umtypes.h> +#include <samsrv.h> -//#include <samsrv.h> - -#define NDEBUG -#include <debug.h> - +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); /* FUNCTIONS ****************************************************************/ -NTSTATUS WINAPI +NTSTATUS +NTAPI SamIInitialize(VOID) { - DPRINT1("SamIInitialize() called\n"); + TRACE("SamIInitialize() called\n"); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } -NTSTATUS WINAPI +NTSTATUS +NTAPI SampInitializeRegistry(VOID) { - DPRINT1("SampInitializeRegistry() called\n"); + TRACE("SampInitializeRegistry() called\n"); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } /* EOF */ Added: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h (added) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun May 20 18:31:10 2012 @@ -1,0 +1,19 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (LSA) Server + * FILE: reactos/dll/win32/samsrv/samsrv.h + * PURPOSE: Common header file + * + * PROGRAMMERS: Eric Kohl + */ + +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/umtypes.h> + +#include <samsrv/samsrv.h> + +#include "sam_s.h" + +#include <wine/debug.h> Propchange: trunk/reactos/dll/win32/samsrv/samsrv.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/samsrv.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sun May 20 18:31:10 2012 @@ -1,73 +1,73 @@ -;SamIAccountRestrictions -;SamIConnect -;SamICreateAccountByRid -;SamIEnumerateAccountRids -;SamIFree_SAMPR_ALIAS_INFO_BUFFER -;SamIFree_SAMPR_DISPLAY_INFO_BUFFER -;SamIFree_SAMPR_DOMAIN_INFO_BUFFER -;SamIFree_SAMPR_ENUMERATION_BUFFER -;SamIFree_SAMPR_GET_GROUPS_BUFFER -;SamIFree_SAMPR_GET_MEMBERS_BUFFER -;SamIFree_SAMPR_GROUP_INFO_BUFFER -;SamIFree_SAMPR_PSID_ARRAY -;SamIFree_SAMPR_RETURNED_USTRING_ARRAY -;SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR -;SamIFree_SAMPR_ULONG_ARRAY -;SamIFree_SAMPR_USER_INFO_BUFFER -;SamIGetPrivateData -;SamIGetSerialNumberDomain +@ stub SamIAccountRestrictions +@ stub SamIConnect +@ stub SamICreateAccountByRid +@ stub SamIEnumerateAccountRids +@ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER +@ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER +@ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER +@ stub SamIFree_SAMPR_ENUMERATION_BUFFER +@ stub SamIFree_SAMPR_GET_GROUPS_BUFFER +@ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER +@ stub SamIFree_SAMPR_GROUP_INFO_BUFFER +@ stub SamIFree_SAMPR_PSID_ARRAY +@ stub SamIFree_SAMPR_RETURNED_USTRING_ARRAY +@ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR +@ stub SamIFree_SAMPR_ULONG_ARRAY +@ stub SamIFree_SAMPR_USER_INFO_BUFFER +@ stub SamIGetPrivateData +@ stub SamIGetSerialNumberDomain @ stdcall SamIInitialize() -;SamINotifyDelta -;SamISetAuditingInformation -;SamISetPrivateData -;SamISetSerialNumberDomain +@ stub SamINotifyDelta +@ stub SamISetAuditingInformation +@ stub SamISetPrivateData +@ stub SamISetSerialNumberDomain @ stdcall SampInitializeRegistry() -;SampRtlConvertUlongToUnicodeString -;SamrAddMemberToAlias -;SamrAddMemberToGroup -;SamrAddMultipleMemberstoAlias -;SamrChangePasswordUser -;SamrCloseHandle -;SamrConnect -;SamrCreateAliasInDomain -;SamrCreateGroupInDomain -;SamrCreateUserInDomain -;SamrDeleteAlias -;SamrDeleteGroup -;SamrDeleteUser -;SamrEnumerateAliasesInDomain -;SamrEnumerateDomainsInSamServer -;SamrEnumerateGroupsInDomain -;SamrEnumerateUsersInDomain -;SamrGetAliasMembership -;SamrGetGroupsForUser -;SamrGetMembersInAlias -;SamrGetMembersInGroup -;SamrGetUserDomainPasswordInformation -;SamrLookupDomainInSamServer -;SamrLookupIdsInDomain -;SamrLookupNamesInDomain -;SamrOpenAlias -;SamrOpenDomain -;SamrOpenGroup -;SamrOpenUser -;SamrQueryDisplayInformation -;SamrQueryInformationAlias -;SamrQueryInformationDomain -;SamrQueryInformationGroup -;SamrQueryInformationUser -;SamrQuerySecurityObject -;SamrRemoveMemberFromAlias -;SamrRemoveMemberFromForeignDomain -;SamrRemoveMemberFromGroup -;SamrRemoveMultipleMembersFromAlias -;SamrSetInformationAlias -;SamrSetInformationDomain -;SamrSetInformationGroup -;SamrSetInformationUser -;SamrSetMemberAttributesOfGroup -;SamrSetSecurityObject -;SamrShutdownSamServer -;SamrTestPrivateFunctionsDomain -;SamrTestPrivateFunctionsUser +@ stub SampRtlConvertUlongToUnicodeString +@ stdcall SamrAddMemberToAlias(ptr ptr) +@ stdcall SamrAddMemberToGroup(ptr long long) +@ stdcall SamrAddMultipleMembersToAlias(ptr ptr) +@ stdcall SamrChangePasswordUser(ptr long ptr ptr long ptr ptr long ptr long ptr) +@ stdcall SamrCloseHandle(ptr) +@ stdcall SamrConnect(ptr ptr long) +@ stdcall SamrCreateAliasInDomain(ptr ptr long ptr ptr) +@ stdcall SamrCreateGroupInDomain(ptr ptr long ptr ptr) +@ stdcall SamrCreateUserInDomain(ptr ptr long ptr ptr) +@ stdcall SamrDeleteAlias(ptr) +@ stdcall SamrDeleteGroup(ptr) +@ stdcall SamrDeleteUser(ptr) +@ stdcall SamrEnumerateAliasesInDomain(ptr ptr ptr long ptr) +@ stdcall SamrEnumerateDomainsInSamServer(ptr ptr ptr long ptr) +@ stdcall SamrEnumerateGroupsInDomain(ptr ptr ptr long ptr) +@ stdcall SamrEnumerateUsersInDomain(ptr ptr long ptr long ptr) +@ stdcall SamrGetAliasMembership(ptr ptr ptr) +@ stdcall SamrGetGroupsForUser(ptr ptr) +@ stdcall SamrGetMembersInAlias(ptr ptr) +@ stdcall SamrGetMembersInGroup(ptr ptr) +@ stdcall SamrGetUserDomainPasswordInformation(ptr ptr) +@ stdcall SamrLookupDomainInSamServer(ptr ptr ptr) +@ stdcall SamrLookupIdsInDomain(ptr long ptr ptr ptr) +@ stdcall SamrLookupNamesInDomain(ptr long ptr ptr ptr) +@ stdcall SamrOpenAlias(ptr long long ptr) +@ stdcall SamrOpenDomain(ptr long ptr ptr) +@ stdcall SamrOpenGroup(ptr long long ptr) +@ stdcall SamrOpenUser(ptr long long ptr) +@ stdcall SamrQueryDisplayInformation(ptr long long long long ptr ptr ptr) +@ stdcall SamrQueryInformationAlias(ptr long ptr) +@ stdcall SamrQueryInformationDomain(ptr long ptr) +@ stdcall SamrQueryInformationGroup(ptr long ptr) +@ stdcall SamrQueryInformationUser(ptr long ptr) +@ stdcall SamrQuerySecurityObject(ptr long ptr) +@ stdcall SamrRemoveMemberFromAlias(ptr ptr) +@ stdcall SamrRemoveMemberFromForeignDomain(ptr ptr) +@ stdcall SamrRemoveMemberFromGroup(ptr long) +@ stdcall SamrRemoveMultipleMembersFromAlias(ptr ptr) +@ stdcall SamrSetInformationAlias(ptr long ptr) +@ stdcall SamrSetInformationDomain(ptr long ptr) +@ stdcall SamrSetInformationGroup(ptr long ptr) +@ stdcall SamrSetInformationUser(ptr long ptr) +@ stdcall SamrSetMemberAttributesOfGroup(ptr long long) +@ stdcall SamrSetSecurityObject(ptr long ptr) +@ stdcall SamrShutdownSamServer(ptr) +@ stdcall SamrTestPrivateFunctionsDomain(ptr) +@ stdcall SamrTestPrivateFunctionsUser(ptr) ; EOF Propchange: trunk/reactos/include/reactos/libs/samsrv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun May 20 18:31:10 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/include/reactos/libs/samsrv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/include/reactos/libs/samsrv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/include/reactos/libs/samsrv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/include/reactos/libs/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samsr… ============================================================================== --- trunk/reactos/include/reactos/libs/samsrv/samsrv.h (added) +++ trunk/reactos/include/reactos/libs/samsrv/samsrv.h [iso-8859-1] Sun May 20 18:31:10 2012 @@ -1,0 +1,13 @@ +#ifndef __SAMSRV__ +#define __SAMSRV__ + +NTSTATUS +NTAPI +SamIInitialize(VOID); + +NTSTATUS +NTAPI +SampInitializeRegistry(VOID); + + +#endif /* __SAMSRV__ */ Propchange: trunk/reactos/include/reactos/libs/samsrv/samsrv.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/libs/samsrv/samsrv.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[ekohl] 56644: [IDL] Add ACF and IDL file for the SAM RPC interface.
by ekohl＠svn.reactos.org 20 May '12

20 May '12

Author: ekohl Date: Sun May 20 16:32:24 2012 New Revision: 56644 URL: http://svn.reactos.org/svn/reactos?rev=56644&view=rev Log: [IDL] Add ACF and IDL file for the SAM RPC interface. Added: trunk/reactos/include/reactos/idl/sam.acf (with props) trunk/reactos/include/reactos/idl/sam.idl (with props) Added: trunk/reactos/include/reactos/idl/sam.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.ac… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.acf (added) +++ trunk/reactos/include/reactos/idl/sam.acf [iso-8859-1] Sun May 20 16:32:24 2012 @@ -1,0 +1,6 @@ +[ + explicit_handle +] +interface samr +{ +} Propchange: trunk/reactos/include/reactos/idl/sam.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl (added) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun May 20 16:32:24 2012 @@ -1,0 +1,1361 @@ +/* + * Security Account Manager interface definition + */ + +#include <ms-dtyp.idl> + +cpp_quote("#ifndef _NTDEF_") +typedef long NTSTATUS; +cpp_quote("#endif") + +typedef struct _RPC_STRING +{ + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength), length_is(Length)] char *Buffer; +} RPC_STRING, *PRPC_STRING; + +typedef struct _OLD_LARGE_INTEGER +{ + unsigned long LowPart; + long HighPart; +} OLD_LARGE_INTEGER, *POLD_LARGE_INTEGER; + +typedef [handle] wchar_t *PSAMPR_SERVER_NAME; + +typedef [context_handle] void *SAMPR_HANDLE; + +typedef struct _ENCRYPTED_LM_OWF_PASSWORD +{ + char data[16]; +} ENCRYPTED_LM_OWF_PASSWORD, *PENCRYPTED_LM_OWF_PASSWORD, ENCRYPTED_NT_OWF_PASSWORD, *PENCRYPTED_NT_OWF_PASSWORD; + +typedef struct _SAMPR_ULONG_ARRAY +{ + unsigned long Count; + [size_is(Count)] unsigned long *Element; +} SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; + +typedef struct _SAMPR_SID_INFORMATION +{ + PRPC_SID SidPointer; +} SAMPR_SID_INFORMATION, *PSAMPR_SID_INFORMATION; + +typedef struct _SAMPR_PSID_ARRAY +{ + [range(0, 1024)] unsigned long Count; + [size_is(Count)] PSAMPR_SID_INFORMATION Sids; +} SAMPR_PSID_ARRAY, *PSAMPR_PSID_ARRAY; + +typedef struct _SAMPR_PSID_ARRAY_OUT +{ + unsigned long Count; + [size_is(Count)] PSAMPR_SID_INFORMATION Sids; +} SAMPR_PSID_ARRAY_OUT, *PSAMPR_PSID_ARRAY_OUT; + +typedef struct _SAMPR_RETURNED_USTRING_ARRAY +{ + unsigned long Count; + [size_is(Count)] PRPC_UNICODE_STRING Element; +} SAMPR_RETURNED_USTRING_ARRAY, *PSAMPR_RETURNED_USTRING_ARRAY; + +cpp_quote("#ifndef _WINNT_H") +typedef enum _SID_NAME_USE +{ + SidTypeUser = 1, + SidTypeGroup, + SidTypeDomain, + SidTypeAlias, + SidTypeWellKnownGroup, + SidTypeDeletedAccount, + SidTypeInvalid, + SidTypeUnknown, +} SID_NAME_USE, *PSID_NAME_USE; +cpp_quote("#endif") + +typedef struct RPC_SHORT_BLOB +{ + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength/2), length_is(Length/2)] + unsigned short* Buffer; +} RPC_SHORT_BLOB, *PRPC_SHORT_BLOB; + +typedef struct _SAMPR_RID_ENUMERATION +{ + unsigned long RelativeId; + RPC_UNICODE_STRING Name; +} SAMPR_RID_ENUMERATION, *PSAMPR_RID_ENUMERATION; + +typedef struct _SAMPR_ENUMERATION_BUFFER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] PSAMPR_RID_ENUMERATION Buffer; +} SAMPR_ENUMERATION_BUFFER, *PSAMPR_ENUMERATION_BUFFER; + +typedef struct _SAMPR_SR_SECURITY_DESCRIPTOR +{ + [range(0, 256 * 1024)] unsigned long Length; + [size_is(Length)] unsigned char* SecurityDescriptor; +} SAMPR_SR_SECURITY_DESCRIPTOR, *PSAMPR_SR_SECURITY_DESCRIPTOR; + +typedef struct _GROUP_MEMBERSHIP +{ + unsigned long RelativeId; + unsigned long Attributes; +} GROUP_MEMBERSHIP, *PGROUP_MEMBERSHIP; + +typedef struct _SAMPR_GET_GROUPS_BUFFER +{ + unsigned long MembershipCount; + [size_is(MembershipCount)] PGROUP_MEMBERSHIP Groups; +} SAMPR_GET_GROUPS_BUFFER, *PSAMPR_GET_GROUPS_BUFFER; + +typedef struct _SAMPR_GET_MEMBERS_BUFFER +{ + unsigned long MemberCount; + [size_is(MemberCount)] unsigned long* Members; + [size_is(MemberCount)] unsigned long* Attributes; +} SAMPR_GET_MEMBERS_BUFFER, *PSAMPR_GET_MEMBERS_BUFFER; + +typedef struct _SAMPR_REVISION_INFO_V1 +{ + unsigned long Revision; + unsigned long SupportedFeatures; +} SAMPR_REVISION_INFO_V1, *PSAMPR_REVISION_INFO_V1; + +typedef [switch_type(unsigned long)] union +{ + [case(1)] SAMPR_REVISION_INFO_V1 V1; +}SAMPR_REVISION_INFO, *PSAMPR_REVISION_INFO; + +typedef struct _USER_DOMAIN_PASSWORD_INFORMATION +{ + unsigned short MinPasswordLength; + unsigned long PasswordProperties; +} USER_DOMAIN_PASSWORD_INFORMATION, *PUSER_DOMAIN_PASSWORD_INFORMATION; + +typedef enum _DOMAIN_SERVER_ENABLE_STATE +{ + DomainServerEnabled = 1, + DomainServerDisabled +} DOMAIN_SERVER_ENABLE_STATE, *PDOMAIN_SERVER_ENABLE_STATE; + +typedef struct _DOMAIN_STATE_INFORMATION +{ + DOMAIN_SERVER_ENABLE_STATE DomainServerState; +} DOMAIN_STATE_INFORMATION, *PDOMAIN_STATE_INFORMATION; + +typedef enum _DOMAIN_SERVER_ROLE +{ + DomainServerRoleBackup = 2, + DomainServerRolePrimary = 3 +} DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; + +typedef struct _DOMAIN_PASSWORD_INFORMATION +{ + unsigned short MinPasswordLength; + unsigned short PasswordHistoryLength; + unsigned long PasswordProperties; + OLD_LARGE_INTEGER MaxPasswordAge; + OLD_LARGE_INTEGER MinPasswordAge; +} DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION; + +typedef struct _DOMAIN_LOGOFF_INFORMATION +{ + OLD_LARGE_INTEGER ForceLogoff; +} DOMAIN_LOGOFF_INFORMATION, *PDOMAIN_LOGOFF_INFORMATION; + +typedef struct _DOMAIN_SERVER_ROLE_INFORMATION +{ + DOMAIN_SERVER_ROLE DomainServerRole; +} DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION; + +typedef struct _DOMAIN_MODIFIED_INFORMATION +{ + OLD_LARGE_INTEGER DomainModifiedCount; + OLD_LARGE_INTEGER CreationTime; +} DOMAIN_MODIFIED_INFORMATION, *PDOMAIN_MODIFIED_INFORMATION; + +typedef struct _DOMAIN_MODIFIED_INFORMATION2 +{ + OLD_LARGE_INTEGER DomainModifiedCount; + OLD_LARGE_INTEGER CreationTime; + OLD_LARGE_INTEGER ModifiedCountAtLastPromotion; +} DOMAIN_MODIFIED_INFORMATION2, *PDOMAIN_MODIFIED_INFORMATION2; + +cpp_quote("#include <pshpack4.h>") +typedef struct _SAMPR_DOMAIN_GENERAL_INFORMATION +{ + OLD_LARGE_INTEGER ForceLogoff; + RPC_UNICODE_STRING OemInformation; + RPC_UNICODE_STRING DomainName; + RPC_UNICODE_STRING ReplicaSourceNodeName; + OLD_LARGE_INTEGER DomainModifiedCount; + unsigned long DomainServerState; + unsigned long DomainServerRole; + unsigned char UasCompatibilityRequired; + unsigned long UserCount; + unsigned long GroupCount; + unsigned long AliasCount; +} SAMPR_DOMAIN_GENERAL_INFORMATION, *PSAMPR_DOMAIN_GENERAL_INFORMATION; + +typedef struct _SAMPR_DOMAIN_GENERAL_INFORMATION2 +{ + SAMPR_DOMAIN_GENERAL_INFORMATION I1; + LARGE_INTEGER LockoutDuration; + LARGE_INTEGER LockoutObservationWindow; + unsigned short LockoutThreshold; +} SAMPR_DOMAIN_GENERAL_INFORMATION2, *PSAMPR_DOMAIN_GENERAL_INFORMATION2; +cpp_quote("#include <poppack.h>") + +typedef struct _SAMPR_DOMAIN_OEM_INFORMATION +{ + RPC_UNICODE_STRING OemInformation; +} SAMPR_DOMAIN_OEM_INFORMATION, *PSAMPR_DOMAIN_OEM_INFORMATION; + +typedef struct _SAMPR_DOMAIN_NAME_INFORMATION +{ + RPC_UNICODE_STRING DomainName; +} SAMPR_DOMAIN_NAME_INFORMATION, *PSAMPR_DOMAIN_NAME_INFORMATION; + +typedef struct SAMPR_DOMAIN_REPLICATION_INFORMATION +{ + RPC_UNICODE_STRING ReplicaSourceNodeName; +} SAMPR_DOMAIN_REPLICATION_INFORMATION, *PSAMPR_DOMAIN_REPLICATION_INFORMATION; + +typedef struct _SAMPR_DOMAIN_LOCKOUT_INFORMATION +{ + LARGE_INTEGER LockoutDuration; + LARGE_INTEGER LockoutObservationWindow; + unsigned short LockoutThreshold; +} SAMPR_DOMAIN_LOCKOUT_INFORMATION, *PSAMPR_DOMAIN_LOCKOUT_INFORMATION; + +typedef enum _DOMAIN_INFORMATION_CLASS +{ + DomainPasswordInformation = 1, + DomainGeneralInformation = 2, + DomainLogoffInformation = 3, + DomainOemInformation = 4, + DomainNameInformation = 5, + DomainReplicationInformation = 6, + DomainServerRoleInformation = 7, + DomainModifiedInformation = 8, + DomainStateInformation = 9, + DomainGeneralInformation2 = 11, + DomainLockoutInformation = 12, + DomainModifiedInformation2 = 13 +} DOMAIN_INFORMATION_CLASS; + +typedef [switch_type(DOMAIN_INFORMATION_CLASS)] union _SAMPR_DOMAIN_INFO_BUFFER +{ + [case(DomainPasswordInformation)] DOMAIN_PASSWORD_INFORMATION Password; + [case(DomainGeneralInformation)] SAMPR_DOMAIN_GENERAL_INFORMATION General; + [case(DomainLogoffInformation)] DOMAIN_LOGOFF_INFORMATION Logoff; + [case(DomainOemInformation)] SAMPR_DOMAIN_OEM_INFORMATION Oem; + [case(DomainNameInformation)] SAMPR_DOMAIN_NAME_INFORMATION Name; + [case(DomainServerRoleInformation)] DOMAIN_SERVER_ROLE_INFORMATION Role; + [case(DomainReplicationInformation)] SAMPR_DOMAIN_REPLICATION_INFORMATION Replication; + [case(DomainModifiedInformation)] DOMAIN_MODIFIED_INFORMATION Modified; + [case(DomainStateInformation)] DOMAIN_STATE_INFORMATION State; + [case(DomainGeneralInformation2)] SAMPR_DOMAIN_GENERAL_INFORMATION2 General2; + [case(DomainLockoutInformation)] SAMPR_DOMAIN_LOCKOUT_INFORMATION Lockout; + [case(DomainModifiedInformation2)] DOMAIN_MODIFIED_INFORMATION2 Modified2; +} SAMPR_DOMAIN_INFO_BUFFER, *PSAMPR_DOMAIN_INFO_BUFFER; + +typedef enum _DOMAIN_DISPLAY_INFORMATION +{ + DomainDisplayUser = 1, + DomainDisplayMachine, + DomainDisplayGroup, + DomainDisplayOemUser, + DomainDisplayOemGroup +} DOMAIN_DISPLAY_INFORMATION, *PDOMAIN_DISPLAY_INFORMATION; + +typedef struct _SAMPR_DOMAIN_DISPLAY_USER +{ + unsigned long Index; + unsigned long Rid; + unsigned long AccountControl; + RPC_UNICODE_STRING AccountName; + RPC_UNICODE_STRING AdminComment; + RPC_UNICODE_STRING FullName; +} SAMPR_DOMAIN_DISPLAY_USER, *PSAMPR_DOMAIN_DISPLAY_USER; + +typedef struct _SAMPR_DOMAIN_DISPLAY_MACHINE +{ + unsigned long Index; + unsigned long Rid; + unsigned long AccountControl; + RPC_UNICODE_STRING AccountName; + RPC_UNICODE_STRING AdminComment; +} SAMPR_DOMAIN_DISPLAY_MACHINE, *PSAMPR_DOMAIN_DISPLAY_MACHINE; + +typedef struct _SAMPR_DOMAIN_DISPLAY_GROUP +{ + unsigned long Index; + unsigned long Rid; + unsigned long Attributes; + RPC_UNICODE_STRING AccountName; + RPC_UNICODE_STRING AdminComment; +} SAMPR_DOMAIN_DISPLAY_GROUP, *PSAMPR_DOMAIN_DISPLAY_GROUP; + +typedef struct _SAMPR_DOMAIN_DISPLAY_OEM_USER +{ + unsigned long Index; + RPC_STRING OemAccountName; +} SAMPR_DOMAIN_DISPLAY_OEM_USER, *PSAMPR_DOMAIN_DISPLAY_OEM_USER; + +typedef struct _SAMPR_DOMAIN_DISPLAY_OEM_GROUP +{ + unsigned long Index; + RPC_STRING OemAccountName; +} SAMPR_DOMAIN_DISPLAY_OEM_GROUP, *PSAMPR_DOMAIN_DISPLAY_OEM_GROUP; + +typedef struct _SAMPR_DOMAIN_DISPLAY_USER_BUFFER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] PSAMPR_DOMAIN_DISPLAY_USER Buffer; +} SAMPR_DOMAIN_DISPLAY_USER_BUFFER, *PSAMPR_DOMAIN_DISPLAY_USER_BUFFER; + +typedef struct _SAMPR_DOMAIN_DISPLAY_MACHINE_BUFFER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] PSAMPR_DOMAIN_DISPLAY_MACHINE Buffer; +} SAMPR_DOMAIN_DISPLAY_MACHINE_BUFFER, *PSAMPR_DOMAIN_DISPLAY_MACHINE_BUFFER; + +typedef struct _SAMPR_DOMAIN_DISPLAY_GROUP_BUFFER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] PSAMPR_DOMAIN_DISPLAY_GROUP Buffer; +} SAMPR_DOMAIN_DISPLAY_GROUP_BUFFER, *PSAMPR_DOMAIN_DISPLAY_GROUP_BUFFER; + +typedef struct _SAMPR_DOMAIN_DISPLAY_OEM_USER_BUFFER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] PSAMPR_DOMAIN_DISPLAY_OEM_USER Buffer; +} SAMPR_DOMAIN_DISPLAY_OEM_USER_BUFFER, *PSAMPR_DOMAIN_DISPLAY_OEM_USER_BUFFER; + +typedef struct _SAMPR_DOMAIN_DISPLAY_OEM_GROUP_BUFFER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] PSAMPR_DOMAIN_DISPLAY_OEM_GROUP Buffer; +} SAMPR_DOMAIN_DISPLAY_OEM_GROUP_BUFFER, *PSAMPR_DOMAIN_DISPLAY_OEM_GROUP_BUFFER; + +typedef [switch_type(DOMAIN_DISPLAY_INFORMATION)] union _SAMPR_DISPLAY_INFO_BUFFER +{ + [case(DomainDisplayUser)] SAMPR_DOMAIN_DISPLAY_USER_BUFFER UserInformation; + [case(DomainDisplayMachine)] SAMPR_DOMAIN_DISPLAY_MACHINE_BUFFER MachineInformation; + [case(DomainDisplayGroup)] SAMPR_DOMAIN_DISPLAY_GROUP_BUFFER GroupInformation; + [case(DomainDisplayOemUser)] SAMPR_DOMAIN_DISPLAY_OEM_USER_BUFFER OemUserInformation; + [case(DomainDisplayOemGroup)] SAMPR_DOMAIN_DISPLAY_OEM_GROUP_BUFFER OemGroupInformation; +} SAMPR_DISPLAY_INFO_BUFFER, *PSAMPR_DISPLAY_INFO_BUFFER; + +typedef struct _GROUP_ATTRIBUTE_INFORMATION +{ + unsigned long Attributes; +} GROUP_ATTRIBUTE_INFORMATION, *PGROUP_ATTRIBUTE_INFORMATION; + +typedef struct _SAMPR_GROUP_GENERAL_INFORMATION +{ + RPC_UNICODE_STRING Name; + unsigned long Attributes; + unsigned long MemberCount; + RPC_UNICODE_STRING AdminComment; +} SAMPR_GROUP_GENERAL_INFORMATION, *PSAMPR_GROUP_GENERAL_INFORMATION; + +typedef struct _SAMPR_GROUP_NAME_INFORMATION +{ + RPC_UNICODE_STRING Name; +} SAMPR_GROUP_NAME_INFORMATION, *PSAMPR_GROUP_NAME_INFORMATION; + +typedef struct _SAMPR_GROUP_ADM_COMMENT_INFORMATION +{ + RPC_UNICODE_STRING AdminComment; +} SAMPR_GROUP_ADM_COMMENT_INFORMATION, *PSAMPR_GROUP_ADM_COMMENT_INFORMATION; + +typedef enum _GROUP_INFORMATION_CLASS +{ + GroupGeneralInformation = 1, + GroupNameInformation, + GroupAttributeInformation, + GroupAdminCommentInformation, + GroupReplicationInformation +} GROUP_INFORMATION_CLASS; + +typedef [switch_type(GROUP_INFORMATION_CLASS)] union _SAMPR_GROUP_INFO_BUFFER +{ + [case(GroupGeneralInformation)] SAMPR_GROUP_GENERAL_INFORMATION General; + [case(GroupNameInformation)] SAMPR_GROUP_NAME_INFORMATION Name; + [case(GroupAttributeInformation)] GROUP_ATTRIBUTE_INFORMATION Attribute; + [case(GroupAdminCommentInformation)] SAMPR_GROUP_ADM_COMMENT_INFORMATION AdminComment; + [case(GroupReplicationInformation)] SAMPR_GROUP_GENERAL_INFORMATION DoNotUse; +} SAMPR_GROUP_INFO_BUFFER, *PSAMPR_GROUP_INFO_BUFFER; + +typedef struct _SAMPR_ALIAS_GENERAL_INFORMATION +{ + RPC_UNICODE_STRING Name; + unsigned long MemberCount; + RPC_UNICODE_STRING AdminComment; +} SAMPR_ALIAS_GENERAL_INFORMATION, *PSAMPR_ALIAS_GENERAL_INFORMATION; + +typedef struct _SAMPR_ALIAS_NAME_INFORMATION +{ + RPC_UNICODE_STRING Name; +} SAMPR_ALIAS_NAME_INFORMATION, *PSAMPR_ALIAS_NAME_INFORMATION; + +typedef struct _SAMPR_ALIAS_ADM_COMMENT_INFORMATION +{ + RPC_UNICODE_STRING AdminComment; +} SAMPR_ALIAS_ADM_COMMENT_INFORMATION, *PSAMPR_ALIAS_ADM_COMMENT_INFORMATION; + +typedef enum _ALIAS_INFORMATION_CLASS +{ + AliasGeneralInformation = 1, + AliasNameInformation, + AliasAdminCommentInformation, +} ALIAS_INFORMATION_CLASS; + +typedef [switch_type(ALIAS_INFORMATION_CLASS)] union _SAMPR_ALIAS_INFO_BUFFER +{ + [case(AliasGeneralInformation)] SAMPR_ALIAS_GENERAL_INFORMATION General; + [case(AliasNameInformation)] SAMPR_ALIAS_NAME_INFORMATION Name; + [case(AliasAdminCommentInformation)] SAMPR_ALIAS_ADM_COMMENT_INFORMATION AdminComment; +} SAMPR_ALIAS_INFO_BUFFER, *PSAMPR_ALIAS_INFO_BUFFER; + +typedef struct _SAMPR_ENCRYPTED_USER_PASSWORD +{ + unsigned char Buffer[(256 * 2) + 4]; +} SAMPR_ENCRYPTED_USER_PASSWORD, *PSAMPR_ENCRYPTED_USER_PASSWORD; + +typedef struct _SAMPR_ENCRYPTED_USER_PASSWORD_NEW +{ + unsigned char Buffer[(256 * 2) + 4 + 16]; +} SAMPR_ENCRYPTED_USER_PASSWORD_NEW, *PSAMPR_ENCRYPTED_USER_PASSWORD_NEW; + +typedef struct _USER_PRIMARY_GROUP_INFORMATION +{ + unsigned long PrimaryGroupId; +} USER_PRIMARY_GROUP_INFORMATION, *PUSER_PRIMARY_GROUP_INFORMATION; + +typedef struct _USER_CONTROL_INFORMATION +{ + unsigned long UserAccountControl; +} USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION; + +typedef struct _USER_EXPIRES_INFORMATION +{ + OLD_LARGE_INTEGER AccountExpires; +} USER_EXPIRES_INFORMATION, *PUSER_EXPIRES_INFORMATION; + +typedef struct _SAMPR_LOGON_HOURS +{ + unsigned short UnitsPerWeek; +// [size_is(1260), length_is((UnitsPerWeek + 7) / 8)] unsigned char *LogonHours; // FIXME + [size_is(1260)] unsigned char *LogonHours; +} SAMPR_LOGON_HOURS, *PSAMPR_LOGON_HOURS; + +typedef struct _SAMPR_USER_ALL_INFORMATION +{ + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + OLD_LARGE_INTEGER PasswordLastSet; + OLD_LARGE_INTEGER AccountExpires; + OLD_LARGE_INTEGER PasswordCanChange; + OLD_LARGE_INTEGER PasswordMustChange; + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; + RPC_UNICODE_STRING HomeDirectory; + RPC_UNICODE_STRING HomeDirectoryDrive; + RPC_UNICODE_STRING ScriptPath; + RPC_UNICODE_STRING ProfilePath; + RPC_UNICODE_STRING AdminComment; + RPC_UNICODE_STRING WorkStations; + RPC_UNICODE_STRING UserComment; + RPC_UNICODE_STRING Parameters; + RPC_SHORT_BLOB LmOwfPassword; + RPC_SHORT_BLOB NtOwfPassword; + RPC_UNICODE_STRING PrivateData; + SAMPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor; + unsigned long UserId; + unsigned long PrimaryGroupId; + unsigned long UserAccountControl; + unsigned long WhichFields; + SAMPR_LOGON_HOURS LogonHours; + unsigned short BadPasswordCount; + unsigned short LogonCount; + unsigned short CountryCode; + unsigned short CodePage; + unsigned char LmPasswordPresent; + unsigned char NtPasswordPresent; + unsigned char PasswordExpired; + unsigned char PrivateDataSensitive; +} SAMPR_USER_ALL_INFORMATION, *PSAMPR_USER_ALL_INFORMATION; + +typedef struct _SAMPR_USER_GENERAL_INFORMATION +{ + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; + unsigned long PrimaryGroupId; + RPC_UNICODE_STRING AdminComment; + RPC_UNICODE_STRING UserComment; +} SAMPR_USER_GENERAL_INFORMATION, *PSAMPR_USER_GENERAL_INFORMATION; + +typedef struct _SAMPR_USER_PREFERENCES_INFORMATION +{ + RPC_UNICODE_STRING UserComment; + RPC_UNICODE_STRING Reserved1; + unsigned short CountryCode; + unsigned short CodePage; +} SAMPR_USER_PREFERENCES_INFORMATION, *PSAMPR_USER_PREFERENCES_INFORMATION; + +typedef struct _SAMPR_USER_PARAMETERS_INFORMATION +{ + RPC_UNICODE_STRING Parameters; +} SAMPR_USER_PARAMETERS_INFORMATION, *PSAMPR_USER_PARAMETERS_INFORMATION; + +typedef struct _SAMPR_USER_LOGON_INFORMATION +{ + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; + unsigned long UserId; + unsigned long PrimaryGroupId; + RPC_UNICODE_STRING HomeDirectory; + RPC_UNICODE_STRING HomeDirectoryDrive; + RPC_UNICODE_STRING ScriptPath; + RPC_UNICODE_STRING ProfilePath; + RPC_UNICODE_STRING WorkStations; + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + OLD_LARGE_INTEGER PasswordLastSet; + OLD_LARGE_INTEGER PasswordCanChange; + OLD_LARGE_INTEGER PasswordMustChange; + SAMPR_LOGON_HOURS LogonHours; + unsigned short BadPasswordCount; + unsigned short LogonCount; + unsigned long UserAccountControl; +} SAMPR_USER_LOGON_INFORMATION, *PSAMPR_USER_LOGON_INFORMATION; + +typedef struct _SAMPR_USER_ACCOUNT_INFORMATION +{ + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; + unsigned long UserId; + unsigned long PrimaryGroupId; + RPC_UNICODE_STRING HomeDirectory; + RPC_UNICODE_STRING HomeDirectoryDrive; + RPC_UNICODE_STRING ScriptPath; + RPC_UNICODE_STRING ProfilePath; + RPC_UNICODE_STRING AdminComment; + RPC_UNICODE_STRING WorkStations; + OLD_LARGE_INTEGER LastLogon; + OLD_LARGE_INTEGER LastLogoff; + SAMPR_LOGON_HOURS LogonHours; + unsigned short BadPasswordCount; + unsigned short LogonCount; + OLD_LARGE_INTEGER PasswordLastSet; + OLD_LARGE_INTEGER AccountExpires; + unsigned long UserAccountControl; +} SAMPR_USER_ACCOUNT_INFORMATION, *PSAMPR_USER_ACCOUNT_INFORMATION; + +typedef struct _SAMPR_USER_A_NAME_INFORMATION +{ + RPC_UNICODE_STRING UserName; +} SAMPR_USER_A_NAME_INFORMATION, *PSAMPR_USER_A_NAME_INFORMATION; + +typedef struct _SAMPR_USER_F_NAME_INFORMATION +{ + RPC_UNICODE_STRING FullName; +} SAMPR_USER_F_NAME_INFORMATION, *PSAMPR_USER_F_NAME_INFORMATION; + +typedef struct _SAMPR_USER_NAME_INFORMATION +{ + RPC_UNICODE_STRING UserName; + RPC_UNICODE_STRING FullName; +} SAMPR_USER_NAME_INFORMATION, *PSAMPR_USER_NAME_INFORMATION; + +typedef struct _SAMPR_USER_HOME_INFORMATION +{ + RPC_UNICODE_STRING HomeDirectory; + RPC_UNICODE_STRING HomeDirectoryDrive; +} SAMPR_USER_HOME_INFORMATION, *PSAMPR_USER_HOME_INFORMATION; + +typedef struct _SAMPR_USER_SCRIPT_INFORMATION +{ + RPC_UNICODE_STRING ScriptPath; +} SAMPR_USER_SCRIPT_INFORMATION, *PSAMPR_USER_SCRIPT_INFORMATION; + +typedef struct _SAMPR_USER_PROFILE_INFORMATION +{ + RPC_UNICODE_STRING ProfilePath; +} SAMPR_USER_PROFILE_INFORMATION, *PSAMPR_USER_PROFILE_INFORMATION; + +typedef struct _SAMPR_USER_ADMIN_COMMENT_INFORMATION +{ + RPC_UNICODE_STRING AdminComment; +} SAMPR_USER_ADMIN_COMMENT_INFORMATION, *PSAMPR_USER_ADMIN_COMMENT_INFORMATION; + +typedef struct _SAMPR_USER_WORKSTATIONS_INFORMATION +{ + RPC_UNICODE_STRING WorkStations; +} SAMPR_USER_WORKSTATIONS_INFORMATION, *PSAMPR_USER_WORKSTATIONS_INFORMATION; + +typedef struct _SAMPR_USER_LOGON_HOURS_INFORMATION +{ + SAMPR_LOGON_HOURS LogonHours; +} SAMPR_USER_LOGON_HOURS_INFORMATION, *PSAMPR_USER_LOGON_HOURS_INFORMATION; + +typedef struct _SAMPR_USER_INTERNAL1_INFORMATION +{ + ENCRYPTED_NT_OWF_PASSWORD EncryptedNtOwfPassword; + ENCRYPTED_LM_OWF_PASSWORD EncryptedLmOwfPassword; + unsigned char NtPasswordPresent; + unsigned char LmPasswordPresent; + unsigned char PasswordExpired; +} SAMPR_USER_INTERNAL1_INFORMATION, *PSAMPR_USER_INTERNAL1_INFORMATION; + +typedef struct _SAMPR_USER_INTERNAL4_INFORMATION +{ + SAMPR_USER_ALL_INFORMATION I1; + SAMPR_ENCRYPTED_USER_PASSWORD UserPassword; +} SAMPR_USER_INTERNAL4_INFORMATION, *PSAMPR_USER_INTERNAL4_INFORMATION; + +typedef struct _SAMPR_USER_INTERNAL4_INFORMATION_NEW +{ + SAMPR_USER_ALL_INFORMATION I1; + SAMPR_ENCRYPTED_USER_PASSWORD_NEW UserPassword; +} SAMPR_USER_INTERNAL4_INFORMATION_NEW, *PSAMPR_USER_INTERNAL4_INFORMATION_NEW; + +typedef struct _SAMPR_USER_INTERNAL5_INFORMATION +{ + SAMPR_ENCRYPTED_USER_PASSWORD UserPassword; + unsigned char PasswordExpired; +} SAMPR_USER_INTERNAL5_INFORMATION, *PSAMPR_USER_INTERNAL5_INFORMATION; + +typedef struct _SAMPR_USER_INTERNAL5_INFORMATION_NEW +{ + SAMPR_ENCRYPTED_USER_PASSWORD_NEW UserPassword; + unsigned char PasswordExpired; +} SAMPR_USER_INTERNAL5_INFORMATION_NEW, *PSAMPR_USER_INTERNAL5_INFORMATION_NEW; + +typedef enum _USER_INFORMATION_CLASS +{ + UserGeneralInformation = 1, + UserPreferencesInformation = 2, + UserLogonInformation = 3, + UserLogonHoursInformation = 4, + UserAccountInformation = 5, + UserNameInformation = 6, + UserAccountNameInformation = 7, + UserFullNameInformation = 8, + UserPrimaryGroupInformation = 9, + UserHomeInformation = 10, + UserScriptInformation = 11, + UserProfileInformation = 12, + UserAdminCommentInformation = 13, + UserWorkStationsInformation = 14, + UserControlInformation = 16, + UserExpiresInformation = 17, + UserInternal1Information = 18, + UserParametersInformation = 20, + UserAllInformation = 21, + UserInternal4Information = 23, + UserInternal5Information = 24, + UserInternal4InformationNew = 25, + UserInternal5InformationNew = 26, +} USER_INFORMATION_CLASS, *PUSER_INFORMATION_CLASS; + +typedef [switch_type(USER_INFORMATION_CLASS)] union _SAMPR_USER_INFO_BUFFER +{ + [case(UserGeneralInformation)] SAMPR_USER_GENERAL_INFORMATION General; + [case(UserPreferencesInformation)] SAMPR_USER_PREFERENCES_INFORMATION Preferences; + [case(UserLogonInformation)] SAMPR_USER_LOGON_INFORMATION Logon; + [case(UserLogonHoursInformation)] SAMPR_USER_LOGON_HOURS_INFORMATION LogonHours; + [case(UserAccountInformation)] SAMPR_USER_ACCOUNT_INFORMATION Account; + [case(UserNameInformation)] SAMPR_USER_NAME_INFORMATION Name; + [case(UserAccountNameInformation)] SAMPR_USER_A_NAME_INFORMATION AccountName; + [case(UserFullNameInformation)] SAMPR_USER_F_NAME_INFORMATION FullName; + [case(UserPrimaryGroupInformation)] USER_PRIMARY_GROUP_INFORMATION PrimaryGroup; + [case(UserHomeInformation)] SAMPR_USER_HOME_INFORMATION Home; + [case(UserScriptInformation)] SAMPR_USER_SCRIPT_INFORMATION Script; + [case(UserProfileInformation)] SAMPR_USER_PROFILE_INFORMATION Profile; + [case(UserAdminCommentInformation)] SAMPR_USER_ADMIN_COMMENT_INFORMATION AdminComment; + [case(UserWorkStationsInformation)] SAMPR_USER_WORKSTATIONS_INFORMATION WorkStations; + [case(UserControlInformation)] USER_CONTROL_INFORMATION Control; + [case(UserExpiresInformation)] USER_EXPIRES_INFORMATION Expires; + [case(UserInternal1Information)] SAMPR_USER_INTERNAL1_INFORMATION Internal1; + [case(UserParametersInformation)] SAMPR_USER_PARAMETERS_INFORMATION Parameters; + [case(UserAllInformation)] SAMPR_USER_ALL_INFORMATION All; + [case(UserInternal4Information)] SAMPR_USER_INTERNAL4_INFORMATION Internal4; + [case(UserInternal5Information)] SAMPR_USER_INTERNAL5_INFORMATION Internal5; + [case(UserInternal4InformationNew)] SAMPR_USER_INTERNAL4_INFORMATION_NEW Internal4New; + [case(UserInternal5InformationNew)] SAMPR_USER_INTERNAL5_INFORMATION_NEW Internal5New; +} SAMPR_USER_INFO_BUFFER, *PSAMPR_USER_INFO_BUFFER; + +typedef enum _PASSWORD_POLICY_VALIDATION_TYPE +{ + SamValidateAuthentication = 1, + SamValidatePasswordChange, + SamValidatePasswordReset +} PASSWORD_POLICY_VALIDATION_TYPE; + +typedef struct _SAM_VALIDATE_PASSWORD_HASH +{ + unsigned long Length; + [unique,size_is(Length)] unsigned char* Hash; +} SAM_VALIDATE_PASSWORD_HASH, *PSAM_VALIDATE_PASSWORD_HASH; + +typedef struct _SAM_VALIDATE_PERSISTED_FIELDS +{ + unsigned long PresentFields; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER BadPasswordTime; + LARGE_INTEGER LockoutTime; + unsigned long BadPasswordCount; + unsigned long PasswordHistoryLength; + [unique,size_is(PasswordHistoryLength)] PSAM_VALIDATE_PASSWORD_HASH PasswordHistory; +} SAM_VALIDATE_PERSISTED_FIELDS, *PSAM_VALIDATE_PERSISTED_FIELDS; + +typedef enum _SAM_VALIDATE_VALIDATION_STATUS +{ + SamValidateSuccess = 0, + SamValidatePasswordMustChange, + SamValidateAccountLockedOut, + SamValidatePasswordExpired, + SamValidatePasswordIncorrect, + SamValidatePasswordIsInHistory, + SamValidatePasswordTooShort, + SamValidatePasswordTooLong, + SamValidatePasswordNotComplexEnough, + SamValidatePasswordTooRecent, + SamValidatePasswordFilterError +} SAM_VALIDATE_VALIDATION_STATUS, *PSAM_VALIDATE_VALIDATION_STATUS; + +typedef struct _SAM_VALIDATE_STANDARD_OUTPUT_ARG +{ + SAM_VALIDATE_PERSISTED_FIELDS ChangedPersistedFields; + SAM_VALIDATE_VALIDATION_STATUS ValidationStatus; +} SAM_VALIDATE_STANDARD_OUTPUT_ARG, *PSAM_VALIDATE_STANDARD_OUTPUT_ARG; + +typedef struct _SAM_VALIDATE_AUTHENTICATION_INPUT_ARG +{ + SAM_VALIDATE_PERSISTED_FIELDS InputPersistedFields; + unsigned char PasswordMatched; +} SAM_VALIDATE_AUTHENTICATION_INPUT_ARG, *PSAM_VALIDATE_AUTHENTICATION_INPUT_ARG; + +typedef struct _SAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG +{ + SAM_VALIDATE_PERSISTED_FIELDS InputPersistedFields; + RPC_UNICODE_STRING ClearPassword; + RPC_UNICODE_STRING UserAccountName; + SAM_VALIDATE_PASSWORD_HASH HashedPassword; + unsigned char PasswordMatch; +} SAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG, *PSAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG; + +typedef struct _SAM_VALIDATE_PASSWORD_RESET_INPUT_ARG +{ + SAM_VALIDATE_PERSISTED_FIELDS InputPersistedFields; + RPC_UNICODE_STRING ClearPassword; + RPC_UNICODE_STRING UserAccountName; + SAM_VALIDATE_PASSWORD_HASH HashedPassword; + unsigned char PasswordMustChangeAtNextLogon; + unsigned char ClearLockout; +} SAM_VALIDATE_PASSWORD_RESET_INPUT_ARG, *PSAM_VALIDATE_PASSWORD_RESET_INPUT_ARG; + +typedef [switch_type(PASSWORD_POLICY_VALIDATION_TYPE)] union _SAM_VALIDATE_INPUT_ARG +{ + [case(SamValidateAuthentication)] SAM_VALIDATE_AUTHENTICATION_INPUT_ARG ValidateAuthenticationInput; + [case(SamValidatePasswordChange)] SAM_VALIDATE_PASSWORD_CHANGE_INPUT_ARG ValidatePasswordChangeInput; + [case(SamValidatePasswordReset)] SAM_VALIDATE_PASSWORD_RESET_INPUT_ARG ValidatePasswordResetInput; +} SAM_VALIDATE_INPUT_ARG, *PSAM_VALIDATE_INPUT_ARG; + +typedef [switch_type(PASSWORD_POLICY_VALIDATION_TYPE)] union _SAM_VALIDATE_OUTPUT_ARG +{ + [case(SamValidateAuthentication)] SAM_VALIDATE_STANDARD_OUTPUT_ARG ValidateAuthenticationOutput; + [case(SamValidatePasswordChange)] SAM_VALIDATE_STANDARD_OUTPUT_ARG ValidatePasswordChangeOutput; + [case(SamValidatePasswordReset)] SAM_VALIDATE_STANDARD_OUTPUT_ARG ValidatePasswordResetOutput; +} SAM_VALIDATE_OUTPUT_ARG, *PSAM_VALIDATE_OUTPUT_ARG; + +[ + uuid(12345778-1234-ABCD-EF00-0123456789AC), + version(1.0), + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\samr]") +#ifndef __midl + ,explicit_handle +#endif +] +interface samr +{ + /* Function 0 */ + NTSTATUS + __stdcall + SamrConnect( + [in, unique] PSAMPR_SERVER_NAME ServerName, + [out] SAMPR_HANDLE *ServerHandle, + [in] ACCESS_MASK DesiredAccess); + + /* Function 1 */ + NTSTATUS + __stdcall + SamrCloseHandle( + [in,out] SAMPR_HANDLE *SamHandle); + + /* Function 2 */ + NTSTATUS + __stdcall + SamrSetSecurityObject( + [in] SAMPR_HANDLE ObjectHandle, + [in] SECURITY_INFORMATION SecurityInformation, + [in] PSAMPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor); + + /* Function 3 */ + NTSTATUS + __stdcall + SamrQuerySecurityObject( + [in] SAMPR_HANDLE ObjectHandle, + [in] SECURITY_INFORMATION SecurityInformation, + [out] PSAMPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor); + + /* Function 4 */ + NTSTATUS + __stdcall + SamrShutdownSamServer( + [in] SAMPR_HANDLE ServerHandle); + + /* Function 5 */ + NTSTATUS + __stdcall + SamrLookupDomainInSamServer( + [in] SAMPR_HANDLE ServerHandle, + [in] PRPC_UNICODE_STRING Name, + [out] PRPC_SID *DomainId); + + /* Function 6 */ + NTSTATUS + __stdcall + SamrEnumerateDomainsInSamServer( + [in] SAMPR_HANDLE ServerHandle, + [in,out] unsigned long *EnumerationContext, + [out] PSAMPR_ENUMERATION_BUFFER *Buffer, + [in] unsigned long PreferedMaximumLength, + [out] unsigned long *CountReturned); + + /* Function 7 */ + NTSTATUS + __stdcall + SamrOpenDomain( + [in] SAMPR_HANDLE ServerHandle, + [in] ACCESS_MASK DesiredAccess, + [in] PRPC_SID DomainId, + [out] SAMPR_HANDLE *DomainHandle); + + /* Function 8 */ + NTSTATUS + __stdcall + SamrQueryInformationDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_INFORMATION_CLASS DomainInformationClass, + [out, switch_is(DomainInformationClass)] PSAMPR_DOMAIN_INFO_BUFFER *Buffer); + + /* Function 9 */ + NTSTATUS + __stdcall + SamrSetInformationDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_INFORMATION_CLASS DomainInformationClass, + [in, switch_is(DomainInformationClass)] PSAMPR_DOMAIN_INFO_BUFFER DomainInformation); + + /* Function 10 */ + NTSTATUS + __stdcall + SamrCreateGroupInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] PRPC_UNICODE_STRING Name, + [in] ACCESS_MASK DesiredAccess, + [out] SAMPR_HANDLE *GroupHandle, + [out] unsigned long *RelativeId); + + /* Function 11 */ + NTSTATUS + __stdcall + SamrEnumerateGroupsInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in,out] unsigned long *EnumerationContext, + [out] PSAMPR_ENUMERATION_BUFFER *Buffer, + [in] unsigned long PreferedMaximumLength, + [out] unsigned long *CountReturned); + + /* Function 12 */ + NTSTATUS + __stdcall + SamrCreateUserInDomain([in] SAMPR_HANDLE DomainHandle, + [in] PRPC_UNICODE_STRING Name, + [in] ACCESS_MASK DesiredAccess, + [out] SAMPR_HANDLE *UserHandle, + [out] unsigned long *RelativeId); + + /* Function 13 */ + NTSTATUS + __stdcall + SamrEnumerateUsersInDomain([in] SAMPR_HANDLE DomainHandle, + [in,out] unsigned long *EnumerationContext, + [in] unsigned long UserAccountControl, + [out] PSAMPR_ENUMERATION_BUFFER *Buffer, + [in] unsigned long PreferedMaximumLength, + [out] unsigned long *CountReturned); + + /* Function 14 */ + NTSTATUS + __stdcall + SamrCreateAliasInDomain([in] SAMPR_HANDLE DomainHandle, + [in] PRPC_UNICODE_STRING AccountName, + [in] ACCESS_MASK DesiredAccess, + [out] SAMPR_HANDLE *AliasHandle, + [out] unsigned long *RelativeId); + + /* Function 15 */ + NTSTATUS + __stdcall + SamrEnumerateAliasesInDomain([in] SAMPR_HANDLE DomainHandle, + [in,out] unsigned long *EnumerationContext, + [out] PSAMPR_ENUMERATION_BUFFER *Buffer, + [in] unsigned long PreferedMaximumLength, + [out] unsigned long *CountReturned); + + /* Function 16 */ + NTSTATUS + __stdcall + SamrGetAliasMembership([in] SAMPR_HANDLE DomainHandle, + [in] PSAMPR_PSID_ARRAY SidArray, + [out] PSAMPR_ULONG_ARRAY Membership); + + /* Function 17 */ + NTSTATUS + __stdcall + SamrLookupNamesInDomain([in] SAMPR_HANDLE DomainHandle, + [in, range(0, 1000)] unsigned long Count, + [in, size_is(1000), length_is(Count)] RPC_UNICODE_STRING Names[*], + [out] PSAMPR_ULONG_ARRAY RelativeIds, + [out] PSAMPR_ULONG_ARRAY Use); + + /* Function 18 */ + NTSTATUS + __stdcall + SamrLookupIdsInDomain( + [in] SAMPR_HANDLE DomainHandle, + [in, range(0, 1000)] unsigned long Count, + [in, size_is(1000), length_is(Count)] unsigned long *RelativeIds, + [out] PSAMPR_RETURNED_USTRING_ARRAY Names, + [out] PSAMPR_ULONG_ARRAY Use); + + /* Function 19 */ + NTSTATUS + __stdcall + SamrOpenGroup( + [in] SAMPR_HANDLE DomainHandle, + [in] ACCESS_MASK DesiredAccess, + [in] unsigned long GroupId, + [out] SAMPR_HANDLE *GroupHandle); + + /* Function 20 */ + NTSTATUS + __stdcall + SamrQueryInformationGroup( + [in] SAMPR_HANDLE GroupHandle, + [in] GROUP_INFORMATION_CLASS GroupInformationClass, + [out, switch_is(GroupInformationClass)] PSAMPR_GROUP_INFO_BUFFER *Buffer); + + /* Function 21 */ + NTSTATUS + __stdcall + SamrSetInformationGroup( + [in] SAMPR_HANDLE GroupHandle, + [in] GROUP_INFORMATION_CLASS GroupInformationClass, + [in, switch_is(GroupInformationClass)] PSAMPR_GROUP_INFO_BUFFER Buffer); + + /* Function 22 */ + NTSTATUS + __stdcall + SamrAddMemberToGroup( + [in] SAMPR_HANDLE GroupHandle, + [in] unsigned long MemberId, + [in] unsigned long Attributes); + + /* Function 21 */ + NTSTATUS + __stdcall + SamrDeleteGroup( + [in,out] SAMPR_HANDLE *GroupHandle); + + /* Function 24 */ + NTSTATUS + __stdcall + SamrRemoveMemberFromGroup( + [in] SAMPR_HANDLE GroupHandle, + [in] unsigned long MemberId); + + /* Function 25 */ + NTSTATUS + __stdcall + SamrGetMembersInGroup( + [in] SAMPR_HANDLE GroupHandle, + [out] PSAMPR_GET_MEMBERS_BUFFER *Members); + + /* Function 26 */ + NTSTATUS + __stdcall + SamrSetMemberAttributesOfGroup( + [in] SAMPR_HANDLE GroupHandle, + [in] unsigned long MemberId, + [in] unsigned long Attributes); + + /* Function 27 */ + NTSTATUS + __stdcall + SamrOpenAlias( + [in] SAMPR_HANDLE DomainHandle, + [in] unsigned long DesiredAccess, + [in] unsigned long AliasId, + [out] SAMPR_HANDLE *AliasHandle); + + /* Function 28 */ + NTSTATUS + __stdcall + SamrQueryInformationAlias( + [in] SAMPR_HANDLE AliasHandle, + [in] ALIAS_INFORMATION_CLASS AliasInformationClass, + [out, switch_is(AliasInformationClass)] PSAMPR_ALIAS_INFO_BUFFER *Buffer); + + /* Function 29 */ + NTSTATUS + __stdcall + SamrSetInformationAlias( + [in] SAMPR_HANDLE AliasHandle, + [in] ALIAS_INFORMATION_CLASS AliasInformationClass, + [in, switch_is(AliasInformationClass)] PSAMPR_ALIAS_INFO_BUFFER Buffer); + + /* Function 30 */ + NTSTATUS + __stdcall + SamrDeleteAlias( + [in, out] SAMPR_HANDLE *AliasHandle); + + /* Function 31 */ + NTSTATUS + __stdcall + SamrAddMemberToAlias( + [in] SAMPR_HANDLE AliasHandle, + [in] PRPC_SID MemberId); + + /* Function 32 */ + NTSTATUS + __stdcall + SamrRemoveMemberFromAlias( + [in] SAMPR_HANDLE AliasHandle, + [in] PRPC_SID MemberId); + + /* Function 33 */ + NTSTATUS + __stdcall + SamrGetMembersInAlias( + [in] SAMPR_HANDLE AliasHandle, + [out] PSAMPR_PSID_ARRAY_OUT Members); + + /* Function 34 */ + NTSTATUS + __stdcall + SamrOpenUser( + [in] SAMPR_HANDLE DomainHandle, + [in] unsigned long DesiredAccess, + [in] unsigned long UserId, + [out] SAMPR_HANDLE *UserHandle); + + /* Function 35 */ + NTSTATUS + __stdcall + SamrDeleteUser( + [in,out] SAMPR_HANDLE *UserHandle); + + /* Function 36 */ + NTSTATUS + __stdcall + SamrQueryInformationUser( + [in] SAMPR_HANDLE UserHandle, + [in] USER_INFORMATION_CLASS UserInformationClass, + [out, switch_is(UserInformationClass)] PSAMPR_USER_INFO_BUFFER *Buffer); + + /* Function 37 */ + NTSTATUS + __stdcall + SamrSetInformationUser( + [in] SAMPR_HANDLE UserHandle, + [in] USER_INFORMATION_CLASS UserInformationClass, + [in, switch_is(UserInformationClass)] PSAMPR_USER_INFO_BUFFER Buffer); + + /* Function 38 */ + NTSTATUS + __stdcall + SamrChangePasswordUser( + [in] SAMPR_HANDLE UserHandle, + [in] unsigned char LmPresent, + [in, unique] PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, + [in, unique] PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, + [in] unsigned char NtPresent, + [in, unique] PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, + [in, unique] PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, + [in] unsigned char NtCrossEncryptionPresent, + [in, unique] PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, + [in] unsigned char LmCrossEncryptionPresent, + [in, unique] PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt); + + /* Function 39 */ + NTSTATUS + __stdcall + SamrGetGroupsForUser( + [in] SAMPR_HANDLE UserHandle, + [out] PSAMPR_GET_GROUPS_BUFFER *Groups); + + /* Function 40 */ + NTSTATUS + __stdcall + SamrQueryDisplayInformation( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + [in] unsigned long Index, + [in] unsigned long EntryCount, + [in] unsigned long PreferredMaximumLength, + [out] unsigned long * TotalAvailable, + [out] unsigned long * TotalReturned, + [out, switch_is(DisplayInformationClass)] PSAMPR_DISPLAY_INFO_BUFFER Buffer); + + /* Function 41 */ + NTSTATUS + __stdcall + SamrGetDisplayEnumerationIndex( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + [in] PRPC_UNICODE_STRING Prefix, + [out] unsigned long *Index); + + /* Function 42 */ + NTSTATUS + __stdcall + SamrTestPrivateFunctionsDomain( + [in] SAMPR_HANDLE DomainHandle); + + /* Function 43 */ + NTSTATUS + __stdcall + SamrTestPrivateFunctionsUser( + [in] SAMPR_HANDLE UserHandle); + + /* Function 44 */ + NTSTATUS + __stdcall + SamrGetUserDomainPasswordInformation( + [in] SAMPR_HANDLE UserHandle, + [out] PUSER_DOMAIN_PASSWORD_INFORMATION PasswordInformation); + + /* Function 45 */ + NTSTATUS + __stdcall + SamrRemoveMemberFromForeignDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] PRPC_SID MemberSid); + + /* Function 46 */ + NTSTATUS + __stdcall + SamrQueryInformationDomain2( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_INFORMATION_CLASS DomainInformationClass, + [out, switch_is(DomainInformationClass)] PSAMPR_DOMAIN_INFO_BUFFER *Buffer); + + /* Function 47 */ + NTSTATUS + __stdcall + SamrQueryInformationUser2( + [in] SAMPR_HANDLE UserHandle, + [in] USER_INFORMATION_CLASS UserInformationClass, + [out, switch_is(UserInformationClass)] PSAMPR_USER_INFO_BUFFER *Buffer); + + /* Function 48 */ + NTSTATUS + __stdcall + SamrQueryDisplayInformation2( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + [in] unsigned long Index, + [in] unsigned long EntryCount, + [in] unsigned long PreferredMaximumLength, + [out] unsigned long *TotalAvailable, + [out] unsigned long *TotalReturned, + [out, switch_is(DisplayInformationClass)] PSAMPR_DISPLAY_INFO_BUFFER Buffer); + + /* Function 49 */ + NTSTATUS + __stdcall + SamrGetDisplayEnumerationIndex2( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + [in] PRPC_UNICODE_STRING Prefix, + [out] unsigned long *Index); + + /* Function 50 */ + NTSTATUS + __stdcall + SamrCreateUser2InDomain( + [in] SAMPR_HANDLE DomainHandle, + [in] PRPC_UNICODE_STRING Name, + [in] unsigned long AccountType, + [in] unsigned long DesiredAccess, + [out] SAMPR_HANDLE *UserHandle, + [out] unsigned long *GrantedAccess, + [out] unsigned long *RelativeId); + + /* Function 51 */ + NTSTATUS + __stdcall + SamrQueryDisplayInformation3( + [in] SAMPR_HANDLE DomainHandle, + [in] DOMAIN_DISPLAY_INFORMATION DisplayInformationClass, + [in] unsigned long Index, + [in] unsigned long EntryCount, + [in] unsigned long PreferredMaximumLength, + [out] unsigned long *TotalAvailable, + [out] unsigned long *TotalReturned, + [out, switch_is(DisplayInformationClass)] PSAMPR_DISPLAY_INFO_BUFFER Buffer); + + /* Function 52 */ + NTSTATUS + __stdcall + SamrAddMultipleMembersToAlias( + [in] SAMPR_HANDLE AliasHandle, + [in] PSAMPR_PSID_ARRAY MembersBuffer); + + /* Function 53 */ + NTSTATUS + __stdcall + SamrRemoveMultipleMembersFromAlias( + [in] SAMPR_HANDLE AliasHandle, + [in] PSAMPR_PSID_ARRAY MembersBuffer); + + /* Function 54 */ + NTSTATUS + __stdcall + SamrOemChangePasswordUser2( + [in] handle_t BindingHandle, + [in,unique] PRPC_STRING ServerName, + [in] PRPC_STRING UserName, + [in,unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, + [in,unique] PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewLm); + + /* Function 55 */ + NTSTATUS + __stdcall + SamrUnicodeChangePasswordUser2( + [in] handle_t BindingHandle, + [in,unique] PRPC_UNICODE_STRING ServerName, + [in] PRPC_UNICODE_STRING UserName, + [in,unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldNt, + [in,unique] PENCRYPTED_NT_OWF_PASSWORD OldNtOwfPasswordEncryptedWithNewNt, + [in] unsigned char LmPresent, + [in,unique] PSAMPR_ENCRYPTED_USER_PASSWORD NewPasswordEncryptedWithOldLm, + [in,unique] PENCRYPTED_LM_OWF_PASSWORD OldLmOwfPasswordEncryptedWithNewNt); + + /* Function 56 */ + NTSTATUS + __stdcall + SamrGetDomainPasswordInformation( + [in] handle_t BindingHandle, + [in,unique] PRPC_UNICODE_STRING Unused, + [out] PUSER_DOMAIN_PASSWORD_INFORMATION PasswordInformation); + + /* Function 57 */ + NTSTATUS + __stdcall + SamrConnect2( + [in,unique,string] PSAMPR_SERVER_NAME ServerName, + [out] SAMPR_HANDLE *ServerHandle, + [in] ACCESS_MASK DesiredAccess); + + /* Function 58 */ + NTSTATUS + __stdcall + SamrSetInformationUser2( + [in] SAMPR_HANDLE UserHandle, + [in] USER_INFORMATION_CLASS UserInformationClass, + [in, switch_is(UserInformationClass)] PSAMPR_USER_INFO_BUFFER Buffer); + + /* Function 59 */ + NTSTATUS + __stdcall + SamrSetBootKeyInformation( + [in] handle_t BindingHandle); /* FIXME */ + + /* Function 60 */ + NTSTATUS + __stdcall + SamrGetBootKeyInformation( + [in] handle_t BindingHandle); /* FIXME */ + + /* Function 61 */ + NTSTATUS + __stdcall + SamrConnect3( + [in] handle_t BindingHandle); /* FIXME */ + + /* Function 62 */ + NTSTATUS + __stdcall + SamrConnect4( + [in,unique,string] PSAMPR_SERVER_NAME ServerName, + [out] SAMPR_HANDLE *ServerHandle, + [in] unsigned long ClientRevision, + [in] ACCESS_MASK DesiredAccess); + + /* Function 63 */ + NTSTATUS + __stdcall + SamrUnicodeChangePasswordUser3( + [in] handle_t BindingHandle); /* FIXME */ + + /* Function 64 */ + NTSTATUS + __stdcall + SamrConnect5( + [in,unique,string] PSAMPR_SERVER_NAME ServerName, + [in] ACCESS_MASK DesiredAccess, + [in] unsigned long InVersion, + [in,switch_is(InVersion)] SAMPR_REVISION_INFO *InRevisionInfo, + [out] unsigned long *OutVersion, + [out,switch_is(*OutVersion)] SAMPR_REVISION_INFO *OutRevisionInfo, + [out] SAMPR_HANDLE *ServerHandle); + + /* Function 65 */ + NTSTATUS + __stdcall + SamrRidToSid( + [in] SAMPR_HANDLE ObjectHandle, + [in] unsigned long Rid, + [out] PRPC_SID *Sid); + + /* Function 66 */ + NTSTATUS + __stdcall + SamrSetDSRMPassword( + [in] handle_t BindingHandle, + [in,unique] PRPC_UNICODE_STRING Unused, + [in] unsigned long UserId, + [in,unique] PENCRYPTED_NT_OWF_PASSWORD EncryptedNtOwfPassword); + + /* Function 67 */ + NTSTATUS + __stdcall + SamrValidatePassword( + [in] handle_t Handle, + [in] PASSWORD_POLICY_VALIDATION_TYPE ValidationType, + [in,switch_is(ValidationType)] PSAM_VALIDATE_INPUT_ARG InputArg, + [out,switch_is(ValidationType)] PSAM_VALIDATE_OUTPUT_ARG *OutputArg); +} Propchange: trunk/reactos/include/reactos/idl/sam.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 56643: [KERNEL32] - Swap GetFullPathName success/failure cases in BasePushProcessParameters. Fixes kernel32:GetModuleFileName test. See issue #6786 for more details.
by tfaber＠svn.reactos.org 20 May '12

20 May '12

Author: tfaber Date: Sun May 20 14:06:09 2012 New Revision: 56643 URL: http://svn.reactos.org/svn/reactos?rev=56643&view=rev Log: [KERNEL32] - Swap GetFullPathName success/failure cases in BasePushProcessParameters. Fixes kernel32:GetModuleFileName test. See issue #6786 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun May 20 14:06:09 2012 @@ -307,7 +307,7 @@ } break; - /* Add the current applicaiton path */ + /* Add the current application path */ case BaseSearchPathApp: if ((AppName) && (AppNameEnd)) { Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun May 20 14:06:09 2012 @@ -778,6 +778,21 @@ if ((Size) && (Size <= (MAX_PATH + 4))) { /* Get the DLL Path */ + DllPathString = BaseComputeProcessDllPath(FullPath, lpEnvironment); + if (!DllPathString) + { + /* Fail */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Initialize Strings */ + RtlInitUnicodeString(&DllPath, DllPathString); + RtlInitUnicodeString(&ImageName, FullPath); + } + else + { + /* Couldn't get the path name. Just take the original path */ DllPathString = BaseComputeProcessDllPath((LPWSTR)ApplicationPathName, lpEnvironment); if (!DllPathString) @@ -790,21 +805,6 @@ /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); RtlInitUnicodeString(&ImageName, ApplicationPathName); - } - else - { - /* Get the DLL Path */ - DllPathString = BaseComputeProcessDllPath(FullPath, lpEnvironment); - if (!DllPathString) - { - /* Fail */ - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Initialize Strings */ - RtlInitUnicodeString(&DllPath, DllPathString); - RtlInitUnicodeString(&ImageName, FullPath); } /* Initialize Strings */ @@ -1656,7 +1656,7 @@ /* Someone beat us to it, use their data instead */ StartupInfo = BaseAnsiStartupInfo; Status = STATUS_SUCCESS; - + /* We're going to free our own stuff, but not raise */ RtlFreeAnsiString(&TitleString); }

1 0

[jimtabor] 56642: [UXTHEME] - Partial sync port Wine 1.5.4 for system.c. - Researched branches/GSoC_2011/ThemesSupport and current changes before sync.
by jimtabor＠svn.reactos.org 20 May '12

20 May '12

Author: jimtabor Date: Sun May 20 05:11:54 2012 New Revision: 56642 URL: http://svn.reactos.org/svn/reactos?rev=56642&view=rev Log: [UXTHEME] - Partial sync port Wine 1.5.4 for system.c. - Researched branches/GSoC_2011/ThemesSupport and current changes before sync. Modified: trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxtheme.spec trunk/reactos/include/psdk/uxtheme.h Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun May 20 05:11:54 2012 @@ -620,9 +620,9 @@ } /*********************************************************************** - * OpenThemeData (UXTHEME.@) - */ -HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR pszClassList) + * OpenThemeDataEx (UXTHEME.61) + */ +HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) { WCHAR szAppBuff[256]; WCHAR szClassBuff[256]; @@ -631,8 +631,14 @@ HTHEME hTheme = NULL; TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList)); - if(pszClassList == NULL) - SetLastError(E_POINTER); + if(!pszClassList) + { + SetLastError(E_POINTER); + return NULL; + } + + if(flags) + FIXME("unhandled flags: %x\n", flags); if(bThemeActive) { @@ -648,8 +654,15 @@ if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); TRACE(" = %p\n", hTheme); - return hTheme; +} + +/*********************************************************************** + * OpenThemeData (UXTHEME.@) + */ +HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist) +{ + return OpenThemeDataEx(hwnd, classlist, 0); } /*********************************************************************** Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Sun May 20 05:11:54 2012 @@ -38,7 +38,7 @@ 46 stub -noname ClassicAdjustWindowRectEx 48 stub -noname GetThemeParseErrorInfo 60 stub -noname CreateThemeDataFromObjects -61 stub -noname OpenThemeDataEx +61 stdcall OpenThemeDataEx(ptr wstr long) 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection Modified: trunk/reactos/include/psdk/uxtheme.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/uxtheme.h?rev… ============================================================================== --- trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] Sun May 20 05:11:54 2012 @@ -136,6 +136,7 @@ BOOL WINAPI IsThemeDialogTextureEnabled(HWND); BOOL WINAPI IsThemePartDefined(HTHEME,int,int); HTHEME WINAPI OpenThemeData(HWND,LPCWSTR); +HTHEME WINAPI OpenThemeDataEx(HWND,LPCWSTR,DWORD); void WINAPI SetThemeAppProperties(DWORD); HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR); #endif

1 0

[spetreolle] 56641: [SETUPAPI] Sync SetupCreateDiskSpaceListW with Wine head. Fixes remaining setupapi:diskspace test failures.
by spetreolle＠svn.reactos.org 19 May '12

19 May '12

Author: spetreolle Date: Sat May 19 18:29:56 2012 New Revision: 56641 URL: http://svn.reactos.org/svn/reactos?rev=56641&view=rev Log: [SETUPAPI] Sync SetupCreateDiskSpaceListW with Wine head. Fixes remaining setupapi:diskspace test failures. Modified: trunk/reactos/dll/win32/setupapi/diskspace.c Modified: trunk/reactos/dll/win32/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/diskspa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/diskspace.c [iso-8859-1] Sat May 19 18:29:56 2012 @@ -35,7 +35,7 @@ /*********************************************************************** - * SetupCreateDiskSpaceListW (SETUPAPI.@) + * SetupCreateDiskSpaceListW (SETUPAPI.@) */ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags) { @@ -43,6 +43,14 @@ DWORD rc; WCHAR *ptr; LPDISKSPACELIST list=NULL; + + TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + + if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } rc = GetLogicalDriveStringsW(255,drives); @@ -73,7 +81,7 @@ } ptr += lstrlenW(ptr) + 1; } - return (HANDLE)list; + return list; }

1 0

[akhaldi] 56640: [UXTHEME_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 15:14:49 2012 New Revision: 56640 URL: http://svn.reactos.org/svn/reactos?rev=56640&view=rev Log: [UXTHEME_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/uxtheme/system.c Modified: trunk/rostests/winetests/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/system.… ============================================================================== --- trunk/rostests/winetests/uxtheme/system.c [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/system.c [iso-8859-1] Sat May 19 15:14:49 2012 @@ -33,17 +33,12 @@ static BOOL (WINAPI * pIsThemeActive)(VOID); static BOOL (WINAPI * pIsThemePartDefined)(HTHEME, int, int); static HTHEME (WINAPI * pOpenThemeData)(HWND, LPCWSTR); +static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); static HRESULT (WINAPI * pSetWindowTheme)(HWND, LPCWSTR, LPCWSTR); static HMODULE hUxtheme = 0; -#define UXTHEME_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hUxtheme, #func); \ - if(!p ## func) { \ - trace("GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(hUxtheme); \ - return FALSE; \ - } +#define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func); static BOOL InitFunctionPtrs(void) { @@ -61,6 +56,7 @@ UXTHEME_GET_PROC(IsThemeActive) UXTHEME_GET_PROC(IsThemePartDefined) UXTHEME_GET_PROC(OpenThemeData) + UXTHEME_GET_PROC(OpenThemeDataEx) UXTHEME_GET_PROC(SetWindowTheme) } /* The following functions should be available, if not return FALSE. The Vista functions will @@ -71,7 +67,10 @@ !pGetWindowTheme || !pIsAppThemed || !pIsThemeActive || !pIsThemePartDefined || !pOpenThemeData || !pSetWindowTheme) + { + FreeLibrary(hUxtheme); return FALSE; + } return TRUE; } @@ -193,8 +192,7 @@ SetLastError(0xdeadbeef); hTheme = pOpenThemeData(NULL, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -233,8 +231,7 @@ SetLastError(0xdeadbeef); hTheme = pOpenThemeData(hWnd, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -336,6 +333,151 @@ hWnd, GetLastError()); } +static void test_OpenThemeDataEx(void) +{ + HTHEME hTheme; + HWND hWnd; + BOOL bThemeActive; + BOOL bDestroyed; + + WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; + WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; + WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; + WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; + + if (!pOpenThemeDataEx) + { + win_skip("OpenThemeDataEx not available\n"); + return; + } + + bThemeActive = pIsThemeActive(); + + /* All NULL */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(NULL, NULL, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + ok( GetLastError() == E_POINTER, + "Expected GLE() to be E_POINTER, got 0x%08x\n", + GetLastError()); + + /* A NULL hWnd and an invalid classlist without flags */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(NULL, szInvalidClassList, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(NULL, szClassList, 0); + if (bThemeActive) + { + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + } + else + { + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + } + + /* Only do the bare minimum to get a valid hdc */ + hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + if (!hWnd) return; + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, NULL, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + ok( GetLastError() == E_POINTER, + "Expected GLE() to be E_POINTER, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szInvalidClassList, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + + if (!bThemeActive) + { + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0); + ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); + todo_wine + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, + "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08x\n", + GetLastError()); + skip("No active theme, skipping rest of OpenThemeDataEx tests\n"); + return; + } + + /* Only do the next checks if we have an active theme */ + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, OTD_FORCE_RECT_SIZING); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, OTD_NONCLIENT); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList, 0x3); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + /* Test with bUtToN instead of Button */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szButtonClassList2, 0); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = pOpenThemeDataEx(hWnd, szClassList, 0); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); + + bDestroyed = DestroyWindow(hWnd); + if (!bDestroyed) + trace("Window %p couldn't be destroyed : 0x%08x\n", + hWnd, GetLastError()); +} + static void test_GetCurrentThemeName(void) { BOOL bThemeActive; @@ -361,23 +503,20 @@ SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); if (bThemeActive) - ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); - else - ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); - - /* When the number of characters given is too small (not 0, see above), GetCurrentThemeName returns 0x8007007a. - * The only definition I found was in strsafe.h: - * - * #define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) // 0x7A = 122L = ERROR_INSUFFICIENT_BUFFER - */ + ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected S_OK, got 0x%08x\n", hRes); + else + ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08x\n", + GetLastError()); + SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -391,7 +530,9 @@ currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -498,6 +639,10 @@ trace("Starting test_OpenThemeData()\n"); test_OpenThemeData(); + /* OpenThemeDataEx */ + trace("Starting test_OpenThemeDataEx()\n"); + test_OpenThemeDataEx(); + /* GetCurrentThemeName */ trace("Starting test_GetCurrentThemeName()\n"); test_GetCurrentThemeName();

1 0

[akhaldi] 56639: [PSDK] * Add some missing definitions.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 15:14:41 2012 New Revision: 56639 URL: http://svn.reactos.org/svn/reactos?rev=56639&view=rev Log: [PSDK] * Add some missing definitions. Modified: trunk/reactos/include/psdk/uxtheme.h Modified: trunk/reactos/include/psdk/uxtheme.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/uxtheme.h?rev… ============================================================================== --- trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] Sat May 19 15:14:41 2012 @@ -32,6 +32,10 @@ #define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM) #define HTTB_SIZINGTEMPLATE 0x0100 #define HTTB_SYSTEMSIZINGMARGINS 0x0200 + +#define OTD_FORCE_RECT_SIZING 0x0001 +#define OTD_NONCLIENT 0x0002 +#define OTD_VALIDBITS (OTD_FORCE_RECT_SIZING | OTD_NONCLIENT) typedef HANDLE HPAINTBUFFER; typedef HANDLE HTHEME;

1 0

[akhaldi] 56638: [USP10_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 15:08:29 2012 New Revision: 56638 URL: http://svn.reactos.org/svn/reactos?rev=56638&view=rev Log: [USP10_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sat May 19 15:08:29 2012 @@ -2798,6 +2798,19 @@ hr = ScriptItemize(test, 3, 4, NULL, NULL, items, NULL); ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + /* + * This Test crashes pre Vista. + + hr = ScriptBreak(test, 1, &items[0].a, NULL); + ok(hr == E_INVALIDARG, "ScriptBreak should return E_INVALIDARG not %08x\n", hr); + */ + + hr = ScriptBreak(test, 0, &items[0].a, &la); + ok(hr == E_FAIL || broken(hr == S_OK), "ScriptBreak should return E_FAIL not %08x\n", hr); + + hr = ScriptBreak(test, -1, &items[0].a, &la); + ok(hr == E_INVALIDARG || broken(hr == S_OK), "ScriptBreak should return E_INVALIDARG not %08x\n", hr); + memset(&la, 0, sizeof(la)); hr = ScriptBreak(test, 1, &items[0].a, &la); ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr);

1 0

[akhaldi] 56637: [USP10] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 15:08:23 2012 New Revision: 56637 URL: http://svn.reactos.org/svn/reactos?rev=56637&view=rev Log: [USP10] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sat May 19 15:08:23 2012 @@ -492,7 +492,7 @@ {{Script_Myanmar, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x55, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'), - {0}}, + {'M','y','a','n','m','a','r',' ','T','e','x','t',0}}, {{Script_Myanmar_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x55, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'), @@ -2665,7 +2665,8 @@ { TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); - if (!la) return S_FALSE; + if (count < 0 || !la) return E_INVALIDARG; + if (count == 0) return E_FAIL; BREAK_line(chars, count, sa, la); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 15:08:23 2012 @@ -168,7 +168,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.3.37 reactos/dll/win32/url # Synced to Wine-1.5.4 reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Synced to Wine-1.4 +reactos/dll/win32/usp10 # Synced to Wine-1.5.4 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync

1 0

[akhaldi] 56636: [URL] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 15:01:23 2012 New Revision: 56636 URL: http://svn.reactos.org/svn/reactos?rev=56636&view=rev Log: [URL] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/url/CMakeLists.txt trunk/reactos/dll/win32/url/url.spec trunk/reactos/dll/win32/url/url_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/url/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/url/CMakeLists.txt [iso-8859-1] Sat May 19 15:01:23 2012 @@ -10,11 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/url.def) add_library(url SHARED ${SOURCE}) - set_module_type(url win32dll) - target_link_libraries(url wine) - add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) - add_cd_file(TARGET url DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/url/url.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/url/url.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/url/url.spec [iso-8859-1] Sat May 19 15:01:23 2012 @@ -1,7 +1,5 @@ @ stdcall AddMIMEFileTypesPS(ptr ptr) @ stub AutodialHookCallback -@ stub -private DllCanUnloadNow -@ stub -private DllGetClassObject @ stub DummyEntryPoint @ stub DummyEntryPointA @ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA @@ -13,8 +11,8 @@ @ stub MailToProtocolHandlerA @ stub NewsProtocolHandler @ stub NewsProtocolHandlerA -@ stub OpenURL -@ stub OpenURLA +@ stdcall OpenURL(long long str long) OpenURLA +@ stdcall OpenURLA(long long str long) @ stdcall TelnetProtocolHandler(long str) TelnetProtocolHandlerA @ stdcall TelnetProtocolHandlerA(long str) @ stub TranslateURLA Modified: trunk/reactos/dll/win32/url/url_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/url/url_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/url/url_main.c [iso-8859-1] Sat May 19 15:01:23 2012 @@ -106,6 +106,15 @@ } /*********************************************************************** + * OpenURLA (URL.@) + * + */ +void WINAPI OpenURLA(HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT show) +{ + FIXME("(%p, %p, %s, %d): stub!\n", hwnd, inst, debugstr_a(cmdline), show); +} + +/*********************************************************************** * TelnetProtocolHandlerA (URL.@) * */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 15:01:23 2012 @@ -166,7 +166,7 @@ reactos/dll/win32/traffic # Synced to Wine-1.5.4 reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/updspapi # Synced to Wine-1.3.37 -reactos/dll/win32/url # Autosync +reactos/dll/win32/url # Synced to Wine-1.5.4 reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.4 reactos/dll/win32/uxtheme # Forked

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs