September 2020 - Ros-diffs

[reactos] 16/19: [RAPPS] Display package name in UI too

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=997650d42454ce48d376f… commit 997650d42454ce48d376f1a9dd390cf354e532f8 Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Wed Aug 19 21:44:50 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:17 2020 +0200 [RAPPS] Display package name in UI too --- base/applications/rapps/appview.cpp | 1 + base/applications/rapps/include/resource.h | 1 + base/applications/rapps/lang/bg-BG.rc | 1 + base/applications/rapps/lang/cs-CZ.rc | 1 + base/applications/rapps/lang/de-DE.rc | 1 + base/applications/rapps/lang/en-US.rc | 1 + base/applications/rapps/lang/es-ES.rc | 1 + base/applications/rapps/lang/et-EE.rc | 1 + base/applications/rapps/lang/fr-FR.rc | 1 + base/applications/rapps/lang/he-IL.rc | 1 + base/applications/rapps/lang/id-ID.rc | 1 + base/applications/rapps/lang/it-IT.rc | 1 + base/applications/rapps/lang/ja-JP.rc | 1 + base/applications/rapps/lang/no-NO.rc | 1 + base/applications/rapps/lang/pl-PL.rc | 1 + base/applications/rapps/lang/pt-BR.rc | 1 + base/applications/rapps/lang/pt-PT.rc | 1 + base/applications/rapps/lang/ro-RO.rc | 1 + base/applications/rapps/lang/ru-RU.rc | 1 + base/applications/rapps/lang/sk-SK.rc | 1 + base/applications/rapps/lang/sq-AL.rc | 1 + base/applications/rapps/lang/sv-SE.rc | 1 + base/applications/rapps/lang/tr-TR.rc | 1 + base/applications/rapps/lang/uk-UA.rc | 1 + base/applications/rapps/lang/zh-CN.rc | 1 + base/applications/rapps/lang/zh-TW.rc | 1 + 26 files changed, 26 insertions(+) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index dff7c0eca85..58584fa3b72 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -372,6 +372,7 @@ BOOL CAppRichEdit::ShowAvailableAppInfo(CAvailableApplicationInfo *Info) LoadAndInsertText(IDS_AINFO_URLSITE, Info->m_szUrlSite, CFE_BOLD, CFE_LINK); LoadAndInsertText(IDS_AINFO_DESCRIPTION, Info->m_szDesc, CFE_BOLD, 0); LoadAndInsertText(IDS_AINFO_URLDOWNLOAD, Info->m_szUrlDownload, CFE_BOLD, CFE_LINK); + LoadAndInsertText(IDS_AINFO_PACKAGE_NAME, Info->m_szPkgName, CFE_BOLD, 0); return TRUE; } diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 104d925c039..6ea0ca1a321 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -169,6 +169,7 @@ #define IDS_AINFO_KILOBYTE_EXT 358 #define IDS_AINFO_MEGABYTE_EXT 359 #define IDS_AINFO_GIGABYTE_EXT 360 +#define IDS_AINFO_PACKAGE_NAME 361 /* Names of categories */ diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 31f208d38e8..4ac81b14652 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -145,6 +145,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nНиз за премахване: " IDS_INFO_MODIFYPATH "\nПът за изменения: " IDS_INFO_INSTALLDATE "\nДата на слагане: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index ce0a04c31e0..965c5b31380 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -146,6 +146,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nOdinstalační řetězec: " IDS_INFO_MODIFYPATH "\nCesta úpravy: " IDS_INFO_INSTALLDATE "\nDatum instalace: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 66fe742cf72..8bd0a0bc36a 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nDeinstallationsstring: " IDS_INFO_MODIFYPATH "\nÄnderungspfad: " IDS_INFO_INSTALLDATE "\nInstallationsdatum: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 193d54b5177..869868fd255 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nUninstall String: " IDS_INFO_MODIFYPATH "\nModify Path: " IDS_INFO_INSTALLDATE "\nInstall Date: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index c8be3fe5433..c9f224c17c3 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -144,6 +144,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nComando de desinstalación: " IDS_INFO_MODIFYPATH "\nRuta de modificación: " IDS_INFO_INSTALLDATE "\nFecha de instalación: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 7149aa767ae..95f2f57a6f9 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -149,6 +149,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nDesinstalli string: " IDS_INFO_MODIFYPATH "\nMuutmise tee: " IDS_INFO_INSTALLDATE "\nInstalli kuupäev: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 97def999b65..22077326c2e 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nCommande de désinstallation : " IDS_INFO_MODIFYPATH "\nModifier le chemin d'accès : " IDS_INFO_INSTALLDATE "\nDate d'installation : " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 24eb6f51217..79a272acb1c 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -147,6 +147,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nמחרוזת הסרה: " IDS_INFO_MODIFYPATH "\nנתיב שינוי: " IDS_INFO_INSTALLDATE "\nתאריך התקנה: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index b7c47d1d123..0a65bcc1605 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nString Pembongkaran: " IDS_INFO_MODIFYPATH "\nJalur Pengubahan: " IDS_INFO_INSTALLDATE "\nTanggal Pemasangan: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 2a19053a8d1..6321268e6b1 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nStringa di disinstallazione: " IDS_INFO_MODIFYPATH "\nModifica percorso: " IDS_INFO_INSTALLDATE "\nData installazione: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index d47201d5967..384eec172de 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nアンインストールに使用する文字列: " IDS_INFO_MODIFYPATH "\n変更に使用するパス: " IDS_INFO_INSTALLDATE "\nインストールした日付: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index b217f736b7c..8ce8f1915b3 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nAvinstallering plassering: " IDS_INFO_MODIFYPATH "\nEndret mappe: " IDS_INFO_INSTALLDATE "\nInstallert dato: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index eebaeef6213..ca5b2615153 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -149,6 +149,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nKomenda deinstalacji: " IDS_INFO_MODIFYPATH "\nModyfikacja ścieżki instalacji: " IDS_INFO_INSTALLDATE "\nData instalacji: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index abbcbb037fc..f60e57c4557 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -143,6 +143,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nDesinstalar String: " IDS_INFO_MODIFYPATH "\nModificar Caminho: " IDS_INFO_INSTALLDATE "\nData de Instalação: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index d26f79dea27..31d968a260a 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -143,6 +143,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nDesinstalar String: " IDS_INFO_MODIFYPATH "\nModificar Caminho: " IDS_INFO_INSTALLDATE "\nData de Instalação: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 7b24c8a508b..7e28b9e41d1 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -150,6 +150,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nComanda pentru dezinstalare: " IDS_INFO_MODIFYPATH "\nComanda pentru modificare: " IDS_INFO_INSTALLDATE "\nData de instalare: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index bb524f5e54e..1ff0dd8651b 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -141,6 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nСтрока для удаления: " IDS_INFO_MODIFYPATH "\nСтрока для изменения: " IDS_INFO_INSTALLDATE "\nДата установки: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 935f2165af5..293028d37d6 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -146,6 +146,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nUninstall String: " IDS_INFO_MODIFYPATH "\nModify Path: " IDS_INFO_INSTALLDATE "\nDátum inštalácie: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index dafe2625a7c..51be3ed3eca 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -145,6 +145,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nUninstall String: " IDS_INFO_MODIFYPATH "\nModifiko Rrugen: " IDS_INFO_INSTALLDATE "\nData Instalimit: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index bdc851b0017..d4715ed0b35 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -148,6 +148,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nAvinstallationssträng: " IDS_INFO_MODIFYPATH "\nÄndra sökväg: " IDS_INFO_INSTALLDATE "\nInstallationsdatum: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 03da9216286..a612fc9b503 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -143,6 +143,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nKaldırma Sözcesi: " IDS_INFO_MODIFYPATH "\nDeğiştirme Yolu: " IDS_INFO_INSTALLDATE "\nKurulum Zamanı: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 9c2372b7892..29067f4871f 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -149,6 +149,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nВидалити рядок: " IDS_INFO_MODIFYPATH "\nЗмінити шлях: " IDS_INFO_INSTALLDATE "\nВстановити дату: " + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 308ac4cbda0..25a12c4fb1f 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -144,6 +144,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\n卸载字符串: " IDS_INFO_MODIFYPATH "\n修改路径: " IDS_INFO_INSTALLDATE "\n安装日期: " + IDS_AINFO_PACKAGE_NAME "\n包名称: " END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 8118d880df6..49f7dfb2c9f 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -143,6 +143,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\n解除安裝字元串:" IDS_INFO_MODIFYPATH "\n修改路徑:" IDS_INFO_INSTALLDATE "\n安裝日期:" + IDS_AINFO_PACKAGE_NAME "\nPackage Name: " END STRINGTABLE

4 years, 8 months

1
0
0 0

