Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[cwittich] 59090: [devmgr] add "update driver" button not functional due to unimplemented DiShowUpdateDevice
by cwittich＠svn.reactos.org 27 May '13

27 May '13

Author: cwittich Date: Mon May 27 18:33:18 2013 New Revision: 59090 URL: http://svn.reactos.org/svn/reactos?rev=59090&view=rev Log: [devmgr] add "update driver" button not functional due to unimplemented DiShowUpdateDevice Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/resource.h trunk/reactos/dll/win32/newdev/stubs.c Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Mon May 27 18:33:18 2013 @@ -18,6 +18,7 @@ add_importlibs(devmgr setupapi advapi32 + newdev user32 version msvcrt Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Mon May 27 18:33:18 2013 @@ -556,6 +556,56 @@ hwndDlg, DriverDetailsDlgProc, (ULONG_PTR)dap); + break; + } + case IDC_UPDATEDRIVER: + { + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + BOOL NeedReboot; + if (DiShowUpdateDevice(hwndDlg, dap->CurrentDeviceInfoSet, &dap->CurrentDeviceInfoData, 0, &NeedReboot)) + { + if (NeedReboot) + { + //FIXME: load text from resource file + if(MessageBoxW(hwndDlg, L"Reboot now?", L"Reboot required", MB_YESNO | MB_ICONQUESTION) == IDYES) + { + HANDLE hToken; + TOKEN_PRIVILEGES Privileges; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + DPRINT("OpenProcessToken failed\n"); + break; + } + + /* Get the LUID for the Shutdown privilege */ + if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) + { + DPRINT("LookupPrivilegeValue failed\n"); + break; + } + + /* Assign the Shutdown privilege to our process */ + Privileges.PrivilegeCount = 1; + Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) + { + DPRINT("AdjustTokenPrivileges failed\n"); + break; + } + + /* Finally shut down the system */ + if(!ExitWindowsEx(EWX_POWEROFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) + { + DPRINT("ExitWindowsEx failed\n"); + break; + } + } + } + } + } break; } } Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Mon May 27 18:33:18 2013 @@ -172,8 +172,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Signaturgeber:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Einzelheiten Ã¼ber die Treiberdateien anzeigen.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "Treiber &aktualisieren...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Aktualisiert den GerÃ¤tetreiber.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Mon May 27 18:33:18 2013 @@ -172,8 +172,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Driver Details", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Mon May 27 18:33:18 2013 @@ -8,6 +8,9 @@ #include <regstr.h> #include <setupapi.h> #include <cfgmgr32.h> +#undef WINVER +#define WINVER _WIN32_WINNT_VISTA +#include <newdev.h> #include <dll/devmgr/devmgr.h> #include "resource.h" Modified: trunk/reactos/dll/win32/devmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resource.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/resource.h [iso-8859-1] Mon May 27 18:33:18 2013 @@ -40,6 +40,7 @@ #define IDC_FILECOPYRIGHT 0x595 #define IDC_DETAILSPROPNAME 0x596 #define IDC_DETAILSPROPVALUE 0x597 +#define IDC_UPDATEDRIVER 0x598 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 Modified: trunk/reactos/dll/win32/newdev/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/stubs.c [iso-8859-1] Mon May 27 18:33:18 2013 @@ -57,13 +57,19 @@ */ BOOL WINAPI DiShowUpdateDevice( - IN HWND hwndParent OPTIONAL, - IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData, - IN DWORD Flags, - OUT PBOOL NeedReboot OPTIONAL) + IN HWND hwndParent OPTIONAL, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Flags, + OUT PBOOL NeedReboot OPTIONAL) { - UNIMPLEMENTED; - SetLastError(ERROR_GEN_FAILURE); - return FALSE; + if (Flags != 0) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; }

1 0

[cwittich] 59089: [newdev] add stub for DiShowUpdateDevice
by cwittich＠svn.reactos.org 27 May '13

27 May '13

