Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-06 05:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] Protect database update with a mutex (#7006)

Browse source
This commit is contained in:
Whindmar Saksit 2025-01-11 19:52:07 +01:00 committed by GitHub
parent e5a6b0f8e5
commit 3ff8adc553
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/applications/rapps/gui.cpp
View file

@ -304,6 +304,7 @@ CMainWindow::CheckAvailable()
{
if (m_Db->GetAvailableCount() == 0)
{
CUpdateDatabaseMutex lock;
m_Db->RemoveCached();
m_Db->UpdateAvailable();
}
@ -591,9 +592,12 @@ CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam)
break;
case ID_RESETDB:
{
CUpdateDatabaseMutex lock;
m_Db->RemoveCached();
UpdateApplicationsList(SelectedEnumType, bReload);
break;
}
case ID_HELP:
MessageBoxW(L"Help not implemented yet", NULL, MB_OK);

29
base/applications/rapps/include/misc.h
View file

@ -117,3 +117,32 @@ GetProgramFilesPath(CStringW &Path, BOOL PerUser, HWND hwnd = NULL);
template <class T> class CLocalPtr : public CHeapPtr<T, CLocalAllocator>
{
};
struct CScopedMutex
{
HANDLE m_hMutex;
CScopedMutex(LPCWSTR Name, UINT Timeout = INFINITE, BOOL InitialOwner = FALSE)
{
m_hMutex = CreateMutexW(NULL, InitialOwner, Name);
if (m_hMutex && !InitialOwner)
{
DWORD wait = WaitForSingleObject(m_hMutex, Timeout);
if (wait != WAIT_OBJECT_0 && wait != WAIT_ABANDONED)
{
CloseHandle(m_hMutex);
m_hMutex = NULL;
}
}
}
~CScopedMutex()
{
if (m_hMutex)
{
ReleaseMutex(m_hMutex);
CloseHandle(m_hMutex);
}
}
bool Acquired() const { return m_hMutex != NULL; }
};

9
base/applications/rapps/include/rapps.h
View file

@ -17,4 +17,13 @@ extern LONG g_Busy;
#define WM_NOTIFY_OPERATIONCOMPLETED (WM_APP + 0)
#define MAINWINDOWCLASSNAME L"ROSAPPMGR2"
#define MAINWINDOWMUTEX szWindowClass
#define UPDATEDBMUTEX ( MAINWINDOWCLASSNAME L":UpDB" )
struct CUpdateDatabaseMutex : public CScopedMutex
{
CUpdateDatabaseMutex() : CScopedMutex(UPDATEDBMUTEX, 1000 * 60 * 10, FALSE) { };
};
#endif /* _RAPPS_H */

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

@ -338,6 +338,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow)
BOOL bAppwizMode = (argc > 1 && MatchCmdOption(argv[1], CMD_KEY_APPWIZ));
if (!bAppwizMode)
{
CUpdateDatabaseMutex lock;
if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch)
db.RemoveCached();
@ -350,7 +351,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow)
{
// Check whether the RAPPS MainWindow is already launched in another process
CStringW szWindowText(MAKEINTRESOURCEW(bAppwizMode ? IDS_APPWIZ_TITLE : IDS_APPTITLE));
LPCWSTR pszMutex = bAppwizMode ? L"RAPPWIZ" : szWindowClass;
LPCWSTR pszMutex = bAppwizMode ? L"RAPPWIZ" : MAINWINDOWMUTEX;
HANDLE hMutex = CreateMutexW(NULL, FALSE, pszMutex);
if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS))

2
base/applications/rapps/winmain.cpp
View file

@ -13,7 +13,7 @@
#include <gdiplus.h>
#include <conutils.h>
LPCWSTR szWindowClass = L"ROSAPPMGR2";
LPCWSTR szWindowClass = MAINWINDOWCLASSNAME;
LONG g_Busy = 0;
HWND hMainWnd;