Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[janderwald] 59224: [VIDEOPRT] - Check if there is a dma adapter CORE-7181 #comment please retest

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jun 16 09:17:29 2013 New Revision: 59224 URL: http://svn.reactos.org/svn/reactos?rev=59224&view=rev Log: [VIDEOPRT] - Check if there is a dma adapter CORE-7181 #comment please retest Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] Sun Jun 16 09:17:29 2013 @@ -229,8 +229,11 @@ return NULL; } - /* sanity check */ - ASSERT(!IsListEmpty(&DeviceExtension->DmaAdapterList)); + if (IsListEmpty(&DeviceExtension->DmaAdapterList)) + { + /* no adapter available */ + return NULL; + } /* grab first dma adapter */ VpDmaAdapter = (PVIP_DMA_ADAPTER)CONTAINING_RECORD(DeviceExtension->DmaAdapterList.Flink, VIP_DMA_ADAPTER, Entry); @@ -239,7 +242,6 @@ ASSERT(VpDmaAdapter->HwDeviceExtension == HwDeviceExtension); ASSERT(VpDmaAdapter->Adapter != NULL); ASSERT(VpDmaAdapter->MapRegisters != 0); - /* allocate common buffer */ Result = VideoPortAllocateCommonBuffer(HwDeviceExtension, (PVP_DMA_ADAPTER)VpDmaAdapter, DesiredLength, LogicalAddress, CacheEnabled, NULL);

11 years, 4 months