Author: cwittich Date: Mon May 27 17:35:15 2013 New Revision: 59089 URL: http://svn.reactos.org/svn/reactos?rev=59089&view=rev Log: [newdev] add stub for DiShowUpdateDevice Modified: trunk/reactos/dll/win32/newdev/newdev.spec trunk/reactos/dll/win32/newdev/stubs.c Modified: trunk/reactos/dll/win32/newdev/newdev.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.sp… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] Mon May 27 17:35:15 2013 @@ -9,3 +9,4 @@ @ stub RollbackDriver @ stdcall UpdateDriverForPlugAndPlayDevicesA(ptr str str long ptr) @ stdcall UpdateDriverForPlugAndPlayDevicesW(ptr wstr wstr long ptr) +@ stdcall DiShowUpdateDevice(ptr ptr ptr long ptr) Modified: trunk/reactos/dll/win32/newdev/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/stubs.c [iso-8859-1] Mon May 27 17:35:15 2013 @@ -51,3 +51,19 @@ SetLastError(ERROR_GEN_FAILURE); return FALSE; } + +/* +* @unimplemented +*/ +BOOL WINAPI +DiShowUpdateDevice( + IN HWND hwndParent OPTIONAL, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Flags, + OUT PBOOL NeedReboot OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +}

1 0

[ekohl] 59088: [SYSSETUP] Set the administrator password (hash) in the SAM database as part of the 2nd stage setup.
by ekohl＠svn.reactos.org 27 May '13

27 May '13

Author: ekohl Date: Mon May 27 13:34:59 2013 New Revision: 59088 URL: http://svn.reactos.org/svn/reactos?rev=59088&view=rev Log: [SYSSETUP] Set the administrator password (hash) in the SAM database as part of the 2nd stage setup. Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/security.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Mon May 27 13:34:59 2013 @@ -67,6 +67,8 @@ NTSTATUS SetAccountDomain(LPCWSTR DomainName, PSID DomainSid); VOID InstallSecurity(VOID); +NTSTATUS +SetAdministratorPassword(LPCWSTR Password); /* wizard.c */ VOID InstallWizard (VOID); Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Mon May 27 13:34:59 2013 @@ -311,3 +311,106 @@ InstallBuiltinAccounts(); InstallPrivileges(); } + + +NTSTATUS +SetAdministratorPassword(LPCWSTR Password) +{ + PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + USER_SET_PASSWORD_INFORMATION PasswordInfo; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE UserHandle = NULL; + NTSTATUS Status; + + DPRINT1("SYSSETUP: SetAdministratorPassword(%S)\n", Password); + + memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); + ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_VIEW_LOCAL_INFORMATION | POLICY_TRUST_ADMIN, + &PolicyHandle); + if (Status != STATUS_SUCCESS) + { + DPRINT1("LsaOpenPolicy() failed (Status: 0x%08lx)\n", Status); + return Status; + } + + Status = LsaQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + (PVOID *)&OrigInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsaQueryInformationPolicy() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamConnect(NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamConnect() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + OrigInfo->DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenDomain() failed (Status: 0x%08lx)\n", Status); + goto done; + } + + Status = SamOpenUser(DomainHandle, + USER_FORCE_PASSWORD_CHANGE, + DOMAIN_USER_RID_ADMIN, /* 500 */ + &UserHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamOpenUser() failed (Status %08lx)\n", Status); + goto done; + } + + RtlInitUnicodeString(&PasswordInfo.Password, Password); + PasswordInfo.PasswordExpired = FALSE; + + Status = SamSetInformationUser(UserHandle, + UserSetPasswordInformation, + (PVOID)&PasswordInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationUser() failed (Status %08lx)\n", Status); + goto done; + } + +done: + if (OrigInfo != NULL) + LsaFreeMemory(OrigInfo); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); + + if (UserHandle != NULL) + SamCloseHandle(UserHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + DPRINT1("SYSSETUP: SetAdministratorPassword() done (Status %08lx)\n", Status); + + return Status; +} + +/* EOF */ + Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon May 27 13:34:59 2013 @@ -709,7 +709,8 @@ Password++; } - /* FIXME: Set admin password */ + /* Set admin password */ + SetAdministratorPassword(Password1); break; case PSN_WIZBACK:

1 0

