Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context);
break;
case WLX_SAS_ACTION_NONE: /* 0x02 */
- if (Session->LogonState == STATE_LOGGED_OFF)
+ if (Session->LogonState == STATE_LOGGED_ON_SAS)
+ {
+ Session->LogonState = STATE_LOGGED_ON;
+ }
+ else if (Session->LogonState == STATE_LOGGED_OFF)
{
Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context);
}
break;
case WLX_SAS_ACTION_TASKLIST: /* 0x07 */
SwitchDesktop(WLSession->ApplicationDesktop);
+ Session->LogonState = STATE_LOGGED_ON;
StartTaskManager(Session);
break;
case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */
{
DWORD wlxAction = WLX_SAS_ACTION_NONE;
+ /* Ignore SAS if we are already in an SAS state */
+ if (Session->LogonState == STATE_LOGGED_OFF_SAS ||
+ Session->LogonState == STATE_LOGGED_ON_SAS)
+ return;
+
if (Session->LogonState == STATE_LOGGED_ON)
+ {
+ Session->LogonState = STATE_LOGGED_ON_SAS;
wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL);
+ }
else if (Session->LogonState == STATE_LOCKED)
wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType);
else
return WLX_SAS_ACTION_NONE;
}
- result = pgContext->pWlxFuncs->WlxSwitchDesktopToWinlogon(
+ pgContext->pWlxFuncs->WlxSwitchDesktopToWinlogon(
pgContext->hWlx);
result = pgContext->pWlxFuncs->WlxDialogBoxParam(
if (result == WLX_SAS_ACTION_NONE)
{
- result = pgContext->pWlxFuncs->WlxSwitchDesktopToUser(
+ pgContext->pWlxFuncs->WlxSwitchDesktopToUser(
pgContext->hWlx);
}
/* FIXME: take care of DontDisplayLastUserName, NoDomainUI, ShutdownWithoutLogon */
pgContext = (PGINA_CONTEXT)lParam;
SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext);
+
+ if (pgContext->bDisableCAD == TRUE)
+ EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
+
SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME));
pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
return ERROR_SUCCESS;
}
+static LONG
+ReadRegDwordKey(
+ IN HKEY hKey,
+ IN LPCWSTR pszKey,
+ OUT LPDWORD pValue)
+{
+ LONG rc;
+ DWORD dwType;
+ DWORD cbData;
+ DWORD dwValue;
+
+ if (!pValue)
+ return ERROR_INVALID_PARAMETER;
+
+ cbData = sizeof(DWORD);
+ rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, (LPBYTE)&dwValue, &cbData);
+ if (rc == ERROR_SUCCESS)
+ *pValue = dwValue;
+
+ return ERROR_SUCCESS;
+}
+
static VOID
ChooseGinaUI(VOID)
{
HeapFree(GetProcessHeap(), 0, SystemStartOptions);
}
+
+static
+BOOL
+GetRegistrySettings(PGINA_CONTEXT pgContext)
+{
+ HKEY hKey = NULL;
+ LPWSTR lpAutoAdminLogon = NULL;
+ DWORD dwDisableCAD = 0;
+ LONG rc;
+
+ rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+ L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon",
+ 0,
+ KEY_QUERY_VALUE,
+ &hKey);
+ if (rc != ERROR_SUCCESS)
+ {
+ WARN("RegOpenKeyExW() failed with error %lu\n", rc);
+ return FALSE;
+ }
+
+ rc = ReadRegSzKey(hKey,
+ L"AutoAdminLogon",
+ &lpAutoAdminLogon);
+ if (rc == ERROR_SUCCESS)
+ {
+ if (wcscmp(lpAutoAdminLogon, L"1") == 0)
+ pgContext->bAutoAdminLogon = TRUE;
+ }
+
+ TRACE("bAutoAdminLogon: %s\n", pgContext->bAutoAdminLogon ? "TRUE" : "FALSE");
+
+ rc = ReadRegDwordKey(hKey,
+ L"DisableCAD",
+ &dwDisableCAD);
+ if (rc == ERROR_SUCCESS)
+ {
+ if (dwDisableCAD != 0)
+ pgContext->bDisableCAD = TRUE;
+ }
+
+ TRACE("bDisableCAD: %s\n", pgContext->bDisableCAD ? "TRUE" : "FALSE");
+
+ if (lpAutoAdminLogon != NULL)
+ HeapFree(GetProcessHeap(), 0, lpAutoAdminLogon);
+
+ if (hKey != NULL)
+ RegCloseKey(hKey);
+
+ return TRUE;
+}
+
+
/*
* @implemented
*/
return FALSE;
}
+ if (!GetRegistrySettings(pgContext))
+ {
+ WARN("GetRegistrySettings() failed\n");
+ LocalFree(pgContext);
+ return FALSE;
+ }
+
/* Return the context to winlogon */
*pWlxContext = (PVOID)pgContext;
pgContext->hDllInstance = hDllInstance;
return FALSE;
}
-
+#if 0
static
BOOL
CheckAutoAdminLogon(
return result;
}
-
+#endif
static BOOL
DoAutoLogon(
return;
}
- if (CheckAutoAdminLogon(pgContext))
+// if (CheckAutoAdminLogon(pgContext))
+ if (pgContext->bAutoAdminLogon == TRUE)
{
/* Don't display the window, we want to do an automatic logon */
pgContext->AutoLogonState = AUTOLOGON_ONCE;
else
pgContext->AutoLogonState = AUTOLOGON_DISABLED;
+TRACE("pgContext->bDisableCAD: %lu\n", pgContext->bDisableCAD);
+
+ if (pgContext->bDisableCAD == TRUE)
+ {
+ pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL);
+ return;
+ }
+
pGinaUI->DisplaySASNotice(pgContext);
TRACE("WlxDisplaySASNotice() done\n");