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

[RAPPS] now /INSTALL option use PkgName instead of software name

Browse source 
currently, PkgName is the name of ini file in DB (without suffix)
This commit is contained in:
赫杨 2020-08-17 03:04:45 +08:00 • committed by Mark Jansen
parent da8810ab88
commit a4ac3c84b2
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,13 +22,12 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine)
return FALSE;
}
// TODO: use DB filenames as names because they're shorter
ATL::CSimpleArray<ATL::CStringW> arrNames;
ATL::CSimpleArray<ATL::CStringW> PkgNameList;
if (!StrCmpIW(argv[1], CMD_KEY_INSTALL))
{
for (INT i = 2; i < argc; ++i)
{
arrNames.Add(argv[i]);
PkgNameList.Add(argv[i]);
}
}
else
@ -43,12 +42,12 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine)
INFCONTEXT Context;
if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context))
{
WCHAR szName[MAX_PATH];
WCHAR szPkgName[MAX_PATH];
do
{
if (SetupGetStringFieldW(&Context, 1, szName, _countof(szName), NULL))
if (SetupGetStringFieldW(&Context, 1, szPkgName, _countof(szPkgName), NULL))
{
arrNames.Add(szName);
PkgNameList.Add(szPkgName);
}
} while (SetupFindNextLine(&Context, &Context));
}
@ -63,7 +62,7 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine)
apps.UpdateAppsDB();
apps.Enum(ENUM_ALL_AVAILABLE, NULL, NULL);
ATL::CSimpleArray<CAvailableApplicationInfo> arrAppInfo = apps.FindInfoList(arrNames);
ATL::CSimpleArray<CAvailableApplicationInfo> arrAppInfo = apps.FindAppsByPkgNameList(PkgNameList);
if (arrAppInfo.GetSize() > 0)
{
DownloadListOfApplications(arrAppInfo, TRUE);