[ekohl] 59087: [SAMSRV] SampSetUserPassword: - Update the password history only if the new password hash is not the empty password hash. - Set the empty LM or NT password hash if the password is no...
by ekohl＠svn.reactos.org 27 May '13

27 May '13

Author: ekohl Date: Mon May 27 12:48:59 2013 New Revision: 59087 URL: http://svn.reactos.org/svn/reactos?rev=59087&view=rev Log: [SAMSRV] SampSetUserPassword: - Update the password history only if the new password hash is not the empty password hash. - Set the empty LM or NT password hash if the password is not present in order to keep both password hashes synchronized. Modified: trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Mon May 27 12:48:59 2013 @@ -397,79 +397,157 @@ ULONG CurrentHistoryLength; ULONG MaxHistoryLength = 3; ULONG Length = 0; + BOOLEAN UseNtPassword; + BOOLEAN UseLmPassword; NTSTATUS Status; - /* Get the size of the NT history */ - SampGetObjectAttribute(UserObject, - L"NTPwdHistory", - NULL, - NULL, - &Length); - - CurrentHistoryLength = Length / sizeof(ENCRYPTED_NT_OWF_PASSWORD); - if (CurrentHistoryLength < MaxHistoryLength) - { - NtHistoryLength = (CurrentHistoryLength + 1) * sizeof(ENCRYPTED_NT_OWF_PASSWORD); - } - else - { - NtHistoryLength = MaxHistoryLength * sizeof(ENCRYPTED_NT_OWF_PASSWORD); - } - - /* Allocate the history buffer */ - NtHistory = midl_user_allocate(NtHistoryLength); - if (NtHistory == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - if (Length > 0) - { - /* Get the history */ - Status = SampGetObjectAttribute(UserObject, + UseNtPassword = + ((memcmp(NtPassword, &EmptyNtHash, sizeof(ENCRYPTED_NT_OWF_PASSWORD)) != 0) && + (NtPasswordPresent != FALSE)); + + UseLmPassword = + ((memcmp(LmPassword, &EmptyLmHash, sizeof(ENCRYPTED_LM_OWF_PASSWORD)) != 0) && + (LmPasswordPresent != FALSE)); + + /* Update the NT password history only if we have a new non-empty NT password */ + if (UseNtPassword) + { + /* Get the size of the NT history */ + SampGetObjectAttribute(UserObject, + L"NTPwdHistory", + NULL, + NULL, + &Length); + + CurrentHistoryLength = Length / sizeof(ENCRYPTED_NT_OWF_PASSWORD); + if (CurrentHistoryLength < MaxHistoryLength) + { + NtHistoryLength = (CurrentHistoryLength + 1) * sizeof(ENCRYPTED_NT_OWF_PASSWORD); + } + else + { + NtHistoryLength = MaxHistoryLength * sizeof(ENCRYPTED_NT_OWF_PASSWORD); + } + + /* Allocate the history buffer */ + NtHistory = midl_user_allocate(NtHistoryLength); + if (NtHistory == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + if (Length > 0) + { + /* Get the history */ + Status = SampGetObjectAttribute(UserObject, + L"NTPwdHistory", + NULL, + NtHistory, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Move the old passwords down by one entry */ + if (NtHistoryLength > sizeof(ENCRYPTED_NT_OWF_PASSWORD)) + { + MoveMemory(&(NtHistory[1]), + &(NtHistory[0]), + NtHistoryLength - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + } + + /* Add the new password to the top of the history */ + if (NtPasswordPresent) + { + CopyMemory(&(NtHistory[0]), + NtPassword, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + } + else + { + ZeroMemory(&(NtHistory[0]), + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + } + + /* Set the history */ + Status = SampSetObjectAttribute(UserObject, L"NTPwdHistory", - NULL, - NtHistory, - &Length); - if (!NT_SUCCESS(Status)) - goto done; - } - - /* Get the size of the LM history */ - Length = 0; - SampGetObjectAttribute(UserObject, - L"LMPwdHistory", - NULL, - NULL, - &Length); - - CurrentHistoryLength = Length / sizeof(ENCRYPTED_LM_OWF_PASSWORD); - if (CurrentHistoryLength < MaxHistoryLength) - { - LmHistoryLength = (CurrentHistoryLength + 1) * sizeof(ENCRYPTED_LM_OWF_PASSWORD); - } - else - { - LmHistoryLength = MaxHistoryLength * sizeof(ENCRYPTED_LM_OWF_PASSWORD); - } - - /* Allocate the history buffer */ - LmHistory = midl_user_allocate(LmHistoryLength); - if (LmHistory == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - if (Length > 0) - { - /* Get the history */ - Status = SampGetObjectAttribute(UserObject, + REG_BINARY, + (PVOID)NtHistory, + NtHistoryLength); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Update the LM password history only if we have a new non-empty LM password */ + if (UseLmPassword) + { + /* Get the size of the LM history */ + Length = 0; + SampGetObjectAttribute(UserObject, + L"LMPwdHistory", + NULL, + NULL, + &Length); + + CurrentHistoryLength = Length / sizeof(ENCRYPTED_LM_OWF_PASSWORD); + if (CurrentHistoryLength < MaxHistoryLength) + { + LmHistoryLength = (CurrentHistoryLength + 1) * sizeof(ENCRYPTED_LM_OWF_PASSWORD); + } + else + { + LmHistoryLength = MaxHistoryLength * sizeof(ENCRYPTED_LM_OWF_PASSWORD); + } + + /* Allocate the history buffer */ + LmHistory = midl_user_allocate(LmHistoryLength); + if (LmHistory == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + if (Length > 0) + { + /* Get the history */ + Status = SampGetObjectAttribute(UserObject, + L"LMPwdHistory", + NULL, + LmHistory, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Move the old passwords down by one entry */ + if (LmHistoryLength > sizeof(ENCRYPTED_LM_OWF_PASSWORD)) + { + MoveMemory(&(LmHistory[1]), + &(LmHistory[0]), + LmHistoryLength - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + } + + /* Add the new password to the top of the history */ + if (LmPasswordPresent) + { + CopyMemory(&(LmHistory[0]), + LmPassword, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + } + else + { + ZeroMemory(&(LmHistory[0]), + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + } + + /* Set the LM password history */ + Status = SampSetObjectAttribute(UserObject, L"LMPwdHistory", - NULL, - LmHistory, - &Length); - if (!NT_SUCCESS(Status)) - goto done; - } - - /* Set the new password */ - if (NtPasswordPresent) + REG_BINARY, + (PVOID)LmHistory, + LmHistoryLength); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Set the new NT password */ + if (UseNtPassword) { Status = SampSetObjectAttribute(UserObject, L"NTPwd", @@ -484,13 +562,14 @@ Status = SampSetObjectAttribute(UserObject, L"NTPwd", REG_BINARY, - NULL, - 0); - if (!NT_SUCCESS(Status)) - goto done; - } - - if (LmPasswordPresent) + &EmptyNtHash, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Set the new LM password */ + if (UseLmPassword) { Status = SampSetObjectAttribute(UserObject, L"LMPwd", @@ -505,71 +584,11 @@ Status = SampSetObjectAttribute(UserObject, L"LMPwd", REG_BINARY, - NULL, - 0); - if (!NT_SUCCESS(Status)) - goto done; - } - - /* Move the old passwords down by one entry */ - if (NtHistoryLength > sizeof(ENCRYPTED_NT_OWF_PASSWORD)) - { - MoveMemory(&(NtHistory[1]), - &(NtHistory[0]), - NtHistoryLength - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); - } - - /* Add the new password on top of the history */ - if (NtPasswordPresent) - { - CopyMemory(&(NtHistory[0]), - NtPassword, - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); - } - else - { - ZeroMemory(&(NtHistory[0]), - sizeof(ENCRYPTED_NT_OWF_PASSWORD)); - } - - /* Set the history */ - Status = SampSetObjectAttribute(UserObject, - L"NTPwdHistory", - REG_BINARY, - (PVOID)NtHistory, - NtHistoryLength); - if (!NT_SUCCESS(Status)) - goto done; - - /* Move the old passwords down by one entry */ - if (LmHistoryLength > sizeof(ENCRYPTED_LM_OWF_PASSWORD)) - { - MoveMemory(&(LmHistory[1]), - &(LmHistory[0]), - LmHistoryLength - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); - } - - /* Add the new password on top of the history */ - if (LmPasswordPresent) - { - CopyMemory(&(LmHistory[0]), - LmPassword, - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); - } - else - { - ZeroMemory(&(LmHistory[0]), - sizeof(ENCRYPTED_LM_OWF_PASSWORD)); - } - - /* Set the LM password history */ - Status = SampSetObjectAttribute(UserObject, - L"LMPwdHistory", - REG_BINARY, - (PVOID)LmHistory, - LmHistoryLength); - if (!NT_SUCCESS(Status)) - goto done; + &EmptyLmHash, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + if (!NT_SUCCESS(Status)) + goto done; + } done: if (NtHistory != NULL)

