Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WINLOGON] Ignore the CTRL+SHIFT+ESC hotkey when the session is not in the logged-on state
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46dcab7ab1aa8c30892f2… commit 46dcab7ab1aa8c30892f27af390964758ce08df2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 18:14:42 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 18:14:42 2018 +0200 [WINLOGON] Ignore the CTRL+SHIFT+ESC hotkey when the session is not in the logged-on state Should fix CORE-13478 --- base/system/winlogon/sas.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index fe558c452c..1a57a4ad6e 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1328,7 +1328,8 @@ SASWindowProc( case MAKELONG(MOD_CONTROL | MOD_SHIFT, VK_ESCAPE): { TRACE("SAS: CONTROL+SHIFT+ESCAPE\n"); - DoGenericAction(Session, WLX_SAS_ACTION_TASKLIST); + if (Session->LogonState == STATE_LOGGED_ON) + DoGenericAction(Session, WLX_SAS_ACTION_TASKLIST); return TRUE; } }

1 0

01/01: [MSGINA] Do not try to impersonate the user on shutdown when we are already logged off
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47567abf279faefd48ad1… commit 47567abf279faefd48ad1bec8dc48ffc06eaab61 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 17:35:33 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 17:35:33 2018 +0200 [MSGINA] Do not try to impersonate the user on shutdown when we are already logged off --- dll/win32/msgina/gui.c | 39 ++++++++++++++++++++++++--------------- dll/win32/msgina/msgina.h | 6 ++++++ dll/win32/msgina/shutdown.c | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index c520f07b31..1e1069eb27 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -624,26 +624,17 @@ OnShutDown( INT ret; DWORD ShutdownOptions; - if (ImpersonateLoggedOnUser(pgContext->UserToken)) - { - pgContext->nShutdownAction = LoadShutdownSelState(); - ShutdownOptions = GetAllowedShutdownOptions(); - RevertToSelf(); - } - else - { - ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); - pgContext->nShutdownAction = 0; - ShutdownOptions = 0; - } + TRACE("OnShutDown(%p %p)\n", hwndDlg, pgContext); - ret = ShutdownDialog(hwndDlg, ShutdownOptions, pgContext); + pgContext->nShutdownAction = GetDefaultShutdownSelState(); + ShutdownOptions = GetDefaultShutdownOptions(); - if (ret == IDOK) + if (pgContext->UserToken != NULL) { if (ImpersonateLoggedOnUser(pgContext->UserToken)) { - SaveShutdownSelState(pgContext->nShutdownAction); + pgContext->nShutdownAction = LoadShutdownSelState(); + ShutdownOptions = GetAllowedShutdownOptions(); RevertToSelf(); } else @@ -652,6 +643,24 @@ OnShutDown( } } + ret = ShutdownDialog(hwndDlg, ShutdownOptions, pgContext); + + if (ret == IDOK) + { + if (pgContext->UserToken != NULL) + { + if (ImpersonateLoggedOnUser(pgContext->UserToken)) + { + SaveShutdownSelState(pgContext->nShutdownAction); + RevertToSelf(); + } + else + { + ERR("WL: ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + } + } + } + return ret; } diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h index 19eabf9eb3..e2b6b5bfb4 100644 --- a/dll/win32/msgina/msgina.h +++ b/dll/win32/msgina/msgina.h @@ -132,12 +132,18 @@ CreateProfile( /* shutdown.c */ +DWORD +GetDefaultShutdownSelState(VOID); + DWORD LoadShutdownSelState(VOID); VOID SaveShutdownSelState(DWORD ShutdownCode); +DWORD +GetDefaultShutdownOptions(VOID); + DWORD GetAllowedShutdownOptions(VOID); diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index ca2528a7bb..1351eabc14 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -90,6 +90,11 @@ GetShutdownReasonUI(VOID) // return (VersionInfo.wProductType == VER_NT_WORKSTATION) ? FALSE : TRUE; } +DWORD +GetDefaultShutdownSelState(VOID) +{ + return WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; +} DWORD LoadShutdownSelState(VOID) @@ -211,6 +216,12 @@ SaveShutdownSelState( RegCloseKey(hKey); } +DWORD +GetDefaultShutdownOptions(VOID) +{ + return WLX_SHUTDOWN_STATE_POWER_OFF | WLX_SHUTDOWN_STATE_REBOOT; +} + DWORD GetAllowedShutdownOptions(VOID) { @@ -271,6 +282,13 @@ UpdateShutdownDesc( LoadStringW(pContext->pgContext->hDllInstance, DescId, szBuffer, _countof(szBuffer)); SetDlgItemTextW(hDlg, IDC_SHUTDOWN_DESCRIPTION, szBuffer); + + if (pContext->bReasonUI) + { + EnableWindow(GetDlgItem(hDlg, IDC_REASON_PLANNED), (ShutdownCode != WLX_SAS_ACTION_LOGOFF)); + EnableWindow(GetDlgItem(hDlg, IDC_REASON_LIST), (ShutdownCode != WLX_SAS_ACTION_LOGOFF)); + EnableWindow(GetDlgItem(hDlg, IDC_REASON_COMMENT), (ShutdownCode != WLX_SAS_ACTION_LOGOFF)); + } } static VOID

1 0

01/01: [MSGINA] Close the LSA handle on shutdown
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c4c6e88b3192a2e045a8… commit 4c4c6e88b3192a2e045a863cfd9964a4b142faec Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 17:31:20 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 17:31:20 2018 +0200 [MSGINA] Close the LSA handle on shutdown --- dll/win32/msgina/msgina.c | 23 +++++++++++++++++++++++ dll/win32/msgina/stubs.c | 15 --------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index c01c75451b..e22413c613 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -1030,6 +1030,29 @@ WlxLogoff( } +/* + * @implemented + */ +VOID WINAPI +WlxShutdown( + PVOID pWlxContext, + DWORD ShutdownType) +{ + PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; + NTSTATUS Status; + + TRACE("WlxShutdown(%p %lx)\n", pWlxContext, ShutdownType); + + /* Close the LSA handle */ + pgContext->AuthenticationPackage = 0; + Status = LsaDeregisterLogonProcess(pgContext->LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaDeregisterLogonProcess failed (Status 0x%08lx)\n", Status); + } +} + + BOOL WINAPI DllMain( IN HINSTANCE hinstDLL, diff --git a/dll/win32/msgina/stubs.c b/dll/win32/msgina/stubs.c index 9b7c0afe16..f5e20c4183 100644 --- a/dll/win32/msgina/stubs.c +++ b/dll/win32/msgina/stubs.c @@ -25,21 +25,6 @@ WlxIsLockOk( } -/* - * @unimplemented - */ -VOID WINAPI -WlxShutdown( - PVOID pWlxContext, - DWORD ShutdownType) -{ - UNREFERENCED_PARAMETER(pWlxContext); - UNREFERENCED_PARAMETER(ShutdownType); - - UNIMPLEMENTED; -} - - /* * @unimplemented */

1 0

01/01: [MSGINA] Close the user token in WlxLogoff
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bab4d87ac824b5317d1a5… commit bab4d87ac824b5317d1a520da63643103a620c85 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 16:32:10 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 16:32:10 2018 +0200 [MSGINA] Close the user token in WlxLogoff --- dll/win32/msgina/msgina.c | 18 ++++++++++++++++++ dll/win32/msgina/stubs.c | 13 ------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 8f6c3a905a..c01c75451b 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -1012,6 +1012,24 @@ WlxIsLogoffOk( return TRUE; } + +/* + * @implemented + */ +VOID WINAPI +WlxLogoff( + PVOID pWlxContext) +{ + PGINA_CONTEXT pgContext = (PGINA_CONTEXT)pWlxContext; + + TRACE("WlxLogoff(%p)\n", pWlxContext); + + /* Close the user token */ + CloseHandle(pgContext->UserToken); + pgContext->UserToken = NULL; +} + + BOOL WINAPI DllMain( IN HINSTANCE hinstDLL, diff --git a/dll/win32/msgina/stubs.c b/dll/win32/msgina/stubs.c index 69921cff92..9b7c0afe16 100644 --- a/dll/win32/msgina/stubs.c +++ b/dll/win32/msgina/stubs.c @@ -25,19 +25,6 @@ WlxIsLockOk( } -/* - * @unimplemented - */ -VOID WINAPI -WlxLogoff( - PVOID pWlxContext) -{ - UNREFERENCED_PARAMETER(pWlxContext); - - UNIMPLEMENTED; -} - - /* * @unimplemented */

1 0

02/02: [MSGINA] Rename context variable: Domain -> DomainName
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c98b8dc98ca7ed78a6c1b… commit c98b8dc98ca7ed78a6c1be860d0b73326461620a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 14:39:38 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 14:39:38 2018 +0200 [MSGINA] Rename context variable: Domain -> DomainName --- dll/win32/msgina/gui.c | 18 +++++++++--------- dll/win32/msgina/msgina.c | 14 +++++++------- dll/win32/msgina/msgina.h | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 46110df992..c520f07b31 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -435,7 +435,7 @@ DoChangePassword( IDS_PASSWORDCHANGED); if ((wcscmp(UserName, pgContext->UserName) == 0) && - (wcscmp(Domain, pgContext->Domain) == 0) && + (wcscmp(Domain, pgContext->DomainName) == 0) && (wcscmp(OldPassword, pgContext->Password) == 0)) { ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); @@ -472,7 +472,7 @@ ChangePasswordDialogProc( SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, pgContext->UserName); - SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain); + SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_ADDSTRING, 0, (LPARAM)pgContext->DomainName); SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_SETCURSEL, 0, 0); SetFocus(GetDlgItem(hwndDlg, IDC_CHANGEPWD_OLDPWD)); return TRUE; @@ -520,7 +520,7 @@ OnInitSecurityDlg(HWND hwnd, LoadStringW(pgContext->hDllInstance, IDS_LOGONMSG, Buffer1, _countof(Buffer1)); - wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer2, L"%s\\%s", pgContext->DomainName, pgContext->UserName); wsprintfW(Buffer4, Buffer1, Buffer2); SetDlgItemTextW(hwnd, IDC_LOGONMSG, Buffer4); @@ -836,7 +836,7 @@ DoLogon( Status = DoLoginTasks(pgContext, pgContext->UserName, - pgContext->Domain, + pgContext->DomainName, pgContext->Password, &SubStatus); if (!NT_SUCCESS(Status)) @@ -910,12 +910,12 @@ SetDomainComboBox( lIndex = SendMessageW(hwndDomainComboBox, CB_ADDSTRING, 0, (LPARAM)szComputerName); } - if (wcslen(pgContext->Domain) != 0) + if (wcslen(pgContext->DomainName) != 0) { - lFindIndex = SendMessageW(hwndDomainComboBox, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)pgContext->Domain); + lFindIndex = SendMessageW(hwndDomainComboBox, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)pgContext->DomainName); if (lFindIndex == CB_ERR) { - lIndex = SendMessageW(hwndDomainComboBox, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain); + lIndex = SendMessageW(hwndDomainComboBox, CB_ADDSTRING, 0, (LPARAM)pgContext->DomainName); } else { @@ -1125,7 +1125,7 @@ SetLockMessage(HWND hwnd, LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, _countof(Buffer1)); - wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer2, L"%s\\%s", pgContext->DomainName, pgContext->UserName); wsprintfW(Buffer3, Buffer1, Buffer2); SetDlgItemTextW(hwnd, nDlgItem, Buffer3); @@ -1179,7 +1179,7 @@ DoUnlock( else { LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, _countof(Buffer1)); - wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer2, Buffer1, pgContext->DomainName, pgContext->UserName); LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, _countof(Buffer1)); MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); } diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 90e59250d2..8f6c3a905a 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -244,12 +244,12 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) (LPBYTE)&pgContext->UserName, &dwSize); - dwSize = sizeof(pgContext->Domain); + dwSize = sizeof(pgContext->DomainName); rc = RegQueryValueExW(hKey, L"DefaultDomainName", NULL, NULL, - (LPBYTE)&pgContext->Domain, + (LPBYTE)&pgContext->DomainName, &dwSize); dwSize = sizeof(pgContext->Password); @@ -803,12 +803,12 @@ CreateProfile( wcscpy(pgContext->UserName, UserName); if (Domain == NULL || wcslen(Domain) == 0) { - dwLength = _countof(pgContext->Domain); - GetComputerNameW(pgContext->Domain, &dwLength); + dwLength = _countof(pgContext->DomainName); + GetComputerNameW(pgContext->DomainName, &dwLength); } else { - wcscpy(pgContext->Domain, Domain); + wcscpy(pgContext->DomainName, Domain); } /* Get profile path */ @@ -841,7 +841,7 @@ CreateProfile( pProfile->pszProfile = ProfilePath; cbSize = sizeof(L"LOGONSERVER=\\\\") + - wcslen(pgContext->Domain) * sizeof(WCHAR) + + wcslen(pgContext->DomainName) * sizeof(WCHAR) + sizeof(UNICODE_NULL); lpEnvironment = HeapAlloc(GetProcessHeap(), 0, cbSize); if (!lpEnvironment) @@ -850,7 +850,7 @@ CreateProfile( goto cleanup; } - StringCbPrintfW(lpEnvironment, cbSize, L"LOGONSERVER=\\\\%ls", pgContext->Domain); + StringCbPrintfW(lpEnvironment, cbSize, L"LOGONSERVER=\\\\%ls", pgContext->DomainName); ASSERT(wcslen(lpEnvironment) == cbSize / sizeof(WCHAR) - 2); lpEnvironment[cbSize / sizeof(WCHAR) - 1] = UNICODE_NULL; diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h index 2243cb8222..19eabf9eb3 100644 --- a/dll/win32/msgina/msgina.h +++ b/dll/win32/msgina/msgina.h @@ -48,7 +48,7 @@ typedef struct /* Information to be filled during logon */ WCHAR UserName[256]; - WCHAR Domain[256]; + WCHAR DomainName[256]; WCHAR Password[256]; SYSTEMTIME LogonTime; HANDLE UserToken;

1 0

01/02: [WINLOGON] Prevent shell restart when the user is logged off
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f0fe38634419df2748e8… commit 1f0fe38634419df2748e88cb8aead8d5549764d0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 14:36:55 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 14:36:55 2018 +0200 [WINLOGON] Prevent shell restart when the user is logged off --- base/system/winlogon/sas.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index e9861de796..fe558c452c 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1372,7 +1372,9 @@ SASWindowProc( case LN_SHELL_EXITED: { /* lParam is the exit code */ - if(lParam != 1) + if (lParam != 1 && + Session->LogonState != STATE_LOGGED_OFF && + Session->LogonState != STATE_LOGGED_OFF_SAS) { SetTimer(hwndDlg, 1, 1000, NULL); }

1 0

01/01: [BOOTDATA][MSGINA][SYSSETUP] Rename the DefaultDomain registry value to DefaultDomainName
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b784c7bfba3fc2d46b46c… commit b784c7bfba3fc2d46b46c606ea423c83904992a2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 11:30:27 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 11:30:27 2018 +0200 [BOOTDATA][MSGINA][SYSSETUP] Rename the DefaultDomain registry value to DefaultDomainName --- boot/bootdata/hivesft.inf | 2 +- dll/win32/msgina/msgina.c | 2 +- dll/win32/syssetup/security.c | 2 +- dll/win32/syssetup/wizard.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index b5c7926de3..4e4e81653d 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1373,7 +1373,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomain",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomainName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 6cb3bc5324..90e59250d2 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -246,7 +246,7 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) dwSize = sizeof(pgContext->Domain); rc = RegQueryValueExW(hKey, - L"DefaultDomain", + L"DefaultDomainName", NULL, NULL, (LPBYTE)&pgContext->Domain, diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index cc35f9a8a3..221d0152af 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -580,7 +580,7 @@ SetAutoAdminLogon(VOID) if (wcscmp(szAutoAdminLogon, L"1") == 0) { RegSetValueExW(hKey, - L"DefaultDomain", + L"DefaultDomainName", 0, REG_SZ, (LPBYTE)AdminInfo.Domain, diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 9c57f6b2da..b896adf193 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -594,14 +594,14 @@ WriteDefaultLogonData(LPWSTR Domain) return FALSE; lError = RegSetValueEx(hKey, - L"DefaultDomain", + L"DefaultDomainName", 0, REG_SZ, (LPBYTE)Domain, (wcslen(Domain)+ 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - DPRINT1("RegSetValueEx(\"DefaultDomain\") failed!\n"); + DPRINT1("RegSetValueEx(\"DefaultDomainName\") failed!\n"); } lError = RegSetValueEx(hKey,

1 0

01/01: [MSGINA] Add the IgnoreShiftOverride feature again
by Eric Kohl 22 May '18

22 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=665926d38bbf7e188111b… commit 665926d38bbf7e188111b3a9b2f8abe9b735002f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 22 11:06:38 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 22 11:06:38 2018 +0200 [MSGINA] Add the IgnoreShiftOverride feature again --- dll/win32/msgina/msgina.c | 25 ++++++++++++++++++++++--- dll/win32/msgina/msgina.h | 5 +---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 8772df7dc1..6cb3bc5324 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -170,6 +170,7 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) LPWSTR lpAutoAdminLogon = NULL; LPWSTR lpDontDisplayLastUserName = NULL; LPWSTR lpShutdownWithoutLogon = NULL; + LPWSTR lpIgnoreShiftOverride = NULL; DWORD dwDisableCAD = 0; DWORD dwSize; LONG rc; @@ -226,6 +227,15 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) pgContext->bDontDisplayLastUserName = TRUE; } + rc = ReadRegSzValue(hKey, + L"IgnoreShiftOverride", + &lpIgnoreShiftOverride); + if (rc == ERROR_SUCCESS) + { + if (wcscmp(lpIgnoreShiftOverride, L"1") == 0) + pgContext->bIgnoreShiftOverride = TRUE; + } + dwSize = sizeof(pgContext->UserName); rc = RegQueryValueExW(hKey, L"DefaultUserName", @@ -250,6 +260,9 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) (LPBYTE)&pgContext->Password, &dwSize); + if (lpIgnoreShiftOverride != NULL) + HeapFree(GetProcessHeap(), 0, lpIgnoreShiftOverride); + if (lpShutdownWithoutLogon != NULL) HeapFree(GetProcessHeap(), 0, lpShutdownWithoutLogon); @@ -893,9 +906,15 @@ WlxDisplaySASNotice( if (pgContext->bAutoAdminLogon) { - /* Don't display the window, we want to do an automatic logon */ - pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); - return; + if (pgContext->bIgnoreShiftOverride || + (GetKeyState(VK_SHIFT) >= 0)) + { + /* Don't display the window, we want to do an automatic logon */ + pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); + return; + } + + pgContext->bAutoAdminLogon = FALSE; } if (pgContext->bDisableCAD) diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h index 38c975eb89..2243cb8222 100644 --- a/dll/win32/msgina/msgina.h +++ b/dll/win32/msgina/msgina.h @@ -28,10 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msgina); #include "resource.h" -/* Values for GINA_CONTEXT.AutoLogonState */ -#define AUTOLOGON_CHECK_REGISTRY 1 -#define AUTOLOGON_ONCE 2 -#define AUTOLOGON_DISABLED 3 typedef struct { @@ -46,6 +42,7 @@ typedef struct BOOL bAutoAdminLogon; BOOL bDontDisplayLastUserName; BOOL bShutdownWithoutLogon; + BOOL bIgnoreShiftOverride; ULONG nShutdownAction;

