This commit is contained in:
DavidXanatos 2022-01-16 21:28:59 +01:00
parent 52ceed857f
commit b8407d4ea1
6 changed files with 13 additions and 10 deletions

View File

@ -36,6 +36,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- fixed issues with the PortableRootDir setting [#1509](https://github.com/sandboxie-plus/Sandboxie/issues/1509)
- fixed issue with the settings window crashing when the driver was not connected
- fixed DPI issues with Finder Tool [#912](https://github.com/sandboxie-plus/Sandboxie/issues/912)
- fixed an other issue with reused pids [#1547](https://github.com/sandboxie-plus/Sandboxie/issues/1547)

View File

@ -229,8 +229,8 @@ SB_STATUS CSandBox::RenameBox(const QString& NewName)
SB_STATUS CSandBox::RemoveBox()
{
//if (!IsEmpty())
// return SB_ERR(SB_DelNotEmpty);
if (!IsEmpty())
return SB_ERR(SB_DelNotEmpty);
return RemoveSection();
}

View File

@ -1575,7 +1575,7 @@ SB_STATUS CSbieAPI::UpdateProcessInfo(const CBoxedProcessPtr& pProcess)
CSandBoxPtr CSbieAPI::GetBoxByProcessId(quint32 ProcessId) const
{
CBoxedProcessPtr pProcess = m_BoxedProxesses.value(ProcessId);
if (!pProcess)
if (!pProcess || pProcess->IsTerminated())
return CSandBoxPtr();
return GetBoxByName(pProcess->GetBoxName());
}

View File

@ -29,7 +29,7 @@ enum ESbieMsgCodes
SB_DeleteProtect,
SB_DeleteError,
//SB_RemNotEmpty,
//SB_DelNotEmpty,
SB_DelNotEmpty,
SB_FailedMoveDir,
SB_SnapMkDirFail,
SB_SnapCopyRegFail,

View File

@ -1844,7 +1844,7 @@ QString CSandMan::FormatError(const SB_STATUS& Error)
case SB_DeleteProtect: Message = tr("Delete protection is enabled for the sandbox"); break;
case SB_DeleteError: Message = tr("Error deleting sandbox folder: %1"); break;
//case SB_RemNotEmpty: Message = tr("A sandbox must be emptied before it can be renamed."); break;
//case SB_DelNotEmpty: Message = tr("A sandbox must be emptied before it can be deleted."); break;
case SB_DelNotEmpty: Message = tr("A sandbox must be emptied before it can be deleted."); break;
case SB_FailedMoveDir: Message = tr("Failed to move directory '%1' to '%2'"); break;
case SB_SnapIsRunning: Message = tr("This Snapshot operation can not be performed while processes are still running in the box."); break;
case SB_SnapMkDirFail: Message = tr("Failed to create directory for new snapshot"); break;
@ -2685,9 +2685,10 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
CreateWindow(L"Static", L"", WS_CHILD, DS(60), DS(100), DS(180), DS(50), hwnd, (HMENU)ID_FINDER_RESULT, NULL, NULL);
WndData.hFont = CreateFont(DS(13), 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, TEXT("Tahoma"));
SendMessage(GetDlgItem(hwnd, ID_FINDER_EXPLAIN), WM_SETFONT, (WPARAM)WndData.hFont, TRUE);
SendMessage(GetDlgItem(hwnd, ID_FINDER_RESULT), WM_SETFONT, (WPARAM)WndData.hFont, TRUE);
if (WndData.hFont) {
SendMessage(GetDlgItem(hwnd, ID_FINDER_EXPLAIN), WM_SETFONT, (WPARAM)WndData.hFont, TRUE);
SendMessage(GetDlgItem(hwnd, ID_FINDER_RESULT), WM_SETFONT, (WPARAM)WndData.hFont, TRUE);
}
MakeFinderTool(GetDlgItem(hwnd, ID_FINDER_TARGET), FindProc);
@ -2697,8 +2698,9 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE:
SFinderWndData &WndData = *(SFinderWndData*)GetWindowLongPtr(hwnd, 0);
if (WndData.hFont) DeleteObject(WndData.hFont);
//DestroyWindow(hwnd);
DeleteObject(WndData.hFont);
PostQuitMessage(0);
break;
}

View File

@ -940,7 +940,7 @@ void CSbieView::OnSandBoxAction(QAction* Action)
}
else if (Action == m_pMenuRemove)
{
if (QMessageBox("Sandboxie-Plus", tr("Do you really want to remove the selected sandbox(es)?"), QMessageBox::Warning, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape, QMessageBox::NoButton, this).exec() != QMessageBox::Yes)
if (QMessageBox("Sandboxie-Plus", tr("Do you really want to remove the selected sandbox(es)?<br /><br />Warning: The box content will also be deleted!"), QMessageBox::Warning, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default | QMessageBox::Escape, QMessageBox::NoButton, this).exec() != QMessageBox::Yes)
return;
foreach(const CSandBoxPtr & pBox, SandBoxes)