[ekohl] 59223: [NETAPI32] - NetUserEnum, NetUserGetInfo: Query UserAllInformation instead of UserAccountInformation. - BuildUserInfoBuffer: Return more information to the caller (UserComment, Param...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 15 22:22:15 2013 New Revision: 59223 URL: http://svn.reactos.org/svn/reactos?rev=59223&view=rev Log: [NETAPI32] - NetUserEnum, NetUserGetInfo: Query UserAllInformation instead of UserAccountInformation. - BuildUserInfoBuffer: Return more information to the caller (UserComment, Parameters, UnitsPerWeek, LogonHours and LogonServer). - FreeUserInfo: Free additional strings. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Jun 15 22:22:15 2013 @@ -112,11 +112,12 @@ static NET_API_STATUS -BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo, +BuildUserInfoBuffer(PUSER_ALL_INFORMATION UserInfo, DWORD level, ULONG RelativeId, LPVOID *Buffer) { + UNICODE_STRING LogonServer = RTL_CONSTANT_STRING(L"\\\\*"); LPVOID LocalBuffer = NULL; PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; @@ -168,14 +169,20 @@ if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); - /* FIXME: usri2_usr_comment */ - /* FIXME: usri2_parms */ + if (UserInfo->UserComment.Length > 0) + Size += UserInfo->UserComment.Length + sizeof(WCHAR); + + if (UserInfo->Parameters.Length > 0) + Size += UserInfo->Parameters.Length + sizeof(WCHAR); if (UserInfo->WorkStations.Length > 0) Size += UserInfo->WorkStations.Length + sizeof(WCHAR); - /* FIXME: usri2_logon_hours */ - /* FIXME: usri2_logon_server */ + if (UserInfo->LogonHours.UnitsPerWeek > 0) + Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8; + + if (LogonServer.Length > 0) + Size += LogonServer.Length + sizeof(WCHAR); break; case 3: @@ -194,14 +201,20 @@ if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); - /* FIXME: usri3_usr_comment */ - /* FIXME: usri3_parms */ + if (UserInfo->UserComment.Length > 0) + Size += UserInfo->UserComment.Length + sizeof(WCHAR); + + if (UserInfo->Parameters.Length > 0) + Size += UserInfo->Parameters.Length + sizeof(WCHAR); if (UserInfo->WorkStations.Length > 0) Size += UserInfo->WorkStations.Length + sizeof(WCHAR); - /* FIXME: usri3_logon_hours */ - /* FIXME: usri3_logon_server */ + if (UserInfo->LogonHours.UnitsPerWeek > 0) + Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8; + + if (LogonServer.Length > 0) + Size += LogonServer.Length + sizeof(WCHAR); if (UserInfo->ProfilePath.Length > 0) Size += UserInfo->ProfilePath.Length + sizeof(WCHAR); @@ -219,7 +232,8 @@ if (UserInfo->AdminComment.Length > 0) Size += UserInfo->AdminComment.Length + sizeof(WCHAR); - /* FIXME: usri10_usr_comment */ + if (UserInfo->UserComment.Length > 0) + Size += UserInfo->UserComment.Length + sizeof(WCHAR); if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); @@ -401,8 +415,29 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); } - /* FIXME: usri2_usr_comment */ - /* FIXME: usri2_parms */ + if (UserInfo->UserComment.Length > 0) + { + UserInfo2->usri2_usr_comment = Ptr; + + memcpy(UserInfo2->usri2_usr_comment, + UserInfo->UserComment.Buffer, + UserInfo->UserComment.Length); + UserInfo2->usri2_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR)); + } + + if (UserInfo->Parameters.Length > 0) + { + UserInfo2->usri2_parms = Ptr; + + memcpy(UserInfo2->usri2_parms, + UserInfo->Parameters.Buffer, + UserInfo->Parameters.Length); + UserInfo2->usri2_parms[UserInfo->Parameters.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->Parameters.Length + sizeof(WCHAR)); + } if (UserInfo->WorkStations.Length > 0) { @@ -426,17 +461,36 @@ &UserInfo2->usri2_acct_expires); UserInfo2->usri2_max_storage = USER_MAXSTORAGE_UNLIMITED; - - /* FIXME: usri2_units_per_week */ - /* FIXME: usri2_logon_hours */ + UserInfo2->usri2_units_per_week = UserInfo->LogonHours.UnitsPerWeek; + + if (UserInfo->LogonHours.UnitsPerWeek > 0) + { + UserInfo2->usri2_logon_hours = (PVOID)Ptr; + + memcpy(UserInfo2->usri2_logon_hours, + UserInfo->LogonHours.LogonHours, + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + } UserInfo2->usri2_bad_pw_count = UserInfo->BadPasswordCount; UserInfo2->usri2_num_logons = UserInfo->LogonCount; - /* FIXME: usri2_logon_server */ - /* FIXME: usri2_country_code */ - /* FIXME: usri2_code_page */ - + if (LogonServer.Length > 0) + { + UserInfo2->usri2_logon_server = Ptr; + + memcpy(UserInfo2->usri2_logon_server, + LogonServer.Buffer, + LogonServer.Length); + UserInfo2->usri2_logon_server[LogonServer.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + LogonServer.Length + sizeof(WCHAR)); + } + + UserInfo2->usri2_country_code = UserInfo->CountryCode; + UserInfo2->usri2_code_page = UserInfo->CodePage; break; case 3: @@ -508,8 +562,29 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR)); } - /* FIXME: usri3_usr_comment */ - /* FIXME: usri3_parms */ + if (UserInfo->UserComment.Length > 0) + { + UserInfo3->usri3_usr_comment = Ptr; + + memcpy(UserInfo3->usri3_usr_comment, + UserInfo->UserComment.Buffer, + UserInfo->UserComment.Length); + UserInfo3->usri3_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR)); + } + + if (UserInfo->Parameters.Length > 0) + { + UserInfo3->usri3_parms = Ptr; + + memcpy(UserInfo3->usri3_parms, + UserInfo->Parameters.Buffer, + UserInfo->Parameters.Length); + UserInfo3->usri3_parms[UserInfo->Parameters.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->Parameters.Length + sizeof(WCHAR)); + } if (UserInfo->WorkStations.Length > 0) { @@ -533,17 +608,36 @@ &UserInfo3->usri3_acct_expires); UserInfo3->usri3_max_storage = USER_MAXSTORAGE_UNLIMITED; - - /* FIXME: usri3_units_per_week */ - /* FIXME: usri3_logon_hours */ + UserInfo3->usri3_units_per_week = UserInfo->LogonHours.UnitsPerWeek; + + if (UserInfo->LogonHours.UnitsPerWeek > 0) + { + UserInfo3->usri3_logon_hours = (PVOID)Ptr; + + memcpy(UserInfo3->usri3_logon_hours, + UserInfo->LogonHours.LogonHours, + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8); + } UserInfo3->usri3_bad_pw_count = UserInfo->BadPasswordCount; UserInfo3->usri3_num_logons = UserInfo->LogonCount; - /* FIXME: usri3_logon_server */ - /* FIXME: usri3_country_code */ - /* FIXME: usri3_code_page */ - + if (LogonServer.Length > 0) + { + UserInfo3->usri3_logon_server = Ptr; + + memcpy(UserInfo3->usri3_logon_server, + LogonServer.Buffer, + LogonServer.Length); + UserInfo3->usri3_logon_server[LogonServer.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + LogonServer.Length + sizeof(WCHAR)); + } + + UserInfo3->usri3_country_code = UserInfo->CountryCode; + UserInfo3->usri3_code_page = UserInfo->CodePage; UserInfo3->usri3_user_id = RelativeId; UserInfo3->usri3_primary_group_id = UserInfo->PrimaryGroupId; @@ -602,7 +696,17 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - /* FIXME: usri10_usr_comment */ + if (UserInfo->UserComment.Length > 0) + { + UserInfo10->usri10_usr_comment = Ptr; + + memcpy(UserInfo10->usri10_usr_comment, + UserInfo->UserComment.Buffer, + UserInfo->UserComment.Length); + UserInfo10->usri10_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR)); + } if (UserInfo->FullName.Length > 0) { @@ -723,7 +827,7 @@ static VOID -FreeUserInfo(PUSER_ACCOUNT_INFORMATION UserInfo) +FreeUserInfo(PUSER_ALL_INFORMATION UserInfo) { if (UserInfo->UserName.Buffer != NULL) SamFreeMemory(UserInfo->UserName.Buffer); @@ -748,6 +852,15 @@ if (UserInfo->WorkStations.Buffer != NULL) SamFreeMemory(UserInfo->WorkStations.Buffer); + + if (UserInfo->UserComment.Buffer != NULL) + SamFreeMemory(UserInfo->UserComment.Buffer); + + if (UserInfo->Parameters.Buffer != NULL) + SamFreeMemory(UserInfo->Parameters.Buffer); + + if (UserInfo->PrivateData.Buffer != NULL) + SamFreeMemory(UserInfo->PrivateData.Buffer); if (UserInfo->LogonHours.LogonHours != NULL) SamFreeMemory(UserInfo->LogonHours.LogonHours); @@ -1495,7 +1608,7 @@ LPVOID Buffer = NULL; ULONG i; SAM_HANDLE UserHandle = NULL; - PUSER_ACCOUNT_INFORMATION UserInfo = NULL; + PUSER_ALL_INFORMATION UserInfo = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -1620,7 +1733,7 @@ } Status = SamQueryInformationUser(UserHandle, - UserAccountInformation, + UserAllInformation, (PVOID *)&UserInfo); if (!NT_SUCCESS(Status)) { @@ -1747,7 +1860,7 @@ SAM_HANDLE UserHandle = NULL; PULONG RelativeIds = NULL; PSID_NAME_USE Use = NULL; - PUSER_ACCOUNT_INFORMATION UserInfo = NULL; + PUSER_ALL_INFORMATION UserInfo = NULL; LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -1820,7 +1933,7 @@ } Status = SamQueryInformationUser(UserHandle, - UserAccountInformation, + UserAllInformation, (PVOID *)&UserInfo); if (!NT_SUCCESS(Status)) { @@ -2212,6 +2325,9 @@ TRACE("(%s %s %lu %p %p)\n", debugstr_w(servername), debugstr_w(username), level, buf, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Check the info level */ switch (level) {

11 years, 4 months

[ekohl] 59222: [NETAPI32] - SetUserInfo: Implement level 2, 1003, 1006, 1007, 1009, 1011, 1012, 1013, 1014, 1052 and 1053. - SetUserInfo: Ignore NULL-Strings. - NetUserSetInfo: Enable implemented l...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 15 19:15:36 2013 New Revision: 59222 URL: http://svn.reactos.org/svn/reactos?rev=59222&view=rev Log: [NETAPI32] - SetUserInfo: Implement level 2, 1003, 1006, 1007, 1009, 1011, 1012, 1013, 1014, 1052 and 1053. - SetUserInfo: Ignore NULL-Strings. - NetUserSetInfo: Enable implemented level. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Jun 15 19:15:36 2013 @@ -765,7 +765,18 @@ USER_ALL_INFORMATION UserAllInfo; PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; + PUSER_INFO_2 UserInfo2; PUSER_INFO_3 UserInfo3; + PUSER_INFO_1003 UserInfo1003; + PUSER_INFO_1006 UserInfo1006; + PUSER_INFO_1007 UserInfo1007; + PUSER_INFO_1009 UserInfo1009; + PUSER_INFO_1011 UserInfo1011; + PUSER_INFO_1012 UserInfo1012; + PUSER_INFO_1013 UserInfo1013; + PUSER_INFO_1014 UserInfo1014; + PUSER_INFO_1052 UserInfo1052; + PUSER_INFO_1053 UserInfo1053; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -779,97 +790,368 @@ RtlInitUnicodeString(&UserAllInfo.UserName, UserInfo0->usri0_name); - UserAllInfo.WhichFields = USER_ALL_USERNAME; + UserAllInfo.WhichFields |= USER_ALL_USERNAME; break; case 1: UserInfo1 = (PUSER_INFO_1)UserInfo; -// RtlInitUnicodeString(&UserAllInfo.UserName, -// UserInfo1->usri1_name); - - RtlInitUnicodeString(&UserAllInfo.AdminComment, - UserInfo1->usri1_comment); - - RtlInitUnicodeString(&UserAllInfo.HomeDirectory, - UserInfo1->usri1_home_dir); - - RtlInitUnicodeString(&UserAllInfo.ScriptPath, - UserInfo1->usri1_script_path); - - RtlInitUnicodeString(&UserAllInfo.NtPassword, - UserInfo1->usri1_password); - UserAllInfo.NtPasswordPresent = TRUE; + // usri1_name ignored + + if (UserInfo1->usri1_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo1->usri1_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + + // usri1_password_age ignored + +// UserInfo1->usri1_priv + + if (UserInfo1->usri1_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo1->usri1_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo1->usri1_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo1->usri1_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } // UserInfo1->usri1_flags -// UserInfo1->usri1_priv - - UserAllInfo.WhichFields = - USER_ALL_ADMINCOMMENT | - USER_ALL_HOMEDIRECTORY | - USER_ALL_SCRIPTPATH | - USER_ALL_NTPASSWORDPRESENT -// USER_ALL_USERACCOUNTCONTROL - ; - break; - +// UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + + if (UserInfo1->usri1_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo1->usri1_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + break; + + case 2: + UserInfo2 = (PUSER_INFO_2)UserInfo; + + // usri2_name ignored + + if (UserInfo2->usri2_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo2->usri2_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + + // usri2_password_age ignored + +// UserInfo2->usri2_priv; + + if (UserInfo2->usri2_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo2->usri2_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo2->usri2_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo2->usri2_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + +// UserInfo2->usri2_flags; + + if (UserInfo2->usri2_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo2->usri2_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + +// UserInfo2->usri2_auth_flags; + + if (UserInfo2->usri2_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo2->usri2_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + + if (UserInfo2->usri2_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo2->usri2_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + + if (UserInfo2->usri2_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo2->usri2_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + + if (UserInfo2->usri2_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo2->usri2_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + + // usri2_last_logon ignored + // usri2_last_logoff ignored + +// UserInfo2->usri2_acct_expires; +// UserInfo2->usri2_max_storage; +// UserInfo2->usri2_units_per_week; +// UserInfo2->usri2_logon_hours; + + // usri2_bad_pw_count ignored + // usri2_num_logons ignored + // usri2_logon_server ignored + +// UserInfo2->usri2_country_code; +// UserInfo2->usri2_code_page; + break; case 3: UserInfo3 = (PUSER_INFO_3)UserInfo; -// LPWSTR usri3_name; - - RtlInitUnicodeString(&UserAllInfo.NtPassword, - UserInfo3->usri3_password); - UserAllInfo.NtPasswordPresent = TRUE; - -// DWORD usri3_password_age; // ignored -// DWORD usri3_priv; - - RtlInitUnicodeString(&UserAllInfo.HomeDirectory, - UserInfo3->usri3_home_dir); - - RtlInitUnicodeString(&UserAllInfo.AdminComment, - UserInfo3->usri3_comment); - -// DWORD usri3_flags; - - RtlInitUnicodeString(&UserAllInfo.ScriptPath, - UserInfo3->usri3_script_path); - -// DWORD usri3_auth_flags; - - RtlInitUnicodeString(&UserAllInfo.FullName, - UserInfo3->usri3_full_name); - -// LPWSTR usri3_usr_comment; -// LPWSTR usri3_parms; -// LPWSTR usri3_workstations; -// DWORD usri3_last_logon; -// DWORD usri3_last_logoff; -// DWORD usri3_acct_expires; -// DWORD usri3_max_storage; -// DWORD usri3_units_per_week; -// PBYTE usri3_logon_hours; -// DWORD usri3_bad_pw_count; -// DWORD usri3_num_logons; -// LPWSTR usri3_logon_server; -// DWORD usri3_country_code; -// DWORD usri3_code_page; -// DWORD usri3_user_id; // ignored -// DWORD usri3_primary_group_id; -// LPWSTR usri3_profile; -// LPWSTR usri3_home_dir_drive; -// DWORD usri3_password_expired; - - UserAllInfo.WhichFields = - USER_ALL_NTPASSWORDPRESENT | - USER_ALL_HOMEDIRECTORY | - USER_ALL_ADMINCOMMENT | - USER_ALL_SCRIPTPATH | - USER_ALL_FULLNAME -// USER_ALL_USERACCOUNTCONTROL - ; + // usri3_name ignored + + if (UserInfo3->usri3_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo3->usri3_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + + // usri3_password_age ignored + +// UserInfo3->usri3_priv; + + if (UserInfo3->usri3_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo3->usri3_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo3->usri3_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo3->usri3_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + +// UserInfo3->usri3_flags; +// UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + + if (UserInfo3->usri3_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo3->usri3_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + +// UserInfo3->usri3_auth_flags; + + if (UserInfo3->usri3_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo3->usri3_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + + if (UserInfo3->usri3_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo3->usri3_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + + if (UserInfo3->usri3_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo3->usri3_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + + if (UserInfo3->usri3_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo3->usri3_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + + // usri3_last_logon ignored + // usri3_last_logoff ignored + +// UserInfo3->usri3_acct_expires; +// UserInfo3->usri3_max_storage; +// UserInfo3->usri3_units_per_week; +// UserInfo3->usri3_logon_hours; + + // usri3_bad_pw_count ignored + // usri3_num_logons ignored + // usri3_logon_server ignored + +// UserInfo3->usri3_country_code; +// UserInfo3->usri3_code_page; + + // usri3_user_id ignored + +// UserInfo3->usri3_primary_group_id; + + if (UserInfo3->usri3_profile != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ProfilePath, + UserInfo3->usri3_profile); + UserAllInfo.WhichFields |= USER_ALL_PROFILEPATH; + } + + if (UserInfo3->usri3_home_dir_drive != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectoryDrive, + UserInfo3->usri3_home_dir_drive); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE; + } + +// UserInfo3->usri3_password_expired; + break; + +// case 4: +// case 21: +// case 22: + + case 1003: + UserInfo1003 = (PUSER_INFO_1003)UserInfo; + + if (UserInfo1003->usri1003_password != NULL) + { + RtlInitUnicodeString(&UserAllInfo.NtPassword, + UserInfo1003->usri1003_password); + UserAllInfo.NtPasswordPresent = TRUE; + UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT; + } + break; + +// case 1005: + + case 1006: + UserInfo1006 = (PUSER_INFO_1006)UserInfo; + + if (UserInfo1006->usri1006_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo1006->usri1006_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + break; + + case 1007: + UserInfo1007 = (PUSER_INFO_1007)UserInfo; + + if (UserInfo1007->usri1007_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo1007->usri1007_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + break; + +// case 1008: + + case 1009: + UserInfo1009 = (PUSER_INFO_1009)UserInfo; + + if (UserInfo1009->usri1009_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo1009->usri1009_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + break; + +// case 1010: + + case 1011: + UserInfo1011 = (PUSER_INFO_1011)UserInfo; + + if (UserInfo1011->usri1011_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo1011->usri1011_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + break; + + case 1012: + UserInfo1012 = (PUSER_INFO_1012)UserInfo; + + if (UserInfo1012->usri1012_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo1012->usri1012_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + break; + + case 1013: + UserInfo1013 = (PUSER_INFO_1013)UserInfo; + + if (UserInfo1013->usri1013_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo1013->usri1013_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + break; + + case 1014: + UserInfo1014 = (PUSER_INFO_1014)UserInfo; + + if (UserInfo1014->usri1014_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo1014->usri1014_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + break; + +// case 1017: +// case 1020: +// case 1024: +// case 1051: + + case 1052: + UserInfo1052 = (PUSER_INFO_1052)UserInfo; + + if (UserInfo1052->usri1052_profile != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ProfilePath, + UserInfo1052->usri1052_profile); + UserAllInfo.WhichFields |= USER_ALL_PROFILEPATH; + } + break; + + case 1053: + UserInfo1053 = (PUSER_INFO_1053)UserInfo; + + if (UserInfo1053->usri1053_home_dir_drive != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectoryDrive, + UserInfo1053->usri1053_home_dir_drive); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE; + } break; default: @@ -1935,27 +2217,28 @@ { case 0: case 1: -// case 2: + case 2: case 3: // case 4: // case 21: // case 22: -// case 1003: + case 1003: // case 1005: -// case 1006: -// case 1007: + case 1006: + case 1007: // case 1008: -// case 1009: + case 1009: // case 1010: -// case 1011: -// case 1012: -// case 1014: + case 1011: + case 1012: + case 1013: + case 1014: // case 1017: // case 1020: // case 1024: // case 1051: -// case 1052: -// case 1053: + case 1052: + case 1053: break; default:

11 years, 4 months

[akhaldi] 59221: [DBGHELP] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 15 11:57:55 2013 New Revision: 59221 URL: http://svn.reactos.org/svn/reactos?rev=59221&view=rev Log: [DBGHELP] * Sync with Wine 1.5.26. Added: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c (with props) Removed: trunk/reactos/dll/win32/dbghelp/cpu_sparc.c trunk/reactos/dll/win32/dbghelp/regex.c Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/coff.c trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/cpu_ppc.c trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/elf_module.c trunk/reactos/dll/win32/dbghelp/image_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/dll/win32/dbghelp/type.c trunk/reactos/include/psdk/cvconst.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/mscvpdb.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… Modified: trunk/reactos/dll/win32/dbghelp/coff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/coff.c?r… Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.… Added: trunk/reactos/dll/win32/dbghelp/cpu_arm64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm6… Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… Modified: trunk/reactos/dll/win32/dbghelp/cpu_ppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_ppc.… Removed: trunk/reactos/dll/win32/dbghelp/cpu_sparc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_spar… Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… Modified: trunk/reactos/dll/win32/dbghelp/elf_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/elf_modu… Modified: trunk/reactos/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image_pr… Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… Removed: trunk/reactos/dll/win32/dbghelp/regex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/regex.c?… Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… Modified: trunk/reactos/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/type.c?r… Modified: trunk/reactos/include/psdk/cvconst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cvconst.h?rev… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… Modified: trunk/reactos/include/reactos/wine/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 4 months

[janderwald] 59220: [MMSYS] - Implement audio selection button

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jun 15 08:23:21 2013 New Revision: 59220 URL: http://svn.reactos.org/svn/reactos?rev=59220&view=rev Log: [MMSYS] - Implement audio selection button Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] Sat Jun 15 08:23:21 2013 @@ -24,7 +24,8 @@ setupapi shlwapi ntdll - kernel32) + kernel32 + comdlg32) add_pch(mmsys mmsys.h) add_cd_file(TARGET mmsys DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h [iso-8859-1] Sat Jun 15 08:23:21 2013 @@ -17,7 +17,7 @@ #include <devguid.h> #include <debug.h> #include <shlwapi.h> - +#include <commdlg.h> #include "resource.h" //typedef LONG (CALLBACK *APPLET_PROC)(VOID); Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat Jun 15 08:23:21 2013 @@ -904,6 +904,11 @@ WPARAM wParam, LPARAM lParam) { + OPENFILENAMEW ofn; + WCHAR filename[MAX_PATH]; + LPWSTR pFileName; + LRESULT lResult; + switch (uMsg) { case WM_INITDIALOG: @@ -936,6 +941,41 @@ { switch (LOWORD(wParam)) { + case IDC_BROWSE_SOUND: + { + ZeroMemory(&ofn, sizeof(OPENFILENAMEW)); + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFile = filename; + ofn.lpstrFile[0] = L'\0'; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFilter = L"Wave Files (*.wav)\0*.wav\0"; //FIXME non-nls + ofn.nFilterIndex = 0; + ofn.lpstrFileTitle = L"Search for new sounds"; //FIXME non-nls + ofn.nMaxFileTitle = wcslen(ofn.lpstrFileTitle); + ofn.lpstrInitialDir = NULL; + ofn.Flags = OFN_FILEMUSTEXIST; + + if (GetOpenFileNameW(&ofn) == TRUE) + { + // FIXME search if list already contains that sound + + // extract file name + pFileName = wcsrchr(filename, L'\\'); + ASSERT(pFileName != NULL); + pFileName++; + + // add to list + lResult = SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)pFileName); + if (lResult != CB_ERR) + { + // add path and select item + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_wcsdup(filename)); + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + } + break; + } case IDC_PLAY_SOUND: { LRESULT lIndex;

11 years, 4 months

[janderwald] 59219: [MOUHID] - Fix build [HIDUSB] - Fix warnings

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jun 15 06:34:38 2013 New Revision: 59219 URL: http://svn.reactos.org/svn/reactos?rev=59219&view=rev Log: [MOUHID] - Fix build [HIDUSB] - Fix warnings Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/mouhid/mouhid.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sat Jun 15 06:34:38 2013 @@ -421,8 +421,6 @@ IN PIRP Irp, IN PVOID Context) { - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; - PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; PHID_USB_RESET_CONTEXT ResetContext; @@ -467,12 +465,6 @@ // return STATUS_CONTINUE_COMPLETION; } - - // - // get device extension - // - DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate reset context @@ -971,7 +963,6 @@ { PIRP Irp; KEVENT Event; - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; IO_STATUS_BLOCK IoStatus; PIO_STACK_LOCATION IoStack; @@ -986,7 +977,6 @@ // get device extension // DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // build irp @@ -1374,16 +1364,8 @@ Hid_SetIdle( IN PDEVICE_OBJECT DeviceObject) { - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; - PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; NTSTATUS Status; - - // - // get device extension - // - DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate urb @@ -1443,7 +1425,6 @@ PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; PURB Urb; - NTSTATUS Status; UCHAR Protocol[1]; // @@ -1494,10 +1475,11 @@ 1, NULL); Protocol[0] = 0xFF; + // // dispatch urb // - Status = Hid_DispatchUrb(DeviceObject, Urb); + Hid_DispatchUrb(DeviceObject, Urb); // // free urb @@ -1706,7 +1688,6 @@ { NTSTATUS Status; PIO_STACK_LOCATION IoStack; - PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; KEVENT Event; @@ -1714,7 +1695,6 @@ // get device extension // DeviceExtension = DeviceObject->DeviceExtension; - HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get current stack location Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat Jun 15 06:34:38 2013 @@ -775,7 +775,7 @@ HID_COLLECTION_INFORMATION Information; PVOID PreparsedData; HIDP_CAPS Capabilities; - ULONG ValueCapsLength; + USHORT ValueCapsLength; HIDP_VALUE_CAPS ValueCaps; PMOUHID_DEVICE_EXTENSION DeviceExtension; PUSAGE Buffer;

11 years, 4 months

[janderwald] 59218: [HID] - Fix function signatures - Fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jun 15 06:24:03 2013 New Revision: 59218 URL: http://svn.reactos.org/svn/reactos?rev=59218&view=rev Log: [HID] - Fix function signatures - Fix build Modified: trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/stubs.c Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=59… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] Sat Jun 15 06:24:03 2013 @@ -126,7 +126,7 @@ NTSTATUS WINAPI HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, + IN OUT PUSHORT ButtonCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { return HidP_GetSpecificButtonCaps(ReportType, 0, 0, 0, ButtonCaps, @@ -343,7 +343,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, + IN OUT PUSHORT ValueCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { return HidP_GetSpecificValueCaps(ReportType, 0, 0, 0, ValueCaps, Modified: trunk/reactos/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] Sat Jun 15 06:24:03 2013 @@ -99,7 +99,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, + IN OUT PUSHORT ButtonCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED; @@ -117,7 +117,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, + IN OUT PUSHORT ValueCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED;

11 years, 4 months

[janderwald] 59217: [HIDPARSER, HIDPARSE, INCLUDE] - Fix function signatures CORE-7183 #comment fixed #resolve

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jun 15 06:18:02 2013 New Revision: 59217 URL: http://svn.reactos.org/svn/reactos?rev=59217&view=rev Log: [HIDPARSER, HIDPARSE, INCLUDE] - Fix function signatures CORE-7183 #comment fixed #resolve Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c trunk/reactos/drivers/hid/hidparse/hidparse.h trunk/reactos/include/psdk/hidpi.h trunk/reactos/lib/drivers/hidparser/api.c trunk/reactos/lib/drivers/hidparser/hidparser.c trunk/reactos/lib/drivers/hidparser/hidparser.h trunk/reactos/lib/drivers/hidparser/parser.h Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa… ============================================================================== --- trunk/reactos/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidparse/hidparse.c [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -73,11 +73,10 @@ { va_list args; - unsigned int i; char printbuffer[1024]; va_start(args, FormatStr); - i = vsprintf(printbuffer, FormatStr, args); + vsprintf(printbuffer, FormatStr, args); va_end(args); DbgPrint(printbuffer); @@ -179,7 +178,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, + IN OUT PUSHORT ValueCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { HID_PARSER Parser; @@ -204,14 +203,14 @@ NTSTATUS NTAPI HidP_GetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - OUT USAGE *UsageList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + OUT PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) { HID_PARSER Parser; @@ -371,19 +370,19 @@ PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { - return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); + return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, ButtonCapsLength, PreparsedData); } HIDAPI NTSTATUS NTAPI HidP_GetSpecificButtonCaps( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PHIDP_BUTTON_CAPS ButtonCaps, + IN OUT PUSHORT ButtonCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED @@ -412,7 +411,7 @@ NTAPI HidP_GetExtendedAttributes( IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, + IN USHORT DataIndex, IN PHIDP_PREPARSED_DATA PreparsedData, OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, IN OUT PULONG LengthAttributes) @@ -637,7 +636,7 @@ HidP_GetValueCaps( HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, + PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED Modified: trunk/reactos/drivers/hid/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa… ============================================================================== --- trunk/reactos/drivers/hid/hidparse/hidparse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidparse/hidparse.h [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -6,7 +6,7 @@ #include <hidpddi.h> #include <hidpi.h> #define NDEBUG -#include <debug.h> +//#include <debug.h> #include "hidparser.h" #include <stdio.h> Modified: trunk/reactos/include/psdk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hidpi.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/hidpi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/hidpi.h [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -369,7 +369,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PULONG ButtonCapsLength, + IN OUT PUSHORT ButtonCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData); HIDAPI @@ -381,7 +381,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, + IN OUT PUSHORT ValueCapsLength, IN PHIDP_PREPARSED_DATA PreparsedData); HIDAPI Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -273,11 +273,11 @@ IN USHORT UsagePage, IN USHORT Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength) + IN OUT PUSHORT ValueCapsLength) { ULONG Index; PHID_REPORT Report; - ULONG ItemCount = 0; + USHORT ItemCount = 0; USHORT CurrentUsagePage; USHORT CurrentUsage; Modified: trunk/reactos/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -350,7 +350,7 @@ IN USHORT LinkCollection, IN USAGE Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength) + IN OUT PUSHORT ValueCapsLength) { HIDPARSER_STATUS ParserStatus; Modified: trunk/reactos/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -123,12 +123,12 @@ HidParser_GetSpecificValueCaps( IN PHID_PARSER Parser, IN PVOID CollectionContext, - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength); + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PHIDP_VALUE_CAPS ValueCaps, + IN OUT PUSHORT ValueCapsLength); HIDAPI Modified: trunk/reactos/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/pars… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/parser.h [iso-8859-1] Sat Jun 15 06:18:02 2013 @@ -302,7 +302,7 @@ IN USHORT UsagePage, IN USHORT Usage, OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength); + IN OUT PUSHORT ValueCapsLength); HIDPARSER_STATUS

11 years, 4 months

[ekohl] 59216: [USRMGR] Enable call to NetUserSetInfo. Now we can rename user accounts.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 14 23:19:24 2013 New Revision: 59216 URL: http://svn.reactos.org/svn/reactos?rev=59216&view=rev Log: [USRMGR] Enable call to NetUserSetInfo. Now we can rename user accounts. Modified: trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Fri Jun 14 23:19:24 2013 @@ -492,7 +492,7 @@ { TCHAR szOldUserName[UNLEN]; TCHAR szNewUserName[UNLEN]; - //USER_INFO_0 useri0; + USER_INFO_0 useri0; NET_API_STATUS status; /* Leave, if there is no valid listview item */ @@ -521,13 +521,9 @@ return FALSE; /* Change the user name */ - //useri0.usri0_name = szNewUserName; - -#if 0 + useri0.usri0_name = szNewUserName; + status = NetUserSetInfo(NULL, szOldUserName, 0, (LPBYTE)&useri0, NULL); -#else - status = NERR_Success; -#endif if (status != NERR_Success) { TCHAR szText[256];

11 years, 4 months

[ekohl] 59215: [NETAPI32] - Implement NetUserSetInfo (levels 0, 1 and 3 only). - Add level 0 support to SetUserInfo.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 14 22:31:38 2013 New Revision: 59215 URL: http://svn.reactos.org/svn/reactos?rev=59215&view=rev Log: [NETAPI32] - Implement NetUserSetInfo (levels 0, 1 and 3 only). - Add level 0 support to SetUserInfo. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Fri Jun 14 22:31:38 2013 @@ -23,7 +23,6 @@ * Implement NetUserChangePassword * Implement NetUserGetGroups * Implement NetUserSetGroups - * Implement NetUserSetInfo * NetUserGetLocalGroups does not support LG_INCLUDE_INDIRECT yet. * Add missing information levels. * ... @@ -764,6 +763,7 @@ DWORD Level) { USER_ALL_INFORMATION UserAllInfo; + PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; PUSER_INFO_3 UserInfo3; NET_API_STATUS ApiStatus = NERR_Success; @@ -773,8 +773,18 @@ switch (Level) { + case 0: + UserInfo0 = (PUSER_INFO_0)UserInfo; + + RtlInitUnicodeString(&UserAllInfo.UserName, + UserInfo0->usri0_name); + + UserAllInfo.WhichFields = USER_ALL_USERNAME; + break; + case 1: UserInfo1 = (PUSER_INFO_1)UserInfo; + // RtlInitUnicodeString(&UserAllInfo.UserName, // UserInfo1->usri1_name); @@ -960,8 +970,17 @@ TRACE("(%s, %d, %p, %p)\n", debugstr_w(servername), level, bufptr, parm_err); /* Check the info level */ - if (level < 1 || level > 4) - return ERROR_INVALID_LEVEL; + switch (level) + { + case 1: + case 2: + case 3: + case 4: + break; + + default: + return ERROR_INVALID_LEVEL; + } if (servername != NULL) RtlInitUnicodeString(&ServerName, servername); @@ -1199,7 +1218,7 @@ NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - FIXME("(%s %d 0x%d %p %d %p %p %p) stub!\n", debugstr_w(servername), level, + TRACE("(%s %d 0x%d %p %d %p %p %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); *entriesread = 0; @@ -1900,9 +1919,109 @@ LPBYTE buf, LPDWORD parm_err) { - FIXME("(%s %s %lu %p %p)\n", + UNICODE_STRING ServerName; + UNICODE_STRING UserName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE AccountDomainHandle = NULL; + SAM_HANDLE UserHandle = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %s %lu %p %p)\n", debugstr_w(servername), debugstr_w(username), level, buf, parm_err); - return ERROR_ACCESS_DENIED; + + /* Check the info level */ + switch (level) + { + case 0: + case 1: +// case 2: + case 3: +// case 4: +// case 21: +// case 22: +// case 1003: +// case 1005: +// case 1006: +// case 1007: +// case 1008: +// case 1009: +// case 1010: +// case 1011: +// case 1012: +// case 1014: +// case 1017: +// case 1020: +// case 1024: +// case 1051: +// case 1052: +// case 1053: + break; + + default: + return ERROR_INVALID_LEVEL; + } + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&UserName, username); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Account Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &AccountDomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the User Account */ + ApiStatus = OpenUserByName(AccountDomainHandle, + &UserName, + USER_ALL_ACCESS, + &UserHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; + } + + /* Set user information */ + ApiStatus = SetUserInfo(UserHandle, + buf, + level); + if (ApiStatus != NERR_Success) + { + ERR("SetUserInfo failed (Status %lu)\n", ApiStatus); + } + +done: + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (AccountDomainHandle != NULL) + SamCloseHandle(AccountDomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; } /* EOF */

11 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013