[reactos] 15/19: [RAPPS] now /INSTALL option use PkgName instead of software name

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4ac3c84b2141802d0428… commit a4ac3c84b2141802d0428daa7c90bb12ef3d90de Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Mon Aug 17 03:04:45 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:17 2020 +0200 [RAPPS] now /INSTALL option use PkgName instead of software name currently, PkgName is the name of ini file in DB (without suffix) --- base/applications/rapps/available.cpp | 10 +++++----- base/applications/rapps/include/available.h | 4 ++-- base/applications/rapps/unattended.cpp | 13 ++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 88a1bf9a8b9..897251321f6 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -530,7 +530,7 @@ int CAvailableApps::GetSelectedCount() return m_SelectedList.GetCount(); } -CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) const +CAvailableApplicationInfo* CAvailableApps::FindAppByPkgName(const ATL::CStringW& szPkgName) const { if (m_InfoList.IsEmpty()) { @@ -543,7 +543,7 @@ CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppNa while (CurrentListPosition != NULL) { info = m_InfoList.GetNext(CurrentListPosition); - if (info->m_szName.CompareNoCase(szAppName) == 0) + if (info->m_szPkgName.CompareNoCase(szPkgName) == 0) { return info; } @@ -551,12 +551,12 @@ CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppNa return NULL; } -ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const +ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindAppsByPkgNameList(const ATL::CSimpleArray<ATL::CStringW> &PkgNameList) const { ATL::CSimpleArray<CAvailableApplicationInfo> result; - for (INT i = 0; i < arrAppsNames.GetSize(); ++i) + for (INT i = 0; i < PkgNameList.GetSize(); ++i) { - CAvailableApplicationInfo* Info = FindInfo(arrAppsNames[i]); + CAvailableApplicationInfo* Info = FindAppByPkgName(PkgNameList[i]); if (Info) { result.Add(*Info); diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 8000c3b11fc..51e32c05230 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -125,8 +125,8 @@ public: VOID RemoveAllSelected(); int GetSelectedCount(); - CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; - ATL::CSimpleArray<CAvailableApplicationInfo> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; + CAvailableApplicationInfo* FindAppByPkgName(const ATL::CStringW& szPkgName) const; + ATL::CSimpleArray<CAvailableApplicationInfo> FindAppsByPkgNameList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; //ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; const ATL::CStringW& GetFolderPath() const; diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 540795be8d4..b37610c4149 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -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);

4 years, 8 months

1
0
0 0

[reactos] 14/19: [RAPPS] add m_szPkgName for AvailableApps

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da8810ab889727d7863c6… commit da8810ab889727d7863c60e9e0bb4d72e0ca58ef Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Mon Aug 17 02:46:37 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:17 2020 +0200 [RAPPS] add m_szPkgName for AvailableApps --- base/applications/rapps/available.cpp | 7 +++++++ base/applications/rapps/include/available.h | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 155840be11b..88a1bf9a8b9 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -38,6 +38,13 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString { m_Parser = new CConfigParser(m_sFileName); + // TODO: I temporarily use the file name (without suffix) as package name. + // It should be better to put this in a field of ini file. + // consider write a converter to do this and write a github action for rapps-db to ensure package_name is unique. + m_szPkgName = m_sFileName; + PathRemoveExtensionW(m_szPkgName.GetBuffer(MAX_PATH)); + m_szPkgName.ReleaseBuffer(); + m_Parser->GetInt(L"Category", m_Category); if (!GetString(L"Name", m_szName) diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 2ee8136cc91..8000c3b11fc 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -43,7 +43,7 @@ public: INT m_Category; //BOOL m_IsSelected; LicenseType m_LicenseType; - ATL::CStringW m_szName; + ATL::CStringW m_szName; // software's display name. ATL::CStringW m_szRegName; ATL::CStringW m_szVersion; ATL::CStringW m_szLicense; @@ -54,6 +54,7 @@ public: ATL::CSimpleArray<LCID> m_LanguageLCIDs; ATL::CSimpleArray<ATL::CStringW> m_szScrnshotLocation; ATL::CStringW m_szIconLocation; + ATL::CStringW m_szPkgName; // software's package name. ULONG m_SizeBytes;

4 years, 8 months

1
0
0 0

[reactos] 13/19: [RAPPS] reduce the chance assert failed

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5e111427c7945c9f687f… commit c5e111427c7945c9f687f32d975c1eb694777cc1 Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Sun Aug 16 03:38:28 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:16 2020 +0200 [RAPPS] reduce the chance assert failed --- base/applications/rapps/loaddlg.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index dce708347bf..505e48643d7 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -149,6 +149,7 @@ public: UINT uiPercentage = ((ULONGLONG) ulProgress * 100) / ulProgressMax; /* send the current progress to the progress bar */ + if (!IsWindow()) return; SendMessage(PBM_SETPOS, uiPercentage, 0); /* format total download size */ @@ -163,6 +164,7 @@ public: else { /* send the current progress to the progress bar */ + if (!IsWindow()) return; SendMessage(PBM_SETPOS, 0, 0); /* total size is not known, display only current size */ @@ -170,6 +172,7 @@ public: } /* and finally display it */ + if (!IsWindow()) return; SendMessage(WM_SETTEXT, 0, (LPARAM) ProgressText.GetString()); } @@ -492,8 +495,10 @@ VOID CDownloadManager::UpdateProgress( { HWND Item; + if (!IsWindow(hDlg)) return; ProgressBar.SetProgress(ulProgress, ulProgressMax); + if (!IsWindow(hDlg)) return; Item = GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS); if (Item && szStatusText && wcslen(szStatusText) > 0 && UrlHasBeenCopied == FALSE) { @@ -580,6 +585,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) for (iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId) { // Reset progress bar + if (!IsWindow(hDlg)) break; Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS); if (Item) { @@ -616,7 +622,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) break; } - + if (!IsWindow(hDlg)) goto end; SetWindowTextW(hDlg, szNewCaption.GetString()); // build the path for the download @@ -671,6 +677,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) } // Add the download URL + if (!IsWindow(hDlg)) goto end; SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, InfoArray[iAppId].szUrl.GetString()); DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_DOWNLOADING); @@ -832,6 +839,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) } dwCurrentBytesRead += dwBytesRead; + if (!IsWindow(hDlg)) goto end; UpdateProgress(hDlg, dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); } while (dwBytesRead && !bCancelled); @@ -850,6 +858,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) ProgressBar.SetMarquee(FALSE); dwContentLen = dwCurrentBytesRead; + if (!IsWindow(hDlg)) goto end; UpdateProgress(hDlg, dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString()); } @@ -866,6 +875,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) goto end; } + if (!IsWindow(hDlg)) goto end; SetWindowTextW(hDlg, szMsgText.GetString()); SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString()); @@ -878,6 +888,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) goto end; } + if (!IsWindow(hDlg)) goto end; MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); goto end; } @@ -902,6 +913,7 @@ run: //reflect installation progress in the titlebar //TODO: make a separate string with a placeholder to include app name? ATL::CStringW szMsgText = LoadStatusString(DLSTATUS_INSTALLING); + if (!IsWindow(hDlg)) goto end; SetWindowTextW(hDlg, szMsgText.GetString()); DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_INSTALLING); @@ -929,10 +941,12 @@ end: DeleteFileW(Path.GetString()); } + if (!IsWindow(hDlg)) return 0; DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_FINISHED); } delete static_cast<DownloadParam*>(param); + if (!IsWindow(hDlg)) return 0; SendMessageW(hDlg, WM_CLOSE, 0, 0); return 0; }

4 years, 8 months

1
0
0 0

[reactos] 12/19: [RAPPS] some renaming

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c524ee3d56d44177d3bf… commit 4c524ee3d56d44177d3bfe29c541d2c6a9435331 Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Wed Aug 5 17:22:07 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:16 2020 +0200 [RAPPS] some renaming --- base/applications/rapps/loaddlg.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 0d75c29c4cc..dce708347bf 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -357,7 +357,7 @@ inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID) // Download dialog (loaddlg.cpp) class CDownloadManager { - static ATL::CSimpleArray<DownloadInfo> AppsToInstallList; + static ATL::CSimpleArray<DownloadInfo> AppsDownloadList; static CDowloadingAppsListView DownloadsListView; static CDownloaderProgress ProgressBar; static BOOL bCancelled; @@ -373,7 +373,7 @@ public: // CDownloadManager -ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; +ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsDownloadList; CDowloadingAppsListView CDownloadManager::DownloadsListView; CDownloaderProgress CDownloadManager::ProgressBar; BOOL CDownloadManager::bCancelled = FALSE; @@ -381,13 +381,13 @@ BOOL CDownloadManager::bModal = FALSE; VOID CDownloadManager::Add(DownloadInfo info) { - AppsToInstallList.Add(info); + AppsDownloadList.Add(info); } VOID CDownloadManager::Download(const DownloadInfo &DLInfo, BOOL bIsModal) { - AppsToInstallList.RemoveAll(); - AppsToInstallList.Add(DLInfo); + AppsDownloadList.RemoveAll(); + AppsDownloadList.Add(DLInfo); LaunchDownloadDialog(bIsModal); } @@ -430,7 +430,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w { return FALSE; } - DownloadsListView.LoadList(AppsToInstallList); + DownloadsListView.LoadList(AppsDownloadList); // Get a dlg string for later use GetWindowTextW(Dlg, szCaption, _countof(szCaption)); @@ -443,7 +443,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w ShowWindow(Dlg, SW_SHOW); // Start download process - DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList, szCaption); + DownloadParam *param = new DownloadParam(Dlg, AppsDownloadList, szCaption); unsigned int ThreadId; HANDLE Thread = (HANDLE)_beginthreadex(NULL, 0, ThreadFunc, (void *) param, 0, &ThreadId); @@ -453,7 +453,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w } CloseHandle(Thread); - AppsToInstallList.RemoveAll(); + AppsDownloadList.RemoveAll(); return TRUE; }

4 years, 8 months

1
0
0 0

[reactos] 11/19: [RAPPS] fix the bug that Toolbar is not working

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d29fba7f7aca41091fb61… commit d29fba7f7aca41091fb61f21afbb529c8406bcbd Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Mon Aug 3 21:54:01 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:16 2020 +0200 [RAPPS] fix the bug that Toolbar is not working --- base/applications/rapps/appview.cpp | 64 +++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 77da1851a38..dff7c0eca85 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1784,6 +1784,7 @@ VOID CApplicationView::OnCommand(WPARAM wParam, LPARAM lParam) break; } + return; } else if ((HWND)lParam == m_ComboBox->GetWindow()) { @@ -1801,42 +1802,51 @@ VOID CApplicationView::OnCommand(WPARAM wParam, LPARAM lParam) } break; } + + return; + } + else if ((HWND)lParam == m_Toolbar->GetWindow()) + { + // the message is sent from Toolbar. fall down to continue process + } + else + { + return; } } - else - { - WORD wCommand = LOWORD(wParam); - switch (wCommand) - { - case ID_INSTALL: - m_MainWindow->InstallApplication((CAvailableApplicationInfo *)GetFocusedItemData()); - break; + // the LOWORD of wParam contains a Menu or Control ID + WORD wCommand = LOWORD(wParam); - case ID_TOOLBAR_INSTALL: - m_MainWindow->SendMessageW(WM_COMMAND, ID_INSTALL, 0); - break; + switch (wCommand) + { + case ID_INSTALL: + m_MainWindow->InstallApplication((CAvailableApplicationInfo *)GetFocusedItemData()); + break; - case ID_UNINSTALL: - m_MainWindow->SendMessageW(WM_COMMAND, ID_UNINSTALL, 0); - break; + case ID_TOOLBAR_INSTALL: + m_MainWindow->SendMessageW(WM_COMMAND, ID_INSTALL, 0); + break; - case ID_MODIFY: - m_MainWindow->SendMessageW(WM_COMMAND, ID_MODIFY, 0); - break; + case ID_UNINSTALL: + m_MainWindow->SendMessageW(WM_COMMAND, ID_UNINSTALL, 0); + break; - case ID_REGREMOVE: - m_MainWindow->SendMessageW(WM_COMMAND, ID_REGREMOVE, 0); - break; + case ID_MODIFY: + m_MainWindow->SendMessageW(WM_COMMAND, ID_MODIFY, 0); + break; - case ID_REFRESH: - m_MainWindow->SendMessageW(WM_COMMAND, ID_REFRESH, 0); - break; + case ID_REGREMOVE: + m_MainWindow->SendMessageW(WM_COMMAND, ID_REGREMOVE, 0); + break; - case ID_RESETDB: - m_MainWindow->SendMessageW(WM_COMMAND, ID_RESETDB, 0); - break; - } + case ID_REFRESH: + m_MainWindow->SendMessageW(WM_COMMAND, ID_REFRESH, 0); + break; + + case ID_RESETDB: + m_MainWindow->SendMessageW(WM_COMMAND, ID_RESETDB, 0); + break; } }

4 years, 8 months

1
0
0 0

[reactos] 10/19: [RAPPS] update some file-header

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36870a02f713e82eb21db… commit 36870a02f713e82eb21db7787bc9b98752eb8e15 Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Sat Aug 1 03:57:35 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:10:16 2020 +0200 [RAPPS] update some file-header update some header to newer format, update purpose and add my name to those file I've modified --- base/applications/rapps/available.cpp | 4 ++-- base/applications/rapps/cabinet.cpp | 11 +++++------ base/applications/rapps/gui.cpp | 4 ++-- base/applications/rapps/installed.cpp | 6 +++--- base/applications/rapps/integrity.cpp | 3 +-- base/applications/rapps/loaddlg.cpp | 3 +-- base/applications/rapps/misc.cpp | 3 +-- base/applications/rapps/settingsdlg.cpp | 3 +-- base/applications/rapps/unattended.cpp | 11 +++++------ base/applications/rapps/winmain.cpp | 3 +-- 10 files changed, 22 insertions(+), 29 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 62d4585d3a5..155840be11b 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -1,11 +1,11 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/available.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Classes for working with available applications * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2020 He Yang (1160386205(a)qq.com) */ #include "rapps.h" diff --git a/base/applications/rapps/cabinet.cpp b/base/applications/rapps/cabinet.cpp index 11b301ed9cc..e10d64f84c5 100644 --- a/base/applications/rapps/cabinet.cpp +++ b/base/applications/rapps/cabinet.cpp @@ -1,10 +1,9 @@ /* -* PROJECT: ReactOS Applications Manager -* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) -* FILE: base/applications/rapps/cabinet.cpp -* PURPOSE: Cabinet extraction using FDI API -* COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez(a)reactos.org) -*/ + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Cabinet extraction using FDI API + * COPYRIGHT: Copyright 2018 Alexander Shaposhnikov (sanchaez(a)reactos.org) + */ #include "rapps.h" #include <fdi.h> diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 9c47b8841eb..7732d18e501 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/gui.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: GUI classes for RAPPS * COPYRIGHT: Copyright 2015 David Quintana (gigaherz(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2020 He Yang (1160386205(a)qq.com) */ #include "rapps.h" diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 0cfb6bc9ddd..955ba012130 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/installed.cpp - * PURPOSE: Functions for working with installed applications + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Classes for working with installed applications * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2020 He Yang (1160386205(a)qq.com) */ #include "rapps.h" diff --git a/base/applications/rapps/integrity.cpp b/base/applications/rapps/integrity.cpp index 10e022c90d2..493a27d69c8 100644 --- a/base/applications/rapps/integrity.cpp +++ b/base/applications/rapps/integrity.cpp @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/integrity.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Various integrity check mechanisms * COPYRIGHT: Copyright Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright Mark Jansen diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 60f999967cb..0d75c29c4cc 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/loaddlg.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Displaying a download dialog * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers) * Copyright 2004 Mike McCormack (for CodeWeavers) diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index be6f68e156d..086adfcfb68 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/misc.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Misc functions * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index 744a07e7a4e..8943c1ac98e 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/settingsdlg.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Settings Dialog * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index d5428cae410..540795be8d4 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -1,10 +1,9 @@ /* -* PROJECT: ReactOS Applications Manager -* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) -* FILE: base/applications/rapps/unattended.cpp -* PURPOSE: Functions to parse command-line flags and process them -* COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) -*/ + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Functions to parse command-line flags and process them + * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + */ #include "rapps.h" #include "unattended.h" diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index ad14c9fd80b..2f462459113 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -1,7 +1,6 @@ /* * PROJECT: ReactOS Applications Manager - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/winmain.cpp + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Main program * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)

4 years, 8 months

1
0
0 0

[reactos] 07/19: [RAPPS] listview refactor (#2970)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10c0ff7416d6e8066c170… commit 10c0ff7416d6e8066c170bb3abdfb22303c472ed Author: He Yang <1160386205(a)qq.com> AuthorDate: Tue Jul 21 22:13:39 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:09:20 2020 +0200 [RAPPS] listview refactor (#2970) This makes it easier to maintain the listview, and better separates the application list and listview. * [RAPPS] fix memory leak when cleanup. some renaming are also done * [RAPPS] move the code adding apps info inside class CAppsListView * [RAPPS] add table view, create listview and AppInfoDisplay inside it * [RAPPS] rename INSTALLED_INFO as CInstalledApplicationInfo now it corresponds with CAvailableApplicationInfo * [RAPPS] add CInstalledApps * [RAPPS] optimize the speed when refreshing listview * [RAPPS] correctly handle Enum for InstalledApps * [RAPPS] make check all working properly (this also fixes some bugs) the old version has some bugs when check all items after switching tags in tree-view * [RAPPS] add handling for wow64 * [RAPPS] use an inline function to replace INSERT_TEXT macro * [RAPPS] fix the bug that StatusBar won't update when switching tags * [RAPPS] now TableView always reset bIsAscending in SetDisplayMode * [RAPPS] rename TableView to ApplicationView * [RAPPS] now bIsAscending would be reset when switching column in listview --- base/applications/rapps/available.cpp | 169 ++-- base/applications/rapps/gui.cpp | 1335 ++++++++++++++++----------- base/applications/rapps/include/available.h | 16 +- base/applications/rapps/include/installed.h | 46 +- base/applications/rapps/include/misc.h | 2 + base/applications/rapps/include/rosui.h | 5 +- base/applications/rapps/installed.cpp | 306 ++++-- base/applications/rapps/misc.cpp | 33 + 8 files changed, 1203 insertions(+), 709 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 8af6c78a8b9..62d4585d3a5 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -19,7 +19,7 @@ // CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam, AvailableStrings& AvlbStrings) - : m_IsSelected(FALSE), m_LicenseType(LICENSE_NONE), m_SizeBytes(0), m_sFileName(sFileNameParam), + : m_LicenseType(LICENSE_NONE), m_SizeBytes(0), m_sFileName(sFileNameParam), m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) { RetrieveGeneralInfo(AvlbStrings); @@ -400,71 +400,127 @@ BOOL CAvailableApps::ForceUpdateAppsDB() BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc, PVOID param) { + if (EnumType == ENUM_CAT_SELECTED) + { + CAvailableApplicationInfo *EnumAvlbInfo = NULL; - HANDLE hFind = INVALID_HANDLE_VALUE; - WIN32_FIND_DATAW FindFileData; - - hFind = FindFirstFileW(m_Strings.szSearchPath.GetString(), &FindFileData); + // enum all object in m_SelectedList and invoke callback + for(POSITION CurrentPosition = m_SelectedList.GetHeadPosition(); + CurrentPosition && (EnumAvlbInfo = m_SelectedList.GetAt(CurrentPosition)); + m_SelectedList.GetNext(CurrentPosition)) + { + EnumAvlbInfo->RefreshAppInfo(m_Strings); - if (hFind == INVALID_HANDLE_VALUE) - { - //no db yet - return FALSE; + if (lpEnumProc) + lpEnumProc(EnumAvlbInfo, TRUE, param); + } + return TRUE; } - - do + else { - // loop for all the cached entries - POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); - CAvailableApplicationInfo* Info = NULL; + HANDLE hFind = INVALID_HANDLE_VALUE; + WIN32_FIND_DATAW FindFileData; + + hFind = FindFirstFileW(m_Strings.szSearchPath.GetString(), &FindFileData); + + if (hFind == INVALID_HANDLE_VALUE) + { + //no db yet + return FALSE; + } - while (CurrentListPosition != NULL) + do { - POSITION LastListPosition = CurrentListPosition; - Info = m_InfoList.GetNext(CurrentListPosition); + // loop for all the cached entries + POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); + CAvailableApplicationInfo *Info = NULL; - // do we already have this entry in cache? - if (Info->m_sFileName == FindFileData.cFileName) + while (CurrentListPosition != NULL) { - // is it current enough, or the file has been modified since our last time here? - if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->m_ftCacheStamp) == 1) - { - // recreate our cache, this is the slow path - m_InfoList.RemoveAt(LastListPosition); + POSITION LastListPosition = CurrentListPosition; + Info = m_InfoList.GetNext(CurrentListPosition); - delete Info; - Info = NULL; - break; + // do we already have this entry in cache? + if (Info->m_sFileName == FindFileData.cFileName) + { + // is it current enough, or the file has been modified since our last time here? + if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->m_ftCacheStamp) == 1) + { + // recreate our cache, this is the slow path + m_InfoList.RemoveAt(LastListPosition); + + // also remove this in selected list (if exist) + RemoveSelected(Info); + + delete Info; + Info = NULL; + break; + } + else + { + // speedy path, compare directly, we already have the data + goto skip_if_cached; + } } - else + } + + // create a new entry + Info = new CAvailableApplicationInfo(FindFileData.cFileName, m_Strings); + + // set a timestamp for the next time + Info->SetLastWriteTime(&FindFileData.ftLastWriteTime); + m_InfoList.AddTail(Info); + + skip_if_cached: + if (EnumType == Info->m_Category + || EnumType == ENUM_ALL_AVAILABLE) + { + Info->RefreshAppInfo(m_Strings); + + if (lpEnumProc) { - // speedy path, compare directly, we already have the data - goto skip_if_cached; + if (m_SelectedList.Find(Info)) + { + lpEnumProc(Info, TRUE, param); + } + else + { + lpEnumProc(Info, FALSE, param); + } } } - } + } while (FindNextFileW(hFind, &FindFileData)); - // create a new entry - Info = new CAvailableApplicationInfo(FindFileData.cFileName, m_Strings); + FindClose(hFind); + return TRUE; + } +} - // set a timestamp for the next time - Info->SetLastWriteTime(&FindFileData.ftLastWriteTime); - m_InfoList.AddTail(Info); +BOOL CAvailableApps::AddSelected(CAvailableApplicationInfo *AvlbInfo) +{ + return m_SelectedList.AddTail(AvlbInfo) != 0; +} -skip_if_cached: - if (EnumType == Info->m_Category - || EnumType == ENUM_ALL_AVAILABLE - || (EnumType == ENUM_CAT_SELECTED && Info->m_IsSelected)) - { - Info->RefreshAppInfo(m_Strings); +BOOL CAvailableApps::RemoveSelected(CAvailableApplicationInfo *AvlbInfo) +{ + POSITION Position = m_SelectedList.Find(AvlbInfo); + if (Position) + { + m_SelectedList.RemoveAt(Position); + return TRUE; + } + return FALSE; +} - if (lpEnumProc) - lpEnumProc(Info, m_Strings.szAppsPath.GetString(), param); - } - } while (FindNextFileW(hFind, &FindFileData) != 0); +VOID CAvailableApps::RemoveAllSelected() +{ + m_SelectedList.RemoveAll(); + return; +} - FindClose(hFind); - return TRUE; +int CAvailableApps::GetSelectedCount() +{ + return m_SelectedList.GetCount(); } CAvailableApplicationInfo* CAvailableApps::FindInfo(const ATL::CStringW& szAppName) const @@ -502,23 +558,6 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindInfoList(const return result; } -ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::GetSelected() const -{ - ATL::CSimpleArray<CAvailableApplicationInfo> result; - POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); - CAvailableApplicationInfo* Info; - - while (CurrentListPosition != NULL) - { - Info = m_InfoList.GetNext(CurrentListPosition); - if (Info->m_IsSelected) - { - result.Add(*Info); - } - } - return result; -} - const ATL::CStringW& CAvailableApps::GetFolderPath() const { return m_Strings.szPath; diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index b0599074a47..e3aeccc579f 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -65,6 +65,21 @@ enum SCRNSHOT_STATUS #define PI 3.1415927 +// retrieve the value using a mask +#define STATEIMAGETOINDEX(x) (((x) & LVIS_STATEIMAGEMASK) >> 12) + +// for listview with extend style LVS_EX_CHECKBOXES, State image 1 is the unchecked box, and state image 2 is the checked box. +// see this: https://docs.microsoft.com/en-us/windows/win32/controls/extended-list-view-… +#define STATEIMAGE_UNCHECKED 1 +#define STATEIMAGE_CHECKED 2 + +enum APPLICATION_VIEW_MODE +{ + ApplicationViewEmpty, + ApplicationViewAvailableApps, + ApplicationViewInstalledApps +}; + typedef struct __ScrnshotDownloadParam { LONGLONG ID; @@ -73,6 +88,8 @@ typedef struct __ScrnshotDownloadParam ATL::CStringW DownloadFileName; } ScrnshotDownloadParam; +class CMainWindow; + INT GetSystemColorDepth() { DEVMODEW pDevMode; @@ -250,41 +267,37 @@ public: return TRUE; } - BOOL ShowInstalledAppInfo(PINSTALLED_INFO Info) + inline VOID InsertTextWithString(UINT StringID, DWORD StringFlags, const ATL::CStringW& Text, DWORD TextFlags) { - ATL::CStringW szText; - ATL::CStringW szInfo; + if (!Text.IsEmpty()) + { + LoadAndInsertText(StringID, Text, StringFlags, TextFlags); + } + } - if (!Info || !Info->hSubKey) - return FALSE; + BOOL ShowInstalledAppInfo(CInstalledApplicationInfo * Info) + { + if (!Info) return FALSE; - Info->GetApplicationString(L"DisplayName", szText); - SetText(szText, CFE_BOLD); + SetText(Info->szDisplayName, CFE_BOLD); InsertText(L"\n", 0); -#define GET_INFO(a, b, c, d) \ - if (Info->GetApplicationString(a, szInfo)) \ - { \ - LoadAndInsertText(b, szInfo, c, d); \ - } - - GET_INFO(L"DisplayVersion", IDS_INFO_VERSION, CFE_BOLD, 0); - GET_INFO(L"Publisher", IDS_INFO_PUBLISHER, CFE_BOLD, 0); - GET_INFO(L"RegOwner", IDS_INFO_REGOWNER, CFE_BOLD, 0); - GET_INFO(L"ProductID", IDS_INFO_PRODUCTID, CFE_BOLD, 0); - GET_INFO(L"HelpLink", IDS_INFO_HELPLINK, CFE_BOLD, CFM_LINK); - GET_INFO(L"HelpTelephone", IDS_INFO_HELPPHONE, CFE_BOLD, 0); - GET_INFO(L"Readme", IDS_INFO_README, CFE_BOLD, 0); - GET_INFO(L"Contact", IDS_INFO_CONTACT, CFE_BOLD, 0); - GET_INFO(L"URLUpdateInfo", IDS_INFO_UPDATEINFO, CFE_BOLD, CFM_LINK); - GET_INFO(L"URLInfoAbout", IDS_INFO_INFOABOUT, CFE_BOLD, CFM_LINK); - GET_INFO(L"Comments", IDS_INFO_COMMENTS, CFE_BOLD, 0); - GET_INFO(L"InstallDate", IDS_INFO_INSTALLDATE, CFE_BOLD, 0); - GET_INFO(L"InstallLocation", IDS_INFO_INSTLOCATION, CFE_BOLD, 0); - GET_INFO(L"InstallSource", IDS_INFO_INSTALLSRC, CFE_BOLD, 0); - GET_INFO(L"UninstallString", IDS_INFO_UNINSTALLSTR, CFE_BOLD, 0); - GET_INFO(L"InstallSource", IDS_INFO_INSTALLSRC, CFE_BOLD, 0); - GET_INFO(L"ModifyPath", IDS_INFO_MODIFYPATH, CFE_BOLD, 0); + InsertTextWithString(IDS_INFO_VERSION, CFE_BOLD, Info->szDisplayVersion, 0); + InsertTextWithString(IDS_INFO_PUBLISHER, CFE_BOLD, Info->szPublisher, 0); + InsertTextWithString(IDS_INFO_REGOWNER, CFE_BOLD, Info->szRegOwner, 0); + InsertTextWithString(IDS_INFO_PRODUCTID, CFE_BOLD, Info->szProductID, 0); + InsertTextWithString(IDS_INFO_HELPLINK, CFE_BOLD, Info->szHelpLink, CFM_LINK); + InsertTextWithString(IDS_INFO_HELPPHONE, CFE_BOLD, Info->szHelpTelephone, 0); + InsertTextWithString(IDS_INFO_README, CFE_BOLD, Info->szReadme, 0); + InsertTextWithString(IDS_INFO_CONTACT, CFE_BOLD, Info->szContact, 0); + InsertTextWithString(IDS_INFO_UPDATEINFO, CFE_BOLD, Info->szURLUpdateInfo, CFM_LINK); + InsertTextWithString(IDS_INFO_INFOABOUT, CFE_BOLD, Info->szURLInfoAbout, CFM_LINK); + InsertTextWithString(IDS_INFO_COMMENTS, CFE_BOLD, Info->szComments, 0); + InsertTextWithString(IDS_INFO_INSTALLDATE, CFE_BOLD, Info->szInstallDate, 0); + InsertTextWithString(IDS_INFO_INSTLOCATION, CFE_BOLD, Info->szInstallLocation, 0); + InsertTextWithString(IDS_INFO_INSTALLSRC, CFE_BOLD, Info->szInstallSource, 0); + InsertTextWithString(IDS_INFO_UNINSTALLSTR, CFE_BOLD, Info->szUninstallString, 0); + InsertTextWithString(IDS_INFO_MODIFYPATH, CFE_BOLD, Info->szModifyPath, 0); return TRUE; } @@ -908,8 +921,8 @@ private: public: - CAppRichEdit * RichEdit; - CAppScrnshotPreview * ScrnshotPrev; + CAppRichEdit * RichEdit = NULL; + CAppScrnshotPreview * ScrnshotPrev = NULL; static ATL::CWndClassInfo& GetWndClassInfo() { @@ -957,7 +970,7 @@ public: return RichEdit->ShowAvailableAppInfo(Info); } - BOOL ShowInstalledAppInfo(PINSTALLED_INFO Info) + BOOL ShowInstalledAppInfo(CInstalledApplicationInfo * Info) { ScrnshotPrev->DisplayEmpty(); ResizeChildren(); @@ -993,6 +1006,11 @@ public: } } + ~CAppInfoDisplay() + { + delete RichEdit; + delete ScrnshotPrev; + } }; class CMainToolbar : @@ -1177,16 +1195,19 @@ class CAppsListView : INT iSubItem; }; - BOOL bHasAllChecked; - BOOL bIsAscending; + BOOL bIsAscending = TRUE; BOOL bHasCheckboxes; + INT ItemCount = 0; + INT CheckedItemCount = 0; + INT ColumnCount = 0; + INT nLastHeaderID; + APPLICATION_VIEW_MODE ApplicationViewMode = ApplicationViewEmpty; + public: CAppsListView() : - bHasAllChecked(FALSE), - bIsAscending(TRUE), bHasCheckboxes(FALSE), nLastHeaderID(-1) { @@ -1221,6 +1242,7 @@ public: /* If the sorting column changed, remove the sorting style from the old column */ if ((nLastHeaderID != -1) && (nLastHeaderID != nHeaderID)) { + bIsAscending = TRUE; // also reset sorting method to ascending hColumn.mask = HDI_FORMAT; Header_GetItem(hHeader, nLastHeaderID, &hColumn); hColumn.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN); @@ -1249,7 +1271,7 @@ public: return AddColumn(Index, const_cast<LPWSTR>(Text.GetString()), Width, Format); } - BOOL AddColumn(INT Index, LPWSTR lpText, INT Width, INT Format) + int AddColumn(INT Index, LPWSTR lpText, INT Width, INT Format) { LVCOLUMNW Column; @@ -1261,7 +1283,13 @@ public: Column.cx = Width; Column.fmt = Format; - return (InsertColumn(Index, &Column) == -1) ? FALSE : TRUE; + return SendMessage(LVM_INSERTCOLUMN, Index, (LPARAM)(&Column)); + } + + void DeleteColumn(INT Index) + { + SendMessage(LVM_DELETECOLUMN, Index, 0); + return; } INT AddItem(INT ItemIndex, INT IconIndex, LPCWSTR lpText, LPARAM lParam) @@ -1270,15 +1298,25 @@ public: ZeroMemory(&Item, sizeof(Item)); - Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + Item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; Item.pszText = const_cast<LPWSTR>(lpText); Item.lParam = lParam; Item.iItem = ItemIndex; Item.iImage = IconIndex; + if (IconIndex >= 0) + { + Item.iImage = IconIndex; + Item.mask |= LVIF_IMAGE; + } return InsertItem(&Item); } + HIMAGELIST GetImageList(int iImageList) + { + return (HIMAGELIST)SendMessage(LVM_GETIMAGELIST, iImageList, 0); + } + static INT CALLBACK s_CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { SortContext * ctx = ((SortContext*) lParamSort); @@ -1319,6 +1357,12 @@ public: SetCheckboxesVisible(FALSE); } + HIMAGELIST hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + GetSystemColorDepth() | ILC_MASK, + 0, 1); + SetImageList(hImageListView, LVSIL_SMALL); + return hwnd; } @@ -1332,219 +1376,656 @@ public: if (bHasCheckboxes) { SetItemState(item, INDEXTOSTATEIMAGEMASK((fCheck) ? 2 : 1), LVIS_STATEIMAGEMASK); - SetSelected(item, fCheck); } } - VOID SetSelected(INT item, BOOL value) + VOID CheckAll() { - if (item < 0) + if (bHasCheckboxes) { - for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) + if (CheckedItemCount == ItemCount) { - CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i); - if (pAppInfo) - { - pAppInfo->m_IsSelected = value; - } + // clear all + SetCheckState(-1, FALSE); } - } - else - { - CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(item); - if (pAppInfo) + else { - pAppInfo->m_IsSelected = value; + // check all + SetCheckState(-1, TRUE); } } } - - VOID CheckAll() + + PVOID GetFocusedItemData() { - if (bHasCheckboxes) + INT item = GetSelectionMark(); + if (item == -1) { - bHasAllChecked = !bHasAllChecked; - SetCheckState(-1, bHasAllChecked); + return (PVOID)0; } + return (PVOID)GetItemData(item); } - ATL::CSimpleArray<CAvailableApplicationInfo> GetCheckedItems() + BOOL SetDisplayMode(APPLICATION_VIEW_MODE Mode) { - if (!bHasCheckboxes) + if (!DeleteAllItems()) return FALSE; + ApplicationViewMode = Mode; + + bIsAscending = TRUE; + + ItemCount = 0; + CheckedItemCount = 0; + + // delete old columns + while (ColumnCount) { - return ATL::CSimpleArray<CAvailableApplicationInfo>(); + DeleteColumn(--ColumnCount); } - ATL::CSimpleArray<CAvailableApplicationInfo> list; - for (INT i = 0; i >= 0; i = GetNextItem(i, LVNI_ALL)) + ImageList_RemoveAll(GetImageList(LVSIL_SMALL)); + + // add new columns + ATL::CStringW szText; + switch (Mode) { - if (GetCheckState(i) != FALSE) - { - CAvailableApplicationInfo* pAppInfo = (CAvailableApplicationInfo*) GetItemData(i); - list.Add(*pAppInfo); - } + case ApplicationViewInstalledApps: + + /* Add columns to ListView */ + szText.LoadStringW(IDS_APP_NAME); + AddColumn(ColumnCount++, szText, 250, LVCFMT_LEFT); + + szText.LoadStringW(IDS_APP_INST_VERSION); + AddColumn(ColumnCount++, szText, 90, LVCFMT_RIGHT); + + szText.LoadStringW(IDS_APP_DESCRIPTION); + AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT); + + // disable checkboxes + SetCheckboxesVisible(FALSE); + break; + + case ApplicationViewAvailableApps: + + /* Add columns to ListView */ + szText.LoadStringW(IDS_APP_NAME); + AddColumn(ColumnCount++, szText, 250, LVCFMT_LEFT); + + szText.LoadStringW(IDS_APP_INST_VERSION); + AddColumn(ColumnCount++, szText, 90, LVCFMT_RIGHT); + + szText.LoadStringW(IDS_APP_DESCRIPTION); + AddColumn(ColumnCount++, szText, 300, LVCFMT_LEFT); + + // enable checkboxes + SetCheckboxesVisible(TRUE); + break; + + case ApplicationViewEmpty: + default: + break; } - return list; + + + return TRUE; } - CAvailableApplicationInfo* GetSelectedData() + BOOL AddInstalledApplication(CInstalledApplicationInfo *InstAppInfo, LPVOID CallbackParam) { - INT item = GetSelectionMark(); - return (CAvailableApplicationInfo*) GetItemData(item); - } -}; + if (ApplicationViewMode != ApplicationViewInstalledApps) + { + return FALSE; + } -class CSideTreeView : - public CUiWindow<CTreeView> -{ - HIMAGELIST hImageTreeView; + HICON hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + HIMAGELIST hImageList = GetImageList(LVSIL_SMALL); + int IconIndex = ImageList_AddIcon(hImageList, hIcon); + DestroyIcon(hIcon); -public: - CSideTreeView() : - CUiWindow(), - hImageTreeView(ImageList_Create(TREEVIEW_ICON_SIZE, TREEVIEW_ICON_SIZE, - GetSystemColorDepth() | ILC_MASK, - 0, 1)) - { - } + int Index = AddItem(ItemCount, IconIndex, InstAppInfo->szDisplayName, (LPARAM)CallbackParam); + SetItemText(Index, 1, InstAppInfo->szDisplayVersion.IsEmpty() ? L"---" : InstAppInfo->szDisplayVersion); + SetItemText(Index, 2, InstAppInfo->szComments.IsEmpty() ? L"---" : InstAppInfo->szComments); - HTREEITEM AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Image, INT SelectedImage, LPARAM lParam) - { - return CUiWindow<CTreeView>::AddItem(hParent, const_cast<LPWSTR>(Text.GetString()), Image, SelectedImage, lParam); + ItemCount++; + return TRUE; } - HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) + BOOL AddAvailableApplication(CAvailableApplicationInfo *AvlbAppInfo, BOOL InitCheckState, LPVOID CallbackParam) { - ATL::CStringW szText; - INT Index; - HICON hIcon; + if (ApplicationViewMode != ApplicationViewAvailableApps) + { + return FALSE; + } - hIcon = (HICON) LoadImageW(hInst, - MAKEINTRESOURCE(IconIndex), - IMAGE_ICON, - TREEVIEW_ICON_SIZE, - TREEVIEW_ICON_SIZE, - LR_CREATEDIBSECTION); - if (hIcon) + /* Load icon from file */ + HICON hIcon = NULL; + ATL::CStringW szIconPath; + if (AvlbAppInfo->RetrieveIcon(szIconPath)) { - Index = ImageList_AddIcon(hImageTreeView, hIcon); - DestroyIcon(hIcon); + hIcon = (HICON)LoadImageW(NULL, + szIconPath.GetString(), + IMAGE_ICON, + LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + LR_LOADFROMFILE); } - szText.LoadStringW(TextIndex); - return AddItem(hRootItem, szText, Index, Index, TextIndex); - } + if (!hIcon || GetLastError() != ERROR_SUCCESS) + { + /* Load default icon */ + hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + } - HIMAGELIST SetImageList() - { - return CUiWindow<CTreeView>::SetImageList(hImageTreeView, TVSIL_NORMAL); - } + HIMAGELIST hImageList = GetImageList(LVSIL_SMALL); - VOID DestroyImageList() - { - if (hImageTreeView) - ImageList_Destroy(hImageTreeView); - } + int IconIndex = ImageList_AddIcon(hImageList, hIcon); + DestroyIcon(hIcon); - ~CSideTreeView() - { - DestroyImageList(); - } -}; + int Index = AddItem(ItemCount, IconIndex, AvlbAppInfo->m_szName, (LPARAM)CallbackParam); -class CSearchBar : - public CWindow -{ -public: - const INT m_Width; - const INT m_Height; + if (InitCheckState) + { + SetCheckState(Index, TRUE); + } - CSearchBar() : m_Width(200), m_Height(22) - { - } + SetItemText(Index, 1, AvlbAppInfo->m_szVersion); + SetItemText(Index, 2, AvlbAppInfo->m_szDesc); - VOID SetText(LPCWSTR lpszText) - { - SendMessageW(SB_SETTEXT, SBT_NOBORDERS, (LPARAM) lpszText); + ItemCount++; + return TRUE; } - HWND Create(HWND hwndParent) + // this function is called when parent window receiving an notification about checkstate changing + VOID ItemCheckStateNotify(int iItem, BOOL bCheck) { - ATL::CStringW szBuf; - m_hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, - WS_CHILD | WS_VISIBLE | ES_LEFT | ES_AUTOHSCROLL, - 0, 0, m_Width, m_Height, - hwndParent, (HMENU) NULL, - hInst, 0); - - SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - szBuf.LoadStringW(IDS_SEARCH_TEXT); - SetWindowTextW(szBuf); - return m_hWnd; + if (bCheck) + { + CheckedItemCount++; + } + else + { + CheckedItemCount--; + } } - }; -class CMainWindow : - public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> +class CApplicationView : + public CUiWindow<CWindowImpl<CApplicationView>> { - CUiPanel* m_ClientPanel; - CUiSplitPanel* m_VSplitter; - CUiSplitPanel* m_HSplitter; +private: + CUiPanel *m_Panel = NULL; - CMainToolbar* m_Toolbar; - CAppsListView* m_ListView; + CAppsListView *m_ListView = NULL; + CAppInfoDisplay *m_AppsInfo = NULL; + CUiSplitPanel *m_HSplitter = NULL; + CMainWindow *m_MainWindow = NULL; + APPLICATION_VIEW_MODE ApplicationViewMode = ApplicationViewEmpty; - CSideTreeView* m_TreeView; - CUiWindow<CStatusBar>* m_StatusBar; - CAppInfoDisplay* m_AppInfo; + BOOL ProcessWindowMessage(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) + { + theResult = 0; + switch (message) + { + case WM_CREATE: + { + BOOL bSuccess = TRUE; + m_Panel = new CUiPanel(); + m_Panel->m_VerticalAlignment = UiAlign_Stretch; + m_Panel->m_HorizontalAlignment = UiAlign_Stretch; - CUiWindow<CSearchBar>* m_SearchBar; - CAvailableApps m_AvailableApps; + bSuccess &= CreateHSplitter(); + bSuccess &= CreateListView(); + bSuccess &= CreateAppInfoDisplay(); - INT nSelectedApps; + if (!bSuccess) + { + return -1; // creation failure + } + } + break; + case WM_NOTIFY: + { + LPNMHDR pNotifyHeader = (LPNMHDR)lParam; + if (pNotifyHeader->hwndFrom == m_ListView->GetWindow()) + { + switch (pNotifyHeader->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnic = (LPNMLISTVIEW)lParam; - BOOL bSearchEnabled; - BOOL bUpdating; + /* Check if this is a valid item + * (technically, it can be also an unselect) */ + INT ItemIndex = pnic->iItem; + if (ItemIndex == -1 || + ItemIndex >= ListView_GetItemCount(pnic->hdr.hwndFrom)) + { + break; + } - ATL::CStringW szSearchPattern; - INT SelectedEnumType; + /* Check if the focus has been moved to another item */ + if ((pnic->uChanged & LVIF_STATE) && + (pnic->uNewState & LVIS_FOCUSED) && + !(pnic->uOldState & LVIS_FOCUSED)) + { + ItemGetFocus((LPVOID)pnic->lParam); + } -public: - CMainWindow() : - m_ClientPanel(NULL), - bSearchEnabled(FALSE), - SelectedEnumType(ENUM_ALL_INSTALLED) - { - } + /* Check if the item is checked/unchecked */ + if (pnic->uChanged & LVIF_STATE) + { + int iOldState = STATEIMAGETOINDEX(pnic->uOldState); + int iNewState = STATEIMAGETOINDEX(pnic->uNewState); + + if (iOldState == STATEIMAGE_UNCHECKED && iNewState == STATEIMAGE_CHECKED) + { + // this item is just checked + m_ListView->ItemCheckStateNotify(pnic->iItem, TRUE); + ItemCheckStateChanged(TRUE, (LPVOID)pnic->lParam); + } + else if (iOldState == STATEIMAGE_CHECKED && iNewState == STATEIMAGE_UNCHECKED) + { + // this item is just unchecked + m_ListView->ItemCheckStateNotify(pnic->iItem, FALSE); + ItemCheckStateChanged(FALSE, (LPVOID)pnic->lParam); + } + } + } + break; -private: - VOID InitApplicationsList() - { - ATL::CStringW szText; + case LVN_COLUMNCLICK: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW)lParam; + + m_ListView->ColumnClick(pnmv); + } + break; - /* Add columns to ListView */ - szText.LoadStringW(IDS_APP_NAME); - m_ListView->AddColumn(0, szText, 250, LVCFMT_LEFT); + case NM_DBLCLK: + { + if (((LPNMLISTVIEW)lParam)->iItem != -1) + { + /* this won't do anything if the program is already installed */ + + // TODO: the same problem I've mentioned in NM_RCLICK + // I think if user double-click this app, then this app should be installed, not those checked apps. + if (ApplicationViewMode == ApplicationViewAvailableApps) + { + SendMessageW(GetParent(), WM_COMMAND, ID_INSTALL, 0); + } + } + } + break; - szText.LoadStringW(IDS_APP_INST_VERSION); - m_ListView->AddColumn(1, szText, 90, LVCFMT_RIGHT); + case NM_RCLICK: + { + if (((LPNMLISTVIEW)lParam)->iItem != -1) + { + // TODO: currently the menu will send WM_COMMAND directly to MainWindow. + // possibly it should be handled by this application-view first + // and then forward to mainwindow. + + // TODO: I think if user right-click on one item, and select "Install" + // that means the user want install "this" application + // but if some apps are checked, this will lead to those checked apps to be installed. + // this should be improved. + ShowPopupMenu(m_ListView->m_hWnd, 0, ID_INSTALL); + } + } + break; + } + } + } + break; - szText.LoadStringW(IDS_APP_DESCRIPTION); - m_ListView->AddColumn(3, szText, 300, LVCFMT_LEFT); + case WM_SYSCOLORCHANGE: + { + /* Forward WM_SYSCOLORCHANGE to common controls */ + m_ListView->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); + m_ListView->SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); + } + break; - // Unnesesary since the list updates on every TreeView selection - // UpdateApplicationsList(ENUM_ALL_COMPONENTS); + case WM_SIZE: + { + OnSize(hwnd, wParam, lParam); + break; + } + } + return FALSE; } - VOID InitCategoriesList() + BOOL CreateHSplitter() { - HTREEITEM hRootItemInstalled, hRootItemAvailable; - - hRootItemInstalled = m_TreeView->AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); - m_TreeView->AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); - m_TreeView->AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); - + m_HSplitter = new CUiSplitPanel(); + m_HSplitter->m_VerticalAlignment = UiAlign_Stretch; + m_HSplitter->m_HorizontalAlignment = UiAlign_Stretch; + m_HSplitter->m_DynamicFirst = TRUE; + m_HSplitter->m_Horizontal = TRUE; + m_HSplitter->m_Pos = INT_MAX; //set INT_MAX to use lowest possible position (m_MinSecond) + m_HSplitter->m_MinFirst = 10; + m_HSplitter->m_MinSecond = 140; + m_Panel->Children().Append(m_HSplitter); + + return m_HSplitter->Create(m_hWnd) != NULL; + } + + BOOL CreateListView() + { + m_ListView = new CAppsListView(); + m_ListView->m_VerticalAlignment = UiAlign_Stretch; + m_ListView->m_HorizontalAlignment = UiAlign_Stretch; + m_HSplitter->First().Append(m_ListView); + + return m_ListView->Create(m_hWnd) != NULL; + } + + BOOL CreateAppInfoDisplay() + { + m_AppsInfo = new CAppInfoDisplay(); + m_AppsInfo->m_VerticalAlignment = UiAlign_Stretch; + m_AppsInfo->m_HorizontalAlignment = UiAlign_Stretch; + m_HSplitter->Second().Append(m_AppsInfo); + + return m_AppsInfo->Create(m_hWnd) != NULL; + } + + VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) + { + if (wParam == SIZE_MINIMIZED) + return; + + RECT r = { 0, 0, LOWORD(lParam), HIWORD(lParam) }; + HDWP hdwp = NULL; + INT count = m_Panel->CountSizableChildren(); + + hdwp = BeginDeferWindowPos(count); + if (hdwp) + { + hdwp = m_Panel->OnParentSize(r, hdwp); + if (hdwp) + { + EndDeferWindowPos(hdwp); + } + } + } + +public: + + CApplicationView(CMainWindow *MainWindow) + : m_MainWindow(MainWindow) + { + } + + ~CApplicationView() + { + delete m_ListView; + delete m_AppsInfo; + delete m_HSplitter; + } + + static ATL::CWndClassInfo& GetWndClassInfo() + { + DWORD csStyle = CS_VREDRAW | CS_HREDRAW; + static ATL::CWndClassInfo wc = + { + { + sizeof(WNDCLASSEX), + csStyle, + StartWindowProc, + 0, + 0, + NULL, + NULL, + NULL, + (HBRUSH)(COLOR_BTNFACE + 1), + NULL, + L"RAppsApplicationView", + NULL + }, + NULL, NULL, IDC_ARROW, TRUE, 0, _T("") + }; + return wc; + } + + HWND Create(HWND hwndParent) + { + RECT r = { 0,0,0,0 }; + + return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); + } + + BOOL SetDisplayMode(APPLICATION_VIEW_MODE Mode) + { + if (!m_ListView->SetDisplayMode(Mode)) + { + return FALSE; + } + ApplicationViewMode = Mode; + m_AppsInfo->SetWelcomeText(); + + HMENU lvwMenu = ::GetMenu(m_ListView->m_hWnd); + switch (Mode) + { + case ApplicationViewEmpty: + default: + EnableMenuItem(lvwMenu, ID_REGREMOVE, MF_GRAYED); + EnableMenuItem(lvwMenu, ID_INSTALL, MF_GRAYED); + EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_GRAYED); + EnableMenuItem(lvwMenu, ID_MODIFY, MF_GRAYED); + break; + + case ApplicationViewInstalledApps: + EnableMenuItem(lvwMenu, ID_REGREMOVE, MF_ENABLED); + EnableMenuItem(lvwMenu, ID_INSTALL, MF_GRAYED); + EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_ENABLED); + EnableMenuItem(lvwMenu, ID_MODIFY, MF_ENABLED); + break; + + case ApplicationViewAvailableApps: + EnableMenuItem(lvwMenu, ID_REGREMOVE, MF_GRAYED); + EnableMenuItem(lvwMenu, ID_INSTALL, MF_ENABLED); + EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_GRAYED); + EnableMenuItem(lvwMenu, ID_MODIFY, MF_GRAYED); + break; + } + return TRUE; + } + + BOOL AddInstalledApplication(CInstalledApplicationInfo * InstAppInfo, LPVOID param) + { + if (ApplicationViewMode != ApplicationViewInstalledApps) + { + return FALSE; + } + return m_ListView->AddInstalledApplication(InstAppInfo, param); + } + + BOOL AddAvailableApplication(CAvailableApplicationInfo * AvlbAppInfo, BOOL InitCheckState, LPVOID param) + { + if (ApplicationViewMode != ApplicationViewAvailableApps) + { + return FALSE; + } + return m_ListView->AddAvailableApplication(AvlbAppInfo, InitCheckState, param); + } + + void CheckAll() + { + m_ListView->CheckAll(); + return; + } + + PVOID GetFocusedItemData() + { + return m_ListView->GetFocusedItemData(); + } + + int GetItemCount() + { + return m_ListView->GetItemCount(); + } + + // this function is called when a item of listview get focus. + // CallbackParam is the param passed to listview when adding the item (the one getting focus now). + BOOL ItemGetFocus(LPVOID CallbackParam) + { + switch (ApplicationViewMode) + { + case ApplicationViewInstalledApps: + return m_AppsInfo->ShowInstalledAppInfo((CInstalledApplicationInfo *)CallbackParam); + + case ApplicationViewAvailableApps: + return m_AppsInfo->ShowAvailableAppInfo((CAvailableApplicationInfo *)CallbackParam); + + case ApplicationViewEmpty: + default: + m_AppsInfo->SetWelcomeText(); + return FALSE; + } + } + + // this function is called when a item of listview is checked/unchecked + // CallbackParam is the param passed to listview when adding the item (the one getting focus now). + BOOL ItemCheckStateChanged(BOOL bChecked, LPVOID CallbackParam); + +}; + +class CSideTreeView : + public CUiWindow<CTreeView> +{ + HIMAGELIST hImageTreeView; + +public: + CSideTreeView() : + CUiWindow(), + hImageTreeView(ImageList_Create(TREEVIEW_ICON_SIZE, TREEVIEW_ICON_SIZE, + GetSystemColorDepth() | ILC_MASK, + 0, 1)) + { + } + + HTREEITEM AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Image, INT SelectedImage, LPARAM lParam) + { + return CUiWindow<CTreeView>::AddItem(hParent, const_cast<LPWSTR>(Text.GetString()), Image, SelectedImage, lParam); + } + + HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) + { + ATL::CStringW szText; + INT Index; + HICON hIcon; + + hIcon = (HICON) LoadImageW(hInst, + MAKEINTRESOURCE(IconIndex), + IMAGE_ICON, + TREEVIEW_ICON_SIZE, + TREEVIEW_ICON_SIZE, + LR_CREATEDIBSECTION); + if (hIcon) + { + Index = ImageList_AddIcon(hImageTreeView, hIcon); + DestroyIcon(hIcon); + } + + szText.LoadStringW(TextIndex); + return AddItem(hRootItem, szText, Index, Index, TextIndex); + } + + HIMAGELIST SetImageList() + { + return CUiWindow<CTreeView>::SetImageList(hImageTreeView, TVSIL_NORMAL); + } + + VOID DestroyImageList() + { + if (hImageTreeView) + ImageList_Destroy(hImageTreeView); + } + + ~CSideTreeView() + { + DestroyImageList(); + } +}; + +class CSearchBar : + public CWindow +{ +public: + const INT m_Width; + const INT m_Height; + + CSearchBar() : m_Width(200), m_Height(22) + { + } + + VOID SetText(LPCWSTR lpszText) + { + SendMessageW(SB_SETTEXT, SBT_NOBORDERS, (LPARAM) lpszText); + } + + HWND Create(HWND hwndParent) + { + ATL::CStringW szBuf; + m_hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", NULL, + WS_CHILD | WS_VISIBLE | ES_LEFT | ES_AUTOHSCROLL, + 0, 0, m_Width, m_Height, + hwndParent, (HMENU) NULL, + hInst, 0); + + SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); + szBuf.LoadStringW(IDS_SEARCH_TEXT); + SetWindowTextW(szBuf); + return m_hWnd; + } + +}; + +class CMainWindow : + public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> +{ + CUiPanel* m_ClientPanel = NULL; + CUiSplitPanel* m_VSplitter = NULL; + + CMainToolbar* m_Toolbar = NULL; + + CSideTreeView* m_TreeView = NULL; + CUiWindow<CStatusBar>* m_StatusBar = NULL; + + CApplicationView* m_ApplicationView = NULL; + + CUiWindow<CSearchBar>* m_SearchBar = NULL; + CAvailableApps m_AvailableApps; + CInstalledApps m_InstalledApps; + + BOOL bSearchEnabled; + BOOL bUpdating = FALSE; + + ATL::CStringW szSearchPattern; + INT SelectedEnumType; + +public: + CMainWindow() : + m_ClientPanel(NULL), + bSearchEnabled(FALSE), + SelectedEnumType(ENUM_ALL_INSTALLED) + { + } + + ~CMainWindow() + { + LayoutCleanup(); + } +private: + + VOID InitCategoriesList() + { + HTREEITEM hRootItemInstalled, hRootItemAvailable; + + hRootItemInstalled = m_TreeView->AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); + m_TreeView->AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); + m_TreeView->AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); + m_TreeView->AddCategory(TVI_ROOT, IDS_SELECTEDFORINST, IDI_SELECTEDFORINST); hRootItemAvailable = m_TreeView->AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); @@ -1601,24 +2082,14 @@ private: return m_TreeView->Create(m_hWnd) != NULL; } - BOOL CreateListView() + BOOL CreateApplicationView() { - m_ListView = new CAppsListView(); - m_ListView->m_VerticalAlignment = UiAlign_Stretch; - m_ListView->m_HorizontalAlignment = UiAlign_Stretch; - m_HSplitter->First().Append(m_ListView); + m_ApplicationView = new CApplicationView(this); // pass this to ApplicationView for callback purpose + m_ApplicationView->m_VerticalAlignment = UiAlign_Stretch; + m_ApplicationView->m_HorizontalAlignment = UiAlign_Stretch; + m_VSplitter->Second().Append(m_ApplicationView); - return m_ListView->Create(m_hWnd) != NULL; - } - - BOOL CreateRichEdit() - { - m_AppInfo = new CAppInfoDisplay(); - m_AppInfo->m_VerticalAlignment = UiAlign_Stretch; - m_AppInfo->m_HorizontalAlignment = UiAlign_Stretch; - m_HSplitter->Second().Append(m_AppInfo); - - return m_AppInfo->Create(m_hWnd) != NULL; + return m_ApplicationView->Create(m_hWnd) != NULL; } BOOL CreateVSplitter() @@ -1636,21 +2107,6 @@ private: return m_VSplitter->Create(m_hWnd) != NULL; } - BOOL CreateHSplitter() - { - m_HSplitter = new CUiSplitPanel(); - m_HSplitter->m_VerticalAlignment = UiAlign_Stretch; - m_HSplitter->m_HorizontalAlignment = UiAlign_Stretch; - m_HSplitter->m_DynamicFirst = TRUE; - m_HSplitter->m_Horizontal = TRUE; - m_HSplitter->m_Pos = INT_MAX; //set INT_MAX to use lowest possible position (m_MinSecond) - m_HSplitter->m_MinFirst = 10; - m_HSplitter->m_MinSecond = 140; - m_VSplitter->Second().Append(m_HSplitter); - - return m_HSplitter->Create(m_hWnd) != NULL; - } - BOOL CreateSearchBar() { m_SearchBar = new CUiWindow<CSearchBar>(); @@ -1678,12 +2134,8 @@ private: b = b && CreateVSplitter(); // Inside V Splitter - b = b && CreateHSplitter(); b = b && CreateTreeView(); - - // Inside H Splitter - b = b && CreateListView(); - b = b && CreateRichEdit(); + b = b && CreateApplicationView(); if (b) { @@ -1707,15 +2159,23 @@ private: return b; } + VOID LayoutCleanup() + { + delete m_TreeView; + delete m_ApplicationView; + delete m_VSplitter; + delete m_SearchBar; + delete m_Toolbar; + delete m_StatusBar; + return; + } + BOOL InitControls() { if (CreateLayout()) { - - InitApplicationsList(); InitCategoriesList(); - nSelectedApps = 0; UpdateStatusBarText(); return TRUE; @@ -1724,28 +2184,6 @@ private: return FALSE; } - VOID ShowAppInfo(INT Index) - { - if (IsInstalledEnum(SelectedEnumType)) - { - if (Index == -1) - Index = m_ListView->GetSelectionMark(); - - PINSTALLED_INFO Info = (PINSTALLED_INFO) m_ListView->GetItemData(Index); - - m_AppInfo->ShowInstalledAppInfo(Info); - } - else if (IsAvailableEnum(SelectedEnumType)) - { - if (Index == -1) - return; - - CAvailableApplicationInfo* Info = (CAvailableApplicationInfo*) m_ListView->GetItemData(Index); - - m_AppInfo->ShowAvailableAppInfo(Info); - } - } - VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { if (wParam == SIZE_MINIMIZED) @@ -1782,7 +2220,6 @@ private: { EndDeferWindowPos(hdwp); } - } // TODO: Sub-layouts for children of children @@ -1796,64 +2233,47 @@ private: EndDeferWindowPos(hdwp); } } - } - VOID RemoveSelectedAppFromRegistry() + BOOL RemoveSelectedAppFromRegistry() { - PINSTALLED_INFO Info; - WCHAR szFullName[MAX_PATH] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"; - ATL::CStringW szMsgText, szMsgTitle; - INT ItemIndex = m_ListView->GetNextItem(-1, LVNI_FOCUSED); - if (!IsInstalledEnum(SelectedEnumType)) - return; + return FALSE; - Info = reinterpret_cast<PINSTALLED_INFO>(m_ListView->GetItemData(ItemIndex)); - if (!Info || !Info->hSubKey || (ItemIndex == -1)) - return; + ATL::CStringW szMsgText, szMsgTitle; if (!szMsgText.LoadStringW(IDS_APP_REG_REMOVE) || !szMsgTitle.LoadStringW(IDS_INFORMATION)) - return; + return FALSE; if (MessageBoxW(szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) { - ATL::CStringW::CopyChars(szFullName, - MAX_PATH, - Info->szKeyName.GetString(), - MAX_PATH - wcslen(szFullName)); - - if (RegDeleteKeyW(Info->hRootKey, szFullName) == ERROR_SUCCESS) + CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); + LSTATUS Result = InstalledApp->RemoveFromRegistry(); + if (Result != ERROR_SUCCESS) { - m_ListView->DeleteItem(ItemIndex); - return; + // TODO: popup a messagebox telling user it fails somehow + return FALSE; } - if (!szMsgText.LoadStringW(IDS_UNABLE_TO_REMOVE)) - return; - - MessageBoxW(szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR); + // as it's already removed form registry, this will also remove it from the list + UpdateApplicationsList(-1); + return TRUE; } + + return FALSE; } 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); + CInstalledApplicationInfo *InstalledApp = (CInstalledApplicationInfo *)m_ApplicationView->GetFocusedItemData(); - PINSTALLED_INFO ItemInfo = (PINSTALLED_INFO)m_ListView->GetItemData(ItemIndex); - return UninstallApplication(ItemInfo, bModify); + return InstalledApp->UninstallApplication(bModify); } + BOOL ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) { theResult = 0; @@ -1871,9 +2291,7 @@ private: FreeLogs(); m_AvailableApps.FreeCachedEntries(); - - if (IsInstalledEnum(SelectedEnumType)) - FreeInstalledAppList(); + m_InstalledApps.FreeCachedEntries(); delete m_ClientPanel; @@ -1984,7 +2402,6 @@ private: } HMENU mainMenu = ::GetMenu(hwnd); - HMENU lvwMenu = ::GetMenu(m_ListView->m_hWnd); /* Disable/enable items based on treeview selection */ if (IsSelectedNodeInstalled()) @@ -1994,11 +2411,6 @@ private: EnableMenuItem(mainMenu, ID_UNINSTALL, MF_ENABLED); EnableMenuItem(mainMenu, ID_MODIFY, MF_ENABLED); - EnableMenuItem(lvwMenu, ID_REGREMOVE, MF_ENABLED); - EnableMenuItem(lvwMenu, ID_INSTALL, MF_GRAYED); - EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_ENABLED); - EnableMenuItem(lvwMenu, ID_MODIFY, MF_ENABLED); - m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_REGREMOVE, TRUE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_INSTALL, FALSE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_UNINSTALL, TRUE); @@ -2011,11 +2423,6 @@ private: EnableMenuItem(mainMenu, ID_UNINSTALL, MF_GRAYED); EnableMenuItem(mainMenu, ID_MODIFY, MF_GRAYED); - EnableMenuItem(lvwMenu, ID_REGREMOVE, MF_GRAYED); - EnableMenuItem(lvwMenu, ID_INSTALL, MF_ENABLED); - EnableMenuItem(lvwMenu, ID_UNINSTALL, MF_GRAYED); - EnableMenuItem(lvwMenu, ID_MODIFY, MF_GRAYED); - m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_REGREMOVE, FALSE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_INSTALL, TRUE); m_Toolbar->SendMessageW(TB_ENABLEBUTTON, ID_UNINSTALL, FALSE); @@ -2024,91 +2431,6 @@ private: } break; - case LVN_ITEMCHANGED: - { - LPNMLISTVIEW pnic = (LPNMLISTVIEW) lParam; - - if (pnic->hdr.hwndFrom == m_ListView->m_hWnd) - { - /* Check if this is a valid item - * (technically, it can be also an unselect) */ - INT ItemIndex = pnic->iItem; - if (ItemIndex == -1 || - ItemIndex >= ListView_GetItemCount(pnic->hdr.hwndFrom)) - { - break; - } - - /* Check if the focus has been moved to another item */ - if ((pnic->uChanged & LVIF_STATE) && - (pnic->uNewState & LVIS_FOCUSED) && - !(pnic->uOldState & LVIS_FOCUSED)) - { - ShowAppInfo(ItemIndex); - } - /* Check if the item is checked */ - if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating) - { - BOOL checked = m_ListView->GetCheckState(pnic->iItem); - /* FIXME: HAX! - - preventing decremention below zero as a safeguard for ReactOS - In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled - Maybe LVIS_STATEIMAGEMASK is set incorrectly - */ - nSelectedApps += - (checked) - ? 1 - : ((nSelectedApps > 0) - ? -1 - : 0); - - /* Update item's selection status */ - m_ListView->SetSelected(pnic->iItem, checked); - - UpdateStatusBarText(); - } - } - } - break; - - case LVN_COLUMNCLICK: - { - LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - - m_ListView->ColumnClick(pnmv); - } - break; - - case NM_CLICK: - { - if (data->hwndFrom == m_ListView->m_hWnd && ((LPNMLISTVIEW) lParam)->iItem != -1) - { - ShowAppInfo(-1); - } - } - break; - - case NM_DBLCLK: - { - if (data->hwndFrom == m_ListView->m_hWnd && ((LPNMLISTVIEW) lParam)->iItem != -1) - { - /* this won't do anything if the program is already installed */ - SendMessageW(hwnd, WM_COMMAND, ID_INSTALL, 0); - } - } - break; - - case NM_RCLICK: - { - if (data->hwndFrom == m_ListView->m_hWnd && ((LPNMLISTVIEW) lParam)->iItem != -1) - { - ShowPopupMenu(m_ListView->m_hWnd, 0, ID_INSTALL); - } - } - break; - - - case TTN_GETDISPINFO: m_Toolbar->OnGetDispInfo((LPTOOLTIPTEXT) lParam); break; @@ -2136,10 +2458,9 @@ private: case WM_SYSCOLORCHANGE: { /* Forward WM_SYSCOLORCHANGE to common controls */ - m_ListView->SendMessageW(WM_SYSCOLORCHANGE, 0, 0); - m_TreeView->SendMessageW(WM_SYSCOLORCHANGE, 0, 0); + m_ApplicationView->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); + m_TreeView->SendMessageW(WM_SYSCOLORCHANGE, wParam, lParam); m_Toolbar->SendMessageW(WM_SYSCOLORCHANGE, 0, 0); - m_ListView->SendMessageW(EM_SETBKGNDCOLOR, 0, GetSysColor(COLOR_BTNFACE)); } break; @@ -2272,17 +2593,36 @@ private: case ID_INSTALL: if (IsAvailableEnum(SelectedEnumType)) { - if (nSelectedApps > 0) + ATL::CSimpleArray<CAvailableApplicationInfo> AppsList; + + // enum all selected apps + m_AvailableApps.Enum(ENUM_CAT_SELECTED, s_EnumSelectedAppForDownloadProc, (PVOID)&AppsList); + + if (AppsList.GetSize()) { - DownloadListOfApplications(m_AvailableApps.GetSelected(), FALSE); - UpdateApplicationsList(-1); - m_ListView->SetSelected(-1, FALSE); + if (DownloadListOfApplications(AppsList, FALSE)) + { + m_AvailableApps.RemoveAllSelected(); + UpdateApplicationsList(-1); + } } - else if (DownloadApplication(m_ListView->GetSelectedData(), FALSE)) + else { - UpdateApplicationsList(-1); + // use the currently focused item in application-view + CAvailableApplicationInfo *FocusedApps = (CAvailableApplicationInfo *)m_ApplicationView->GetFocusedItemData(); + if (FocusedApps) + { + if (DownloadApplication(FocusedApps, FALSE)) + { + UpdateApplicationsList(-1); + } + } + else + { + // TODO: in this case, Install button in toolbar (and all other places) should be disabled + // or at least popup a messagebox telling user to select/check some app first + } } - } break; @@ -2318,28 +2658,11 @@ private: break; case ID_CHECK_ALL: - m_ListView->CheckAll(); + m_ApplicationView->CheckAll(); break; } } - VOID FreeInstalledAppList() - { - INT Count = m_ListView->GetItemCount() - 1; - PINSTALLED_INFO Info; - - while (Count >= 0) - { - Info = (PINSTALLED_INFO) m_ListView->GetItemData(Count); - if (Info) - { - RegCloseKey(Info->hSubKey); - delete Info; - } - Count--; - } - } - static BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle) { if (!*szNeedle) @@ -2348,91 +2671,42 @@ private: return StrStrIW(szHaystack, szNeedle) != NULL; } - BOOL CALLBACK EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &m_szName, PINSTALLED_INFO Info) + BOOL CALLBACK EnumInstalledAppProc(CInstalledApplicationInfo * Info) { - PINSTALLED_INFO ItemInfo; - ATL::CStringW szText; - INT Index; - - if (!SearchPatternMatch(m_szName.GetString(), szSearchPattern)) + if (!SearchPatternMatch(Info->szDisplayName.GetString(), szSearchPattern)) { - RegCloseKey(Info->hSubKey); return TRUE; } - - ItemInfo = new INSTALLED_INFO(*Info); - if (!ItemInfo) - { - RegCloseKey(Info->hSubKey); - return FALSE; - } - - Index = m_ListView->AddItem(ItemIndex, 0, m_szName.GetString(), (LPARAM) ItemInfo); - - /* Get version info */ - ItemInfo->GetApplicationString(L"DisplayVersion", szText); - m_ListView->SetItemText(Index, 1, szText.GetString()); - - /* Get comments */ - ItemInfo->GetApplicationString(L"Comments", szText); - m_ListView->SetItemText(Index, 2, szText.GetString()); - - return TRUE; + return m_ApplicationView->AddInstalledApplication(Info, Info); // currently, the callback param is Info itself } - BOOL EnumAvailableAppProc(CAvailableApplicationInfo* Info, LPCWSTR szFolderPath) + BOOL CALLBACK EnumAvailableAppProc(CAvailableApplicationInfo * Info, BOOL bInitialCheckState) { - INT Index; - HICON hIcon = NULL; - - HIMAGELIST hImageListView = (HIMAGELIST)m_ListView->SendMessage(LVM_GETIMAGELIST, LVSIL_SMALL, 0); - if (!SearchPatternMatch(Info->m_szName.GetString(), szSearchPattern) && !SearchPatternMatch(Info->m_szDesc.GetString(), szSearchPattern)) { return TRUE; } - - /* Load icon from file */ - ATL::CStringW szIconPath; - if (Info->RetrieveIcon(szIconPath)) - { - hIcon = (HICON)LoadImageW(NULL, - szIconPath.GetString(), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_LOADFROMFILE); - } - - if (!hIcon || GetLastError() != ERROR_SUCCESS) - { - /* Load default icon */ - hIcon = (HICON) LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); - } - - Index = ImageList_AddIcon(hImageListView, hIcon); - DestroyIcon(hIcon); - - Index = m_ListView->AddItem(Info->m_Category, Index, Info->m_szName.GetString(), (LPARAM) Info); - m_ListView->SetImageList(hImageListView, LVSIL_SMALL); - m_ListView->SetItemText(Index, 1, Info->m_szVersion.GetString()); - m_ListView->SetItemText(Index, 2, Info->m_szDesc.GetString()); - m_ListView->SetCheckState(Index, Info->m_IsSelected); - - return TRUE; + return m_ApplicationView->AddAvailableApplication(Info, bInitialCheckState, Info); // currently, the callback param is Info itself } - static BOOL CALLBACK s_EnumInstalledAppProc(INT ItemIndex, ATL::CStringW &m_szName, PINSTALLED_INFO Info, PVOID param) + static BOOL CALLBACK s_EnumInstalledAppProc(CInstalledApplicationInfo * Info, PVOID param) { CMainWindow* pThis = (CMainWindow*)param; - return pThis->EnumInstalledAppProc(ItemIndex, m_szName, Info); + return pThis->EnumInstalledAppProc(Info); } - static BOOL CALLBACK s_EnumAvailableAppProc(CAvailableApplicationInfo* Info, LPCWSTR szFolderPath, PVOID param) + static BOOL CALLBACK s_EnumAvailableAppProc(CAvailableApplicationInfo* Info, BOOL bInitialCheckState, PVOID param) { CMainWindow* pThis = (CMainWindow*)param; - return pThis->EnumAvailableAppProc(Info, szFolderPath); + return pThis->EnumAvailableAppProc(Info, bInitialCheckState); + } + + static BOOL CALLBACK s_EnumSelectedAppForDownloadProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param) + { + ATL::CSimpleArray<CAvailableApplicationInfo> *pAppList = (ATL::CSimpleArray<CAvailableApplicationInfo> *)param; + pAppList->Add(*Info); + return TRUE; } VOID UpdateStatusBarText() @@ -2441,83 +2715,46 @@ private: { ATL::CStringW szBuffer; - szBuffer.Format(IDS_APPS_COUNT, m_ListView->GetItemCount(), nSelectedApps); + szBuffer.Format(IDS_APPS_COUNT, m_ApplicationView->GetItemCount(), m_AvailableApps.GetSelectedCount()); m_StatusBar->SetText(szBuffer); } } VOID UpdateApplicationsList(INT EnumType) { - ATL::CStringW szBuffer1, szBuffer2; - HIMAGELIST hImageListView; - BOOL bWasInInstalled = IsInstalledEnum(SelectedEnumType); - bUpdating = TRUE; - m_ListView->SetRedraw(FALSE); - if (EnumType < 0) + if (EnumType == -1) { + // keep the old enum type EnumType = SelectedEnumType; } - - //if previous one was INSTALLED purge the list - //TODO: make the Installed category a separate class to avoid doing this - if (bWasInInstalled) - { - FreeInstalledAppList(); - } - - m_ListView->DeleteAllItems(); - - // Create new ImageList - hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - GetSystemColorDepth() | ILC_MASK, - 0, 1); - HIMAGELIST hImageListBuf = m_ListView->SetImageList(hImageListView, LVSIL_SMALL); - if (hImageListBuf) + else { - ImageList_Destroy(hImageListBuf); + SelectedEnumType = EnumType; } + m_ApplicationView->SetRedraw(FALSE); if (IsInstalledEnum(EnumType)) { - if (!bWasInInstalled) - { - m_ListView->SetCheckboxesVisible(FALSE); - } + // set the display mode of application-view. this will remove all the item in application-view too. + m_ApplicationView->SetDisplayMode(ApplicationViewInstalledApps); - HICON hIcon = (HICON) LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); - ImageList_AddIcon(hImageListView, hIcon); - DestroyIcon(hIcon); - - // Enum installed applications and updates - EnumInstalledApplications(EnumType, TRUE, s_EnumInstalledAppProc, this); - EnumInstalledApplications(EnumType, FALSE, s_EnumInstalledAppProc, this); + // enum installed softwares + m_InstalledApps.Enum(EnumType, s_EnumInstalledAppProc, this); } else if (IsAvailableEnum(EnumType)) { - if (bWasInInstalled) - { - m_ListView->SetCheckboxesVisible(TRUE); - } + // set the display mode of application-view. this will remove all the item in application-view too. + m_ApplicationView->SetDisplayMode(ApplicationViewAvailableApps); - // Enum available applications + // enum available softwares m_AvailableApps.Enum(EnumType, s_EnumAvailableAppProc, this); } - - SelectedEnumType = EnumType; + m_ApplicationView->SetRedraw(TRUE); + m_ApplicationView->RedrawWindow(0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN); // force the child window to repaint UpdateStatusBarText(); - m_AppInfo->SetWelcomeText(); - - // Set automatic column width for program names if the list is not empty - if (m_ListView->GetItemCount() > 0) - { - ListView_SetColumnWidth(m_ListView->GetWindow(), 0, LVSCW_AUTOSIZE); - } - bUpdating = FALSE; - m_ListView->SetRedraw(TRUE); } public: @@ -2562,9 +2799,39 @@ public: return CWindowImpl::Create(NULL, r, szWindowName.GetString(), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); } + // this function is called when a item of application-view is checked/unchecked + // CallbackParam is the param passed to application-view when adding the item (the one getting focus now). + BOOL ItemCheckStateChanged(BOOL bChecked, LPVOID CallbackParam) + { + if (!bUpdating) + { + if (bChecked) + { + if (!m_AvailableApps.AddSelected((CAvailableApplicationInfo *)CallbackParam)) + { + return FALSE; + } + } + else + { + if (!m_AvailableApps.RemoveSelected((CAvailableApplicationInfo *)CallbackParam)) + { + return FALSE; + } + } + + UpdateStatusBarText(); + return TRUE; + } + else + { + return TRUE; + } + } + void HandleTabOrder(int direction) { - HWND Controls[] = { m_Toolbar->m_hWnd, m_SearchBar->m_hWnd, m_TreeView->m_hWnd, m_ListView->m_hWnd, m_AppInfo->m_hWnd }; + HWND Controls[] = { m_Toolbar->m_hWnd, m_SearchBar->m_hWnd, m_TreeView->m_hWnd, m_ApplicationView->m_hWnd}; // When there is no control found, go to the first or last (depending on tab vs shift-tab) int current = direction > 0 ? 0 : (_countof(Controls) - 1); HWND hActive = ::GetFocus(); @@ -2586,6 +2853,12 @@ public: } }; +BOOL CApplicationView::ItemCheckStateChanged(BOOL bChecked, LPVOID CallbackParam) +{ + m_MainWindow->ItemCheckStateChanged(bChecked, CallbackParam); + return TRUE; +} + VOID ShowMainWindow(INT nShowCmd) { HACCEL KeyBrd; diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 259b644dce1..2ee8136cc91 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -37,10 +37,11 @@ struct AvailableStrings AvailableStrings(); }; -struct CAvailableApplicationInfo +class CAvailableApplicationInfo { +public: INT m_Category; - BOOL m_IsSelected; + //BOOL m_IsSelected; LicenseType m_LicenseType; ATL::CStringW m_szName; ATL::CStringW m_szRegName; @@ -98,11 +99,12 @@ private: inline BOOL FindInLanguages(LCID what) const; }; -typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, LPCWSTR szFolderPath, PVOID param); +typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param); class CAvailableApps { ATL::CAtlList<CAvailableApplicationInfo*> m_InfoList; + ATL::CAtlList< CAvailableApplicationInfo*> m_SelectedList; public: static AvailableStrings m_Strings; @@ -116,9 +118,15 @@ public: VOID FreeCachedEntries(); BOOL Enum(INT EnumType, AVAILENUMPROC lpEnumProc, PVOID param); + BOOL AddSelected(CAvailableApplicationInfo *AvlbInfo); + BOOL RemoveSelected(CAvailableApplicationInfo *AvlbInfo); + + VOID RemoveAllSelected(); + int GetSelectedCount(); + CAvailableApplicationInfo* FindInfo(const ATL::CStringW& szAppName) const; ATL::CSimpleArray<CAvailableApplicationInfo> FindInfoList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; - ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; + //ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; const ATL::CStringW& GetFolderPath() const; const ATL::CStringW& GetAppPath() const; diff --git a/base/applications/rapps/include/installed.h b/base/applications/rapps/include/installed.h index 76a12418c1c..f13e37e1b48 100644 --- a/base/applications/rapps/include/installed.h +++ b/base/applications/rapps/include/installed.h @@ -3,19 +3,51 @@ #include <windef.h> #include <atlstr.h> -struct INSTALLED_INFO +class CInstalledApplicationInfo { - HKEY hRootKey; +public: + BOOL IsUserKey; + REGSAM WowKey; HKEY hSubKey; + BOOL bIsUpdate = FALSE; + ATL::CStringW szKeyName; + CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey); BOOL GetApplicationString(LPCWSTR lpKeyName, ATL::CStringW& String); + BOOL UninstallApplication(BOOL bModify); + LSTATUS RemoveFromRegistry(); + + ATL::CStringW szDisplayName; + ATL::CStringW szDisplayVersion; + ATL::CStringW szPublisher; + ATL::CStringW szRegOwner; + ATL::CStringW szProductID; + ATL::CStringW szHelpLink; + ATL::CStringW szHelpTelephone; + ATL::CStringW szReadme; + ATL::CStringW szContact; + ATL::CStringW szURLUpdateInfo; + ATL::CStringW szURLInfoAbout; + ATL::CStringW szComments; + ATL::CStringW szInstallDate; + ATL::CStringW szInstallLocation; + ATL::CStringW szInstallSource; + ATL::CStringW szUninstallString; + ATL::CStringW szModifyPath; + + ~CInstalledApplicationInfo(); }; -typedef INSTALLED_INFO *PINSTALLED_INFO; -typedef BOOL(CALLBACK *APPENUMPROC)(INT ItemIndex, ATL::CStringW &Name, PINSTALLED_INFO Info, PVOID param); +typedef BOOL(CALLBACK *APPENUMPROC)(CInstalledApplicationInfo * Info, PVOID param); -BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc, PVOID param); -BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString); +class CInstalledApps +{ + ATL::CAtlList<CInstalledApplicationInfo *> m_InfoList; + +public: + BOOL Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param); + + VOID FreeCachedEntries(); +}; -BOOL UninstallApplication(PINSTALLED_INFO ItemInfo, BOOL bModify); diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 4c1fc6a4b1d..7e3b1567b65 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -46,3 +46,5 @@ public: }; BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore); + +BOOL IsSystem64Bit(); diff --git a/base/applications/rapps/include/rosui.h b/base/applications/rapps/include/rosui.h index 378e677c053..19ba8d26f0d 100644 --- a/base/applications/rapps/include/rosui.h +++ b/base/applications/rapps/include/rosui.h @@ -495,7 +495,10 @@ public: virtual ~CUiWindow() { - T::DestroyWindow(); + if (T::IsWindow()) + { + T::DestroyWindow(); + } } VOID GetWindowTextW(ATL::CStringW& szText) diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index c35f141f526..065422762ad 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -12,149 +12,253 @@ #include "misc.h" -BOOL INSTALLED_INFO::GetApplicationString(LPCWSTR lpKeyName, ATL::CStringW& String) +CInstalledApplicationInfo::CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey) + : IsUserKey(bIsUserKey), WowKey(RegWowKey), hSubKey(hKey) { - BOOL result = ::GetApplicationString(hSubKey, lpKeyName, String.GetBuffer(MAX_PATH)); - String.ReleaseBuffer(); - return result; + // if Initialize failed, hSubKey will be closed automatically and set to zero + + DWORD dwSize = MAX_PATH, dwType, dwValue; + BOOL bIsSystemComponent; + ATL::CStringW szParentKeyName; + + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + + if (RegQueryValueExW(hSubKey, + L"SystemComponent", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + { + bIsSystemComponent = (dwValue == 0x1); + } + else + { + bIsSystemComponent = FALSE; + } + + dwType = REG_SZ; + dwSize = MAX_PATH * sizeof(WCHAR); + bIsUpdate = (RegQueryValueExW(hSubKey, + L"ParentKeyName", + NULL, + &dwType, + (LPBYTE)szParentKeyName.GetBuffer(MAX_PATH), + &dwSize) == ERROR_SUCCESS); + szParentKeyName.ReleaseBuffer(); + + if (bIsSystemComponent) + { + CloseHandle(hSubKey); + hSubKey = NULL; + } + } -BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString) +CInstalledApplicationInfo::~CInstalledApplicationInfo() { - DWORD dwSize = MAX_PATH * sizeof(WCHAR); - - if (RegQueryValueExW(hKey, - lpKeyName, - NULL, - NULL, - (LPBYTE) szString, - &dwSize) == ERROR_SUCCESS) + if (hSubKey) { - return TRUE; + CloseHandle(hSubKey); + hSubKey = NULL; } - - StringCchCopyW(szString, MAX_PATH, L"---"); - return FALSE; } -BOOL UninstallApplication(PINSTALLED_INFO ItemInfo, BOOL bModify) +BOOL CInstalledApplicationInfo::GetApplicationString(LPCWSTR lpKeyName, ATL::CStringW& String) { - LPCWSTR szModify = L"ModifyPath"; - LPCWSTR szUninstall = L"UninstallString"; - DWORD dwType, dwSize; - WCHAR szPath[MAX_PATH]; + DWORD dwSize = 0; + String.Empty(); + DWORD dwType; - dwType = REG_SZ; - dwSize = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW(ItemInfo->hSubKey, - bModify ? szModify : szUninstall, - NULL, - &dwType, - (LPBYTE) szPath, - &dwSize) != ERROR_SUCCESS) + // retrieve the size of value first. + if (RegQueryValueExW(hSubKey, + lpKeyName, + NULL, + &dwType, + NULL, + &dwSize) != ERROR_SUCCESS) { return FALSE; } - return StartProcess(szPath, TRUE); + // TODO: I assume the type as REG_SZ. but I think REG_EXPAND_SZ should be handled correctly too. + if (dwType != REG_SZ) + { + return FALSE; + } + + // allocate buffer. + // attention: dwSize is size in bytes, and RegQueryValueExW does not guarantee the terminating null character. + String.GetBuffer(dwSize + sizeof(WCHAR)); + + // query the value + if (RegQueryValueExW(hSubKey, + lpKeyName, + NULL, + NULL, + (LPBYTE)String.GetBuffer(), + &dwSize) != ERROR_SUCCESS) + { + String.ReleaseBuffer(); + String.Empty(); + return FALSE; + } + String.GetBuffer()[dwSize / sizeof(WCHAR)] = L'\0'; // ensure zero terminated + String.ReleaseBuffer(); + return TRUE; } -BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc, PVOID param) +BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) { - DWORD dwSize = MAX_PATH, dwType, dwValue; - BOOL bIsSystemComponent, bIsUpdate; - ATL::CStringW szParentKeyName; - ATL::CStringW szDisplayName; - INSTALLED_INFO Info; - HKEY hKey; - LONG ItemIndex = 0; + return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); +} + +LSTATUS CInstalledApplicationInfo::RemoveFromRegistry() +{ + ATL::CStringW szFullName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + szKeyName; - Info.hRootKey = IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE; + // TODO: if there are subkeys inside, simply RegDeleteKeyExW will fail + // we don't have RegDeleteTree for ReactOS now. (It's a WinVista API) + // write a function to delete all subkeys recursively to solve this + // or consider letting ReactOS having this API - if (RegOpenKeyW(Info.hRootKey, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", - &hKey) != ERROR_SUCCESS) + return RegDeleteKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, WowKey, 0); +} + +BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) +{ + FreeCachedEntries(); + + HKEY RootKeyEnum[3] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE, HKEY_LOCAL_MACHINE }; + REGSAM RegSamEnum[3] = { KEY_WOW64_32KEY, KEY_WOW64_32KEY, KEY_WOW64_64KEY }; + + int LoopTime; + + // test if the OS is 64 bit. + if (IsSystem64Bit()) { - return FALSE; + // loop for all 3 combination. + // note that HKEY_CURRENT_USER\Software don't have a redirect + // https://docs.microsoft.com/en-us/windows/win32/winprog64/shared-registry-ke… + LoopTime = 3; + } + else + { + // loop for 2 combination for KEY_WOW64_32KEY only + LoopTime = 2; } - while (RegEnumKeyExW(hKey, ItemIndex, Info.szKeyName.GetBuffer(MAX_PATH), &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + // loop for all combination + for (int i = 0; i < LoopTime; i++) { - Info.szKeyName.ReleaseBuffer(); - if (RegOpenKeyW(hKey, Info.szKeyName.GetString(), &Info.hSubKey) == ERROR_SUCCESS) + DWORD dwSize = MAX_PATH; + HKEY hKey, hSubKey; + LONG ItemIndex = 0; + ATL::CStringW szKeyName; + + if (RegOpenKeyExW(RootKeyEnum[i], + L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + NULL, + KEY_READ | RegSamEnum[i], + &hKey) != ERROR_SUCCESS) { - dwType = REG_DWORD; - dwSize = sizeof(DWORD); - - if (RegQueryValueExW(Info.hSubKey, - L"SystemComponent", - NULL, - &dwType, - (LPBYTE) &dwValue, - &dwSize) == ERROR_SUCCESS) - { - bIsSystemComponent = (dwValue == 0x1); - } - else + return FALSE; + } + + while (1) + { + dwSize = MAX_PATH; + if (RegEnumKeyExW(hKey, ItemIndex, szKeyName.GetBuffer(MAX_PATH), &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) { - bIsSystemComponent = FALSE; + break; } - dwType = REG_SZ; - dwSize = MAX_PATH * sizeof(WCHAR); - bIsUpdate = (RegQueryValueExW(Info.hSubKey, - L"ParentKeyName", - NULL, - &dwType, - (LPBYTE) szParentKeyName.GetBuffer(MAX_PATH), - &dwSize) == ERROR_SUCCESS); - szParentKeyName.ReleaseBuffer(); - - dwType = REG_SZ; - dwSize = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW(Info.hSubKey, - L"DisplayName", - NULL, - &dwType, - (LPBYTE) szDisplayName.GetBuffer(MAX_PATH), - &dwSize) == ERROR_SUCCESS) + ItemIndex++; + + szKeyName.ReleaseBuffer(); + if (RegOpenKeyW(hKey, szKeyName.GetString(), &hSubKey) == ERROR_SUCCESS) { - szDisplayName.ReleaseBuffer(); - if (EnumType < ENUM_ALL_INSTALLED || EnumType > ENUM_UPDATES) - EnumType = ENUM_ALL_INSTALLED; + BOOL bSuccess = FALSE; + CInstalledApplicationInfo *Info = new CInstalledApplicationInfo(RootKeyEnum[i] == HKEY_CURRENT_USER, RegSamEnum[i], hSubKey); + Info->szKeyName = szKeyName; - if (!bIsSystemComponent) + // check for failure. if failed to init, Info->hSubKey will be set to NULL + if (Info->hSubKey) { - if ((EnumType == ENUM_ALL_INSTALLED) || /* All components */ - ((EnumType == ENUM_INSTALLED_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */ - ((EnumType == ENUM_UPDATES) && (bIsUpdate))) /* Updates only */ + // those items without display name are ignored + if (Info->GetApplicationString(L"DisplayName", Info->szDisplayName)) { - if (!lpEnumProc(ItemIndex, szDisplayName, &Info, param)) - break; + Info->GetApplicationString(L"DisplayVersion", Info->szDisplayVersion); + Info->GetApplicationString(L"Publisher", Info->szPublisher); + Info->GetApplicationString(L"RegOwner", Info->szRegOwner); + Info->GetApplicationString(L"ProductID", Info->szProductID); + Info->GetApplicationString(L"HelpLink", Info->szHelpLink); + Info->GetApplicationString(L"HelpTelephone", Info->szHelpTelephone); + Info->GetApplicationString(L"Readme", Info->szReadme); + Info->GetApplicationString(L"Contact", Info->szContact); + Info->GetApplicationString(L"URLUpdateInfo", Info->szURLUpdateInfo); + Info->GetApplicationString(L"URLInfoAbout", Info->szURLInfoAbout); + Info->GetApplicationString(L"Comments", Info->szComments); + Info->GetApplicationString(L"InstallDate", Info->szInstallDate); + Info->GetApplicationString(L"InstallLocation", Info->szInstallLocation); + Info->GetApplicationString(L"InstallSource", Info->szInstallSource); + Info->GetApplicationString(L"UninstallString", Info->szUninstallString); + Info->GetApplicationString(L"ModifyPath", Info->szModifyPath); + + bSuccess = TRUE; } - else + } + + // close handle + if (Info->hSubKey) + { + CloseHandle(Info->hSubKey); + Info->hSubKey = NULL; + } + + if (bSuccess) + { + // add to InfoList. + m_InfoList.AddTail(Info); + + // invoke callback + if (lpEnumProc) { - RegCloseKey(Info.hSubKey); + if ((EnumType == ENUM_ALL_INSTALLED) || /* All components */ + ((EnumType == ENUM_INSTALLED_APPLICATIONS) && (!Info->bIsUpdate)) || /* Applications only */ + ((EnumType == ENUM_UPDATES) && (Info->bIsUpdate))) /* Updates only */ + { + lpEnumProc(Info, param); + } } } else { - RegCloseKey(Info.hSubKey); + // destory object + delete Info; } } - else - { - szDisplayName.ReleaseBuffer(); - RegCloseKey(Info.hSubKey); - } } - dwSize = MAX_PATH; - ItemIndex++; + szKeyName.ReleaseBuffer(); + RegCloseKey(hKey); } - - Info.szKeyName.ReleaseBuffer(); - RegCloseKey(hKey); + return TRUE; } + +VOID CInstalledApps::FreeCachedEntries() +{ + POSITION InfoListPosition = m_InfoList.GetHeadPosition(); + + /* loop and deallocate all the cached app infos in the list */ + while (InfoListPosition) + { + CInstalledApplicationInfo *Info = m_InfoList.GetNext(InfoListPosition); + delete Info; + } + + m_InfoList.RemoveAll(); +} diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 8e164db8648..90f4e88cd3c 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -13,6 +13,9 @@ static HANDLE hLog = NULL; +static BOOL bIsSys64ResultCached = FALSE; +static BOOL bIsSys64Result = FALSE; + INT GetWindowWidth(HWND hwnd) { RECT Rect; @@ -453,3 +456,33 @@ BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore) return TRUE; } + + + +BOOL IsSystem64Bit() +{ + if (bIsSys64ResultCached) + { + // just return cached result + return bIsSys64Result; + } + + SYSTEM_INFO si; + typedef void (WINAPI *LPFN_PGNSI)(LPSYSTEM_INFO); + LPFN_PGNSI pGetNativeSystemInfo = (LPFN_PGNSI)GetProcAddress(GetModuleHandle(L"kernel32.dll"), "GetNativeSystemInfo"); + if (pGetNativeSystemInfo) + { + pGetNativeSystemInfo(&si); + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 || si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_IA64) + { + bIsSys64Result = TRUE; + } + } + else + { + bIsSys64Result = FALSE; + } + + bIsSys64ResultCached = TRUE; // next time calling this function, it will directly return bIsSys64Result + return bIsSys64Result; +}

4 years, 8 months

1
0
0 0

[reactos] 06/19: [RAPPS] move icon to a field in .txt file (#2941)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4482d0f4557ec3df12e39… commit 4482d0f4557ec3df12e3982c148353724ac3ebf3 Author: He Yang <1160386205(a)qq.com> AuthorDate: Tue Jun 30 04:40:40 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:09:20 2020 +0200 [RAPPS] move icon to a field in .txt file (#2941) * [RAPPS] move icon to a field in .txt file * [RAPPS] add function PathAppendNoDirEscapeW, apply it. --- base/applications/rapps/available.cpp | 37 ++++++++++++++++++++--- base/applications/rapps/gui.cpp | 22 +++++++------- base/applications/rapps/include/available.h | 2 ++ base/applications/rapps/include/misc.h | 2 ++ base/applications/rapps/misc.cpp | 46 +++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 16 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index c26c5aaf622..8af6c78a8b9 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -72,14 +72,33 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString } else { - // TODO: Does the filename contain anything stuff like "\\" ".." ":" "<" ">" ? + // TODO: Does the filename contain anything stuff like ":" "<" ">" ? // these stuff may lead to security issues - ATL::CStringW ScrnshotName = AvlbStrings.szAppsPath; PathAppendW(ScrnshotName.GetBuffer(MAX_PATH), L"screenshots"); - PathAppendW(ScrnshotName.GetBuffer(), ScrnshotLocation.GetString()); + BOOL bSuccess = PathAppendNoDirEscapeW(ScrnshotName.GetBuffer(), ScrnshotLocation.GetString()); ScrnshotName.ReleaseBuffer(); - m_szScrnshotLocation.Add(ScrnshotName); + if (bSuccess) + { + m_szScrnshotLocation.Add(ScrnshotName); + } + } + } + + // TODO: are we going to support specify an URL for an icon ? + ATL::CStringW IconLocation; + if (GetString(L"Icon", IconLocation)) + { + // TODO: Does the filename contain anything stuff like ":" "<" ">" ? + // these stuff may lead to security issues + ATL::CStringW IconPath = AvlbStrings.szAppsPath; + PathAppendW(IconPath.GetBuffer(MAX_PATH), L"icons"); + BOOL bSuccess = PathAppendNoDirEscapeW(IconPath.GetBuffer(), IconLocation.GetString()); + IconPath.ReleaseBuffer(); + + if (bSuccess) + { + m_szIconLocation = IconPath; } } @@ -246,6 +265,16 @@ BOOL CAvailableApplicationInfo::RetrieveScrnshot(UINT Index,ATL::CStringW& Scrns return TRUE; } +BOOL CAvailableApplicationInfo::RetrieveIcon(ATL::CStringW& IconLocation) const +{ + if (m_szIconLocation.IsEmpty()) + { + return FALSE; + } + IconLocation = m_szIconLocation; + return TRUE; +} + VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) { RtlCopyMemory(&m_ftCacheStamp, ftTime, sizeof(FILETIME)); diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 367a13bcb64..b0599074a47 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -2394,18 +2394,16 @@ private: } /* Load icon from file */ - ATL::CStringW szIconPath = szFolderPath; - PathAppendW(szIconPath.GetBuffer(MAX_PATH), L"icons"); - PathAppendW(szIconPath.GetBuffer(), Info->m_szName.GetString()); - PathAddExtensionW(szIconPath.GetBuffer(), L".ico"); - szIconPath.ReleaseBuffer(); - - hIcon = (HICON) LoadImageW(NULL, - szIconPath.GetString(), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_LOADFROMFILE); + ATL::CStringW szIconPath; + if (Info->RetrieveIcon(szIconPath)) + { + hIcon = (HICON)LoadImageW(NULL, + szIconPath.GetString(), + IMAGE_ICON, + LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + LR_LOADFROMFILE); + } if (!hIcon || GetLastError() != ERROR_SUCCESS) { diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 917fd261b0e..259b644dce1 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -52,6 +52,7 @@ struct CAvailableApplicationInfo ATL::CStringW m_szUrlDownload; ATL::CSimpleArray<LCID> m_LanguageLCIDs; ATL::CSimpleArray<ATL::CStringW> m_szScrnshotLocation; + ATL::CStringW m_szIconLocation; ULONG m_SizeBytes; @@ -75,6 +76,7 @@ struct CAvailableApplicationInfo BOOL HasInstalledVersion() const; BOOL HasUpdate() const; BOOL RetrieveScrnshot(UINT Index, ATL::CStringW& ScrnshotLocation) const; + BOOL RetrieveIcon(ATL::CStringW& IconLocation) const; // Set a timestamp VOID SetLastWriteTime(FILETIME* ftTime); diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 50354c0f7ff..4c1fc6a4b1d 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -44,3 +44,5 @@ public: BOOL GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); BOOL GetInt(const ATL::CStringW& KeyName, INT& iResult); }; + +BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 9ee6a391f63..8e164db8648 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -407,3 +407,49 @@ BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) return (iResult > 0); } // CConfigParser + + +BOOL PathAppendNoDirEscapeW(LPWSTR pszPath, LPCWSTR pszMore) +{ + WCHAR pszPathBuffer[MAX_PATH]; // buffer to store result + WCHAR pszPathCopy[MAX_PATH]; + + if (!PathCanonicalizeW(pszPathCopy, pszPath)) + { + return FALSE; + } + + PathRemoveBackslashW(pszPathCopy); + + if (StringCchCopyW(pszPathBuffer, _countof(pszPathBuffer), pszPathCopy) != S_OK) + { + return FALSE; + } + + if (!PathAppendW(pszPathBuffer, pszMore)) + { + return FALSE; + } + + size_t PathLen; + if (StringCchLengthW(pszPathCopy, _countof(pszPathCopy), &PathLen) != S_OK) + { + return FALSE; + } + int CommonPrefixLen = PathCommonPrefixW(pszPathCopy, pszPathBuffer, NULL); + + if ((unsigned int)CommonPrefixLen != PathLen) + { + // pszPathBuffer should be a file/folder under pszPath. + // but now common prefix len is smaller than length of pszPathCopy + // hacking use ".." ? + return FALSE; + } + + if (StringCchCopyW(pszPath, MAX_PATH, pszPathBuffer) != S_OK) + { + return FALSE; + } + + return TRUE; +}

4 years, 8 months

1
0
0 0

[reactos] 05/19: [RAPPS] rename snapshot to screenshot, filename to location (#2939)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e636373016b0918550f06… commit e636373016b0918550f0647d0df5bd041fbe8f58 Author: He Yang <1160386205(a)qq.com> AuthorDate: Mon Jun 22 00:20:45 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:09:20 2020 +0200 [RAPPS] rename snapshot to screenshot, filename to location (#2939) --- base/applications/rapps/available.cpp | 32 ++++---- base/applications/rapps/gui.cpp | 120 ++++++++++++++-------------- base/applications/rapps/include/available.h | 6 +- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 5957e8cf31b..c26c5aaf622 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -54,32 +54,32 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString GetString(L"URLSite", m_szUrlSite); GetString(L"SHA1", m_szSHA1); - static_assert(MAX_SNAPSHOT_NUM < 10000, "MAX_SNAPSHOT_NUM is too big"); - for (int i = 0; i < MAX_SNAPSHOT_NUM; i++) + static_assert(MAX_SCRNSHOT_NUM < 10000, "MAX_SCRNSHOT_NUM is too big"); + for (int i = 0; i < MAX_SCRNSHOT_NUM; i++) { - WCHAR SnapshotField[sizeof("Snapshot") + 4]; - wsprintfW(SnapshotField, L"Snapshot%d", i + 1); - ATL::CStringW SnapshotLocation; - if (!GetString(SnapshotField, SnapshotLocation)) + CStringW ScrnshotField; + ScrnshotField.Format(L"Screenshot%d", i + 1); + CStringW ScrnshotLocation; + if (!GetString(ScrnshotField, ScrnshotLocation)) { continue; } - if (PathIsURLW(SnapshotLocation.GetString())) + if (PathIsURLW(ScrnshotLocation.GetString())) { - m_szSnapshotLocation.Add(SnapshotLocation); + m_szScrnshotLocation.Add(ScrnshotLocation); } else { // TODO: Does the filename contain anything stuff like "\\" ".." ":" "<" ">" ? // these stuff may lead to security issues - ATL::CStringW SnapshotName = AvlbStrings.szAppsPath; - PathAppendW(SnapshotName.GetBuffer(MAX_PATH), L"snapshots"); - PathAppendW(SnapshotName.GetBuffer(), SnapshotLocation.GetString()); - SnapshotName.ReleaseBuffer(); - m_szSnapshotLocation.Add(SnapshotName); + ATL::CStringW ScrnshotName = AvlbStrings.szAppsPath; + PathAppendW(ScrnshotName.GetBuffer(MAX_PATH), L"screenshots"); + PathAppendW(ScrnshotName.GetBuffer(), ScrnshotLocation.GetString()); + ScrnshotName.ReleaseBuffer(); + m_szScrnshotLocation.Add(ScrnshotName); } } @@ -236,13 +236,13 @@ BOOL CAvailableApplicationInfo::HasUpdate() const return (m_szInstalledVersion.Compare(m_szVersion) < 0) ? TRUE : FALSE; } -BOOL CAvailableApplicationInfo::RetrieveSnapshot(UINT Index,ATL::CStringW& SnapshotFileName) const +BOOL CAvailableApplicationInfo::RetrieveScrnshot(UINT Index,ATL::CStringW& ScrnshotLocation) const { - if (Index >= (UINT)m_szSnapshotLocation.GetSize()) + if (Index >= (UINT)m_szScrnshotLocation.GetSize()) { return FALSE; } - SnapshotFileName = m_szSnapshotLocation[Index]; + ScrnshotLocation = m_szScrnshotLocation[Index]; return TRUE; } diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index a501690e3bb..367a13bcb64 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -35,10 +35,10 @@ using namespace Gdiplus; // default broken-image icon size #define BROKENIMG_ICON_SIZE 96 -// the boundary of w/h ratio of snapshot preview window -#define SNPSHT_MAX_ASPECT_RAT 2.5 +// the boundary of w/h ratio of scrnshot preview window +#define SCRNSHOT_MAX_ASPECT_RAT 2.5 -// padding between snapshot preview and richedit (in pixel) +// padding between scrnshot preview and richedit (in pixel) #define INFO_DISPLAY_PADDING 10 // minimum width of richedit @@ -46,15 +46,15 @@ using namespace Gdiplus; // user-defined window message -#define WM_RAPPS_DOWNLOAD_COMPLETE (WM_USER + 1) // notify download complete. wParam is error code, and lParam is a pointer to SnapshotDownloadParam +#define WM_RAPPS_DOWNLOAD_COMPLETE (WM_USER + 1) // notify download complete. wParam is error code, and lParam is a pointer to ScrnshotDownloadParam #define WM_RAPPS_RESIZE_CHILDREN (WM_USER + 2) // ask parent window to resize children. -enum SNPSHT_STATUS +enum SCRNSHOT_STATUS { - SNPSHTPREV_EMPTY, // show nothing - SNPSHTPREV_LOADING, // image is loading (most likely downloading) - SNPSHTPREV_IMAGE, // display image from a file - SNPSHTPREV_FAILED // image can not be shown (download failure or wrong image) + SCRNSHOT_PREV_EMPTY, // show nothing + SCRNSHOT_PREV_LOADING, // image is loading (most likely downloading) + SCRNSHOT_PREV_IMAGE, // display image from a file + SCRNSHOT_PREV_FAILED // image can not be shown (download failure or wrong image) }; #define TIMER_LOADING_ANIMATION 1 // Timer ID @@ -65,13 +65,13 @@ enum SNPSHT_STATUS #define PI 3.1415927 -typedef struct __SnapshotDownloadParam +typedef struct __ScrnshotDownloadParam { LONGLONG ID; HANDLE hFile; HWND hwndNotify; ATL::CStringW DownloadFileName; -} SnapshotDownloadParam; +} ScrnshotDownloadParam; INT GetSystemColorDepth() { @@ -304,7 +304,7 @@ public: } }; -int SnapshotDownloadCallback( +int ScrnshotDownloadCallback( pASYNCINET AsyncInet, ASYNC_EVENT Event, WPARAM wParam, @@ -312,7 +312,7 @@ int SnapshotDownloadCallback( VOID* Extension ) { - SnapshotDownloadParam* DownloadParam = (SnapshotDownloadParam*)Extension; + ScrnshotDownloadParam* DownloadParam = (ScrnshotDownloadParam*)Extension; switch (Event) { case ASYNCINET_DATA: @@ -338,12 +338,12 @@ int SnapshotDownloadCallback( return 0; } -class CAppSnapshotPreview : - public CWindowImpl<CAppSnapshotPreview> +class CAppScrnshotPreview : + public CWindowImpl<CAppScrnshotPreview> { private: - SNPSHT_STATUS SnpshtPrevStauts = SNPSHTPREV_EMPTY; + SCRNSHOT_STATUS ScrnshotPrevStauts = SCRNSHOT_PREV_EMPTY; Image* pImage = NULL; HICON hBrokenImgIcon = NULL; BOOL bLoadingTimerOn = FALSE; @@ -377,7 +377,7 @@ private: } case WM_RAPPS_DOWNLOAD_COMPLETE: { - SnapshotDownloadParam* DownloadParam = (SnapshotDownloadParam*)lParam; + ScrnshotDownloadParam* DownloadParam = (ScrnshotDownloadParam*)lParam; AsyncInetRelease(AsyncInet); AsyncInet = NULL; switch (wParam) @@ -477,7 +477,7 @@ private: VOID DisplayLoading() { - SetStatus(SNPSHTPREV_LOADING); + SetStatus(SCRNSHOT_PREV_LOADING); if (bLoadingTimerOn) { KillTimer(TIMER_LOADING_ANIMATION); @@ -490,14 +490,14 @@ private: VOID DisplayFailed() { InterlockedIncrement64(&ContentID); - SetStatus(SNPSHTPREV_FAILED); + SetStatus(SCRNSHOT_PREV_FAILED); PreviousDisplayCleanup(); } BOOL DisplayFile(LPCWSTR lpszFileName) { PreviousDisplayCleanup(); - SetStatus(SNPSHTPREV_IMAGE); + SetStatus(SCRNSHOT_PREV_IMAGE); pImage = Bitmap::FromFile(lpszFileName, 0); if (pImage->GetLastStatus() != Ok) { @@ -507,9 +507,9 @@ private: return TRUE; } - VOID SetStatus(SNPSHT_STATUS Status) + VOID SetStatus(SCRNSHOT_STATUS Status) { - SnpshtPrevStauts = Status; + ScrnshotPrevStauts = Status; } VOID PaintOnDC(HDC hdc, int width, int height, BOOL bDrawBkgnd) @@ -526,15 +526,15 @@ private: SelectObject(hdcMem, hOldBrush); } - switch (SnpshtPrevStauts) + switch (ScrnshotPrevStauts) { - case SNPSHTPREV_EMPTY: + case SCRNSHOT_PREV_EMPTY: { } break; - case SNPSHTPREV_LOADING: + case SCRNSHOT_PREV_LOADING: { Graphics graphics(hdcMem); Color color(255, 0, 0); @@ -564,7 +564,7 @@ private: } break; - case SNPSHTPREV_IMAGE: + case SCRNSHOT_PREV_IMAGE: { if (pImage) { @@ -581,7 +581,7 @@ private: } break; - case SNPSHTPREV_FAILED: + case SCRNSHOT_PREV_FAILED: { DrawIconEx(hdcMem, (width - BrokenImgSize) / 2, @@ -632,7 +632,7 @@ public: LoadCursorW(NULL, IDC_ARROW), (HBRUSH)(COLOR_BTNFACE + 1), 0, - L"RAppsSnapshotPreview", + L"RAppsScrnshotPreview", NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("") @@ -674,7 +674,7 @@ public: VOID DisplayEmpty() { InterlockedIncrement64(&ContentID); - SetStatus(SNPSHTPREV_EMPTY); + SetStatus(SCRNSHOT_PREV_EMPTY); PreviousDisplayCleanup(); } @@ -687,22 +687,22 @@ public: { DisplayLoading(); - SnapshotDownloadParam* DownloadParam = new SnapshotDownloadParam; + ScrnshotDownloadParam* DownloadParam = new ScrnshotDownloadParam; if (!DownloadParam) return FALSE; DownloadParam->hwndNotify = m_hWnd; DownloadParam->ID = ID; // generate a filename - ATL::CStringW SnapshotFolder = CAvailableApps::m_Strings.szAppsPath; - PathAppendW(SnapshotFolder.GetBuffer(MAX_PATH), L"snapshots"); - SnapshotFolder.ReleaseBuffer(); + ATL::CStringW ScrnshotFolder = CAvailableApps::m_Strings.szAppsPath; + PathAppendW(ScrnshotFolder.GetBuffer(MAX_PATH), L"screenshots"); + ScrnshotFolder.ReleaseBuffer(); - if (!PathIsDirectoryW(SnapshotFolder.GetString())) + if (!PathIsDirectoryW(ScrnshotFolder.GetString())) { - CreateDirectoryW(SnapshotFolder.GetString(), NULL); + CreateDirectoryW(ScrnshotFolder.GetString(), NULL); } - if (!GetTempFileNameW(SnapshotFolder.GetString(), L"img", + if (!GetTempFileNameW(ScrnshotFolder.GetString(), L"img", 0, DownloadParam->DownloadFileName.GetBuffer(MAX_PATH))) { DownloadParam->DownloadFileName.ReleaseBuffer(); @@ -721,7 +721,7 @@ public: return FALSE; } - AsyncInet = AsyncInetDownload(0, INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, lpszLocation, TRUE, SnapshotDownloadCallback, DownloadParam); + AsyncInet = AsyncInetDownload(0, INTERNET_OPEN_TYPE_PRECONFIG, 0, 0, lpszLocation, TRUE, ScrnshotDownloadCallback, DownloadParam); if (!AsyncInet) { CloseHandle(DownloadParam->hFile); @@ -740,29 +740,29 @@ public: int GetRequestedWidth(int Height) // calculate requested window width by given height { - switch (SnpshtPrevStauts) + switch (ScrnshotPrevStauts) { - case SNPSHTPREV_EMPTY: + case SCRNSHOT_PREV_EMPTY: return 0; - case SNPSHTPREV_LOADING: + case SCRNSHOT_PREV_LOADING: return 200; - case SNPSHTPREV_IMAGE: + case SCRNSHOT_PREV_IMAGE: if (pImage) { // return the width needed to display image inside the window. - // and always keep window w/h ratio inside [ 1/SNPSHT_MAX_ASPECT_RAT, SNPSHT_MAX_ASPECT_RAT ] + // and always keep window w/h ratio inside [ 1/SCRNSHOT_MAX_ASPECT_RAT, SCRNSHOT_MAX_ASPECT_RAT ] return (int)floor((float)Height * - max(min((float)pImage->GetWidth() / (float)pImage->GetHeight(), (float)SNPSHT_MAX_ASPECT_RAT), 1.0/ (float)SNPSHT_MAX_ASPECT_RAT)); + max(min((float)pImage->GetWidth() / (float)pImage->GetHeight(), (float)SCRNSHOT_MAX_ASPECT_RAT), 1.0/ (float)SCRNSHOT_MAX_ASPECT_RAT)); } return 0; - case SNPSHTPREV_FAILED: + case SCRNSHOT_PREV_FAILED: return 200; default: return 0; } } - ~CAppSnapshotPreview() + ~CAppScrnshotPreview() { PreviousDisplayCleanup(); } @@ -784,8 +784,8 @@ private: RichEdit = new CAppRichEdit(); RichEdit->Create(hwnd); - SnpshtPrev = new CAppSnapshotPreview(); - SnpshtPrev->Create(hwnd); + ScrnshotPrev = new CAppScrnshotPreview(); + ScrnshotPrev->Create(hwnd); break; } case WM_SIZE: @@ -831,23 +831,23 @@ private: VOID ResizeChildren(int Width, int Height) { - int SnpshtWidth = SnpshtPrev->GetRequestedWidth(Height); + int ScrnshotWidth = ScrnshotPrev->GetRequestedWidth(Height); // make sure richedit always have room to display - SnpshtWidth = min(SnpshtWidth, Width - INFO_DISPLAY_PADDING - RICHEDIT_MIN_WIDTH); + ScrnshotWidth = min(ScrnshotWidth, Width - INFO_DISPLAY_PADDING - RICHEDIT_MIN_WIDTH); DWORD dwError = ERROR_SUCCESS; HDWP hDwp = BeginDeferWindowPos(2); if (hDwp) { - hDwp = ::DeferWindowPos(hDwp, SnpshtPrev->m_hWnd, NULL, - 0, 0, SnpshtWidth, Height, 0); + hDwp = ::DeferWindowPos(hDwp, ScrnshotPrev->m_hWnd, NULL, + 0, 0, ScrnshotWidth, Height, 0); if (hDwp) { - // hide the padding if snapshot window width == 0 - int RicheditPosX = SnpshtWidth ? (SnpshtWidth + INFO_DISPLAY_PADDING) : 0; + // hide the padding if scrnshot window width == 0 + int RicheditPosX = ScrnshotWidth ? (ScrnshotWidth + INFO_DISPLAY_PADDING) : 0; hDwp = ::DeferWindowPos(hDwp, RichEdit->m_hWnd, NULL, RicheditPosX, 0, Width - RicheditPosX, Height, 0); @@ -909,7 +909,7 @@ private: public: CAppRichEdit * RichEdit; - CAppSnapshotPreview * SnpshtPrev; + CAppScrnshotPreview * ScrnshotPrev; static ATL::CWndClassInfo& GetWndClassInfo() { @@ -944,14 +944,14 @@ public: BOOL ShowAvailableAppInfo(CAvailableApplicationInfo* Info) { - ATL::CStringW SnapshotLocation; - if (Info->RetrieveSnapshot(0, SnapshotLocation)) + ATL::CStringW ScrnshotLocation; + if (Info->RetrieveScrnshot(0, ScrnshotLocation)) { - SnpshtPrev->DisplayImage(SnapshotLocation); + ScrnshotPrev->DisplayImage(ScrnshotLocation); } else { - SnpshtPrev->DisplayEmpty(); + ScrnshotPrev->DisplayEmpty(); } ResizeChildren(); return RichEdit->ShowAvailableAppInfo(Info); @@ -959,14 +959,14 @@ public: BOOL ShowInstalledAppInfo(PINSTALLED_INFO Info) { - SnpshtPrev->DisplayEmpty(); + ScrnshotPrev->DisplayEmpty(); ResizeChildren(); return RichEdit->ShowInstalledAppInfo(Info); } VOID SetWelcomeText() { - SnpshtPrev->DisplayEmpty(); + ScrnshotPrev->DisplayEmpty(); ResizeChildren(); RichEdit->SetWelcomeText(); } diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 53253e8563c..917fd261b0e 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -8,7 +8,7 @@ #include "misc.h" -#define MAX_SNAPSHOT_NUM 16 +#define MAX_SCRNSHOT_NUM 16 enum LicenseType { @@ -51,7 +51,7 @@ struct CAvailableApplicationInfo ATL::CStringW m_szUrlSite; ATL::CStringW m_szUrlDownload; ATL::CSimpleArray<LCID> m_LanguageLCIDs; - ATL::CSimpleArray<ATL::CStringW> m_szSnapshotLocation; + ATL::CSimpleArray<ATL::CStringW> m_szScrnshotLocation; ULONG m_SizeBytes; @@ -74,7 +74,7 @@ struct CAvailableApplicationInfo BOOL IsInstalled() const; BOOL HasInstalledVersion() const; BOOL HasUpdate() const; - BOOL RetrieveSnapshot(UINT Index, ATL::CStringW& SnapshotFileName) const; + BOOL RetrieveScrnshot(UINT Index, ATL::CStringW& ScrnshotLocation) const; // Set a timestamp VOID SetLastWriteTime(FILETIME* ftTime);

4 years, 8 months

1
0
0 0

[reactos] 04/19: [RAPPS] update broken-img icon

by 赫杨

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfb0963c1f2bb5db2c5ec… commit cfb0963c1f2bb5db2c5ec6f37c82a65ccf4cbd93 Author: 赫杨 <1160386205(a)qq.com> AuthorDate: Sat Jun 20 13:00:02 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:09:20 2020 +0200 [RAPPS] update broken-img icon --- base/applications/rapps/res/brokenimg.ico | Bin 152126 -> 152126 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/base/applications/rapps/res/brokenimg.ico b/base/applications/rapps/res/brokenimg.ico index 58454f74041..0a455301a0f 100644 Binary files a/base/applications/rapps/res/brokenimg.ico and b/base/applications/rapps/res/brokenimg.ico differ

4 years, 8 months

1
0
0 0

[reactos] 02/19: [RAPPS] Screenshot preview and other trivial fixes (#2894)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbf119fde1fe00f0e5920… commit fbf119fde1fe00f0e5920070d37b73983c7cfb5a Author: He Yang <1160386205(a)qq.com> AuthorDate: Sun Jun 14 21:22:58 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:09:19 2020 +0200 [RAPPS] Screenshot preview and other trivial fixes (#2894) * add one more layer of window * using Path* API to operate path * always use rappmgr.cab as file name when downloading db. ignore the URL * add snapshot preview window * show a broken-image icon when failed to load image * add a padding between image and content, and make sure always some space is reserved for richedit * hide the padding if snapshot window does not have a width * some work to avoid blinking when window resizing * add WM_PRINTCLIENT handling --- base/applications/rapps/CMakeLists.txt | 2 +- base/applications/rapps/available.cpp | 67 +++- base/applications/rapps/gui.cpp | 491 ++++++++++++++++++++++++++-- base/applications/rapps/include/available.h | 38 ++- base/applications/rapps/include/misc.h | 1 - base/applications/rapps/include/resource.h | 1 + base/applications/rapps/loaddlg.cpp | 15 +- base/applications/rapps/misc.cpp | 5 +- base/applications/rapps/rapps.rc | 3 +- base/applications/rapps/res/brokenimg.ico | Bin 0 -> 152126 bytes base/applications/rapps/winmain.cpp | 20 ++ 11 files changed, 574 insertions(+), 69 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 33225ae5c04..226a8badcbd 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -39,7 +39,7 @@ add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid wine) -add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 setupapi gdiplus msvcrt kernel32 ntdll) add_pch(rapps include/rapps.h SOURCE) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index c7c78e180a9..be376c1c05b 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -18,23 +18,23 @@ #include <atlstr.h> // CAvailableApplicationInfo -CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) +CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam, AvailableStrings& AvlbStrings) : m_IsSelected(FALSE), m_LicenseType(LICENSE_NONE), m_SizeBytes(0), m_sFileName(sFileNameParam), m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) { - RetrieveGeneralInfo(); + RetrieveGeneralInfo(AvlbStrings); } -VOID CAvailableApplicationInfo::RefreshAppInfo() +VOID CAvailableApplicationInfo::RefreshAppInfo(AvailableStrings& AvlbStrings) { if (m_szUrlDownload.IsEmpty()) { - RetrieveGeneralInfo(); + RetrieveGeneralInfo(AvlbStrings); } } // Lazily load general info from the file -VOID CAvailableApplicationInfo::RetrieveGeneralInfo() +VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbStrings) { m_Parser = new CConfigParser(m_sFileName); @@ -52,10 +52,31 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo() GetString(L"License", m_szLicense); GetString(L"Description", m_szDesc); GetString(L"URLSite", m_szUrlSite); - GetString(L"CDPath", m_szCDPath); - GetString(L"Language", m_szRegName); GetString(L"SHA1", m_szSHA1); + static_assert(MAX_SNAPSHOT_NUM < 10000, "MAX_SNAPSHOT_NUM is too big"); + for (int i = 0; i < MAX_SNAPSHOT_NUM; i++) + { + WCHAR SnapshotField[sizeof("Snapshot") + 4]; + wsprintfW(SnapshotField, L"Snapshot%d", i + 1); + ATL::CStringW SnapshotFileName; + if (!GetString(SnapshotField, SnapshotFileName)) + { + continue; + } + + // TODO: Add URL Support + + // TODO: Does the filename contain anything stuff like "\\" ".." ":" "<" ">" ? + // these stuff may lead to security issues + + ATL::CStringW SnapshotName = AvlbStrings.szAppsPath; + PathAppendW(SnapshotName.GetBuffer(MAX_PATH), L"snapshots"); + PathAppendW(SnapshotName.GetBuffer(), SnapshotFileName.GetString()); + SnapshotName.ReleaseBuffer(); + m_szSnapshotFilename.Add(SnapshotName); + } + RetrieveSize(); RetrieveLicenseType(); RetrieveLanguages(); @@ -209,6 +230,16 @@ BOOL CAvailableApplicationInfo::HasUpdate() const return (m_szInstalledVersion.Compare(m_szVersion) < 0) ? TRUE : FALSE; } +BOOL CAvailableApplicationInfo::RetrieveSnapshot(UINT Index,ATL::CStringW& SnapshotFileName) const +{ + if (Index >= (UINT)m_szSnapshotFilename.GetSize()) + { + return FALSE; + } + SnapshotFileName = m_szSnapshotFilename[Index]; + return TRUE; +} + VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) { RtlCopyMemory(&m_ftCacheStamp, ftTime, sizeof(FILETIME)); @@ -231,11 +262,19 @@ AvailableStrings::AvailableStrings() //FIXME: maybe provide a fallback? if (GetStorageDirectory(szPath)) { - szAppsPath = szPath + L"\\rapps\\"; + szAppsPath = szPath; + PathAppendW(szAppsPath.GetBuffer(MAX_PATH), L"rapps"); + szAppsPath.ReleaseBuffer(); + szCabName = L"rappmgr.cab"; szCabDir = szPath; - szCabPath = (szCabDir + L"\\") + szCabName; - szSearchPath = szAppsPath + L"*.txt"; + szCabPath = szCabDir; + PathAppendW(szCabPath.GetBuffer(MAX_PATH), szCabName); + szCabPath.ReleaseBuffer(); + + szSearchPath = szAppsPath; + PathAppendW(szSearchPath.GetBuffer(MAX_PATH), L"*.txt"); + szSearchPath.ReleaseBuffer(); } } // AvailableStrings @@ -273,7 +312,9 @@ VOID CAvailableApps::DeleteCurrentAppsDB() ATL::CStringW szTmp; do { - szTmp = m_Strings.szAppsPath + FindFileData.cFileName; + szTmp = m_Strings.szAppsPath; + PathAppendW(szTmp.GetBuffer(MAX_PATH), FindFileData.cFileName); + szTmp.ReleaseBuffer(); DeleteFileW(szTmp.GetString()); } while (FindNextFileW(hFind, &FindFileData) != 0); FindClose(hFind); @@ -369,7 +410,7 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc, PVOID param) } // create a new entry - Info = new CAvailableApplicationInfo(FindFileData.cFileName); + Info = new CAvailableApplicationInfo(FindFileData.cFileName, m_Strings); // set a timestamp for the next time Info->SetLastWriteTime(&FindFileData.ftLastWriteTime); @@ -380,7 +421,7 @@ skip_if_cached: || EnumType == ENUM_ALL_AVAILABLE || (EnumType == ENUM_CAT_SELECTED && Info->m_IsSelected)) { - Info->RefreshAppInfo(); + Info->RefreshAppInfo(m_Strings); if (lpEnumProc) lpEnumProc(Info, m_Strings.szAppsPath.GetString(), param); diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index a1d1e0075c8..e8d2e4057de 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -17,15 +17,48 @@ #include <atlbase.h> #include <atlcom.h> +#include <atltypes.h> #include <atlwin.h> #include <wininet.h> #include <shellutils.h> #include <rosctrls.h> +#include <gdiplus.h> +#include <math.h> + +using namespace Gdiplus; #define SEARCH_TIMER_ID 'SR' #define LISTVIEW_ICON_SIZE 24 #define TREEVIEW_ICON_SIZE 24 +// default broken-image icon size +#define BROKENIMG_ICON_SIZE 96 + +// the boundary of w/h ratio of snapshot preview window +#define SNPSHT_MAX_ASPECT_RAT 2.5 + +// padding between snapshot preview and richedit (in pixel) +#define INFO_DISPLAY_PADDING 10 + +// minimum width of richedit +#define RICHEDIT_MIN_WIDTH 160 + +enum SNPSHT_STATUS +{ + SNPSHTPREV_EMPTY, // show nothing + SNPSHTPREV_LOADING, // image is loading (most likely downloading) + SNPSHTPREV_FILE, // display image from a file + SNPSHTPREV_FAILED // image can not be shown (download failure or wrong image) +}; + +#define TIMER_LOADING_ANIMATION 1 // Timer ID + +#define LOADING_ANIMATION_PERIOD 3 // Animation cycling period (in seconds) +#define LOADING_ANIMATION_FPS 18 // Animation Frame Per Second + + +#define PI 3.1415927 + INT GetSystemColorDepth() { DEVMODEW pDevMode; @@ -257,6 +290,322 @@ public: } }; +class CAppSnapshotPreview : + public CWindowImpl<CAppSnapshotPreview> +{ +private: + + SNPSHT_STATUS SnpshtPrevStauts = SNPSHTPREV_EMPTY; + Image* pImage = NULL; + HICON hBrokenImgIcon = NULL; + BOOL bLoadingTimerOn = FALSE; + int LoadingAnimationFrame = 0; + int BrokenImgSize = BROKENIMG_ICON_SIZE; + + BOOL ProcessWindowMessage(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) + { + theResult = 0; + switch (Msg) + { + case WM_CREATE: + hBrokenImgIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_BROKEN_IMAGE), IMAGE_ICON, BrokenImgSize, BrokenImgSize, 0); + break; + case WM_SIZE: + { + if (BrokenImgSize != min(min(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), BROKENIMG_ICON_SIZE)) + { + BrokenImgSize = min(min(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)), BROKENIMG_ICON_SIZE); + + if (hBrokenImgIcon) + { + DeleteObject(hBrokenImgIcon); + hBrokenImgIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_BROKEN_IMAGE), IMAGE_ICON, BrokenImgSize, BrokenImgSize, 0); + } + } + break; + } + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc = BeginPaint(&ps); + CRect rect; + GetClientRect(&rect); + + PaintOnDC(hdc, + rect.Width(), + rect.Height(), + ps.fErase); + + EndPaint(&ps); + break; + } + case WM_PRINTCLIENT: + { + if (lParam & PRF_CHECKVISIBLE) + { + if (!IsWindowVisible()) break; + } + CRect rect; + GetClientRect(&rect); + + PaintOnDC((HDC)wParam, + rect.Width(), + rect.Height(), + lParam & PRF_ERASEBKGND); + break; + } + case WM_ERASEBKGND: + { + return TRUE; // do not erase to avoid blinking + } + case WM_TIMER: + { + switch (wParam) + { + case TIMER_LOADING_ANIMATION: + LoadingAnimationFrame++; + LoadingAnimationFrame %= (LOADING_ANIMATION_PERIOD * LOADING_ANIMATION_FPS); + HDC hdc = GetDC(); + CRect rect; + GetClientRect(&rect); + + PaintOnDC(hdc, + rect.Width(), + rect.Height(), + TRUE); + ReleaseDC(hdc); + } + break; + } + case WM_DESTROY: + { + PreviousDisplayCleanup(); + DeleteObject(hBrokenImgIcon); + hBrokenImgIcon = NULL; + break; + } + } + return FALSE; + } + + VOID SetStatus(SNPSHT_STATUS Status) + { + SnpshtPrevStauts = Status; + } + + VOID PaintOnDC(HDC hdc, int width, int height, BOOL bDrawBkgnd) + { + // use an off screen dc to avoid blinking + HDC hdcMem = CreateCompatibleDC(hdc); + HBITMAP hBitmap = CreateCompatibleBitmap(hdc, width, height); + SelectObject(hdcMem, hBitmap); + + if (bDrawBkgnd) + { + HBRUSH hOldBrush = (HBRUSH)SelectObject(hdcMem, (HGDIOBJ)GetSysColorBrush(COLOR_BTNFACE)); + PatBlt(hdcMem, 0, 0, width, height, PATCOPY); + SelectObject(hdcMem, hOldBrush); + } + + switch (SnpshtPrevStauts) + { + case SNPSHTPREV_EMPTY: + { + + } + break; + + case SNPSHTPREV_LOADING: + { + Graphics graphics(hdcMem); + Color color(255, 0, 0); + SolidBrush dotBrush(Color(255, 100, 100, 100)); + + graphics.SetSmoothingMode(SmoothingMode::SmoothingModeAntiAlias); + + // Paint three dot + float DotWidth = GetLoadingDotWidth(width, height); + graphics.FillEllipse((Brush*)(&dotBrush), + (REAL)width / 2.0 - min(width, height) * 2.0 / 16.0 - DotWidth / 2.0, + (REAL)height / 2.0 - GetFrameDotShift(LoadingAnimationFrame + LOADING_ANIMATION_FPS / 4, width, height) - DotWidth / 2.0, + DotWidth, + DotWidth); + + graphics.FillEllipse((Brush*)(&dotBrush), + (REAL)width / 2.0 - DotWidth / 2.0, + (REAL)height / 2.0 - GetFrameDotShift(LoadingAnimationFrame, width, height) - DotWidth / 2.0, + DotWidth, + DotWidth); + + graphics.FillEllipse((Brush*)(&dotBrush), + (REAL)width / 2.0 + min(width, height) * 2.0 / 16.0 - DotWidth / 2.0, + (REAL)height / 2.0 - GetFrameDotShift(LoadingAnimationFrame - LOADING_ANIMATION_FPS / 4, width, height) - DotWidth / 2.0, + DotWidth, + DotWidth); + } + break; + + case SNPSHTPREV_FILE: + { + if (pImage) + { + // always draw entire image inside the window. + Graphics graphics(hdcMem); + float ZoomRatio = min(((float)width / (float)pImage->GetWidth()), ((float)height / (float)pImage->GetHeight())); + float ZoomedImgWidth = ZoomRatio * (float)pImage->GetWidth(); + float ZoomedImgHeight = ZoomRatio * (float)pImage->GetHeight(); + + graphics.DrawImage(pImage, + ((float)width - ZoomedImgWidth) / 2.0, ((float)height - ZoomedImgHeight) / 2.0, + ZoomedImgWidth, ZoomedImgHeight); + } + } + break; + + case SNPSHTPREV_FAILED: + { + DrawIconEx(hdcMem, + (width - BrokenImgSize) / 2, + (height - BrokenImgSize) / 2, + hBrokenImgIcon, + BrokenImgSize, + BrokenImgSize, + NULL, + NULL, + DI_NORMAL | DI_COMPAT); + } + break; + } + + // copy the content form off-screen dc to hdc + BitBlt(hdc, 0, 0, width, height, hdcMem, 0, 0, SRCCOPY); + DeleteDC(hdcMem); + DeleteObject(hBitmap); + } + + float GetLoadingDotWidth(int width, int height) + { + return min(width, height) / 20.0; + } + + float GetFrameDotShift(int Frame, int width, int height) + { + return min(width, height) * + (1.0 / 16.0) * + (2.0 / (2.0 - sqrt(3.0))) * + (max(sin((float)Frame * 2 * PI / (LOADING_ANIMATION_PERIOD * LOADING_ANIMATION_FPS)), sqrt(3.0) / 2.0) - sqrt(3.0) / 2.0); + } + +public: + static ATL::CWndClassInfo& GetWndClassInfo() + { + DWORD csStyle = CS_VREDRAW | CS_HREDRAW; + static ATL::CWndClassInfo wc = + { + { + sizeof(WNDCLASSEX), + csStyle, + StartWindowProc, + 0, + 0, + NULL, + 0, + LoadCursorW(NULL, IDC_ARROW), + (HBRUSH)(COLOR_BTNFACE + 1), + 0, + L"RAppsSnapshotPreview", + NULL + }, + NULL, NULL, IDC_ARROW, TRUE, 0, _T("") + }; + return wc; + } + + HWND Create(HWND hParent) + { + RECT r = { 0,0,0,0 }; + + return CWindowImpl::Create(hParent, r, L"", WS_CHILD | WS_VISIBLE); + } + + VOID PreviousDisplayCleanup() + { + if (bLoadingTimerOn) + { + KillTimer(TIMER_LOADING_ANIMATION); + bLoadingTimerOn = FALSE; + } + LoadingAnimationFrame = 0; + if (pImage) + { + delete pImage; + pImage = NULL; + } + } + + VOID DisplayEmpty() + { + SetStatus(SNPSHTPREV_EMPTY); + PreviousDisplayCleanup(); + } + + VOID DisplayLoading() + { + SetStatus(SNPSHTPREV_LOADING); + PreviousDisplayCleanup(); + bLoadingTimerOn = TRUE; + SetTimer(TIMER_LOADING_ANIMATION, 1000 / LOADING_ANIMATION_FPS, 0); + } + + BOOL DisplayFile(LPCWSTR lpszFileName) + { + SetStatus(SNPSHTPREV_FILE); + PreviousDisplayCleanup(); + pImage = Bitmap::FromFile(lpszFileName, 0); + if (pImage->GetLastStatus() != Ok) + { + DisplayFailed(); + return FALSE; + } + return TRUE; + } + + VOID DisplayFailed() + { + SetStatus(SNPSHTPREV_FAILED); + PreviousDisplayCleanup(); + } + + int GetRequestedWidth(int Height) // calculate requested window width by given height + { + switch (SnpshtPrevStauts) + { + case SNPSHTPREV_EMPTY: + return 0; + case SNPSHTPREV_LOADING: + return 200; + case SNPSHTPREV_FILE: + if (pImage) + { + // return the width needed to display image inside the window. + // and always keep window w/h ratio inside [ 1/SNPSHT_MAX_ASPECT_RAT, SNPSHT_MAX_ASPECT_RAT ] + return (int)floor((float)Height * + max(min((float)pImage->GetWidth() / (float)pImage->GetHeight(), (float)SNPSHT_MAX_ASPECT_RAT), 1.0/ (float)SNPSHT_MAX_ASPECT_RAT)); + } + return 0; + case SNPSHTPREV_FAILED: + return 200; + default: + return 0; + } + } + + ~CAppSnapshotPreview() + { + PreviousDisplayCleanup(); + } +}; + class CAppInfoDisplay : public CUiWindow<CWindowImpl<CAppInfoDisplay>> { @@ -272,16 +621,18 @@ private: { RichEdit = new CAppRichEdit(); RichEdit->Create(hwnd); + + SnpshtPrev = new CAppSnapshotPreview(); + SnpshtPrev->Create(hwnd); break; } case WM_SIZE: { - ::MoveWindow(RichEdit->m_hWnd, 0, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), TRUE); + ResizeChildren(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); break; } case WM_COMMAND: { - OnCommand(wParam, lParam); break; } @@ -304,9 +655,94 @@ private: return FALSE; } + VOID ResizeChildren() + { + CRect rect; + GetWindowRect(&rect); + ResizeChildren(rect.Width(), rect.Height()); + } + + VOID ResizeChildren(int Width, int Height) + { + int SnpshtWidth = SnpshtPrev->GetRequestedWidth(Height); + + // make sure richedit always have room to display + SnpshtWidth = min(SnpshtWidth, Width - INFO_DISPLAY_PADDING - RICHEDIT_MIN_WIDTH); + + DWORD dwError = ERROR_SUCCESS; + HDWP hDwp = BeginDeferWindowPos(2); + + if (hDwp) + { + hDwp = ::DeferWindowPos(hDwp, SnpshtPrev->m_hWnd, NULL, + 0, 0, SnpshtWidth, Height, 0); + + if (hDwp) + { + // hide the padding if snapshot window width == 0 + int RicheditPosX = SnpshtWidth ? (SnpshtWidth + INFO_DISPLAY_PADDING) : 0; + + hDwp = ::DeferWindowPos(hDwp, RichEdit->m_hWnd, NULL, + RicheditPosX, 0, Width - RicheditPosX, Height, 0); + + if (hDwp) + { + EndDeferWindowPos(hDwp); + } + else + { + dwError = GetLastError(); + } + } + else + { + dwError = GetLastError(); + } + } + else + { + dwError = GetLastError(); + } + + +#if DBG + ATLASSERT(dwError == ERROR_SUCCESS); +#endif + + UpdateWindow(); + } + + VOID OnLink(ENLINK* Link) + { + switch (Link->msg) + { + case WM_LBUTTONUP: + case WM_RBUTTONUP: + { + if (pLink) HeapFree(GetProcessHeap(), 0, pLink); + + pLink = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (max(Link->chrg.cpMin, Link->chrg.cpMax) - + min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); + if (!pLink) + { + /* TODO: Error message */ + return; + } + + RichEdit->SendMessageW(EM_SETSEL, Link->chrg.cpMin, Link->chrg.cpMax); + RichEdit->SendMessageW(EM_GETSELTEXT, 0, (LPARAM)pLink); + + ShowPopupMenuEx(m_hWnd, m_hWnd, IDR_LINKMENU, -1); + } + break; + } + } + public: CAppRichEdit * RichEdit; + CAppSnapshotPreview * SnpshtPrev; static ATL::CWndClassInfo& GetWndClassInfo() { @@ -336,51 +772,38 @@ public: { RECT r = { 0,0,0,0 }; - return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE); + return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); } BOOL ShowAvailableAppInfo(CAvailableApplicationInfo* Info) { + ATL::CStringW SnapshotFilename; + if (Info->RetrieveSnapshot(0, SnapshotFilename)) + { + SnpshtPrev->DisplayFile(SnapshotFilename); + } + else + { + SnpshtPrev->DisplayEmpty(); + } + ResizeChildren(); return RichEdit->ShowAvailableAppInfo(Info); } BOOL ShowInstalledAppInfo(PINSTALLED_INFO Info) { + SnpshtPrev->DisplayEmpty(); + ResizeChildren(); return RichEdit->ShowInstalledAppInfo(Info); } VOID SetWelcomeText() { + SnpshtPrev->DisplayEmpty(); + ResizeChildren(); RichEdit->SetWelcomeText(); } - VOID OnLink(ENLINK* Link) - { - switch (Link->msg) - { - case WM_LBUTTONUP: - case WM_RBUTTONUP: - { - if (pLink) HeapFree(GetProcessHeap(), 0, pLink); - - pLink = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, - (max(Link->chrg.cpMin, Link->chrg.cpMax) - - min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); - if (!pLink) - { - /* TODO: Error message */ - return; - } - - RichEdit->SendMessageW(EM_SETSEL, Link->chrg.cpMin, Link->chrg.cpMax); - RichEdit->SendMessageW(EM_GETSELTEXT, 0, (LPARAM)pLink); - - ShowPopupMenuEx(m_hWnd, m_hWnd, IDR_LINKMENU, -1); - } - break; - } - } - VOID OnCommand(WPARAM wParam, LPARAM lParam) { WORD wCommand = LOWORD(wParam); @@ -1804,8 +2227,12 @@ private: } /* Load icon from file */ - ATL::CStringW szIconPath; - szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->m_szName.GetString()); + ATL::CStringW szIconPath = szFolderPath; + PathAppendW(szIconPath.GetBuffer(MAX_PATH), L"icons"); + PathAppendW(szIconPath.GetBuffer(), Info->m_szName.GetString()); + PathAddExtensionW(szIconPath.GetBuffer(), L".ico"); + szIconPath.ReleaseBuffer(); + hIcon = (HICON) LoadImageW(NULL, szIconPath.GetString(), IMAGE_ICON, diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 5e3a464fc03..e52c1970a30 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -7,6 +7,9 @@ #include "misc.h" + +#define MAX_SNAPSHOT_NUM 16 + enum LicenseType { LICENSE_NONE, @@ -22,6 +25,18 @@ inline BOOL IsLicenseType(INT x) return (x >= LICENSE_MIN && x <= LICENSE_MAX); } +struct AvailableStrings +{ + ATL::CStringW szPath; + ATL::CStringW szCabPath; + ATL::CStringW szAppsPath; + ATL::CStringW szSearchPath; + ATL::CStringW szCabName; + ATL::CStringW szCabDir; + + AvailableStrings(); +}; + struct CAvailableApplicationInfo { INT m_Category; @@ -35,8 +50,9 @@ struct CAvailableApplicationInfo ATL::CStringW m_szSize; ATL::CStringW m_szUrlSite; ATL::CStringW m_szUrlDownload; - ATL::CStringW m_szCDPath; ATL::CSimpleArray<LCID> m_LanguageLCIDs; + ATL::CSimpleArray<ATL::CStringW> m_szSnapshotFilename; + ULONG m_SizeBytes; // Caching mechanism related entries @@ -48,17 +64,17 @@ struct CAvailableApplicationInfo ATL::CStringW m_szInstalledVersion; // Create an object from file - CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam); + CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam, AvailableStrings& m_Strings); // Load all info from the file - VOID RefreshAppInfo(); + VOID RefreshAppInfo(AvailableStrings& m_Strings); BOOL HasLanguageInfo() const; BOOL HasNativeLanguage() const; BOOL HasEnglishLanguage() const; BOOL IsInstalled() const; BOOL HasInstalledVersion() const; BOOL HasUpdate() const; - + BOOL RetrieveSnapshot(UINT Index, ATL::CStringW& SnapshotFileName) const; // Set a timestamp VOID SetLastWriteTime(FILETIME* ftTime); @@ -71,7 +87,7 @@ private: inline BOOL GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString); // Lazily load general info from the file - VOID RetrieveGeneralInfo(); + VOID RetrieveGeneralInfo(AvailableStrings& m_Strings); VOID RetrieveInstalledStatus(); VOID RetrieveInstalledVersion(); VOID RetrieveLanguages(); @@ -82,18 +98,6 @@ private: typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, LPCWSTR szFolderPath, PVOID param); -struct AvailableStrings -{ - ATL::CStringW szPath; - ATL::CStringW szCabPath; - ATL::CStringW szAppsPath; - ATL::CStringW szSearchPath; - ATL::CStringW szCabName; - ATL::CStringW szCabDir; - - AvailableStrings(); -}; - class CAvailableApps { static AvailableStrings m_Strings; diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index fd914c4c468..50354c0f7ff 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -9,7 +9,6 @@ INT GetClientWindowWidth(HWND hwnd); INT GetClientWindowHeight(HWND hwnd); VOID CopyTextToClipboard(LPCWSTR lpszText); -VOID SetWelcomeText(); VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem); VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem); BOOL StartProcess(ATL::CStringW &Path, BOOL Wait); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 49dc2105b4f..26b6cf706db 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -14,6 +14,7 @@ #define IDI_UPDATE_DB 20 #define IDI_CHECK_ALL 21 #define IDI_SELECTEDFORINST 22 +#define IDI_BROKEN_IMAGE 23 /* Icons for categories */ #define IDI_CAT_AUDIO 50 diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index cc88af6cc16..60f999967cb 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -650,8 +650,19 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) } // append a \ to the provided file system path, and the filename portion from the URL after that - Path += L"\\"; - Path += (LPWSTR) (p + 1); + + PathAddBackslashW(Path.GetBuffer(MAX_PATH)); + switch (InfoArray[iAppId].DLType) + { + case DLTYPE_DBUPDATE: + case DLTYPE_DBUPDATE_UNOFFICIAL: + PathAppendW(Path.GetBuffer(), L"rappmgr.cab"); // whatever the URL is, use the file name L"rappmgr.cab" + break; + case DLTYPE_APPLICATION: + PathAppendW(Path.GetBuffer(), (LPWSTR)(p + 1)); // use the filename retrieved from URL + break; + } + Path.ReleaseBuffer(); if ((InfoArray[iAppId].DLType == DLTYPE_APPLICATION) && InfoArray[iAppId].szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES) { diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index d0f13cac232..9ee6a391f63 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -177,14 +177,15 @@ BOOL StartProcess(LPWSTR lpPath, BOOL Wait) BOOL GetStorageDirectory(ATL::CStringW& Directory) { - if (!SHGetSpecialFolderPathW(NULL, Directory.GetBuffer(MAX_PATH), CSIDL_LOCAL_APPDATA, TRUE)) + LPWSTR DirectoryStr = Directory.GetBuffer(MAX_PATH); + if (!SHGetSpecialFolderPathW(NULL, DirectoryStr, CSIDL_LOCAL_APPDATA, TRUE)) { Directory.ReleaseBuffer(); return FALSE; } + PathAppendW(DirectoryStr, L"rapps"); Directory.ReleaseBuffer(); - Directory += L"\\rapps"; return (CreateDirectoryW(Directory.GetString(), NULL) || GetLastError() == ERROR_ALREADY_EXISTS); } diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc index c67e1de5442..5debb642bdd 100644 --- a/base/applications/rapps/rapps.rc +++ b/base/applications/rapps/rapps.rc @@ -23,6 +23,8 @@ IDI_APPUPD ICON "res/appupd.ico" IDI_CATEGORY ICON "res/cat.ico" IDI_UPDATE_DB ICON "res/updatedb.ico" IDI_CHECK_ALL ICON "res/select.ico" +IDI_SELECTEDFORINST ICON "res/select.ico" +IDI_BROKEN_IMAGE ICON "res/brokenimg.ico" /* Categories */ IDI_CAT_AUDIO ICON "res/cats/audio.ico" @@ -41,7 +43,6 @@ IDI_CAT_SCIENCE ICON "res/cats/science.ico" IDI_CAT_TOOLS ICON "res/cats/tools.ico" IDI_CAT_VIDEO ICON "res/cats/video.ico" IDI_CAT_THEMES ICON "res/cats/themes.ico" -IDI_SELECTEDFORINST ICON "res/select.ico" /* Accelerators -- key bindings */ HOTKEYS ACCELERATORS diff --git a/base/applications/rapps/res/brokenimg.ico b/base/applications/rapps/res/brokenimg.ico new file mode 100644 index 00000000000..58454f74041 Binary files /dev/null and b/base/applications/rapps/res/brokenimg.ico differ diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index d55edca46fa..ad14c9fd80b 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -13,6 +13,8 @@ #include <atlcom.h> +#include <gdiplus.h> + HWND hMainWnd; HINSTANCE hInst; SETTINGS_INFO SettingsInfo; @@ -28,6 +30,10 @@ END_OBJECT_MAP() CRAppsModule gModule; CAtlWinModule gWinModule; +Gdiplus::GdiplusStartupInput gdiplusStartupInput; +ULONG_PTR gdiplusToken; + + static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) { if (bInitialize) @@ -40,6 +46,18 @@ static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) } } +VOID InitializeGDIPlus(BOOL bInitialize) +{ + if (bInitialize) + { + Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + } + else + { + Gdiplus::GdiplusShutdown(gdiplusToken); + } +} + VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) { ATL::CStringW szDownloadDir; @@ -129,6 +147,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi BOOL bIsFirstLaunch; InitializeAtlModule(hInstance, TRUE); + InitializeGDIPlus(TRUE); if (GetUserDefaultUILanguage() == MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT)) { @@ -169,6 +188,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi if (hMutex) CloseHandle(hMutex); + InitializeGDIPlus(FALSE); InitializeAtlModule(hInstance, FALSE); return 0;

4 years, 8 months

1
0
0 0

[reactos] 01/19: [RAPPS] add a layer of window above the richedit (#2871)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eacaf65459b81610f17e9… commit eacaf65459b81610f17e92865c429ab59866ae8e Author: He Yang <1160386205(a)qq.com> AuthorDate: Fri Jun 5 23:32:08 2020 +0800 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 17:09:12 2020 +0200 [RAPPS] add a layer of window above the richedit (#2871) * add one more layer of window * use ATL to create window * set pLink to NULL to avoid wild pointer --- base/applications/rapps/gui.cpp | 216 ++++++++++++++++++++++++--------- base/applications/rapps/include/misc.h | 1 + base/applications/rapps/misc.cpp | 10 +- base/applications/rapps/winmain.cpp | 2 +- 4 files changed, 171 insertions(+), 58 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 65209073ce6..a1d1e0075c8 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1,4 +1,4 @@ -/* +/* * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * FILE: base/applications/rapps/gui.cpp @@ -53,7 +53,7 @@ INT GetSystemColorDepth() return ColorDepth; } -class CAppRichEdit: +class CAppRichEdit : public CUiWindow<CRichEdit> { private: @@ -257,6 +257,154 @@ public: } }; +class CAppInfoDisplay : + public CUiWindow<CWindowImpl<CAppInfoDisplay>> +{ + LPWSTR pLink = NULL; + +private: + BOOL ProcessWindowMessage(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT& theResult, DWORD dwMapId) + { + theResult = 0; + switch (message) + { + case WM_CREATE: + { + RichEdit = new CAppRichEdit(); + RichEdit->Create(hwnd); + break; + } + case WM_SIZE: + { + ::MoveWindow(RichEdit->m_hWnd, 0, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), TRUE); + break; + } + case WM_COMMAND: + { + + OnCommand(wParam, lParam); + break; + } + case WM_NOTIFY: + { + NMHDR* NotifyHeader = (NMHDR*)lParam; + if (NotifyHeader->hwndFrom == RichEdit->m_hWnd) + { + switch (NotifyHeader->code) + { + case EN_LINK: + OnLink((ENLINK*)lParam); + break; + } + } + break; + } + } + + return FALSE; + } + +public: + + CAppRichEdit * RichEdit; + + static ATL::CWndClassInfo& GetWndClassInfo() + { + DWORD csStyle = CS_VREDRAW | CS_HREDRAW; + static ATL::CWndClassInfo wc = + { + { + sizeof(WNDCLASSEX), + csStyle, + StartWindowProc, + 0, + 0, + NULL, + NULL, + NULL, + (HBRUSH)(COLOR_BTNFACE + 1), + NULL, + L"RAppsAppInfo", + NULL + }, + NULL, NULL, IDC_ARROW, TRUE, 0, _T("") + }; + return wc; + } + + HWND Create(HWND hwndParent) + { + RECT r = { 0,0,0,0 }; + + return CWindowImpl::Create(hwndParent, r, L"", WS_CHILD | WS_VISIBLE); + } + + BOOL ShowAvailableAppInfo(CAvailableApplicationInfo* Info) + { + return RichEdit->ShowAvailableAppInfo(Info); + } + + BOOL ShowInstalledAppInfo(PINSTALLED_INFO Info) + { + return RichEdit->ShowInstalledAppInfo(Info); + } + + VOID SetWelcomeText() + { + RichEdit->SetWelcomeText(); + } + + VOID OnLink(ENLINK* Link) + { + switch (Link->msg) + { + case WM_LBUTTONUP: + case WM_RBUTTONUP: + { + if (pLink) HeapFree(GetProcessHeap(), 0, pLink); + + pLink = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, + (max(Link->chrg.cpMin, Link->chrg.cpMax) - + min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); + if (!pLink) + { + /* TODO: Error message */ + return; + } + + RichEdit->SendMessageW(EM_SETSEL, Link->chrg.cpMin, Link->chrg.cpMax); + RichEdit->SendMessageW(EM_GETSELTEXT, 0, (LPARAM)pLink); + + ShowPopupMenuEx(m_hWnd, m_hWnd, IDR_LINKMENU, -1); + } + break; + } + } + + VOID OnCommand(WPARAM wParam, LPARAM lParam) + { + WORD wCommand = LOWORD(wParam); + + switch (wCommand) + { + case ID_OPEN_LINK: + + ShellExecuteW(m_hWnd, L"open", pLink, NULL, NULL, SW_SHOWNOACTIVATE); + HeapFree(GetProcessHeap(), 0, pLink); + pLink = NULL; + break; + + case ID_COPY_LINK: + CopyTextToClipboard(pLink); + HeapFree(GetProcessHeap(), 0, pLink); + pLink = NULL; + break; + + } + } + +}; + class CMainToolbar : public CUiWindow< CToolbar<> > { @@ -759,13 +907,11 @@ class CMainWindow : CSideTreeView* m_TreeView; CUiWindow<CStatusBar>* m_StatusBar; - CAppRichEdit* m_RichEdit; + CAppInfoDisplay* m_AppInfo; CUiWindow<CSearchBar>* m_SearchBar; CAvailableApps m_AvailableApps; - LPWSTR pLink; - INT nSelectedApps; BOOL bSearchEnabled; @@ -777,7 +923,6 @@ class CMainWindow : public: CMainWindow() : m_ClientPanel(NULL), - pLink(NULL), bSearchEnabled(FALSE), SelectedEnumType(ENUM_ALL_INSTALLED) { @@ -878,12 +1023,12 @@ private: BOOL CreateRichEdit() { - m_RichEdit = new CAppRichEdit(); - m_RichEdit->m_VerticalAlignment = UiAlign_Stretch; - m_RichEdit->m_HorizontalAlignment = UiAlign_Stretch; - m_HSplitter->Second().Append(m_RichEdit); + m_AppInfo = new CAppInfoDisplay(); + m_AppInfo->m_VerticalAlignment = UiAlign_Stretch; + m_AppInfo->m_HorizontalAlignment = UiAlign_Stretch; + m_HSplitter->Second().Append(m_AppInfo); - return m_RichEdit->Create(m_hWnd) != NULL; + return m_AppInfo->Create(m_hWnd) != NULL; } BOOL CreateVSplitter() @@ -998,7 +1143,7 @@ private: PINSTALLED_INFO Info = (PINSTALLED_INFO) m_ListView->GetItemData(Index); - m_RichEdit->ShowInstalledAppInfo(Info); + m_AppInfo->ShowInstalledAppInfo(Info); } else if (IsAvailableEnum(SelectedEnumType)) { @@ -1007,7 +1152,7 @@ private: CAvailableApplicationInfo* Info = (CAvailableApplicationInfo*) m_ListView->GetItemData(Index); - m_RichEdit->ShowAvailableAppInfo(Info); + m_AppInfo->ShowAvailableAppInfo(Info); } } @@ -1372,9 +1517,7 @@ private: } break; - case EN_LINK: - OnLink((ENLINK*) lParam); - break; + case TTN_GETDISPINFO: m_Toolbar->OnGetDispInfo((LPTOOLTIPTEXT) lParam); @@ -1423,33 +1566,6 @@ private: return FALSE; } - virtual VOID OnLink(ENLINK *Link) - { - switch (Link->msg) - { - case WM_LBUTTONUP: - case WM_RBUTTONUP: - { - if (pLink) HeapFree(GetProcessHeap(), 0, pLink); - - pLink = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, - (max(Link->chrg.cpMin, Link->chrg.cpMax) - - min(Link->chrg.cpMin, Link->chrg.cpMax) + 1) * sizeof(WCHAR)); - if (!pLink) - { - /* TODO: Error message */ - return; - } - - m_RichEdit->SendMessageW(EM_SETSEL, Link->chrg.cpMin, Link->chrg.cpMax); - m_RichEdit->SendMessageW(EM_GETSELTEXT, 0, (LPARAM) pLink); - - ShowPopupMenu(m_RichEdit->m_hWnd, IDR_LINKMENU, -1); - } - break; - } - } - BOOL IsSelectedNodeInstalled() { HTREEITEM hSelectedItem = m_TreeView->GetSelection(); @@ -1551,16 +1667,6 @@ private: switch (wCommand) { - case ID_OPEN_LINK: - ShellExecuteW(m_hWnd, L"open", pLink, NULL, NULL, SW_SHOWNOACTIVATE); - HeapFree(GetProcessHeap(), 0, pLink); - break; - - case ID_COPY_LINK: - CopyTextToClipboard(pLink); - HeapFree(GetProcessHeap(), 0, pLink); - break; - case ID_SETTINGS: CreateSettingsDlg(m_hWnd); break; @@ -1810,7 +1916,7 @@ private: SelectedEnumType = EnumType; UpdateStatusBarText(); - m_RichEdit->SetWelcomeText(); + m_AppInfo->SetWelcomeText(); // Set automatic column width for program names if the list is not empty if (m_ListView->GetItemCount() > 0) @@ -1866,7 +1972,7 @@ public: void HandleTabOrder(int direction) { - HWND Controls[] = { m_Toolbar->m_hWnd, m_SearchBar->m_hWnd, m_TreeView->m_hWnd, m_ListView->m_hWnd, m_RichEdit->m_hWnd }; + HWND Controls[] = { m_Toolbar->m_hWnd, m_SearchBar->m_hWnd, m_TreeView->m_hWnd, m_ListView->m_hWnd, m_AppInfo->m_hWnd }; // When there is no control found, go to the first or last (depending on tab vs shift-tab) int current = direction > 0 ? 0 : (_countof(Controls) - 1); HWND hActive = ::GetFocus(); diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 143d9769b72..fd914c4c468 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -10,6 +10,7 @@ INT GetClientWindowHeight(HWND hwnd); VOID CopyTextToClipboard(LPCWSTR lpszText); VOID SetWelcomeText(); +VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem); VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem); BOOL StartProcess(ATL::CStringW &Path, BOOL Wait); BOOL StartProcess(LPWSTR lpPath, BOOL Wait); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index f76c3849b50..d0f13cac232 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -71,7 +71,7 @@ VOID CopyTextToClipboard(LPCWSTR lpszText) CloseClipboard(); } -VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) +VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) { HMENU hMenu = NULL; HMENU hPopupMenu; @@ -102,7 +102,7 @@ VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) GetCursorPos(&pt); SetForegroundWindow(hwnd); - TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hMainWnd, NULL); + TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwndOwner, NULL); if (hMenu) { @@ -110,6 +110,12 @@ VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) } } +VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) +{ + ShowPopupMenuEx(hwnd, hMainWnd, MenuID, DefaultItem); +} + + BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) { return StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait);; diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 1c351e864f8..d55edca46fa 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -65,7 +65,7 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) PathAppendW(szDownloadDir.GetBuffer(MAX_PATH), L"\\RAPPS Downloads"); szDownloadDir.ReleaseBuffer(); - + ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, _countof(pSettingsInfo->szDownloadDir), szDownloadDir.GetString(),

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32] Make 'hwndServer == NULL' spams quiet

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88cdb9696b96fcaacc802… commit 88cdb9696b96fcaacc802462be6a4fa1c5f7de78 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 6 22:48:29 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 6 22:48:29 2020 +0900 [SHELL32] Make 'hwndServer == NULL' spams quiet --- dll/win32/shell32/changenotify.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index 08a7e632eba..c35201cce7c 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -300,10 +300,7 @@ CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPCITEMIDLIST pidl1, // get server window HWND hwndServer = GetNotificationServer(FALSE); if (hwndServer == NULL) - { - ERR("hwndServer == NULL\n"); return; - } // the ticket owner is the process of the notification server DWORD pid;

4 years, 8 months

1
0
0 0

[reactos] 01/01: [BROWSEUI_APITEST] Follow-up of #3123 (94a413a)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7430a86b23677f7b1c0c… commit e7430a86b23677f7b1c0c5c9e811c74b3eaca58a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 6 21:51:08 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 6 21:51:08 2020 +0900 [BROWSEUI_APITEST] Follow-up of #3123 (94a413a) --- modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c index be16dfa29b7..ea45c95d18f 100644 --- a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c +++ b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -422,6 +422,7 @@ START_TEST(SHExplorerParseCmdLine) { __LINE__, L"/inproc,\"c:\\\"", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, { __LINE__, L"/inproc,{20d04fe0-3aea-1069-a2d8-08002b30309d}", TRUE, PIDL_IS_UNTOUCHED, 0x00000400 }, { __LINE__, L"shell:::{450D8FBA-AD25-11D0-98A8-0800361B1103}", TRUE, CSIDL_MYDOCUMENTS, 0x00000200 }, + { __LINE__, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", TRUE, CSIDL_MYDOCUMENTS, 0x00000200 }, }; const int TestCount = sizeof(Tests) / sizeof(Tests[0]); PWSTR CommandLine;

4 years, 8 months

1
0
0 0

[reactos] 01/01: [BROWSEUI] Stop the address edit box trying to parse a null pidl

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=246e6a0de99e9d993fe9e… commit 246e6a0de99e9d993fe9e4c0916d16af73b84ea1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 14:32:59 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 14:32:59 2020 +0200 [BROWSEUI] Stop the address edit box trying to parse a null pidl --- dll/win32/browseui/addresseditbox.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index f3d7bc20008..69e6f25d50c 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -390,6 +390,12 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID ri if (FAILED_UNEXPECTEDLY(hr)) return hr; + if (!absolutePIDL) + { + ERR("Got no PIDL, investigate me!\n"); + return S_OK; + } + /* Fill the combobox */ PopulateComboBox(absolutePIDL);

4 years, 8 months

1
0
0 0

[reactos] 01/01: [ZIPFLDR] Fix PathCompactPathW writing out of bounds CORE-17245

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53badbd2f78630fc0cc72… commit 53badbd2f78630fc0cc72e3cd3ff0e6a04a00eab Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 14:28:56 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 6 14:28:56 2020 +0200 [ZIPFLDR] Fix PathCompactPathW writing out of bounds CORE-17245 --- dll/shellext/zipfldr/CZipExtract.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index f9dd21d9b0e..1ccba19b226 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -293,7 +293,7 @@ public: { SetWizardButtons(PSWIZB_FINISH); CStringW Path = m_pExtract->m_Directory; - PWSTR Ptr = Path.GetBuffer(); + PWSTR Ptr = Path.GetBuffer(MAX_PATH); RECT rc; ::GetWindowRect(GetDlgItem(IDC_DESTDIR), &rc); HDC dc = GetDC();

4 years, 8 months

1
0
0 0

[reactos] 01/01: [CMAKE] Fix regressions CORE-17243 & CORE-17246

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4fee60e460966e7aa9b2… commit a4fee60e460966e7aa9b21e696c854750a9171d4 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Sep 6 04:35:33 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Sep 6 04:35:33 2020 +0200 [CMAKE] Fix regressions CORE-17243 & CORE-17246 By sledge-hammer-reverting of 0.4.15-dev-689-g 7ffb6a09c370ef51de554a1ce913f871d72b76ca and 0.4.15-dev-688-g 1234223f417c2ea9617af0f7a1d80934861eb7d1 Sorry, but the negative impact for other devs and the whole project are just unbearable. Stuff got committed meanwhile even so I had to act. The improvements may be reapplied later when the negative consequences are under control. --- CMakeLists.txt | 3 + boot/CMakeLists.txt | 138 +++++++++++------------- boot/bootdata/packages/CMakeLists.txt | 27 +---- sdk/cmake/CMakeMacros.cmake | 192 +++++++++++++++++++++++----------- 4 files changed, 201 insertions(+), 159 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7f851df962..4cbb6b3f190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,6 +265,9 @@ else() # Create the registry hives create_registry_hives() + # Create {bootcd, livecd, bootcdregtest}.lst + create_iso_lists() + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/sdk/include/reactos) add_dependency_footer() diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 17bc2bdce61..727f75a7fff 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -15,12 +15,11 @@ else() message(FATAL_ERROR "Unknown ARCH '" ${ARCH} "', cannot generate a valid UEFI boot filename.") endif() -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin +add_custom_target(efisys COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi DEPENDS native-fatten fat bootmgfw VERBATIM) -add_custom_target(efisys DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) + # Create an 'empty' directory (guaranteed to be empty) to be able to add # arbitrary empty directories to the ISO image using mkisofs. @@ -60,119 +59,108 @@ set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Vol # Create user profile directories in the LiveImage -function(add_allusers_profile_dirs _target _rootdir) - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty") +function(add_allusers_profile_dirs _image_filelist _rootdir) + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") endfunction() -function(add_user_profile_dirs _target _rootdir _username) - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty") - set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty") +function(add_user_profile_dirs _image_filelist _rootdir _username) + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") endfunction() ## BootCD -# create file list on generation phase -file(GENERATE - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst - CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:bootcd,FILE_LIST>,\n>>) -# create target -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/bootcd.iso +# Create the file list +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + +add_custom_target(bootcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso - DEPENDS isombr native-isohybrid native-mkisofs $<TARGET_PROPERTY:bootcd,ISO_DEPENDENCIES> + DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) -add_custom_target(bootcd DEPENDS ${REACTOS_BINARY_DIR}/bootcd.iso) ## BootCDRegTest -# create file list on generation phase -file(GENERATE - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst - CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:bootcdregtest,FILE_LIST>,\n>>) -# create target -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/bootcdregtest.iso +# Create the file list +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "") +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + +add_custom_target(bootcdregtest COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso - DEPENDS isombr native-isohybrid native-mkisofs $<TARGET_PROPERTY:bootcdregtest,ISO_DEPENDENCIES> + DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) -add_custom_target(bootcdregtest DEPENDS ${REACTOS_BINARY_DIR}/bootcdregtest.iso) ## LiveCD -# create file list on generation phase -file(GENERATE - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst - CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:livecd,FILE_LIST>,\n>>) -# create target -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso +# Create the file list +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + +# Create user profile directories +add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") +add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") + +add_custom_target(livecd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso - DEPENDS isombr native-isohybrid native-mkisofs ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst $<TARGET_PROPERTY:livecd,ISO_DEPENDENCIES> + DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) -add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) -# Create user profile directories -add_allusers_profile_dirs(livecd "Profiles") -add_user_profile_dirs(livecd "Profiles" "Default User") ## HybridCD -# create file list on generation phase -file(GENERATE - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst - CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:hybridcd,FILE_LIST>,\n>>) -# create target -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/hybridcd.iso +# Create the file list +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "") +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") + +# Create user profile directories +add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") +add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") + +add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso - DEPENDS isombr native-isohybrid native-mkisofs ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst $<TARGET_PROPERTY:hybridcd,ISO_DEPENDENCIES> + DEPENDS bootcd livecd VERBATIM) -add_custom_target(hybridcd DEPENDS ${REACTOS_BINARY_DIR}/hybridcd.iso) -# Create user profile directories -add_allusers_profile_dirs(hybridcd "livecd/Profiles") -add_user_profile_dirs(livecd "livecd/Profiles" "Default User") add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) -add_cd_file(TARGET livecd FILE ${REACTOS_BINARY_DIR}/livecd.iso DESTINATION livecd FOR hybridcd) add_subdirectory(freeldr) add_subdirectory(bootdata) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index 5ef12d6f107..3f1cc6ff00c 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -31,37 +31,20 @@ add_custom_command( -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake - COMMAND ${CMAKE_COMMAND} -E copy_if_different + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn) -# reactos.inf. We want this command to be always executed, in case someone added an optional file between two builds. -# So we pretend it generates another file although it will never do. -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file +add_custom_target( + reactos_cab_inf COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf native-cabman $<TARGET_PROPERTY:reactos_cab,CAB_DEPENDENCIES>) - -add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) - -add_cd_file( - TARGET reactos_cab - FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - DESTINATION reactos - NO_CAB FOR bootcd regtest) - add_cd_file( - TARGET reactos_cab - FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf - NAME_ON_CD reactos.inf + TARGET reactos_cab_inf + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index a99c9ea3b03..5ac5dec5555 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -309,12 +309,7 @@ macro(dir_to_num dir var) endmacro() function(add_cd_file) - cmake_parse_arguments(_CD "NO_CAB;NOT_IN_HYBRIDCD" "DESTINATION;NAME_ON_CD;TARGET;FILE" "FOR" ${ARGN}) - - if (_CD_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Unexpected arguments to add_cd_file : ${_CD_UNPARSED_ARGUMENTS}") - endif() - + cmake_parse_arguments(_CD "NO_CAB;NOT_IN_HYBRIDCD" "DESTINATION;NAME_ON_CD;TARGET" "FILE;FOR" ${ARGN}) if(NOT (_CD_TARGET OR _CD_FILE)) message(FATAL_ERROR "You must provide a target or a file to install!") endif() @@ -337,10 +332,6 @@ function(add_cd_file) endif() endif() - if (NOT _CD_NAME_ON_CD) - get_filename_component(_CD_NAME_ON_CD ${_CD_FILE} NAME) - endif() - # do we add it to all CDs? list(FIND _CD_FOR all __cd) if(NOT __cd EQUAL -1) @@ -348,38 +339,42 @@ function(add_cd_file) list(INSERT _CD_FOR __cd "bootcd;livecd;regtest") endif() - # do we add it to bootcd? list(FIND _CD_FOR bootcd __cd) if(NOT __cd EQUAL -1) # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) # directly on cd - set_property(TARGET bootcd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") - # add it also into the hybridcd if not specified otherwise - if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") - endif() - # manage dependency - if(_CD_TARGET) - set_property(TARGET bootcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) - if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + foreach(item ${_CD_FILE}) + if(_CD_NAME_ON_CD) + # rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) endif() - else() - set_property(TARGET bootcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") + # add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") endif() + endforeach() + # manage dependency + if(_CD_TARGET) + add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() dir_to_num(${_CD_DESTINATION} _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n") - # manage dependencies + foreach(item ${_CD_FILE}) + # add it in reactos.cab + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n") + + # manage dependency - file level + set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item}) + endforeach() + + # manage dependency - target level if(_CD_TARGET) - set_property(TARGET reactos_cab APPEND PROPERTY CAB_DEPENDENCIES ${_CD_TARGET}) - else() - set_property(TARGET reactos_cab APPEND PROPERTY CAB_DEPENDENCIES ${_CD_FILE}) + add_dependencies(reactos_cab_inf ${_CD_TARGET}) endif() endif() endif() #end bootcd @@ -389,36 +384,39 @@ function(add_cd_file) if(NOT __cd EQUAL -1) # manage dependency if(_CD_TARGET) - set_property(TARGET livecd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) - if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) - endif() + add_dependencies(livecd ${_CD_TARGET} registry_inf) endif() - - set_property(TARGET livecd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") - # manage dependency - if (NOT _CD_TARGET) - set_property(TARGET livecd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) - endif() - # add it also into the hybridcd if not specified otherwise - if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(TARGET hybridcd APPEND PROPERTY FILE_LIST "livecd/${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") - if (NOT _CD_TARGET) - set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + foreach(item ${_CD_FILE}) + if(_CD_NAME_ON_CD) + # rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) endif() - endif() + set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") + # add it also into the hybridcd if not specified otherwise + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "livecd/${_CD_DESTINATION}/${__file}=${item}") + endif() + endforeach() endif() #end livecd # do we need also to add it to hybridcd? list(FIND _CD_FOR hybridcd __cd) if(NOT __cd EQUAL -1) - set_property(TARGET hybridcd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") # manage dependency if(_CD_TARGET) - set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) - else() - set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + add_dependencies(hybridcd ${_CD_TARGET}) endif() + foreach(item ${_CD_FILE}) + if(_CD_NAME_ON_CD) + # rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) + endif() + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") + endforeach() endif() #end hybridcd # do we add it to regtest? @@ -426,12 +424,19 @@ function(add_cd_file) if(NOT __cd EQUAL -1) # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - set_property(TARGET bootcdregtest APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + # directly on cd + foreach(item ${_CD_FILE}) + if(_CD_NAME_ON_CD) + # rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) + endif() + set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") + endforeach() # manage dependency if(_CD_TARGET) - set_property(TARGET bootcdregtest APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) - else() - set_property(TARGET bootcdregtest APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) endif() else() #add it in reactos.cab @@ -445,6 +450,68 @@ function(add_cd_file) endif() #end bootcd endfunction() +function(create_iso_lists) + # generate reactos.cab before anything else + get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS) + + # begin with reactos.inf. We want this command to be always executed, so we pretend it generates another file although it will never do. + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf reactos_cab_inf) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman ${_filelist}) + + add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) + add_dependencies(reactos_cab reactos_cab_inf) + + add_cd_file( + TARGET reactos_cab + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + DESTINATION reactos + NO_CAB FOR bootcd regtest) + + add_cd_file( + FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso + DESTINATION livecd + FOR hybridcd) + + get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst "${_filelist}") + unset(_filelist) + file(GENERATE + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.$<CONFIG>.lst + INPUT ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst) + + get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst "${_filelist}") + unset(_filelist) + file(GENERATE + OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.$<CONFIG>.lst + INPUT ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst) + + get_property(_filelist GLOBAL PROPERTY HYBRIDCD_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst "${_filelist}") + unset(_filelist) + file(GENERATE + OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.$<CONFIG>.lst + INPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst) + + get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst "${_filelist}") + unset(_filelist) + file(GENERATE + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.$<CONFIG>.lst + INPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst) +endfunction() + # Create module_clean targets function(add_clean_target _target) set(_clean_working_directory ${CMAKE_CURRENT_BINARY_DIR}) @@ -820,11 +887,15 @@ function(create_registry_hives) ${CMAKE_BINARY_DIR}/boot/bootdata/sam ${CMAKE_BINARY_DIR}/boot/bootdata/security) - add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) - add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/software TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) - add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/default TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) - add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) - add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/security TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file( + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/security + TARGET livecd_hives + DESTINATION reactos/system32/config + FOR livecd) # BCD Hive add_custom_command( @@ -853,13 +924,10 @@ function(add_driver_inf _module) COMMAND native-utf16le "${_source_item}" "${_converted_item}" DEPENDS native-utf16le "${_source_item}") list(APPEND _converted_inf_files ${_converted_item}) - endforeach() add_custom_target(${_module}_inf_files DEPENDS ${_converted_inf_files}) - foreach(item ${_converted_inf_files}) - add_cd_file(FILE ${item} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) - endforeach() + add_cd_file(FILE ${_converted_inf_files} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) endfunction() if(KDBG)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen SHExplorerParseCmdLine testcase a bit (#3123)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94a413ae3e410ff01a1c6… commit 94a413ae3e410ff01a1c6e50d416fe8f9660829d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 6 08:03:09 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 6 08:03:09 2020 +0900 [BROWSEUI_APITEST] Strengthen SHExplorerParseCmdLine testcase a bit (#3123) CORE-14177 --- .../apitests/browseui/SHExplorerParseCmdLine.c | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c index 59b7c0452c8..be16dfa29b7 100644 --- a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c +++ b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -2,7 +2,8 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Test for SHExplorerParseCmdLine - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <apitest.h> @@ -30,7 +31,7 @@ typedef struct _EXPLORER_INFO DWORD dwFlags; ULONG Unknown1[5]; PIDLIST_ABSOLUTE pidlRoot; - ULONG Unknown3[4]; + CLSID clsid; GUID guidInproc; ULONG Padding[PADDING_SIZE]; } EXPLORER_INFO, *PEXPLORER_INFO; @@ -85,6 +86,7 @@ _In_ INT ExpectedCsidl, _In_ DWORD ExpectedFlags, _In_ PCWSTR ExpectedFileName, _In_ PCWSTR PidlPath, +_In_ PCWSTR pclsid, _Out_opt_ PUINT PWriteEnd) { EXPLORER_INFO Info; @@ -220,6 +222,23 @@ _Out_opt_ PUINT PWriteEnd) } } + { + LPOLESTR psz; + BYTE ab[sizeof(CLSID)]; + + StringFromCLSID(&Info.clsid, &psz); + if (pclsid == NULL) + { + FillMemory(ab, sizeof(ab), 0x55); + ok(memcmp(ab, &Info.clsid, sizeof(ab)) == 0, "Line %lu: CLSID was %ls.\n", TestLine, psz); + } + else + { + ok(lstrcmpiW(psz, pclsid) == 0, "Line %lu: CLSID was %ls.\n", TestLine, psz); + } + CoTaskMemFree(psz); + } + if (PWriteEnd) { PBYTE data = (PBYTE)&Info; @@ -248,6 +267,7 @@ START_TEST(SHExplorerParseCmdLine) DWORD ExpectedFlags; PCWSTR ExpectedFileName; PCWSTR PidlPath; + PCWSTR pclsid; } Tests [] = { { __LINE__, L"", -1, CSIDL_MYDOCUMENTS, 0x00000009 }, @@ -401,6 +421,7 @@ START_TEST(SHExplorerParseCmdLine) { __LINE__, L"/inproc,c:\\", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, { __LINE__, L"/inproc,\"c:\\\"", FALSE, PIDL_IS_UNTOUCHED, 0x00000000 }, { __LINE__, L"/inproc,{20d04fe0-3aea-1069-a2d8-08002b30309d}", TRUE, PIDL_IS_UNTOUCHED, 0x00000400 }, + { __LINE__, L"shell:::{450D8FBA-AD25-11D0-98A8-0800361B1103}", TRUE, CSIDL_MYDOCUMENTS, 0x00000200 }, }; const int TestCount = sizeof(Tests) / sizeof(Tests[0]); PWSTR CommandLine; @@ -440,6 +461,7 @@ START_TEST(SHExplorerParseCmdLine) Tests[i].ExpectedFlags, Tests[i].ExpectedFileName, Tests[i].PidlPath, + Tests[i].pclsid, &cWrite); if (cWrite > maxWrite)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [NTUSER] Demote ERR to TRACE, also some minor corrections (#3132)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f428f5522c9a6a4ec8cf… commit 9f428f5522c9a6a4ec8cf19f7f0c543c944b9483 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 5 16:59:10 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 5 17:59:10 2020 +0300 [NTUSER] Demote ERR to TRACE, also some minor corrections (#3132) --- win32ss/user/ntuser/message.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index ae0c0733ebe..2d6164e7c7c 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -800,7 +800,7 @@ static LRESULT handle_internal_message( PWND pWnd, UINT msg, WPARAM wparam, LPAR } case WM_ASYNC_DESTROYWINDOW: { - ERR("WM_ASYNC_DESTROYWINDOW\n"); + TRACE("WM_ASYNC_DESTROYWINDOW\n"); if (pWnd->style & WS_CHILD) return co_UserFreeWindow(pWnd, PsGetCurrentProcessWin32Process(), PsGetCurrentThreadWin32Thread(), TRUE); else @@ -1867,8 +1867,8 @@ co_IntSendMessageWithCallBack( HWND hWnd, if(!(Message = AllocateUserMessage(FALSE))) { - ERR("MsqSendMessage(): Not enough memory to allocate a message"); - RETURN( FALSE); + ERR("MsqSendMessage(): Not enough memory to allocate a message\n"); + RETURN(FALSE); } Message->Msg.hwnd = hWnd;

4 years, 8 months

1
0
0 0

[reactos] 01/01: [EXPLORER] Implement HSHELL_ACTIVATESHELLWINDOW (#3125)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb529605a60c06d369b2d… commit fb529605a60c06d369b2dcf4c06a0d8e0c63c088 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 5 18:46:49 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 5 18:46:49 2020 +0900 [EXPLORER] Implement HSHELL_ACTIVATESHELLWINDOW (#3125) Implement HSHELL_ACTIVATESHELLWINDOW shell hook. --- base/shell/explorer/taskswnd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 17d11e27ed0..f8f4147c225 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1533,6 +1533,10 @@ public: break; case HSHELL_ACTIVATESHELLWINDOW: + ::SwitchToThisWindow(m_Tray->GetHWND(), TRUE); + ::SetForegroundWindow(m_Tray->GetHWND()); + break; + case HSHELL_LANGUAGE: case HSHELL_SYSMENU: case HSHELL_ENDTASK:

4 years, 8 months

1
0
0 0

[reactos] 01/01: [CMD] Code formatting for IsValidPathName, IsExistingFile, IsExistingDirectory, and use INVALID_FILE_ATTRIBUTES instead of an hardcoded value.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=050df0f56df52aaf628e4… commit 050df0f56df52aaf628e4cc5dedd9799e42c9489 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 4 00:17:15 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 4 00:24:45 2020 +0200 [CMD] Code formatting for IsValidPathName, IsExistingFile, IsExistingDirectory, and use INVALID_FILE_ATTRIBUTES instead of an hardcoded value. --- base/shell/cmd/cmd.h | 7 ++++--- base/shell/cmd/filecomp.c | 4 ++-- base/shell/cmd/if.c | 2 +- base/shell/cmd/misc.c | 28 +++++++++++++--------------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index c4b4cca90ca..205ff8ef7fe 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -297,9 +297,10 @@ LPTSTR *splitspace (LPTSTR, LPINT); VOID freep (LPTSTR *); LPTSTR _stpcpy (LPTSTR, LPCTSTR); VOID StripQuotes(LPTSTR); -BOOL IsValidPathName (LPCTSTR); -BOOL IsExistingFile (LPCTSTR); -BOOL IsExistingDirectory (LPCTSTR); + +BOOL IsValidPathName(IN LPCTSTR pszPath); +BOOL IsExistingFile(IN LPCTSTR pszPath); +BOOL IsExistingDirectory(IN LPCTSTR pszPath); VOID GetPathCase(TCHAR *, TCHAR *); #define PROMPT_NO 0 diff --git a/base/shell/cmd/filecomp.c b/base/shell/cmd/filecomp.c index 060b2122c02..9dfa2943fdc 100644 --- a/base/shell/cmd/filecomp.c +++ b/base/shell/cmd/filecomp.c @@ -532,7 +532,7 @@ FileNameContainsSpecialCharacters(LPTSTR pszFileName) (chr == _T('^')) || (chr == _T('~')) || (chr == _T('+')) || - (chr == 0xB4)) // '�' + (chr == 0xB4)) // '´' { return TRUE; } @@ -669,7 +669,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) /* Don't show files when they are doing 'cd' or 'rd' */ if (!ShowAll && - file.dwFileAttributes != 0xFFFFFFFF && + file.dwFileAttributes != INVALID_FILE_ATTRIBUTES && !(file.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { continue; diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index 66526ee154a..e219a3db225 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -138,7 +138,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) attrs = GetFileAttributes(Right); } - if (attrs == 0xFFFFFFFF) + if (attrs == INVALID_FILE_ATTRIBUTES) result = FALSE; else if (IsDir) result = ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index cd7a08f7722..97b252e50ed 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -477,36 +477,34 @@ StripQuotes(TCHAR *in) /* - * Checks if a path is valid (accessible) + * Checks if a path is valid (is accessible) */ -BOOL IsValidPathName (LPCTSTR pszPath) +BOOL IsValidPathName(IN LPCTSTR pszPath) { - TCHAR szOldPath[MAX_PATH]; BOOL bResult; + TCHAR szOldPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szOldPath); - bResult = SetCurrentDirectory (pszPath); + GetCurrentDirectory(ARRAYSIZE(szOldPath), szOldPath); + bResult = SetCurrentDirectory(pszPath); - SetCurrentDirectory (szOldPath); + SetCurrentDirectory(szOldPath); return bResult; } - /* - * Checks if a file exists (accessible) + * Checks if a file exists (is accessible) */ -BOOL IsExistingFile (LPCTSTR pszPath) +BOOL IsExistingFile(IN LPCTSTR pszPath) { - DWORD attr = GetFileAttributes (pszPath); - return (attr != 0xFFFFFFFF && (! (attr & FILE_ATTRIBUTE_DIRECTORY)) ); + DWORD attr = GetFileAttributes(pszPath); + return ((attr != INVALID_FILE_ATTRIBUTES) && !(attr & FILE_ATTRIBUTE_DIRECTORY)); } - -BOOL IsExistingDirectory (LPCTSTR pszPath) +BOOL IsExistingDirectory(IN LPCTSTR pszPath) { - DWORD attr = GetFileAttributes (pszPath); - return (attr != 0xFFFFFFFF && (attr & FILE_ATTRIBUTE_DIRECTORY) ); + DWORD attr = GetFileAttributes(pszPath); + return ((attr != INVALID_FILE_ATTRIBUTES) && (attr & FILE_ATTRIBUTE_DIRECTORY)); }

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SETUP] French translation of missing elements (#3111)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5634138c37263f6bcb65… commit a5634138c37263f6bcb65700055c0f90ab63fe0d Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu Sep 3 21:20:54 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 3 21:20:54 2020 +0200 [SETUP] French translation of missing elements (#3111) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/setup/usetup/lang/fr-FR.h | 68 +++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index aeb2913ffee..263e73a62f6 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -192,63 +192,63 @@ static MUI_ENTRY frFRIntroPageEntries[] = { 6, 8, - "ReactOS Version Status", + "Statut de version de ReactOS", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "ReactOS est en version Alpha, ce qui signifie qu'il n'est pas complet", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "et est en cours de d\202veloppement. Il est recommand\202 de ne l'utiliser", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "que pour \202valuation et test, pas pour un usage quotidien.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 15, - "Backup your data or test on a secondary computer if you attempt", + "Sauvegardez vos donn\202es ou testez sur un ordinateur secondaire", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 16, - "to run ReactOS on real hardware.", + "si vous souhaitez utiliser ReactOS sur du mat\202riel.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 Appuyez sur ENTR\220E pour continuer l'installation de ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 Appuyez sur F3 pour quitter sans installer ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTR\220E = Continuer F3 = Quitter", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -279,112 +279,126 @@ static MUI_ENTRY frFRLicensePageEntries[] = { 8, 8, - "The ReactOS System is licensed under the terms of the", + "Le syst\212me ReactOS est distribu\202 sous les termes de", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 9, - "GNU GPL with parts containing code from other compatible", + "la licence GNU GPL avec des parties contenant du code sous", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 10, - "licenses such as the X11 or BSD and GNU LGPL licenses.", + "d'autres licences compatibles telles que X11, BSD et GNU LGPL.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 11, - "All software that is part of the ReactOS system is", + "Tout le logiciel constituant le syst\212me ReactOS est", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 12, - "therefore released under the GNU GPL as well as maintaining", + "par cons\202quent distribu\202 sous licence GNU GPL tout en", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 13, - "the original license.", + "maintenant la licence d'origine.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 15, - "This software comes with NO WARRANTY or restrictions on usage", + "Ce logiciel vient SANS GARANTIE ou restriction d'usage", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 16, - "save applicable local and international law. The licensing of", + "sous les lois locales ou internationales applicables.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "ReactOS only covers distribution to third parties.", + "La licence de ReactOS ne couvre que la distribution", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 18, - "If for some reason you did not receive a copy of the", + "aux tierces parties.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "GNU General Public License with ReactOS please visit", + "Si vous n'avez pas obtenu une copie de la", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 20, + "GNU General Public License avec ReactOS veuillez visiter", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 8, + 21, "http://www.gnu.org/licenses/licenses.html", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 8, - 22, + 23, "Garantie :", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 8, - 24, - "This is free software; see the source for copying conditions.", + 25, + "Ce logiciel est gratuit. Voir les sources pour les", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, - 25, - "There is NO warranty; not even for MERCHANTABILITY or", + 26, + "conditions de copie.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, - 26, - "FITNESS FOR A PARTICULAR PURPOSE", + 27, + "Il n'y a AUCUNE garantie; pas m\210me sur la QUALIT\220 ou", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 8, + 28, + "l'AD\220QUATION POUR UN USAGE EN PARTICULIER", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

4 years, 8 months

1
0
0 0

[reactos] 01/01: [CMD] IF: Add extra validity checks in ExecuteIf().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c81bf4f823aa09448a583… commit c81bf4f823aa09448a58331b5c3e38f88416c208 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 3 16:03:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 3 16:05:55 2020 +0200 [CMD] IF: Add extra validity checks in ExecuteIf(). --- base/shell/cmd/cmd.c | 2 +- base/shell/cmd/if.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index fbc12154d1b..f760bf7745c 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -938,7 +938,7 @@ GetEnvVarOrSpecial(LPCTSTR varName) /* %CMDEXTVERSION% */ else if (_tcsicmp(varName, _T("CMDEXTVERSION")) == 0) { - /* Set version number to CMDEXTVERSION */ + /* Set Command Extensions version number to CMDEXTVERSION */ _itot(CMDEXTVERSION, ret, 10); return ret; } diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index e74298ad612..66526ee154a 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -78,20 +78,19 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) Right = DoDelayedExpansion(Cmd->If.RightArg); if (!Right) { - cmd_free(Left); + if (Left) cmd_free(Left); return 1; } if (bEnableExtensions && (Cmd->If.Operator == IF_CMDEXTVERSION)) { - /* IF CMDEXTVERSION n: check if Command Extensions version - * is greater or equal to n */ + /* IF CMDEXTVERSION n: check if Command Extensions + * version is greater or equal to n. */ DWORD n = _tcstoul(Right, &param, 10); if (*param != _T('\0')) { error_syntax(Right); - cmd_free(Right); - return 1; + goto fail; } result = (CMDEXTVERSION >= n); } @@ -107,8 +106,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) if (*param != _T('\0')) { error_syntax(Right); - cmd_free(Right); - return 1; + goto fail; } result = (nErrorLevel >= n); } @@ -178,11 +176,19 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) case IF_LEQ: result = (result <= 0); break; case IF_GTR: result = (result > 0); break; case IF_GEQ: result = (result >= 0); break; + default: goto unknownOp; } } + else + { +unknownOp: + ERR("Unknown IF operator 0x%x\n", Cmd->If.Operator); + ASSERT(FALSE); + goto fail; + } } - cmd_free(Left); + if (Left) cmd_free(Left); cmd_free(Right); if (result ^ ((Cmd->If.Flags & IFFLAG_NEGATE) != 0)) @@ -195,6 +201,11 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) /* Full condition was false, do the "else" command if there is one */ return ExecuteCommand(Cmd->Subcommands->Next); } + +fail: + if (Left) cmd_free(Left); + cmd_free(Right); + return 1; } /* EOF */