1 0

[janderwald] 59086: [USBSTOR] - Disable usbstor cbw debug print CORE-7223 #resolve
by janderwald＠svn.reactos.org 26 May '13

26 May '13

Author: janderwald Date: Sun May 26 17:49:43 2013 New Revision: 59086 URL: http://svn.reactos.org/svn/reactos?rev=59086&view=rev Log: [USBSTOR] - Disable usbstor cbw debug print CORE-7223 #resolve Modified: trunk/reactos/drivers/usb/usbstor/scsi.c Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 26 17:49:43 2013 @@ -579,7 +579,7 @@ DumpCBW( PUCHAR Block) { - DPRINT1("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + DPRINT("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", Block[0] & 0xFF, Block[1] & 0xFF, Block[2] & 0xFF, Block[3] & 0xFF, Block[4] & 0xFF, Block[5] & 0xFF, Block[6] & 0xFF, Block[7] & 0xFF, Block[8] & 0xFF, Block[9] & 0xFF, Block[10] & 0xFF, Block[11] & 0xFF, Block[12] & 0xFF, Block[13] & 0xFF, Block[14] & 0xFF, Block[15] & 0xFF, Block[16] & 0xFF, Block[17] & 0xFF, Block[18] & 0xFF, Block[19] & 0xFF, Block[20] & 0xFF, Block[21] & 0xFF, Block[22] & 0xFF, Block[23] & 0xFF, Block[24] & 0xFF, Block[25] & 0xFF, Block[26] & 0xFF, Block[27] & 0xFF, Block[28] & 0xFF, Block[29] & 0xFF,

