Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Windows: use cleaner approach to implement bringing our windows to foreground. The previous implementation was causing issues with other application, like random freezing.

Browse Source
This commit is contained in:
Mounir IDRASSI
2018-03-25 20:39:40 +02:00
parent e412c0458b
commit b206988531
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Common/Dlgcode.c
View File

@@ -7577,33 +7577,42 @@ BOOL CALLBACK WaitDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
} }
void BringToForeground(HWND hWnd) // Based on source: https://www.codeproject.com/Tips/76427/How-to-bring-window-to-top-with-SetForegroundWindo?msg=5285754#xx5285754xx
void BringToForeground (HWND hWnd)
{ {
if(!::IsWindow(hWnd)) return; if(!::IsWindow(hWnd)) return;
DWORD lockTimeOut = 0;
HWND hCurrWnd = ::GetForegroundWindow(); HWND hCurrWnd = ::GetForegroundWindow();
DWORD dwThisTID = ::GetCurrentThreadId(), DWORD dwThisTID = ::GetCurrentThreadId(),
dwCurrTID = ::GetWindowThreadProcessId(hCurrWnd,0); dwCurrTID = ::GetWindowThreadProcessId(hCurrWnd,0);
// This structure will be used to create the keyboard
// input event.
INPUT ip;
if (hCurrWnd != hWnd) if (hCurrWnd != hWnd)
{ {
if(dwThisTID != dwCurrTID) if(dwThisTID != dwCurrTID)
{ {
::AttachThreadInput(dwThisTID, dwCurrTID, TRUE); // Set up a generic keyboard event.
ip.type = INPUT_KEYBOARD;
::SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT,0,&lockTimeOut,0); ip.ki.wScan = 0; // hardware scan code for key
::SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT,0,0,SPIF_SENDWININICHANGE | SPIF_UPDATEINIFILE); ip.ki.time = 0;
ip.ki.dwExtraInfo = 0;
::AllowSetForegroundWindow(ASFW_ANY);
// Press the "A" key
ip.ki.wVk = VK_MENU; // virtual-key code for the "a" key
ip.ki.dwFlags = 0; // 0 for key press
SendInput(1, &ip, sizeof(INPUT));
::Sleep(250); //Sometimes SetForegroundWindow will fail and the window will flash instead of it being show. Sleeping for a bit seems to help.
} }
::SetForegroundWindow(hWnd); ::SetForegroundWindow(hWnd);
if(dwThisTID != dwCurrTID) if(dwThisTID != dwCurrTID)
{ {
::SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT,0,(PVOID)lockTimeOut,SPIF_SENDWININICHANGE | SPIF_UPDATEINIFILE); // Release the "A" key
::AttachThreadInput(dwThisTID, dwCurrTID, FALSE); ip.ki.dwFlags = KEYEVENTF_KEYUP; // KEYEVENTF_KEYUP for key release
SendInput(1, &ip, sizeof(INPUT));
} }
} }