From 7efe4e4f2a99450f3e6a15447a2ea816f9be848d Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 24 Feb 2021 21:42:20 +0100 Subject: Windows: Fix freeze when password dialog displayed in secure desktop and try to access token keyfiles protected by PIN --- src/Common/Dlgcode.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Common/Dlgcode.h') diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h index baf07a5c..6370c2a7 100644 --- a/src/Common/Dlgcode.h +++ b/src/Common/Dlgcode.h @@ -124,7 +124,8 @@ extern BOOL bHideWaitingDialog; extern BOOL bCmdHideWaitingDialog; extern BOOL bCmdHideWaitingDialogValid; extern BOOL bUseSecureDesktop; -extern BOOL bSecureDesktopOngoing; +extern volatile BOOL bSecureDesktopOngoing; +extern TCHAR SecureDesktopName[65]; extern BOOL bUseLegacyMaxPasswordLength; extern BOOL bCmdUseSecureDesktop; extern BOOL bCmdUseSecureDesktopValid; @@ -550,6 +551,7 @@ BOOL LaunchElevatedProcess (HWND hwndDlg, const wchar_t* szModPath, const wchar_ BOOL GetFreeDriveLetter(WCHAR* pCh); BOOL SetPrivilege(LPTSTR szPrivilegeName, BOOL bEnable); BOOL DeleteDirectory (const wchar_t* szDirName); +BOOL IsThreadInSecureDesktop(DWORD dwThreadID); INT_PTR SecureDesktopDialogBoxParam (HINSTANCE, LPCWSTR, HWND, DLGPROC, LPARAM); BOOL VerifyModuleSignature (const wchar_t* path); void GetInstallationPath (HWND hwndDlg, wchar_t* szInstallPath, DWORD cchSize, BOOL* pbInstallPathDetermined); -- cgit v1.2.3