1 0

[cwittich] 59085: [advapi32] return the required buffer size in case a temp buffer is used fixes services tab in msconfig
by cwittich＠svn.reactos.org 26 May '13

26 May '13

Author: cwittich Date: Sun May 26 17:33:39 2013 New Revision: 59085 URL: http://svn.reactos.org/svn/reactos?rev=59085&view=rev Log: [advapi32] return the required buffer size in case a temp buffer is used fixes services tab in msconfig Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun May 26 17:33:39 2013 @@ -2123,6 +2123,7 @@ if (bUseTempBuffer == TRUE) { TRACE("RQueryServiceConfig2A() returns ERROR_INSUFFICIENT_BUFFER\n"); + *pcbBytesNeeded = dwBufferSize; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } @@ -2240,6 +2241,7 @@ if (bUseTempBuffer == TRUE) { TRACE("RQueryServiceConfig2W() returns ERROR_INSUFFICIENT_BUFFER\n"); + *pcbBytesNeeded = dwBufferSize; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

[janderwald] 59084: [USBSTOR] - Hackplement IRP_MJ_POWER support - Inspired by Thomas (Blame him ; ))
by janderwald＠svn.reactos.org 26 May '13

26 May '13

Author: janderwald Date: Sun May 26 17:18:19 2013 New Revision: 59084 URL: http://svn.reactos.org/svn/reactos?rev=59084&view=rev Log: [USBSTOR] - Hackplement IRP_MJ_POWER support - Inspired by Thomas (Blame him ;)) Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.c [iso-8859-1] Sun May 26 17:18:19 2013 @@ -212,12 +212,24 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNIMPLEMENTED - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + PFDO_DEVICE_EXTENSION DeviceExtension; + + // get common device extension + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->Common.IsFDO) + { + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + } + else + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } }

