Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 09:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RAPPS] Improve existing window re-use (#5617)

Browse source 
- Fix small race between CreateMutex and CMainWindow creating the window, and another instance getting NULL from FindWindow.
- If the existing window is minimized, it should be restored.
This commit is contained in:
Whindmar Saksit 2024-06-08 01:18:18 +02:00 committed by GitHub
parent 7e2cd98688
commit 3f6af8b848
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
base/applications/rapps/unattended.cpp
View file

@ -355,15 +355,27 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow)
if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS))
{ {
/* If already started, find its window */ /* If already started, find its window */
HWND hWindow = FindWindowW(szWindowClass, NULL); HWND hWindow;
for (int wait = 2500, inter = 250; wait > 0; wait -= inter)
{
if ((hWindow = FindWindowW(szWindowClass, NULL)) != NULL)
break;
Sleep(inter);
}
/* Activate window */ if (hWindow)
ShowWindow(hWindow, SW_SHOWNORMAL); {
SetForegroundWindow(hWindow); /* Activate the window in the other instance */
SwitchToThisWindow(hWindow, TRUE);
if (bAppwizMode) if (bAppwizMode)
PostMessage(hWindow, WM_COMMAND, ID_ACTIVATE_APPWIZ, 0); PostMessage(hWindow, WM_COMMAND, ID_ACTIVATE_APPWIZ, 0);
if (hMutex)
CloseHandle(hMutex);
return FALSE; return FALSE;
} }
}
CMainWindow wnd(&db, bAppwizMode); CMainWindow wnd(&db, bAppwizMode);
MainWindowLoop(&wnd, nCmdShow); MainWindowLoop(&wnd, nCmdShow);