Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 11:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] CMainWindow: Move gui part of UninstallApplication in it

Browse source
This commit is contained in:
Giannis Adamopoulos 2019-04-28 16:47:23 +03:00 • committed by Mark Jansen
parent 85d6055201
commit 8a401eb299
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
3 changed files with 24 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -511,7 +511,6 @@ public:
PVOID GetLParam(INT Index)
{
INT ItemIndex;
LVITEMW Item;
if (Index == -1)
{
@ -524,14 +523,7 @@ public:
ItemIndex = Index;
}
ZeroMemory(&Item, sizeof(Item));
Item.mask = LVIF_PARAM;
Item.iItem = ItemIndex;
if (!GetItem(&Item))
return NULL;
return (PVOID) Item.lParam;
return (PVOID) GetItemData(ItemIndex);
}
BOOL AddColumn(INT Index, ATL::CStringW& Text, INT Width, INT Format)
@ -1134,6 +1126,23 @@ private:
}
}
BOOL UninstallSelectedApp(BOOL bModify)
{
WCHAR szAppName[MAX_STR_LEN];
if (!IsInstalledEnum(SelectedEnumType))
return FALSE;
INT ItemIndex = m_ListView->GetNextItem(-1, LVNI_FOCUSED);
if (ItemIndex == -1)
return FALSE;
m_ListView->GetItemText(ItemIndex, 0, szAppName, _countof(szAppName));
WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_REMOVE, szAppName);
PINSTALLED_INFO ItemInfo = (PINSTALLED_INFO)m_ListView->GetItemData(ItemIndex);
return UninstallApplication(ItemInfo, bModify);
}
BOOL ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId)
{
theResult = 0;
@ -1593,12 +1602,12 @@ private:
break;
case ID_UNINSTALL:
if (UninstallApplication(-1, FALSE))
if (UninstallSelectedApp(FALSE))
UpdateApplicationsList(-1);
break;
case ID_MODIFY:
if (UninstallApplication(-1, TRUE))
if (UninstallSelectedApp(TRUE))
UpdateApplicationsList(-1);
break;