1 0

[ekohl] 59083: [SAMSRV] Calculate NT and LM hashes of the empty password string and use them as default passwords hashes in new user accounts.
by ekohl＠svn.reactos.org 26 May '13

26 May '13

Author: ekohl Date: Sun May 26 10:48:54 2013 New Revision: 59083 URL: http://svn.reactos.org/svn/reactos?rev=59083&view=rev Log: [SAMSRV] Calculate NT and LM hashes of the empty password string and use them as default passwords hashes in new user accounts. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun May 26 10:48:54 2013 @@ -2371,8 +2371,8 @@ Status = SampSetObjectAttribute(UserObject, L"LMPwd", REG_BINARY, - NULL, - 0); + &EmptyLmHash, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -2383,8 +2383,8 @@ Status = SampSetObjectAttribute(UserObject, L"NTPwd", REG_BINARY, - NULL, - 0); + &EmptyNtHash, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); 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 26 10:48:54 2013 @@ -23,7 +23,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); -/* FUNCTIONS ****************************************************************/ + +/* GLOBALS *******************************************************************/ + +ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; +ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; + + +/* FUNCTIONS *****************************************************************/ + +static +NTSTATUS +SampInitHashes(VOID) +{ + UNICODE_STRING EmptyNtPassword = {0, 0, NULL}; + CHAR EmptyLmPassword[15] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,}; + NTSTATUS Status; + + /* Calculate the NT hash value of the empty password */ + Status = SystemFunction007(&EmptyNtPassword, + (LPBYTE)&EmptyNtHash); + if (!NT_SUCCESS(Status)) + { + ERR("Calculation of the empty NT hash failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Calculate the LM hash value of the empty password */ + Status = SystemFunction006(EmptyLmPassword, + (LPSTR)&EmptyLmHash); + if (!NT_SUCCESS(Status)) + { + ERR("Calculation of the empty LM hash failed (Status 0x%08lx)\n", Status); + } + + return Status; +} + NTSTATUS NTAPI @@ -70,6 +106,10 @@ TRACE("SamIInitialize() called\n"); + Status = SampInitHashes(); + if (!NT_SUCCESS(Status)) + return Status; + if (SampIsSetupRunning()) { Status = SampInitializeRegistry(); Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun May 26 10:48:54 2013 @@ -118,6 +118,8 @@ extern PGENERIC_MAPPING pServerMapping; +extern ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; +extern ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; /* alias.c */ @@ -371,4 +373,17 @@ SampGetRidFromSid(IN PSID Sid, OUT PULONG Rid); + +/* Undocumented advapi32 functions */ + +NTSTATUS +WINAPI +SystemFunction006(LPCSTR password, + LPSTR hash); + +NTSTATUS +WINAPI +SystemFunction007(PUNICODE_STRING string, + LPBYTE hash); + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sun May 26 10:48:54 2013 @@ -301,16 +301,16 @@ L"LMPwd", 0, REG_BINARY, - NULL, - 0); + (LPVOID)&EmptyLmHash, + sizeof(ENCRYPTED_LM_OWF_PASSWORD)); /* Set NTPwd attribute*/ RegSetValueEx(hAccountKey, L"NTPwd", 0, REG_BINARY, - NULL, - 0); + (LPVOID)&EmptyNtHash, + sizeof(ENCRYPTED_NT_OWF_PASSWORD)); /* Set LMPwdHistory attribute*/ RegSetValueEx(hAccountKey,

1 0

[ekohl] 59082: [MSPORTS] - Only use the first port base address for parallel port identification. ECP ports have a second base address that confused the identification code. - Apply the same check ...
by ekohl＠svn.reactos.org 25 May '13

25 May '13