4 years, 8 months

1
0
0 0

[reactos] 01/01: [INETCPL] Update Hebrew translation (#3122)

by Omer Itzic S

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49972f51c6f4f45b314c4… commit 49972f51c6f4f45b314c406adc3d10a01797baa8 Author: Omer Itzic S <66558205+omeritzics(a)users.noreply.github.com> AuthorDate: Wed Sep 2 02:38:44 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 3 15:00:08 2020 +0300 [INETCPL] Update Hebrew translation (#3122) --- dll/cpl/inetcpl/lang/He.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/inetcpl/lang/He.rc b/dll/cpl/inetcpl/lang/He.rc index 1ca433008c6..ee5bf9bb5e9 100644 --- a/dll/cpl/inetcpl/lang/He.rc +++ b/dll/cpl/inetcpl/lang/He.rc @@ -68,7 +68,7 @@ END IDD_DELETE_HISTORY DIALOGEX 0, 0, 250, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Delete browsing history" +CAPTION "מחק היסטוריית גלישה" BEGIN AUTOCHECKBOX "Temporary internet files\nCached copies of web pages, images and certificates.", @@ -125,7 +125,7 @@ END IDD_CONNECTIONS DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Connections" +CAPTION "חיבורים" BEGIN GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32] Big fix for change notification (#3048)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c134e4d14efa98eac47e… commit 7c134e4d14efa98eac47e8b6b4b3589d5db8f8ac Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 3 13:36:31 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 3 13:36:31 2020 +0900 [SHELL32] Big fix for change notification (#3048) - Reduced the failures of SHChangeNotify testcase. - Simplified change notification mechanism. - Realized PIDL aliasing. CORE-13950 --- dll/win32/shell32/CDefView.cpp | 33 +--- dll/win32/shell32/changenotify.cpp | 187 +++++++++++++++++++-- .../shell32/shelldesktop/CChangeNotifyServer.cpp | 117 +++++-------- dll/win32/shell32/shelldesktop/CDirectoryList.cpp | 10 ++ .../shell32/shelldesktop/CDirectoryWatcher.cpp | 5 +- dll/win32/shell32/stubs.cpp | 35 ---- dll/win32/shell32/wine/pidl.c | 8 +- 7 files changed, 244 insertions(+), 151 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 6948e572958..6495b08610e 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1166,39 +1166,14 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl SetShellWindowEx(hwndSB, m_ListView); } - INT nRegCount; - SHChangeNotifyEntry ntreg[3]; - PIDLIST_ABSOLUTE pidls[3]; - if (_ILIsDesktop(m_pidlParent)) - { - nRegCount = 3; - SHGetSpecialFolderLocation(m_hWnd, CSIDL_DESKTOPDIRECTORY, &pidls[0]); - SHGetSpecialFolderLocation(m_hWnd, CSIDL_COMMON_DESKTOPDIRECTORY, &pidls[1]); - SHGetSpecialFolderLocation(m_hWnd, CSIDL_BITBUCKET, &pidls[2]); - ntreg[0].fRecursive = FALSE; - ntreg[0].pidl = pidls[0]; - ntreg[1].fRecursive = FALSE; - ntreg[1].pidl = pidls[1]; - ntreg[2].fRecursive = FALSE; - ntreg[2].pidl = pidls[2]; - } - else - { - nRegCount = 1; - ntreg[0].fRecursive = FALSE; - ntreg[0].pidl = m_pidlParent; - } + SHChangeNotifyEntry ntreg[1]; + ntreg[0].fRecursive = FALSE; + ntreg[0].pidl = m_pidlParent; m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNRF_InterruptLevel | SHCNRF_ShellLevel | SHCNRF_NewDelivery, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, - nRegCount, ntreg); - if (nRegCount == 3) - { - ILFree(pidls[0]); - ILFree(pidls[1]); - ILFree(pidls[2]); - } + 1, ntreg); /* _DoFolderViewCB(SFVM_GETNOTIFY, ?? ??) */ diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index ae5e0e8bdb4..08a7e632eba 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -294,13 +294,16 @@ CreateRegistrationParam(ULONG nRegID, HWND hwnd, UINT wMsg, INT fSources, LONG f // It creates a delivery ticket and send CN_DELIVER_NOTIFICATION message to // transport the change. static void -CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPITEMIDLIST pidl1, LPITEMIDLIST pidl2, +CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, DWORD dwTick) { // get server window HWND hwndServer = GetNotificationServer(FALSE); if (hwndServer == NULL) + { + ERR("hwndServer == NULL\n"); return; + } // the ticket owner is the process of the notification server DWORD pid; @@ -314,10 +317,79 @@ CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPITEMIDLIST pidl1, L TRACE("hTicket: %p, 0x%lx\n", hTicket, pid); // send the ticket by using CN_DELIVER_NOTIFICATION - if ((uFlags & (SHCNF_FLUSH | SHCNF_FLUSHNOWAIT)) == SHCNF_FLUSH) + if (pid != GetCurrentProcessId() || + (uFlags & (SHCNF_FLUSH | SHCNF_FLUSHNOWAIT)) == SHCNF_FLUSH) + { SendMessageW(hwndServer, CN_DELIVER_NOTIFICATION, (WPARAM)hTicket, pid); + } else + { SendNotifyMessageW(hwndServer, CN_DELIVER_NOTIFICATION, (WPARAM)hTicket, pid); + } +} + +struct ALIAS_PIDL +{ + INT csidl1; // from + INT csidl2; // to + LPITEMIDLIST pidl1; // from + LPITEMIDLIST pidl2; // to + WCHAR szPath1[MAX_PATH]; // from + WCHAR szPath2[MAX_PATH]; // to +}; + +static ALIAS_PIDL AliasPIDLs[] = +{ + { CSIDL_PERSONAL, CSIDL_PERSONAL }, + { CSIDL_DESKTOP, CSIDL_COMMON_DESKTOPDIRECTORY, }, + { CSIDL_DESKTOP, CSIDL_DESKTOPDIRECTORY }, +}; + +static VOID DoInitAliasPIDLs(void) +{ + static BOOL s_bInit = FALSE; + if (!s_bInit) + { + for (SIZE_T i = 0; i < _countof(AliasPIDLs); ++i) + { + ALIAS_PIDL *alias = &AliasPIDLs[i]; + + SHGetSpecialFolderLocation(NULL, alias->csidl1, &alias->pidl1); + SHGetPathFromIDListW(alias->pidl1, alias->szPath1); + + SHGetSpecialFolderLocation(NULL, alias->csidl2, &alias->pidl2); + SHGetPathFromIDListW(alias->pidl2, alias->szPath2); + } + s_bInit = TRUE; + } +} + +static BOOL DoGetAliasPIDLs(LPITEMIDLIST apidls[2], PCIDLIST_ABSOLUTE pidl) +{ + DoInitAliasPIDLs(); + + apidls[0] = apidls[1] = NULL; + + INT k = 0; + for (SIZE_T i = 0; i < _countof(AliasPIDLs); ++i) + { + const ALIAS_PIDL *alias = &AliasPIDLs[i]; + if (ILIsEqual(pidl, alias->pidl1)) + { + if (alias->csidl1 == alias->csidl2) + { + apidls[k++] = ILCreateFromPathW(alias->szPath2); + } + else + { + apidls[k++] = ILClone(alias->pidl2); + } + if (k >= 2) + break; + } + } + + return k > 0; } /************************************************************************* @@ -349,11 +421,10 @@ SHChangeNotifyRegister(HWND hwnd, INT fSources, LONG wEventMask, UINT uMsg, if (hwndServer == NULL) return INVALID_REG_ID; - // disable new delivery method in specific condition - if ((fSources & SHCNRF_RecursiveInterrupt) != 0 && - (fSources & SHCNRF_InterruptLevel) == 0) + // disable recursive interrupt in specific condition + if ((fSources & SHCNRF_RecursiveInterrupt) && !(fSources & SHCNRF_InterruptLevel)) { - fSources &= ~SHCNRF_NewDelivery; + fSources &= ~SHCNRF_RecursiveInterrupt; } // if it is old delivery method, then create a broker window @@ -393,13 +464,62 @@ SHChangeNotifyRegister(HWND hwnd, INT fSources, LONG wEventMask, UINT uMsg, SHFreeShared(hRegEntry, dwOwnerPID); } - // if failed, then destroy the broker - if (nRegID == INVALID_REG_ID && (fSources & SHCNRF_NewDelivery) == 0) + if (nRegID == INVALID_REG_ID) { ERR("Delivery failed\n"); - DestroyWindow(hwndBroker); + + if (hwndBroker) + { + // destroy the broker + DestroyWindow(hwndBroker); + } break; } + + // PIDL alias + LPITEMIDLIST apidlAlias[2]; + if (DoGetAliasPIDLs(apidlAlias, lpItems[iItem].pidl)) + { + if (apidlAlias[0]) + { + // create another registration entry + hRegEntry = CreateRegistrationParam(nRegID, hwnd, uMsg, fSources, wEventMask, + lpItems[iItem].fRecursive, apidlAlias[0], + dwOwnerPID, hwndBroker); + if (hRegEntry) + { + TRACE("CN_REGISTER: hwnd:%p, hRegEntry:%p, pid:0x%lx\n", + hwndServer, hRegEntry, dwOwnerPID); + + // send CN_REGISTER to the server + SendMessageW(hwndServer, CN_REGISTER, (WPARAM)hRegEntry, dwOwnerPID); + + // free registration entry + SHFreeShared(hRegEntry, dwOwnerPID); + } + ILFree(apidlAlias[0]); + } + + if (apidlAlias[1]) + { + // create another registration entry + hRegEntry = CreateRegistrationParam(nRegID, hwnd, uMsg, fSources, wEventMask, + lpItems[iItem].fRecursive, apidlAlias[1], + dwOwnerPID, hwndBroker); + if (hRegEntry) + { + TRACE("CN_REGISTER: hwnd:%p, hRegEntry:%p, pid:0x%lx\n", + hwndServer, hRegEntry, dwOwnerPID); + + // send CN_REGISTER to the server + SendMessageW(hwndServer, CN_REGISTER, (WPARAM)hRegEntry, dwOwnerPID); + + // free registration entry + SHFreeShared(hRegEntry, dwOwnerPID); + } + ILFree(apidlAlias[1]); + } + } } LeaveCriticalSection(&SHELL32_ChangenotifyCS); @@ -472,6 +592,39 @@ static LPCSTR DumpEvent(LONG event) #undef DUMPEV } +/************************************************************************* + * SHChangeRegistrationReceive [SHELL32.646] + */ +EXTERN_C BOOL WINAPI +SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) +{ + FIXME("SHChangeRegistrationReceive() stub\n"); + return FALSE; +} + +EXTERN_C VOID WINAPI +SHChangeNotifyReceiveEx(LONG lEvent, UINT uFlags, + LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, DWORD dwTick) +{ + // TODO: Queueing notifications + CreateNotificationParamAndSend(lEvent, uFlags, pidl1, pidl2, dwTick); +} + +/************************************************************************* + * SHChangeNotifyReceive [SHELL32.643] + */ +EXTERN_C VOID WINAPI +SHChangeNotifyReceive(LONG lEvent, UINT uFlags, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + SHChangeNotifyReceiveEx(lEvent, uFlags, pidl1, pidl2, GetTickCount()); +} + +EXTERN_C VOID WINAPI +SHChangeNotifyTransmit(LONG lEvent, UINT uFlags, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, DWORD dwTick) +{ + SHChangeNotifyReceiveEx(lEvent, uFlags, pidl1, pidl2, dwTick); +} + /************************************************************************* * SHChangeNotify [SHELL32.@] */ @@ -532,7 +685,7 @@ SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2) if (wEventId == 0 || (wEventId & SHCNE_ASSOCCHANGED) || pidl1 != NULL) { TRACE("notifying event %s(%x)\n", DumpEvent(wEventId), wEventId); - CreateNotificationParamAndSend(wEventId, uFlags, pidl1, pidl2, dwTick); + SHChangeNotifyTransmit(wEventId, uFlags, pidl1, pidl2, dwTick); } if (pidlTemp1) @@ -610,3 +763,17 @@ NTSHChangeNotifyDeregister(ULONG hNotify) FIXME("(0x%08x):semi stub.\n", hNotify); return SHChangeNotifyDeregister(hNotify); } + +/************************************************************************* + * SHChangeNotifySuspendResume [SHELL32.277] + */ +EXTERN_C BOOL +WINAPI +SHChangeNotifySuspendResume(BOOL bSuspend, + LPITEMIDLIST pidl, + BOOL bRecursive, + DWORD dwReserved) +{ + FIXME("SHChangeNotifySuspendResume() stub\n"); + return FALSE; +} diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index 2186fe20ca4..c0835faa919 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -11,8 +11,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcn); -// TODO: SHCNRF_RecursiveInterrupt - ////////////////////////////////////////////////////////////////////////////// // notification target item @@ -188,10 +186,6 @@ CreateDirectoryWatcherFromRegEntry(LPREGENTRY pRegEntry) if (pRegEntry->ibPidl == 0) return NULL; - // it must be interrupt level if pRegEntry is a filesystem watch - if (!(pRegEntry->fSources & SHCNRF_InterruptLevel)) - return NULL; - // get the path WCHAR szPath[MAX_PATH]; LPITEMIDLIST pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); @@ -249,13 +243,18 @@ LRESULT CChangeNotifyServer::OnRegister(UINT uMsg, WPARAM wParam, LPARAM lParam, } // create a directory watch if necessary - CDirectoryWatcher *pDirWatch = CreateDirectoryWatcherFromRegEntry(pRegEntry); - if (pDirWatch && !pDirWatch->RequestAddWatcher()) + CDirectoryWatcher *pDirWatch = NULL; + if (pRegEntry->ibPidl && (pRegEntry->fSources & SHCNRF_InterruptLevel)) { - pRegEntry->nRegID = INVALID_REG_ID; - SHUnlockShared(pRegEntry); - delete pDirWatch; - return FALSE; + pDirWatch = CreateDirectoryWatcherFromRegEntry(pRegEntry); + if (pDirWatch && !pDirWatch->RequestAddWatcher()) + { + ERR("RequestAddWatcher failed: %u\n", pRegEntry->nRegID); + pRegEntry->nRegID = INVALID_REG_ID; + SHUnlockShared(pRegEntry); + delete pDirWatch; + return FALSE; + } } // unlock the registry entry @@ -386,6 +385,7 @@ BOOL CChangeNotifyServer::DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID) TRACE("Notifying: %p, 0x%x, %p, %lu\n", pRegEntry->hwnd, pRegEntry->uMsg, hTicket, dwOwnerPID); SendMessageW(pRegEntry->hwnd, pRegEntry->uMsg, (WPARAM)hTicket, dwOwnerPID); + TRACE("GetLastError(): %ld\n", ::GetLastError()); } // unlock the registration entry @@ -400,91 +400,58 @@ BOOL CChangeNotifyServer::DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID) BOOL CChangeNotifyServer::ShouldNotify(LPDELITICKET pTicket, LPREGENTRY pRegEntry) { - LPITEMIDLIST pidl, pidl1 = NULL, pidl2 = NULL; - WCHAR szPath[MAX_PATH], szPath1[MAX_PATH], szPath2[MAX_PATH]; - INT cch, cch1, cch2; +#define RETURN(x) do { \ + TRACE("ShouldNotify return %d\n", (x)); \ + return (x); \ +} while (0) - // check fSources - if (pTicket->uFlags & SHCNE_INTERRUPT) + if (pTicket->wEventId & SHCNE_INTERRUPT) { if (!(pRegEntry->fSources & SHCNRF_InterruptLevel)) - return FALSE; + RETURN(FALSE); + if (!pRegEntry->ibPidl) + RETURN(FALSE); } else { if (!(pRegEntry->fSources & SHCNRF_ShellLevel)) - return FALSE; + RETURN(FALSE); } - if (pRegEntry->ibPidl == 0) - return TRUE; // there is no PIDL - - // get the stored pidl - pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); - if (pidl->mkid.cb == 0 && pRegEntry->fRecursive) - return TRUE; // desktop is the root + if (!(pTicket->wEventId & pRegEntry->fEvents)) + RETURN(FALSE); - // check pidl1 + LPITEMIDLIST pidl = NULL, pidl1 = NULL, pidl2 = NULL; + if (pRegEntry->ibPidl) + pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); if (pTicket->ibOffset1) - { pidl1 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset1); - if (ILIsEqual(pidl, pidl1) || ILIsParent(pidl, pidl1, !pRegEntry->fRecursive)) - return TRUE; - } - - // check pidl2 if (pTicket->ibOffset2) - { pidl2 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset2); - if (ILIsEqual(pidl, pidl2) || ILIsParent(pidl, pidl2, !pRegEntry->fRecursive)) - return TRUE; - } - // The paths: - // "C:\\Path\\To\\File1" - // "C:\\Path\\To\\File1Test" - // should be distinguished in comparison, so we add backslash at last as follows: - // "C:\\Path\\To\\File1\\" - // "C:\\Path\\To\\File1Test\\" - if (SHGetPathFromIDListW(pidl, szPath)) - { - PathAddBackslashW(szPath); - cch = lstrlenW(szPath); + if (pidl == NULL || (pTicket->wEventId & SHCNE_GLOBALEVENTS)) + RETURN(TRUE); - if (pidl1 && SHGetPathFromIDListW(pidl1, szPath1)) + if (pRegEntry->fRecursive) + { + if (ILIsParent(pidl, pidl1, FALSE) || + (pidl2 && ILIsParent(pidl, pidl2, FALSE))) { - PathAddBackslashW(szPath1); - cch1 = lstrlenW(szPath1); - - // Is szPath1 a subfile or subdirectory of szPath? - if (cch < cch1 && - (pRegEntry->fRecursive || - wcschr(&szPath1[cch], L'\\') == &szPath1[cch1 - 1])) - { - szPath1[cch] = 0; - if (lstrcmpiW(szPath, szPath1) == 0) - return TRUE; - } + RETURN(TRUE); } - - if (pidl2 && SHGetPathFromIDListW(pidl2, szPath2)) + } + else + { + if (ILIsEqual(pidl, pidl1) || + ILIsParent(pidl, pidl1, TRUE) || + (pidl2 && ILIsParent(pidl, pidl2, TRUE))) { - PathAddBackslashW(szPath2); - cch2 = lstrlenW(szPath2); - - // Is szPath2 a subfile or subdirectory of szPath? - if (cch < cch2 && - (pRegEntry->fRecursive || - wcschr(&szPath2[cch], L'\\') == &szPath2[cch2 - 1])) - { - szPath2[cch] = 0; - if (lstrcmpiW(szPath, szPath2) == 0) - return TRUE; - } + RETURN(TRUE); } } - return FALSE; + RETURN(FALSE); +#undef RETURN } HRESULT WINAPI CChangeNotifyServer::GetWindow(HWND* phwnd) diff --git a/dll/win32/shell32/shelldesktop/CDirectoryList.cpp b/dll/win32/shell32/shelldesktop/CDirectoryList.cpp index eff446df467..2bdd36f0eb0 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryList.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryList.cpp @@ -28,6 +28,16 @@ BOOL CDirectoryList::ContainsPath(LPCWSTR pszPath) const BOOL CDirectoryList::AddPath(LPCWSTR pszPath) { assert(!PathIsRelativeW(pszPath)); + if (ContainsPath(pszPath)) + return FALSE; + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].IsEmpty()) + { + m_items[i].SetPath(pszPath); + return TRUE; + } + } return m_items.Add(pszPath); } diff --git a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp index 9a206ac673a..1e4a7015287 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp @@ -15,7 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcn); static inline void NotifyFileSystemChange(LONG wEventId, LPCWSTR path1, LPCWSTR path2) { - SHChangeNotify(wEventId | SHCNE_INTERRUPT, SHCNF_PATHW, path1, path2); + SHChangeNotify(wEventId | SHCNE_INTERRUPT, SHCNF_PATHW | SHCNF_FLUSH, path1, path2); } // The handle of the APC thread @@ -138,6 +138,7 @@ void CDirectoryWatcher::ProcessNotification() WCHAR szName[MAX_PATH], szPath[MAX_PATH], szTempPath[MAX_PATH]; DWORD dwEvent, cbName; BOOL fDir; + TRACE("CDirectoryWatcher::ProcessNotification: enter\n"); // for each entry in s_buffer szPath[0] = szTempPath[0] = 0; @@ -225,6 +226,8 @@ void CDirectoryWatcher::ProcessNotification() // go next entry pInfo = (PFILE_NOTIFY_INFORMATION)((LPBYTE)pInfo + pInfo->NextEntryOffset); } + + TRACE("CDirectoryWatcher::ProcessNotification: leave\n"); } void CDirectoryWatcher::ReadCompletion(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index ebba2f3b298..a995e395509 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -329,17 +329,6 @@ CDefFolderMenu_Create(LPITEMIDLIST pidlFolder, return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) -{ - FIXME("SHChangeRegistrationReceive() stub\n"); - return FALSE; -} - /* * Unimplemented */ @@ -350,16 +339,6 @@ SHWaitOp_Operate(LPVOID lpUnknown1, DWORD dwUnknown2) FIXME("SHWaitOp_Operate() stub\n"); } -/* - * Unimplemented - */ -EXTERN_C VOID -WINAPI -SHChangeNotifyReceive(LONG lUnknown, UINT uUnknown, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - FIXME("SHChangeNotifyReceive() stub\n"); -} - /* * Unimplemented */ @@ -625,20 +604,6 @@ SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW pscpi) return FALSE; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHChangeNotifySuspendResume(BOOL bSuspend, - LPITEMIDLIST pidl, - BOOL bRecursive, - DWORD dwReserved) -{ - FIXME("SHChangeNotifySuspendResume() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/wine/pidl.c b/dll/win32/shell32/wine/pidl.c index a813f9293cd..1f27557db9b 100644 --- a/dll/win32/shell32/wine/pidl.c +++ b/dll/win32/shell32/wine/pidl.c @@ -1101,8 +1101,13 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath) MultiByteToWideChar(CP_ACP, 0, lpszPath, -1, wPath, len); } #ifdef __REACTOS__ + // FIXME: Needs folder attribute if (PathFileExistsW(wPath)) - return ILCreateFromPathW(wPath); + { + pidl = ILCreateFromPathW(wPath); + HeapFree(GetProcessHeap(), 0, wPath); + return pidl; + } #endif _ILParsePathW(wPath, NULL, TRUE, &pidl, NULL); @@ -1118,6 +1123,7 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathW(LPCWSTR lpszPath) TRACE("%s\n", debugstr_w(lpszPath)); #ifdef __REACTOS__ + // FIXME: Needs folder attribute if (PathFileExistsW(lpszPath)) return ILCreateFromPathW(lpszPath); #endif

4 years, 8 months

1
0
0 0

[reactos] 02/02: [CMAKE] Overhaul creation from CD

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ffb6a09c370ef51de554… commit 7ffb6a09c370ef51de554a1ce913f871d72b76ca Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 27 16:04:27 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Sep 2 11:02:44 2020 +0200 [CMAKE] Overhaul creation from CD Get rid of global properties and use a target-level properties instead Limit temporary files by using cmake-generator expressions instead Avoid function calls at the end configuration, use file(GENERATE) idiom instead --- CMakeLists.txt | 3 - boot/CMakeLists.txt | 117 +++++++++++---------- boot/bootdata/packages/CMakeLists.txt | 27 ++++- sdk/cmake/CMakeMacros.cmake | 192 +++++++++++----------------------- 4 files changed, 144 insertions(+), 195 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cbb6b3f190..b7f851df962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,9 +265,6 @@ else() # Create the registry hives create_registry_hives() - # Create {bootcd, livecd, bootcdregtest}.lst - create_iso_lists() - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/sdk/include/reactos) add_dependency_footer() diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index a18810d1e76..17bc2bdce61 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -60,44 +60,45 @@ set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Vol # Create user profile directories in the LiveImage -function(add_allusers_profile_dirs _image_filelist _rootdir) - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +function(add_allusers_profile_dirs _target _rootdir) + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty") endfunction() -function(add_user_profile_dirs _image_filelist _rootdir _username) - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +function(add_user_profile_dirs _target _rootdir _username) + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty") endfunction() ## BootCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:bootcd,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/bootcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 @@ -106,15 +107,16 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso - DEPENDS isombr native-isohybrid native-mkisofs + DEPENDS isombr native-isohybrid native-mkisofs $<TARGET_PROPERTY:bootcd,ISO_DEPENDENCIES> VERBATIM) add_custom_target(bootcd DEPENDS ${REACTOS_BINARY_DIR}/bootcd.iso) ## BootCDRegTest -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:bootcdregtest,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/bootcdregtest.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 @@ -123,19 +125,16 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso - DEPENDS isombr native-isohybrid native-mkisofs + DEPENDS isombr native-isohybrid native-mkisofs $<TARGET_PROPERTY:bootcdregtest,ISO_DEPENDENCIES> VERBATIM) add_custom_target(bootcdregtest DEPENDS ${REACTOS_BINARY_DIR}/bootcdregtest.iso) ## LiveCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - -# Create user profile directories -add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") -add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") - +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:livecd,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 @@ -144,19 +143,19 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso - DEPENDS isombr native-isohybrid native-mkisofs + DEPENDS isombr native-isohybrid native-mkisofs ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst $<TARGET_PROPERTY:livecd,ISO_DEPENDENCIES> VERBATIM) add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) - -## HybridCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - # Create user profile directories -add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") -add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") +add_allusers_profile_dirs(livecd "Profiles") +add_user_profile_dirs(livecd "Profiles" "Default User") +## HybridCD +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:hybridcd,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/hybridcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 @@ -165,11 +164,15 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso - DEPENDS bootcd livecd + DEPENDS isombr native-isohybrid native-mkisofs ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst $<TARGET_PROPERTY:hybridcd,ISO_DEPENDENCIES> VERBATIM) add_custom_target(hybridcd DEPENDS ${REACTOS_BINARY_DIR}/hybridcd.iso) +# Create user profile directories +add_allusers_profile_dirs(hybridcd "livecd/Profiles") +add_user_profile_dirs(livecd "livecd/Profiles" "Default User") add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) +add_cd_file(TARGET livecd FILE ${REACTOS_BINARY_DIR}/livecd.iso DESTINATION livecd FOR hybridcd) add_subdirectory(freeldr) add_subdirectory(bootdata) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index 3f1cc6ff00c..5ef12d6f107 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -31,20 +31,37 @@ add_custom_command( -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake - COMMAND ${CMAKE_COMMAND} -E copy_if_different + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn) -add_custom_target( - reactos_cab_inf +# reactos.inf. We want this command to be always executed, in case someone added an optional file between two builds. +# So we pretend it generates another file although it will never do. +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf native-cabman $<TARGET_PROPERTY:reactos_cab,CAB_DEPENDENCIES>) + +add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) + +add_cd_file( + TARGET reactos_cab + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + DESTINATION reactos + NO_CAB FOR bootcd regtest) + add_cd_file( - TARGET reactos_cab_inf - FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + TARGET reactos_cab + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf + NAME_ON_CD reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 5ac5dec5555..a99c9ea3b03 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -309,7 +309,12 @@ macro(dir_to_num dir var) endmacro() function(add_cd_file) - cmake_parse_arguments(_CD "NO_CAB;NOT_IN_HYBRIDCD" "DESTINATION;NAME_ON_CD;TARGET" "FILE;FOR" ${ARGN}) + cmake_parse_arguments(_CD "NO_CAB;NOT_IN_HYBRIDCD" "DESTINATION;NAME_ON_CD;TARGET;FILE" "FOR" ${ARGN}) + + if (_CD_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unexpected arguments to add_cd_file : ${_CD_UNPARSED_ARGUMENTS}") + endif() + if(NOT (_CD_TARGET OR _CD_FILE)) message(FATAL_ERROR "You must provide a target or a file to install!") endif() @@ -332,6 +337,10 @@ function(add_cd_file) endif() endif() + if (NOT _CD_NAME_ON_CD) + get_filename_component(_CD_NAME_ON_CD ${_CD_FILE} NAME) + endif() + # do we add it to all CDs? list(FIND _CD_FOR all __cd) if(NOT __cd EQUAL -1) @@ -339,42 +348,38 @@ function(add_cd_file) list(INSERT _CD_FOR __cd "bootcd;livecd;regtest") endif() + # do we add it to bootcd? list(FIND _CD_FOR bootcd __cd) if(NOT __cd EQUAL -1) # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) # directly on cd - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) + set_property(TARGET bootcd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + # add it also into the hybridcd if not specified otherwise + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + endif() + # manage dependency + if(_CD_TARGET) + set_property(TARGET bootcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) endif() - set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - # add it also into the hybridcd if not specified otherwise + else() + set_property(TARGET bootcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) endif() - endforeach() - # manage dependency - if(_CD_TARGET) - add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() dir_to_num(${_CD_DESTINATION} _num) - foreach(item ${_CD_FILE}) - # add it in reactos.cab - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n") - - # manage dependency - file level - set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item}) - endforeach() - - # manage dependency - target level + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n") + # manage dependencies if(_CD_TARGET) - add_dependencies(reactos_cab_inf ${_CD_TARGET}) + set_property(TARGET reactos_cab APPEND PROPERTY CAB_DEPENDENCIES ${_CD_TARGET}) + else() + set_property(TARGET reactos_cab APPEND PROPERTY CAB_DEPENDENCIES ${_CD_FILE}) endif() endif() endif() #end bootcd @@ -384,39 +389,36 @@ function(add_cd_file) if(NOT __cd EQUAL -1) # manage dependency if(_CD_TARGET) - add_dependencies(livecd ${_CD_TARGET} registry_inf) - endif() - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) - endif() - set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - # add it also into the hybridcd if not specified otherwise + set_property(TARGET livecd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "livecd/${_CD_DESTINATION}/${__file}=${item}") + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) endif() - endforeach() + endif() + + set_property(TARGET livecd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + # manage dependency + if (NOT _CD_TARGET) + set_property(TARGET livecd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + endif() + # add it also into the hybridcd if not specified otherwise + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(TARGET hybridcd APPEND PROPERTY FILE_LIST "livecd/${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + if (NOT _CD_TARGET) + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + endif() + endif() endif() #end livecd # do we need also to add it to hybridcd? list(FIND _CD_FOR hybridcd __cd) if(NOT __cd EQUAL -1) + set_property(TARGET hybridcd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") # manage dependency if(_CD_TARGET) - add_dependencies(hybridcd ${_CD_TARGET}) + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + else() + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) endif() - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) - endif() - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - endforeach() endif() #end hybridcd # do we add it to regtest? @@ -424,19 +426,12 @@ function(add_cd_file) if(NOT __cd EQUAL -1) # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - # directly on cd - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) - endif() - set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - endforeach() + set_property(TARGET bootcdregtest APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") # manage dependency if(_CD_TARGET) - add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) + set_property(TARGET bootcdregtest APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + else() + set_property(TARGET bootcdregtest APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) endif() else() #add it in reactos.cab @@ -450,68 +445,6 @@ function(add_cd_file) endif() #end bootcd endfunction() -function(create_iso_lists) - # generate reactos.cab before anything else - get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS) - - # begin with reactos.inf. We want this command to be always executed, so we pretend it generates another file although it will never do. - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf - DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf reactos_cab_inf) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman ${_filelist}) - - add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) - add_dependencies(reactos_cab reactos_cab_inf) - - add_cd_file( - TARGET reactos_cab - FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - DESTINATION reactos - NO_CAB FOR bootcd regtest) - - add_cd_file( - FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION livecd - FOR hybridcd) - - get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst) - - get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst) - - get_property(_filelist GLOBAL PROPERTY HYBRIDCD_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst) - - get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst) -endfunction() - # Create module_clean targets function(add_clean_target _target) set(_clean_working_directory ${CMAKE_CURRENT_BINARY_DIR}) @@ -887,15 +820,11 @@ function(create_registry_hives) ${CMAKE_BINARY_DIR}/boot/bootdata/sam ${CMAKE_BINARY_DIR}/boot/bootdata/security) - add_cd_file( - FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/security - TARGET livecd_hives - DESTINATION reactos/system32/config - FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/software TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/default TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/security TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) # BCD Hive add_custom_command( @@ -924,10 +853,13 @@ function(add_driver_inf _module) COMMAND native-utf16le "${_source_item}" "${_converted_item}" DEPENDS native-utf16le "${_source_item}") list(APPEND _converted_inf_files ${_converted_item}) + endforeach() add_custom_target(${_module}_inf_files DEPENDS ${_converted_inf_files}) - add_cd_file(FILE ${_converted_inf_files} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) + foreach(item ${_converted_inf_files}) + add_cd_file(FILE ${item} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) + endforeach() endfunction() if(KDBG)

4 years, 8 months

1
0
0 0

[reactos] 01/02: [CMAKE] Use cutom commands with custom targets for generating cd targets

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1234223f417c2ea9617af… commit 1234223f417c2ea9617af0f7a1d80934861eb7d1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sun Mar 22 09:54:24 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Sep 2 11:02:44 2020 +0200 [CMAKE] Use cutom commands with custom targets for generating cd targets This avoids rebuilding them over and over while there is nothing to do --- boot/CMakeLists.txt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 727f75a7fff..a18810d1e76 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -15,11 +15,12 @@ else() message(FATAL_ERROR "Unknown ARCH '" ${ARCH} "', cannot generate a valid UEFI boot filename.") endif() -add_custom_target(efisys +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi DEPENDS native-fatten fat bootmgfw VERBATIM) - +add_custom_target(efisys DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # Create an 'empty' directory (guaranteed to be empty) to be able to add # arbitrary empty directories to the ISO image using mkisofs. @@ -97,7 +98,8 @@ endfunction() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -add_custom_target(bootcd +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/bootcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -106,13 +108,15 @@ add_custom_target(bootcd COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) +add_custom_target(bootcd DEPENDS ${REACTOS_BINARY_DIR}/bootcd.iso) ## BootCDRegTest # Create the file list file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -add_custom_target(bootcdregtest +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/bootcdregtest.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -121,6 +125,7 @@ add_custom_target(bootcdregtest COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) +add_custom_target(bootcdregtest DEPENDS ${REACTOS_BINARY_DIR}/bootcdregtest.iso) ## LiveCD # Create the file list @@ -131,7 +136,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_ add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") -add_custom_target(livecd +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -140,6 +146,7 @@ add_custom_target(livecd COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) +add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) ## HybridCD # Create the file list @@ -150,7 +157,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINAR add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") -add_custom_target(hybridcd +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/hybridcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -159,6 +167,7 @@ add_custom_target(hybridcd COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso DEPENDS bootcd livecd VERBATIM) +add_custom_target(hybridcd DEPENDS ${REACTOS_BINARY_DIR}/hybridcd.iso) add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SDK][INCLUDE] Improve EXPLORER_CMDLINE_PARSE_RESULTS structure

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2f25ebc6a2fa25cc1058… commit d2f25ebc6a2fa25cc1058481685bdb13952a928d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 2 12:47:19 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 2 12:47:19 2020 +0900 [SDK][INCLUDE] Improve EXPLORER_CMDLINE_PARSE_RESULTS structure --- sdk/include/reactos/browseui_undoc.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index f90ac9ada1c..e1017bd7d97 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -106,10 +106,7 @@ typedef struct ExplorerCommandLineParseResults DWORD offset18; DWORD offset1C; LPITEMIDLIST pidlRoot; - DWORD offset24; - DWORD offset28; - DWORD offset2C; - DWORD offset30; + CLSID clsid; GUID guidInproc; } EXPLORER_CMDLINE_PARSE_RESULTS, *PEXPLORER_CMDLINE_PARSE_RESULTS;

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RPCRT4] Check hBinding != 0 CORE-16936

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cc84c6db70b57a54e583… commit 1cc84c6db70b57a54e5835103939163ccd78e2a3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Sep 1 22:10:18 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Sep 1 22:10:18 2020 +0200 [RPCRT4] Check hBinding != 0 CORE-16936 To prevent logspam that was introduced when syncing to Wine Staging 4.18 in 0.4.14-dev-422-g 6feb8748d300347f848eee8436845a1f0c67d3aa Thanks for anyone helping: Doug Lyons, Fabian Maurer (Wine), Zebediah Figura (Wine) I intend to port it back into 0.4.14RC so that none of our releases will be affected. --- dll/win32/rpcrt4/ndr_stubless.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/rpcrt4/ndr_stubless.c b/dll/win32/rpcrt4/ndr_stubless.c index cc52ee27e85..47d03b13564 100644 --- a/dll/win32/rpcrt4/ndr_stubless.c +++ b/dll/win32/rpcrt4/ndr_stubless.c @@ -402,7 +402,11 @@ static void client_free_handle( pArg = ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); memcpy(&pObject, pArg, pDesc->flag_and_size & 0xf); pGenPair = &pStubMsg->StubDesc->aGenericBindingRoutinePairs[pDesc->binding_routine_pair_index]; +#ifdef __REACTOS__ + if (hBinding) pGenPair->pfnUnbind(pObject, hBinding); +#else pGenPair->pfnUnbind(pObject, hBinding); +#endif break; } case FC_BIND_CONTEXT: /* explicit context */

4 years, 8 months

1
0
0 0

[reactos] 01/01: [GDI] Demote the insane amount of logging CORE-1091

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9835710f7e9ef9b9c273d… commit 9835710f7e9ef9b9c273d0213ea630b97392689d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Sep 1 19:11:22 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Sep 1 19:11:22 2020 +0200 [GDI] Demote the insane amount of logging CORE-1091 that was introduced by 0.4.15-dev-684-g 448bcede24b2f8384c35656019622eb0ff5379d2 --- win32ss/gdi/ntgdi/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index 3761dd8f3e0..8de0855558e 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -41,7 +41,7 @@ IntTMWFixUp( * to a TrueType one when we have a 'Raster' font as our input we filter * out the problematic TrueType and Vector bits. * Our list below checks for Raster Font Facenames. */ - DPRINT1("Font Facename is '%S'.\n", lf.lfFaceName); + DPRINT("Font Facename is '%S'.\n", lf.lfFaceName); if ((wcsicmp(lf.lfFaceName, L"Helv") == 0) || (wcsicmp(lf.lfFaceName, L"Courier") == 0) || (wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) ||

4 years, 8 months

1
0
0 0

[reactos] 01/01: [GDI32] Preserve PitchAndFamily across GetTextMetricsW call (#2689)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=448bcede24b2f8384c356… commit 448bcede24b2f8384c35656019622eb0ff5379d2 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Sep 1 06:08:26 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 1 20:08:26 2020 +0900 [GDI32] Preserve PitchAndFamily across GetTextMetricsW call (#2689) ReactOS has no Raster fonts today, so compensate for this affecting the editbox margins. CORE-1091 This patch fixes the inability to see all of the characters in the CD-KEY box of Starcraft and Visual Basic 5 and Visual Basic 6 Installs. It supersedes #2656 --- win32ss/gdi/ntgdi/text.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index 2ea694103ae..3761dd8f3e0 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -13,6 +13,48 @@ #define NDEBUG #include <debug.h> + +/* + This is a hack. See CORE-1091. + + It is needed because ReactOS does not support raster fonts now. + After Raster Font support is added, then it can be removed. + Find the current font's logfont for testing its lf.lfFaceName. + + The ftGdiGetTextMetricsW function currently in ReactOS will always return a Truetype font + because we cannot yet handle raster fonts. So it will return flags + TMPF_VECTOR and TMPF_TRUETYPE, which can cause problems in edit boxes. + */ + +VOID FASTCALL +IntTMWFixUp( + HDC hDC, + TMW_INTERNAL *ptm) +{ + LOGFONTW lf; + HFONT hCurrentFont; + + hCurrentFont = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_FONT); + GreGetObject(hCurrentFont, sizeof(LOGFONTW), &lf); + + /* To compensate for the GetTextMetricsW call changing the PitchAndFamily + * to a TrueType one when we have a 'Raster' font as our input we filter + * out the problematic TrueType and Vector bits. + * Our list below checks for Raster Font Facenames. */ + DPRINT1("Font Facename is '%S'.\n", lf.lfFaceName); + if ((wcsicmp(lf.lfFaceName, L"Helv") == 0) || + (wcsicmp(lf.lfFaceName, L"Courier") == 0) || + (wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) || + (wcsicmp(lf.lfFaceName, L"MS Serif") == 0) || + (wcsicmp(lf.lfFaceName, L"Times New Roman") == 0) || + (wcsicmp(lf.lfFaceName, L"MS Shell Dlg") == 0) || + (wcsicmp(lf.lfFaceName, L"System") == 0) || + (wcsicmp(lf.lfFaceName, L"Terminal") == 0)) + { + ptm->TextMetric.tmPitchAndFamily &= ~(TMPF_TRUETYPE | TMPF_VECTOR); + } +} + /** Functions *****************************************************************/ BOOL FASTCALL @@ -154,6 +196,7 @@ GreGetTextMetricsW( { TMW_INTERNAL tmwi; if (!ftGdiGetTextMetricsW(hdc, &tmwi)) return FALSE; + IntTMWFixUp(hdc, &tmwi); *lptm = tmwi.TextMetric; return TRUE; } @@ -555,6 +598,7 @@ NtGdiGetTextMetricsW( { if (ftGdiGetTextMetricsW(hDC, &Tmwi)) { + IntTMWFixUp(hDC, &Tmwi); _SEH2_TRY { ProbeForWrite(pUnsafeTmwi, cj, 1);

4 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020