1 0

01/01: [MSGINA] Simplify the auto logon code path
by Eric Kohl 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d308f4b6e6b64d0ecb37… commit 0d308f4b6e6b64d0ecb37d825165531350fef857 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 21 16:29:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 21 16:29:02 2018 +0200 [MSGINA] Simplify the auto logon code path - Get rid of DoAutoLogon() and the AutoLogonState variable. - Handle the auto logon in the normal logon code path instead. - Set bAutoAdminLogon to FALSE on a successful login. This will prevent another automatic logon after a logoff. - The IgnoreShiftOverride feature got lost by this change but I will add it again. --- dll/win32/msgina/gui.c | 16 ++++-- dll/win32/msgina/msgina.c | 131 +++------------------------------------------- dll/win32/msgina/msgina.h | 1 - 3 files changed, 21 insertions(+), 127 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 6d0840c368..46110df992 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -873,6 +873,8 @@ DoLogon( ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); wcscpy(pgContext->Password, Password); + pgContext->bAutoAdminLogon = FALSE; + result = TRUE; done: @@ -944,21 +946,29 @@ LoggedOutWindowProc( pgContext = (PGINA_CONTEXT)lParam; SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); - if (!pgContext->bDontDisplayLastUserName) + if (pgContext->bAutoAdminLogon || + !pgContext->bDontDisplayLastUserName) SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); + if (pgContext->bAutoAdminLogon) + SetDlgItemTextW(hwndDlg, IDC_PASSWORD, pgContext->Password); + + SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pgContext); + if (pgContext->bDisableCAD) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); if (!pgContext->bShutdownWithoutLogon) EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); - SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pgContext); - SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); /* Draw the logo bitmap */ pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + + if (pgContext->bAutoAdminLogon) + PostMessage(GetDlgItem(hwndDlg, IDOK), BM_CLICK, 0, 0); + return TRUE; } diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c index 013c8bce44..8772df7dc1 100644 --- a/dll/win32/msgina/msgina.c +++ b/dll/win32/msgina/msgina.c @@ -242,6 +242,14 @@ GetRegistrySettings(PGINA_CONTEXT pgContext) (LPBYTE)&pgContext->Domain, &dwSize); + dwSize = sizeof(pgContext->Password); + rc = RegQueryValueExW(hKey, + L"DefaultPassword", + NULL, + NULL, + (LPBYTE)&pgContext->Password, + &dwSize); + if (lpShutdownWithoutLogon != NULL) HeapFree(GetProcessHeap(), 0, lpShutdownWithoutLogon); @@ -333,9 +341,6 @@ WlxInitialize( /* Locates the authentication package */ //LsaRegisterLogonProcess(...); - /* Check autologon settings the first time */ - pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; - pgContext->nShutdownAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; ChooseGinaUI(); @@ -868,115 +873,6 @@ cleanup: } -static BOOL -DoAutoLogon( - IN PGINA_CONTEXT pgContext) -{ - HKEY WinLogonKey = NULL; - LPWSTR AutoLogon = NULL; - LPWSTR AutoCount = NULL; - LPWSTR IgnoreShiftOverride = NULL; - LPWSTR UserName = NULL; - LPWSTR Domain = NULL; - LPWSTR Password = NULL; - BOOL result = FALSE; - LONG rc; - NTSTATUS Status; - NTSTATUS SubStatus = STATUS_SUCCESS; - - TRACE("DoAutoLogon(): AutoLogonState = %lu\n", - pgContext->AutoLogonState); - - if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) - return FALSE; - - rc = RegOpenKeyExW( - HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", - 0, - KEY_QUERY_VALUE, - &WinLogonKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - - if (pgContext->AutoLogonState == AUTOLOGON_CHECK_REGISTRY) - { - /* Set it by default to disabled, we might reenable it again later */ - pgContext->AutoLogonState = AUTOLOGON_DISABLED; - - rc = ReadRegSzValue(WinLogonKey, L"AutoAdminLogon", &AutoLogon); - if (rc != ERROR_SUCCESS) - goto cleanup; - if (wcscmp(AutoLogon, L"1") != 0) - goto cleanup; - - rc = ReadRegSzValue(WinLogonKey, L"AutoLogonCount", &AutoCount); - if (rc == ERROR_SUCCESS && wcscmp(AutoCount, L"0") == 0) - goto cleanup; - else if (rc != ERROR_FILE_NOT_FOUND) - goto cleanup; - - rc = ReadRegSzValue(WinLogonKey, L"IgnoreShiftOverride", &UserName); - if (rc == ERROR_SUCCESS) - { - if (wcscmp(AutoLogon, L"1") != 0 && GetKeyState(VK_SHIFT) < 0) - goto cleanup; - } - else if (GetKeyState(VK_SHIFT) < 0) - { - /* User pressed SHIFT */ - goto cleanup; - } - - pgContext->AutoLogonState = AUTOLOGON_ONCE; - result = TRUE; - } - else /* pgContext->AutoLogonState == AUTOLOGON_ONCE */ - { - pgContext->AutoLogonState = AUTOLOGON_DISABLED; - - rc = ReadRegSzValue(WinLogonKey, L"DefaultUserName", &UserName); - if (rc != ERROR_SUCCESS) - goto cleanup; - rc = ReadRegSzValue(WinLogonKey, L"DefaultDomain", &Domain); - if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND) - goto cleanup; - rc = ReadRegSzValue(WinLogonKey, L"DefaultPassword", &Password); - if (rc != ERROR_SUCCESS) - goto cleanup; - - Status = DoLoginTasks(pgContext, UserName, Domain, Password, &SubStatus); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Handle errors!!! */ - result = FALSE; - goto cleanup; - } - - result = CreateProfile(pgContext, UserName, Domain, Password); - if (result) - { - ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); - wcscpy(pgContext->Password, Password); - - NotifyBootConfigStatus(TRUE); - } - } - -cleanup: - if (WinLogonKey != NULL) - RegCloseKey(WinLogonKey); - HeapFree(GetProcessHeap(), 0, AutoLogon); - HeapFree(GetProcessHeap(), 0, AutoCount); - HeapFree(GetProcessHeap(), 0, IgnoreShiftOverride); - HeapFree(GetProcessHeap(), 0, UserName); - HeapFree(GetProcessHeap(), 0, Domain); - HeapFree(GetProcessHeap(), 0, Password); - TRACE("DoAutoLogon(): AutoLogonState = %lu, returning %d\n", - pgContext->AutoLogonState, result); - return result; -} - /* * @implemented */ @@ -998,12 +894,9 @@ WlxDisplaySASNotice( if (pgContext->bAutoAdminLogon) { /* Don't display the window, we want to do an automatic logon */ - pgContext->AutoLogonState = AUTOLOGON_ONCE; pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); return; } - else - pgContext->AutoLogonState = AUTOLOGON_DISABLED; if (pgContext->bDisableCAD) { @@ -1043,14 +936,6 @@ WlxLoggedOutSAS( pgContext->pMprNotifyInfo = pMprNotifyInfo; pgContext->pProfile = pProfile; - if (0 == GetSystemMetrics(SM_REMOTESESSION) && - DoAutoLogon(pgContext)) - { - /* User is local and registry contains information - * to log on him automatically */ - *phToken = pgContext->UserToken; - return WLX_SAS_ACTION_LOGON; - } res = pGinaUI->LoggedOutSAS(pgContext); *phToken = pgContext->UserToken; diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h index 44ea5c3d02..38c975eb89 100644 --- a/dll/win32/msgina/msgina.h +++ b/dll/win32/msgina/msgina.h @@ -42,7 +42,6 @@ typedef struct HWND hStatusWindow; HANDLE LsaHandle; ULONG AuthenticationPackage; - DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon; BOOL bDontDisplayLastUserName;

1 0

01/01: [WINLOGON] Fix build.
by Pierre Schweitzer 21 May '18

21 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dc07c91f8c02a654d058… commit 3dc07c91f8c02a654d05815dce55871d52275c59 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon May 21 11:33:02 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon May 21 11:33:02 2018 +0200 [WINLOGON] Fix build. --- base/system/winlogon/sas.c | 1 - base/system/winlogon/wlx.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index 077079d7e1..e9861de796 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1140,7 +1140,6 @@ DispatchSAS( IN DWORD dwSasType) { DWORD wlxAction = WLX_SAS_ACTION_NONE; - HWND hwnd; PSID LogonSid = NULL; /* FIXME */ BOOL bSecure = TRUE; diff --git a/base/system/winlogon/wlx.c b/base/system/winlogon/wlx.c index 44983e78e9..5557e7fbf5 100644 --- a/base/system/winlogon/wlx.c +++ b/base/system/winlogon/wlx.c @@ -105,7 +105,7 @@ GetDialogListEntry(HWND hwndDlg) } -HWND +VOID CloseAllDialogWindows(VOID) { PDIALOG_LIST_ENTRY Current;

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