Author: ekohl Date: Sat May 25 18:28:28 2013 New Revision: 59082 URL: http://svn.reactos.org/svn/reactos?rev=59082&view=rev Log: [MSPORTS] - Only use the first port base address for parallel port identification. ECP ports have a second base address that confused the identification code. - Apply the same check to the serial port identification code because it can prevent potential malfunction. At least it doesn't hurt to be on the safe side. Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Sat May 25 18:28:28 2013 @@ -129,7 +129,7 @@ TRACE("Port: Start: %I64x Length: %lu\n", lpResDes->u.Port.Start.QuadPart, lpResDes->u.Port.Length); - if (lpResDes->u.Port.Start.HighPart == 0) + if ((lpResDes->u.Port.Start.HighPart == 0) && (dwBaseAddress == 0)) dwBaseAddress = (DWORD)lpResDes->u.Port.Start.LowPart; break; @@ -201,7 +201,7 @@ TRACE("Port: Start: %I64x Length: %lu\n", lpResDes->u.Port.Start.QuadPart, lpResDes->u.Port.Length); - if (lpResDes->u.Port.Start.HighPart == 0) + if ((lpResDes->u.Port.Start.HighPart == 0) && (dwBaseAddress == 0)) dwBaseAddress = (DWORD)lpResDes->u.Port.Start.LowPart; break; @@ -416,12 +416,16 @@ /* ... try to determine the port number from its resources */ if (dwPortNumber == 0) + { dwPortNumber = GetParallelPortNumber(DeviceInfoSet, DeviceInfoData); + TRACE("GetParallelPortNumber() returned port number: %lu\n", dwPortNumber); + } if (dwPortNumber == 0) { /* FIXME */ + FIXME("Got no valid port numer!\n"); } if (dwPortNumber != 0) @@ -485,6 +489,8 @@ L"Parallel Port (%s)", szPortName); } + + TRACE("Friendly name: %S\n", szFriendlyName); /* Set the friendly name for the device */ SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet,

1 0

[janderwald] 59081: [USBSTOR] - partly implement support for scsiop_mechanism command, not yet activated - terminate request properly when it is not supported. Fixes leaking of irp requests
by janderwald＠svn.reactos.org 24 May '13

24 May '13

Author: janderwald Date: Fri May 24 19:02:28 2013 New Revision: 59081 URL: http://svn.reactos.org/svn/reactos?rev=59081&view=rev Log: [USBSTOR] - partly implement support for scsiop_mechanism command, not yet activated - terminate request properly when it is not supported. Fixes leaking of irp requests Modified: trunk/reactos/drivers/usb/usbstor/scsi.c Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 24 19:02:28 2013 @@ -1249,6 +1249,52 @@ return USBSTOR_SendRequest(DeviceObject, Irp, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); } +NTSTATUS +USBSTOR_SendUnknownRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp, + IN ULONG RetryCount) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + UFI_TEST_UNIT_CMD Cmd; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = IoStack->Parameters.Others.Argument1; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // check that we're sending to the right LUN + // + ASSERT(Request->Cdb[1] == (PDODeviceExtension->LUN & MAX_LUN)); + + // + // sanity check + // + ASSERT(Request->CdbLength == sizeof(UFI_TEST_UNIT_CMD)); + + // + // initialize test unit cmd + // + RtlCopyMemory(&Cmd, Request->Cdb, Request->CdbLength); + + // + // send the request + // + return USBSTOR_SendRequest(DeviceObject, Irp, Request->CdbLength, (PUCHAR)&Cmd, Request->DataTransferLength, Request->DataBuffer, RetryCount); +} NTSTATUS USBSTOR_HandleExecuteSCSI( @@ -1366,12 +1412,28 @@ // Status = USBSTOR_SendTestUnit(DeviceObject, Irp, RetryCount); } +#if 0 + else if (pCDB->AsByte[0] == SCSIOP_MECHANISM_STATUS) + { + DPRINT1("SCSIOP_MECHANISM_STATUS\n"); + + // + // Just send it the way it is + // + Status = USBSTOR_SendUnknownRequest(DeviceObject, Irp, RetryCount); + } +#endif else { + // unsupported request DPRINT1("UNIMPLEMENTED Operation Code %x\n", pCDB->AsByte[0]); + Status = STATUS_NOT_SUPPORTED; + Request->SrbStatus = SRB_STATUS_ERROR; - Status = STATUS_NOT_SUPPORTED; - DbgBreakPoint(); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } return Status;

1 0

← Newer
1
2
3
4
5
6
7
8
...
24
Older →

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 May 2013