Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-28 03:52:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] Add ExeInZip installer type to support running installers in zip files (#7866)

Browse source
This commit is contained in:
Whindmar Saksit 2025-04-29 15:39:22 +02:00 • committed by GitHub
parent eb91f91569
commit 37e2c59096
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 111 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
base/applications/rapps/loaddlg.cpp
View file

@ -1058,10 +1058,8 @@ run:
// run it
if (Info.DLType == DLTYPE_APPLICATION)
{
CStringW app, params;
SHELLEXECUTEINFOW shExInfo = {0};
shExInfo.cbSize = sizeof(shExInfo);
shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
CStringW app, params, tempdir;
SHELLEXECUTEINFOW shExInfo = { sizeof(shExInfo), SEE_MASK_NOCLOSEPROCESS, hDlg };
shExInfo.lpVerb = L"open";
shExInfo.lpFile = Path;
shExInfo.lpParameters = L"";
@ -1077,6 +1075,16 @@ run:
GetModuleFileNameW(NULL, const_cast<LPWSTR>(shExInfo.lpFile), MAX_PATH);
app.ReleaseBuffer();
}
else if (Info.IType == INSTALLER_EXEINZIP)
{
HRESULT hr = ExtractArchiveForExecution(Path, Info.szPackageName, tempdir, app);
if (FAILED(hr))
{
ShowLastError(hDlg, FALSE, hr);
goto end;
}
shExInfo.lpFile = app;
}
/* FIXME: Do we want to log installer status? */
WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, Info.szName);
@ -1102,6 +1110,11 @@ run:
{
ShowLastError(hMainWnd, FALSE, GetLastError());
}
if (!tempdir.IsEmpty())
{
DeleteDirectoryTree(tempdir, hDlg);
}
}
end:
@ -1117,8 +1130,8 @@ end:
if (bCancelled || (SettingsInfo.bDelInstaller && Info.DLType == DLTYPE_APPLICATION))
{
// Don't delete .zip/.cab files so the user can extract from them
if (bCancelled || Info.IType == INSTALLER_GENERATE || !OpensWithExplorer(Path) ||
HIBYTE(ClassifyFile(Path)) != PERCEIVED_TYPE_COMPRESSED)
if (bCancelled || Info.IType == INSTALLER_GENERATE || Info.IType == INSTALLER_EXEINZIP ||
!OpensWithExplorer(Path) || HIBYTE(ClassifyFile(Path)) != PERCEIVED_TYPE_COMPRESSED)
{
DeleteFileW(Path);
}