Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [REACTOS] Addendum to Stasms last commit
by Joachim Henze 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6bf1108905a2c38d3d75… commit b6bf1108905a2c38d3d75bc5a1dedabc6d8cae5c Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Jul 29 18:20:36 2024 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Jul 29 18:20:36 2024 +0200 [REACTOS] Addendum to Stasms last commit which was not PR'ed even. especially to unbreak modules/rosapps/application/notevil Addendum to 9cf6b253e732ac551d40195367bcdc09c6f56b4c --- base/applications/dxdiag/ddtest.c | 3 +-- dll/keyboard/kbdcz1/kbdcz1.c | 2 +- modules/rosapps/applications/notevil/notevil.rc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/base/applications/dxdiag/ddtest.c b/base/applications/dxdiag/ddtest.c index 8d54159896b..26fdb750cf9 100644 --- a/base/applications/dxdiag/ddtest.c +++ b/base/applications/dxdiag/ddtest.c @@ -1,9 +1,8 @@ /* * PROJECT: ReactX Diagnosis Application * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/dxdiag/ddtest.c * PURPOSE: ReactX DirectDraw tests - * COPYRIGHT: Copyright 2008 Kamil Horníček + * COPYRIGHT: Copyright 2008 Kamil Hornicek * */ diff --git a/dll/keyboard/kbdcz1/kbdcz1.c b/dll/keyboard/kbdcz1/kbdcz1.c index 4b7d5a4af59..42a4f9255ec 100644 --- a/dll/keyboard/kbdcz1/kbdcz1.c +++ b/dll/keyboard/kbdcz1/kbdcz1.c @@ -4,7 +4,7 @@ * License: LGPL, see: LGPL.txt * * Based on other kbd*.dlls - * modified by Kamil Horníček (tykef(a)atlas.cz) + * modified by Kamil Hornicek <tykef(a)atlas.cz> */ #define WIN32_NO_STATUS diff --git a/modules/rosapps/applications/notevil/notevil.rc b/modules/rosapps/applications/notevil/notevil.rc index c75020e8143..935eb55f0cc 100644 --- a/modules/rosapps/applications/notevil/notevil.rc +++ b/modules/rosapps/applications/notevil/notevil.rc @@ -107,7 +107,7 @@ BEGIN 66, "Jose Catena" 67, "Jurgen van Gael" 68, "Kai Tietz" - 69, "Kamil Horn�cek" + 69, "Kamil Hornicek" 70, "KJK::Hyperion" 71, "Klemens R. Friedl" 72, "Lucas Suggs"

1 0

[reactos] 01/01: [REACTOS] Fix Kamil Horníček's last name where possible
by Stanislav Motylkov 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cf6b253e732ac551d401… commit 9cf6b253e732ac551d40195367bcdc09c6f56b4c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jul 29 17:58:02 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jul 29 17:58:02 2024 +0300 [REACTOS] Fix Kamil Horníček's last name where possible --- base/applications/dxdiag/ddtest.c | 2 +- base/applications/fontview/lang/cs-CZ.rc | 2 +- base/applications/msconfig/lang/cs-CZ.rc | 2 +- base/applications/msconfig_new/lang/cs-CZ.rc | 2 +- base/applications/mscutils/eventvwr/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/system/winlogon/lang/cs-CZ.rc | 2 +- dll/cpl/main/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/sysdm.rc | 2 +- dll/cpl/timedate/lang/cs-CZ.rc | 2 +- dll/keyboard/kbdcz1/kbdcz1.c | 2 +- dll/win32/syssetup/lang/cs-CZ.rc | 2 +- modules/rosapps/applications/notevil/notevil.rc | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/dxdiag/ddtest.c b/base/applications/dxdiag/ddtest.c index 7b63805b738..8d54159896b 100644 --- a/base/applications/dxdiag/ddtest.c +++ b/base/applications/dxdiag/ddtest.c @@ -3,7 +3,7 @@ * LICENSE: LGPL - See COPYING in the top level directory * FILE: base/applications/dxdiag/ddtest.c * PURPOSE: ReactX DirectDraw tests - * COPYRIGHT: Copyright 2008 Kamil Hornicek + * COPYRIGHT: Copyright 2008 Kamil Horníček * */ diff --git a/base/applications/fontview/lang/cs-CZ.rc b/base/applications/fontview/lang/cs-CZ.rc index f770ee9d7cf..3034332a2f0 100644 --- a/base/applications/fontview/lang/cs-CZ.rc +++ b/base/applications/fontview/lang/cs-CZ.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Font Viewer * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Czech resource file - * TRANSLATOR: Copyright 2014-2017 Kamil Hornicek <kamil.hornicek(a)reactos.org> + * TRANSLATOR: Copyright 2014-2017 Kamil Horníček <kamil.hornicek(a)reactos.org> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/applications/msconfig/lang/cs-CZ.rc b/base/applications/msconfig/lang/cs-CZ.rc index 5a26ca16a7d..db811eb4a78 100644 --- a/base/applications/msconfig/lang/cs-CZ.rc +++ b/base/applications/msconfig/lang/cs-CZ.rc @@ -1,7 +1,7 @@ /* FILE: base/applications/msconfig/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2009-08-03 - * THANKS TO: Kamil Hornicek, who translated major part of this file + * THANKS TO: Kamil Horníček, who translated major part of this file */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/applications/msconfig_new/lang/cs-CZ.rc b/base/applications/msconfig_new/lang/cs-CZ.rc index 1849d2b8d41..6cc1bce37fa 100644 --- a/base/applications/msconfig_new/lang/cs-CZ.rc +++ b/base/applications/msconfig_new/lang/cs-CZ.rc @@ -1,7 +1,7 @@ /* FILE: base/applications/msconfig/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2009-08-03 - * THANKS TO: Kamil Hornicek, who translated major part of this file + * THANKS TO: Kamil Horníček, who translated major part of this file */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc index cbdc122be44..11e3a926d96 100644 --- a/base/applications/mscutils/eventvwr/lang/cs-CZ.rc +++ b/base/applications/mscutils/eventvwr/lang/cs-CZ.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Event Log Viewer * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Czech resource file - * TRANSLATORS: Copyright 2014-2017 Kamil Hornicek <kamil.hornicek(a)reactos.org> + * TRANSLATORS: Copyright 2014-2017 Kamil Horníček <kamil.hornicek(a)reactos.org> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index f37ff2686dc..f5566e31d0a 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -3,7 +3,7 @@ * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Czech resource file * TRANSLATORS: Copyright 2009-2010 Radek Liška aka Black_Fox <radekliska(a)gmail.com> - * Copyright 2011 Kamil Hornicek <kamil.hornicek(a)reactos.org> + * Copyright 2011 Kamil Horníček <kamil.hornicek(a)reactos.org> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 66b49ceccc3..2b31d6ec02f 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Czech resource file * TRANSLATORS: Copyright 2005 Jirka Ďoubek (potapnik) <jirka(a)studioprojekt.cz> - * Copyright 2011 Kamil Hornicek <kamil.hornicek(a)reactos.org> + * Copyright 2011 Kamil Horníček <kamil.hornicek(a)reactos.org> * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ diff --git a/dll/cpl/main/lang/cs-CZ.rc b/dll/cpl/main/lang/cs-CZ.rc index 56b3afcf005..d383c936d4c 100644 --- a/dll/cpl/main/lang/cs-CZ.rc +++ b/dll/cpl/main/lang/cs-CZ.rc @@ -1,6 +1,6 @@ /* FILE: dll/cpl/main/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * THANKS TO: Kamil Hornicek, who translated major part of this file + * THANKS TO: Kamil Horníček, who translated major part of this file * UPDATED: 2009-02-03 */ diff --git a/dll/cpl/sysdm/sysdm.rc b/dll/cpl/sysdm/sysdm.rc index cb0e6914d06..d7e2a69e301 100644 --- a/dll/cpl/sysdm/sysdm.rc +++ b/dll/cpl/sysdm/sysdm.rc @@ -32,7 +32,7 @@ RC_LICENSE RTDATA "resources/gpl.txt" STRINGTABLE BEGIN - IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksandar Andrejevic\nAleksey Bragin\nAlexander Shaposhnikov\nAmine Khaldi\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nBenedikt Freisen\nCameron Gutman\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDavid Quintana\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGiannis Adamopoulos\nGregor Brunmar\nHermès Bélusca-Maïto\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJérôme Gardou\nJohannes And [...] END #ifdef LANGUAGE_BG_BG diff --git a/dll/cpl/timedate/lang/cs-CZ.rc b/dll/cpl/timedate/lang/cs-CZ.rc index 6bfee8cacb8..64bc2a55b82 100644 --- a/dll/cpl/timedate/lang/cs-CZ.rc +++ b/dll/cpl/timedate/lang/cs-CZ.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Czech resource file * TRANSLATORS: Copyright 2005 Jirka Ďoubek (potapnik) <jirka(a)studioprojekt.cz> - * Copyright 2007 Kamil Hornícek <tykef(a)atlas.cz> + * Copyright 2007 Kamil Horníček <tykef(a)atlas.cz> * Copyright 2008 Radek Liška (Black_Fox) <radekliska(a)gmail.com> * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ diff --git a/dll/keyboard/kbdcz1/kbdcz1.c b/dll/keyboard/kbdcz1/kbdcz1.c index be5b932e154..4b7d5a4af59 100644 --- a/dll/keyboard/kbdcz1/kbdcz1.c +++ b/dll/keyboard/kbdcz1/kbdcz1.c @@ -4,7 +4,7 @@ * License: LGPL, see: LGPL.txt * * Based on other kbd*.dlls - * modified by Kamil Hornicek (tykef at atlas dot cz) + * modified by Kamil Horníček (tykef(a)atlas.cz) */ #define WIN32_NO_STATUS diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 6920c7a3960..192e00b31f3 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Czech resource file * TRANSLATORS: Copyright 2008-2014 Radek Liška aka Black_Fox <radekliska(a)gmail.com> - * Copyright 2014-2017 Kamil Hornicek <kamil.hornicek(a)reactos.org> + * Copyright 2014-2017 Kamil Horníček <kamil.hornicek(a)reactos.org> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/modules/rosapps/applications/notevil/notevil.rc b/modules/rosapps/applications/notevil/notevil.rc index 935eb55f0cc..c75020e8143 100644 --- a/modules/rosapps/applications/notevil/notevil.rc +++ b/modules/rosapps/applications/notevil/notevil.rc @@ -107,7 +107,7 @@ BEGIN 66, "Jose Catena" 67, "Jurgen van Gael" 68, "Kai Tietz" - 69, "Kamil Hornicek" + 69, "Kamil Horn�cek" 70, "KJK::Hyperion" 71, "Klemens R. Friedl" 72, "Lucas Suggs"

1 0

[reactos] 01/01: [POWERCFG] Update Czech (cs-CZ) translation (#7182)
by Václav Zouzalík 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b41e8298ee169bb573a0… commit 5b41e8298ee169bb573a0b04ba2ad5c404f246b6 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Jul 29 16:06:44 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 17:06:44 2024 +0300 [POWERCFG] Update Czech (cs-CZ) translation (#7182) --- dll/cpl/powercfg/lang/cs-CZ.rc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc index e4eea9d4c7b..737d7721647 100644 --- a/dll/cpl/powercfg/lang/cs-CZ.rc +++ b/dll/cpl/powercfg/lang/cs-CZ.rc @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Power Configuration Applet + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATORS: Copyright 2007 Kamil Horníček <kamil.hornicek(a)reactos.org> + * Copyright 2009 Radek Liška (Black_Fox) <radekliska(a)gmail.com> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220 @@ -121,13 +130,13 @@ END IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Save Scheme" +CAPTION "Uložit schéma" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8 + LTEXT "Uložit toto schéma napájení jako:", -1, 7, 7, 180, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -167,5 +176,5 @@ BEGIN IDS_TIMEOUT16 "Nikdy" IDS_DEL_SCHEME "Opravdu si přejete smazat toto schéma napájení: ""%s""?" IDS_DEL_SCHEME_TITLE "Smazat schéma" - IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" + IDS_DEL_SCHEME_ERROR "Nepodařilo se smazat schéma napájení" END

1 0

[reactos] 01/01: [UXTHEME] Add Czech (cs-CZ) and Slovak (sk-SK) translations (#7179)
by Václav Zouzalík 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bfae181840f9dae993f1… commit 7bfae181840f9dae993f1d1e63aaaf4182575242 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Jul 29 14:19:37 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 14:19:37 2024 +0200 [UXTHEME] Add Czech (cs-CZ) and Slovak (sk-SK) translations (#7179) --- dll/win32/uxtheme/lang/cs-CZ.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/lang/sk-SK.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/uxtheme.rc | 6 ++++++ 3 files changed, 44 insertions(+) diff --git a/dll/win32/uxtheme/lang/cs-CZ.rc b/dll/win32/uxtheme/lang/cs-CZ.rc new file mode 100644 index 00000000000..dd41ecaff9f --- /dev/null +++ b/dll/win32/uxtheme/lang/cs-CZ.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Czech resource file + * TRANSLATOR: Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Okno zprávy" + IDS_ACTIVEWIN "Aktivní okno" + IDS_INACTIVEWIN "Neaktivní okno" + IDS_OK "OK" + IDS_WINTEXT "Text okna" +END diff --git a/dll/win32/uxtheme/lang/sk-SK.rc b/dll/win32/uxtheme/lang/sk-SK.rc new file mode 100644 index 00000000000..4077afa3908 --- /dev/null +++ b/dll/win32/uxtheme/lang/sk-SK.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Okno správy" + IDS_ACTIVEWIN "Aktívne okno" + IDS_INACTIVEWIN "Neaktívne okno" + IDS_OK "OK" + IDS_WINTEXT "Text okna" +END diff --git a/dll/win32/uxtheme/uxtheme.rc b/dll/win32/uxtheme/uxtheme.rc index 041990e358c..9e1101293c0 100644 --- a/dll/win32/uxtheme/uxtheme.rc +++ b/dll/win32/uxtheme/uxtheme.rc @@ -19,12 +19,18 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif

1 0

[reactos] 01/01: [RAPPS] Update Czech (cs-CZ) translation (#7177)
by Václav Zouzalík 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ee524ac066ab42ccc316… commit 8ee524ac066ab42ccc316f98677e3c3a9b499e43 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Jul 29 14:18:32 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 14:18:32 2024 +0200 [RAPPS] Update Czech (cs-CZ) translation (#7177) --- base/applications/rapps/lang/cs-CZ.rc | 109 +++++++++++++++++----------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 20dda0a0ba5..4c510924493 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -2,7 +2,8 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Czech resource file - * TRANSLATOR: Copyright 2014 Radek Liska aka Black_Fox <radekliska(a)gmail.com> + * TRANSLATORS: Copyright 2014 Radek Liška (Black_Fox) <radekliska(a)gmail.com> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -73,9 +74,9 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Procházet…", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Smazat instalátor programu po dokončení instalace", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - AUTORADIOBUTTON "Use default", IDC_SOURCE_DEFAULT, 15, 132, 74, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Specified source", IDC_USE_SOURCE, 15, 147, 74, 10 + GROUPBOX "Zdroj softwaru", -1, 4, 118, 240, 46 + AUTORADIOBUTTON "Použít výchozí", IDC_SOURCE_DEFAULT, 15, 132, 74, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Vlastní zdroj", IDC_USE_SOURCE, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Proxy", -1, 4, 166, 240, 76 AUTORADIOBUTTON "Systémové nastavení proxy", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP @@ -116,7 +117,7 @@ BEGIN IDS_TOOLTIP_INSTALL "Instalovat" IDS_TOOLTIP_UNINSTALL "Odinstalovat" IDS_TOOLTIP_MODIFY "Změnit" - IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" + IDS_TOOLTIP_SELECT_ALL "Vybrat vše/Zrušit výběr" IDS_TOOLTIP_SETTINGS "Nastavení" IDS_TOOLTIP_REFRESH "Obnovit" IDS_TOOLTIP_UPDATE_DB "Aktualizovat databázi" @@ -136,7 +137,7 @@ BEGIN IDS_INFO_DESCRIPTION "\nPopis: " IDS_INFO_PUBLISHER "\nVydavatel: " IDS_INFO_HELPLINK "\nInternetová pomoc: " - IDS_INFO_HELPPHONE "\nTelefonní pomoc: " + IDS_INFO_HELPPHONE "\nTelefonická pomoc: " IDS_INFO_README "\nReadme: " IDS_INFO_REGOWNER "\nRegistrovaný vlastník: " IDS_INFO_PRODUCTID "\nID produktu: " @@ -149,19 +150,19 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nOdinstalační řetězec: " IDS_INFO_MODIFYPATH "\nCesta úpravy: " IDS_INFO_INSTALLDATE "\nDatum instalace: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNázev balíčku: " END STRINGTABLE BEGIN IDS_AINFO_VERSION "\nVerze: " - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\nDostupná verze: " IDS_AINFO_DESCRIPTION "\nPopis: " IDS_AINFO_SIZE "\nVelikost: " IDS_AINFO_URLSITE "\nDomovská stránka: " - IDS_AINFO_LICENSE "\nLicense: " + IDS_AINFO_LICENSE "\nLicence: " IDS_AINFO_URLDOWNLOAD "\nStažení: " - IDS_AINFO_LANGUAGES "\nLanguages: " + IDS_AINFO_LANGUAGES "\nJazyky: " END STRINGTABLE @@ -181,7 +182,7 @@ BEGIN IDS_CAT_SCIENCE "Věda" IDS_CAT_TOOLS "Nástroje" IDS_CAT_VIDEO "Video" - IDS_CAT_THEMES "Themes" + IDS_CAT_THEMES "Vzhled" END STRINGTABLE @@ -189,7 +190,7 @@ BEGIN IDS_APPTITLE "ReactOS Správce aplikací" IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" IDS_SEARCH_TEXT "Hledat…" - IDS_APPS_COUNT "Počet aplikací: %d; Selected: %d" + IDS_APPS_COUNT "Počet aplikací: %d; Vybráno: %d" IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n" IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: " IDS_WELCOME_URL "https://reactos.org" @@ -199,38 +200,38 @@ BEGIN IDS_APPLICATIONS "Aplikace" IDS_CHOOSE_FOLDER_TEXT "Zvolte složku, do které se budou ukládat stažené soubory: " IDS_CHOOSE_FOLDER_ERROR "Zvolená složka neexistuje. Vytvořit?" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Vámi specifikovaná URL adresa není platná nebo není podporována. Prosím opravte ji!" IDS_APP_REG_REMOVE "Určitě odstranit data instalovaného programu z registru?" IDS_INFORMATION "Informace" IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodařilo stáhnout! Adresa nenalezena!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD2 "Balíček se nepodařilo stáhnout! Zkontrolujte připojení k Internetu!" IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!" - IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" - IDS_INTEG_CHECK_TITLE "Verifying package integrity…" - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_INSTALL_SELECTED "Install Selected" - IDS_SELECTEDFORINST "Selected for installation" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" - IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "Details" - IDS_APP_DISPLAY_LIST "List" - IDS_APP_DISPLAY_TILE "Tile" - IDS_NO_SEARCH_RESULTS "No search results" + IDS_UNABLE_TO_INSTALL "Nepodařilo se otevřít instalátor!" + IDS_UNABLE_TO_QUERY_CERT "Nepodařilo se získat informace o certifikátu.\n\nChcete přesto pokračovat?" + IDS_INTEG_CHECK_TITLE "Ověřuji integritu balíčku…" + IDS_INTEG_CHECK_FAIL "Balíček neprošel kontrolou integrity, mohl být poškozen nebo změněn během stahování. Nedoporučujeme spouštět tento program." + IDS_INTERRUPTED_DOWNLOAD "Stahování bylo přerušeno. Zkontrolujte připojení k Internetu." + IDS_UNABLE_TO_WRITE "Ukládání na disk se nepodařilo. Disk může být zaplněn." + IDS_INSTALL_SELECTED "Nainstalovat vybrané" + IDS_SELECTEDFORINST "Vybráno k instalaci" + IDS_MISMATCH_CERT_INFO "Neznámý certifikát:\nSubjekt: %s\nVydavatel: %s\nChcete i přesto pokračovat?" + IDS_UNABLE_PATH "Neplatný formát cesty." + IDS_APP_DISPLAY_DETAILS "Podrobnosti" + IDS_APP_DISPLAY_LIST "Seznam" + IDS_APP_DISPLAY_TILE "Dlaždice" + IDS_NO_SEARCH_RESULTS "Žádné výsledky" END STRINGTABLE BEGIN - IDS_STATUS_INSTALLED "Installed" - IDS_STATUS_NOTINSTALLED "Not installed" - IDS_STATUS_DOWNLOADED "Downloaded" - IDS_STATUS_UPDATE_AVAILABLE "Update available" - IDS_STATUS_DOWNLOADING "Downloading…" - IDS_STATUS_INSTALLING "Installing…" - IDS_STATUS_WAITING "Waiting to install…" - IDS_STATUS_FINISHED "Finished" + IDS_STATUS_INSTALLED "Nainstalováno" + IDS_STATUS_NOTINSTALLED "Nenainstalováno" + IDS_STATUS_DOWNLOADED "Staženo" + IDS_STATUS_UPDATE_AVAILABLE "Aktualizovatelné" + IDS_STATUS_DOWNLOADING "Stahuji…" + IDS_STATUS_INSTALLING "Instaluji…" + IDS_STATUS_WAITING "Čekám na instalaci…" + IDS_STATUS_FINISHED "Dokončeno" END STRINGTABLE @@ -242,34 +243,34 @@ END STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" - IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" - IDS_LANGUAGE_SINGLE "Single language" - IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" - IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Podporuje váš jazyk" + IDS_LANGUAGE_NO_TRANSLATION "Podporuje jiné jazyky" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Podporuje angličtinu" + IDS_LANGUAGE_SINGLE "Jediný jazyk" + IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d dalších)" + IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d dalších)" END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Applications Database" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_DISP "Databáze aplikací" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizuji databázi…" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Aktualizuji databázi… (Neoficiální zdroj)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Použití: " + IDS_CMD_NEED_PACKAGE_NAME "Chyba: přepínač %1 očekává jeden nebo více názvů balíčků.\n" + IDS_CMD_NEED_FILE_NAME "Chyba: přepínač %1 očekává název souboru.\n" + IDS_CMD_NEED_PARAMS "Chyba: přepínač %1 očekává jeden nebo více parametrů.\n" + IDS_CMD_INVALID_OPTION "Chyba: Neznámý nebo neplatný přepínač příkazové řádky.\n" + IDS_CMD_FIND_RESULT_FOR "Najdi výsledek pro %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Nepodařilo se najít balíček %1.\n" + IDS_CMD_PACKAGE_INFO "Informace o balíčku %1:\n" END STRINGTABLE BEGIN - IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?" + IDS_INSTGEN_CONFIRMUNINST "Opravdu chcete odinstalovat %s?" END

1 0

[reactos] 01/01: [THEMEUI][INF] Update Czech (cs-CZ) translation (#7145)
by Václav Zouzalík 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e6b2daf152cfc69fcb72… commit 5e6b2daf152cfc69fcb72f33b8da0aae46033469 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Jul 29 14:18:10 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 14:18:10 2024 +0200 [THEMEUI][INF] Update Czech (cs-CZ) translation (#7145) --- boot/bootdata/hivedef.inf | 6 +++--- dll/win32/themeui/lang/cs-CZ.rc | 24 ++++++++++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 2bc01b7f418..0aa38716ffd 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2333,7 +2333,7 @@ POWERCFG_NAME_4="Maximální výkon" POWERCFG_DESC_4="Toto schéma udržuje počítač zapnutý a umožní nejvyšší výkon." POWERCFG_NAME_5="Maximální baterie" POWERCFG_DESC_5="Toto schéma extrémně spoří energii." -DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_0="ReactOS standardní" DESKTOP_SCHEME_1="Cihla" DESKTOP_SCHEME_2="Lilek" DESKTOP_SCHEME_3="Zelená oliva" @@ -2347,7 +2347,7 @@ DESKTOP_SCHEME_10="Námořní" DESKTOP_SCHEME_11="Švestka" DESKTOP_SCHEME_12="Dýně" DESKTOP_SCHEME_13="Deštivý den" -DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_14="ReactOS klasický" DESKTOP_SCHEME_15="Růže" DESKTOP_SCHEME_16="Písek" DESKTOP_SCHEME_17="Nebe" @@ -2355,7 +2355,7 @@ DESKTOP_SCHEME_18="Břidlice" DESKTOP_SCHEME_19="Bouře" DESKTOP_SCHEME_20="Modrozelená" DESKTOP_SCHEME_21="Pšenice" -DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_22="Červená, bílá a modrá" DESKTOP_SCHEME_SIZE_0="Výchozí velikost" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" diff --git a/dll/win32/themeui/lang/cs-CZ.rc b/dll/win32/themeui/lang/cs-CZ.rc index b91527d6645..6fd9a22d145 100644 --- a/dll/win32/themeui/lang/cs-CZ.rc +++ b/dll/win32/themeui/lang/cs-CZ.rc @@ -1,10 +1,18 @@ +/* + * PROJECT: Theme UI Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATORS: Copyright 2014 Radek Liška (Black_Fox) <radekliska(a)gmail.com> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_BRICK "Cihla" IDS_EGGPLANT "Lilek" - IDS_GOLIVE "Zelená oliva" //Spruce + IDS_GOLIVE "Zelená oliva" IDS_HCONTRAST_1 "Vysoký kontrast 1" IDS_HCONTRAST_2 "Vysoký kontrast 2" IDS_HCONTRAST_BLACK "Vysoký kontrast černá" @@ -15,11 +23,11 @@ BEGIN IDS_PLUM "Švestka" IDS_PUMPKIN "Dýně" IDS_RAIN "Deštivý den" - IDS_RWB "Red, White, and Blue" - IDS_CLASSIC "ReactOS Classic" - IDS_STANDARD "ReactOS Standard" + IDS_RWB "Červená, bílá a modrá" + IDS_CLASSIC "ReactOS klasický" + IDS_STANDARD "ReactOS standardní" IDS_ROSE "Růže" - IDS_SAND "Písek" //Desert + IDS_SAND "Písek" IDS_SLATE "Břidlice" IDS_SKY "Nebe" IDS_STORM "Bouře" @@ -29,7 +37,7 @@ END STRINGTABLE BEGIN - IDS_SIZE_NORMAL "Normal" - IDS_SIZE_LARGE "Large" - IDS_SIZE_XLARGE "Extra Large" + IDS_SIZE_NORMAL "Normální" + IDS_SIZE_LARGE "Velká" + IDS_SIZE_XLARGE "Velmi velká" END

1 0

[reactos] 01/01: [SHELL32] Follow-up of #7169 (#7175)
by Katayama Hirofumi MZ 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73e795656379a0519b9bc… commit 73e795656379a0519b9bc93d4ba035b12e221d5b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 20:37:42 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 20:37:42 2024 +0900 [SHELL32] Follow-up of #7169 (#7175) Follow-up of #7169 JIRA issue: CORE-19595 - Revert some code in RecycleBinGeneric::DeleteFile. --- dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp b/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp index c9a010e12b0..a7ad1b00de0 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_generic.cpp @@ -97,7 +97,15 @@ STDMETHODIMP RecycleBinGeneric::DeleteFile(LPCWSTR szFileName) /* Get associated volume path */ WCHAR szVolume[MAX_PATH]; +#ifndef __REACTOS__ + if (!GetVolumePathNameW(szFullName, szVolume, _countof(szVolume))) + { + CoTaskMemFree(szFullName); + return HRESULT_FROM_WIN32(GetLastError()); + } +#else swprintf(szVolume, L"%c:\\", szFullName[0]); +#endif /* Skip namespace (if any): "\\.\" or "\\?\" */ if (szVolume[0] == '\\' && @@ -130,7 +138,7 @@ STDMETHODIMP RecycleBinGeneric::EmptyRecycleBin() if (dwLogicalDrives == 0) return HRESULT_FROM_WIN32(GetLastError()); - for (DWORD i = 0; i < L'Z' - L'A' + 1; i++) + for (DWORD i = 0; i < 'Z' - 'A' + 1; i++) { if (!(dwLogicalDrives & (1 << i))) continue;

1 0

[reactos] 01/01: [SDK][NTUSER] s/KLF_UNLOAD/KL_UNLOAD/ (#7196)
by Katayama Hirofumi MZ 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dd081e945a1d3756666c… commit 7dd081e945a1d3756666c2e4c32b32ac74fe7b03 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 19:30:49 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 19:30:49 2024 +0900 [SDK][NTUSER] s/KLF_UNLOAD/KL_UNLOAD/ (#7196) JIRA issue: CORE-19268 - Rename KLF_UNLOAD as KL_UNLOAD. - Move it from win32ss/user/ntuser/input.h to sdk/include/reactos/undocuser.h. - Add UKL_NOACTIVATENEXT constant and use it. --- sdk/include/reactos/undocuser.h | 6 ++++++ win32ss/user/ntuser/input.h | 3 --- win32ss/user/ntuser/kbdlayout.c | 32 +++++++++++++------------------- win32ss/user/ntuser/keyboard.c | 2 +- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index b2bc7a8ccc9..ab289d056b9 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -175,6 +175,12 @@ extern "C" { #define SBRG_PAGEDOWNLEFT 4 /* the page down or page left region */ #define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ +// Keyboard Layout undocumented flags +#define KL_UNLOAD 0x20000000 + +// co_IntUnloadKeyboardLayoutEx undocumented flags +#define UKL_NOACTIVATENEXT 0x80000000 + BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwReserved, BOOL bEnable); BOOL WINAPI SetLogonNotifyWindow(HWND Wnd); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); diff --git a/win32ss/user/ntuser/input.h b/win32ss/user/ntuser/input.h index 35105947d68..fdf8c13cc5f 100644 --- a/win32ss/user/ntuser/input.h +++ b/win32ss/user/ntuser/input.h @@ -47,9 +47,6 @@ typedef struct _ATTACHINFO extern PATTACHINFO gpai; -/* Keyboard layout undocumented flags */ -#define KLF_UNLOAD 0x20000000 - /* Key States */ #define KS_DOWN_BIT 0x80 #define KS_LOCK_BIT 0x01 diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 31c016d3e97..d72b561a38b 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -32,7 +32,6 @@ typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); /* * Retrieves a PKL by an input locale identifier (HKL). * @implemented - * Win: HKLtoPKL */ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) { @@ -50,7 +49,7 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) do { pKL = pKL->pklNext; - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) return pKL; } while (pKL != pFirstKL); } @@ -59,13 +58,13 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) do { pKL = pKL->pklPrev; - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) return pKL; } while (pKL != pFirstKL); } else if (HIWORD(hKL)) /* hKL is a full input locale identifier */ { - /* No KLF_UNLOAD check */ + /* No KL_UNLOAD check */ do { if (pKL->hkl == hKL) @@ -76,7 +75,7 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) } else /* Language only specified */ { - /* No KLF_UNLOAD check */ + /* No KL_UNLOAD check */ do { if (LOWORD(pKL->hkl) == LOWORD(hKL)) /* Low word is language ID */ @@ -92,7 +91,6 @@ PKL FASTCALL IntHKLtoPKL(_Inout_ PTHREADINFO pti, _In_ HKL hKL) /* * A helper function for NtUserGetKeyboardLayoutList. * @implemented - * Win: _GetKeyboardLayoutList */ static UINT APIENTRY IntGetKeyboardLayoutList( @@ -114,7 +112,7 @@ IntGetKeyboardLayoutList( /* Count the effective PKLs */ do { - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) ++ret; pKL = pKL->pklNext; } while (pKL != pFirstKL); @@ -124,7 +122,7 @@ IntGetKeyboardLayoutList( /* Copy the effective HKLs to pHklBuff */ do { - if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + if (!(pKL->dwKL_Flags & KL_UNLOAD)) { *pHklBuff = pKL->hkl; ++pHklBuff; @@ -489,7 +487,7 @@ UserUnloadKbl(PKL pKl) if (pKl->head.cLockObj > 1) { /* Layout is used by other threads */ - pKl->dwKL_Flags |= KLF_UNLOAD; + pKl->dwKL_Flags |= KL_UNLOAD; return FALSE; } @@ -521,7 +519,7 @@ W32kGetDefaultKeyLayout(VOID) /* Return not unloaded layout */ do { - if (!(pKl->dwKL_Flags & KLF_UNLOAD)) + if (!(pKl->dwKL_Flags & KL_UNLOAD)) return pKl; pKl = pKl->pklPrev; /* Confirmed on Win2k */ @@ -556,7 +554,6 @@ UserHklToKbl(HKL hKl) return NULL; } -// Win: ReorderKeyboardLayouts VOID FASTCALL IntReorderKeyboardLayouts( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -813,7 +810,6 @@ co_UserActivateKeyboardLayout( return hOldKL; } -/* Win: xxxActivateKeyboardLayout */ HKL APIENTRY co_IntActivateKeyboardLayout( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -837,7 +833,6 @@ co_IntActivateKeyboardLayout( return co_UserActivateKeyboardLayout(pKL, uFlags, pWnd); } -// Win: xxxInternalUnloadKeyboardLayout static BOOL APIENTRY co_IntUnloadKeyboardLayoutEx( _Inout_ PWINSTATION_OBJECT pWinSta, @@ -848,16 +843,16 @@ co_IntUnloadKeyboardLayoutEx( USER_REFERENCE_ENTRY Ref1, Ref2; PTHREADINFO pti = gptiCurrent; - if (pKL == gspklBaseLayout && !(dwFlags & 0x80000000)) + if (pKL == gspklBaseLayout && !(dwFlags & UKL_NOACTIVATENEXT)) return FALSE; UserRefObjectCo(pKL, &Ref1); /* Add reference */ /* Regard as unloaded */ UserMarkObjectDestroy(pKL); - pKL->dwKL_Flags |= KLF_UNLOAD; + pKL->dwKL_Flags |= KL_UNLOAD; - if (!(dwFlags & 0x80000000) && pti->KeyboardLayout == pKL) + if (!(dwFlags & UKL_NOACTIVATENEXT) && pti->KeyboardLayout == pKL) { pNextKL = IntHKLtoPKL(pti, UlongToHandle(HKL_NEXT)); if (pNextKL) @@ -885,7 +880,6 @@ co_IntUnloadKeyboardLayoutEx( return TRUE; } -// Win: xxxUnloadKeyboardLayout static BOOL APIENTRY IntUnloadKeyboardLayout(_Inout_ PWINSTATION_OBJECT pWinSta, _In_ HKL hKL) { @@ -957,7 +951,7 @@ co_IntLoadKeyboardLayoutEx( { /* Find last not unloaded layout */ PKL pLastKL = gspklBaseLayout->pklPrev; - while (pLastKL != gspklBaseLayout && (pLastKL->dwKL_Flags & KLF_UNLOAD)) + while (pLastKL != gspklBaseLayout && (pLastKL->dwKL_Flags & KL_UNLOAD)) pLastKL = pLastKL->pklPrev; /* Add new layout to the list */ @@ -978,7 +972,7 @@ co_IntLoadKeyboardLayoutEx( } /* If this layout was prepared to unload, undo it */ - pNewKL->dwKL_Flags &= ~KLF_UNLOAD; + pNewKL->dwKL_Flags &= ~KL_UNLOAD; /* Reorder if necessary */ if (Flags & KLF_REORDER) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 3d8bed1ad25..3e187da36e4 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -807,7 +807,7 @@ IntGetNextKL( { pKL = (bNext ? pKL->pklNext : pKL->pklPrev); - if (!(pKL->dwKL_Flags & KLF_UNLOAD) && bSameLang == (LangID == LOWORD(pKL->hkl))) + if (!(pKL->dwKL_Flags & KL_UNLOAD) && bSameLang == (LangID == LOWORD(pKL->hkl))) return pKL; } while (pKL != pFirstKL);

1 0

[reactos] 01/01: [SHELL32] RecycleBin5: Make it C++ (#7174)
by Katayama Hirofumi MZ 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90a5b9a83f2215085a0a6… commit 90a5b9a83f2215085a0a628c996eeb32e60853fc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 09:20:36 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 09:20:36 2024 +0900 [SHELL32] RecycleBin5: Make it C++ (#7174) Modernize code. JIRA issue: CORE-19595 Rewrite RecycleBin5 in C++. --- dll/win32/shell32/shellrecyclebin/CMakeLists.txt | 3 +- .../shell32/shellrecyclebin/recyclebin_private.h | 3 +- .../{recyclebin_v5.c => recyclebin_v5.cpp} | 401 ++++++++++----------- 3 files changed, 195 insertions(+), 212 deletions(-) diff --git a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt index ef5bf3da1c8..1c8f343ff65 100644 --- a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt +++ b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt @@ -8,11 +8,12 @@ list(APPEND SOURCE recyclebin.c recyclebin_generic.cpp recyclebin_generic_enumerator.cpp - recyclebin_v5.c + recyclebin_v5.cpp recyclebin_v5_enumerator.cpp recyclebin_private.h) add_library(recyclebin ${SOURCE} guid.c) +target_link_libraries(recyclebin PRIVATE atl_classes) add_pch(recyclebin recyclebin_private.h SOURCE) add_dependencies(recyclebin psdk) target_link_libraries(recyclebin PRIVATE atl_classes) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_private.h b/dll/win32/shell32/shellrecyclebin/recyclebin_private.h index aba8decdfd1..42cffd22656 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_private.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_private.h @@ -50,6 +50,7 @@ HRESULT RecycleBinGenericEnum_Constructor(OUT IRecycleBinEnumList **pprbel); /* recyclebin_v5.c */ -HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown); +EXTERN_C +HRESULT RecycleBin5_Constructor(_In_ LPCWSTR VolumePath, _Out_ IUnknown **ppUnknown); #endif /* _RECYCLEBIN_PRIVATE_H_ */ diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp similarity index 65% rename from dll/win32/shell32/shellrecyclebin/recyclebin_v5.c rename to dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp index 3344b2c035c..a98e56861bb 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.cpp @@ -1,13 +1,14 @@ /* * PROJECT: Recycle bin management - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/recyclebin/recyclebin_v5.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Deals with recycle bins of Windows 2000/XP/2003 - * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + * COPYRIGHT: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + * Copyright 2024 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "recyclebin_private.h" - +#include <atlstr.h> +#include <shlwapi.h> #include "sddl.h" static BOOL @@ -38,7 +39,7 @@ IntDeleteRecursive( { /* Prepare file specification */ dwLength = wcslen(FullName); - FullPath = HeapAlloc(GetProcessHeap(), 0, (dwLength + 1 + MAX_PATH + 1) * sizeof(WCHAR)); + FullPath = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (dwLength + 1 + MAX_PATH + 1) * sizeof(WCHAR)); if (!FullPath) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -91,99 +92,97 @@ cleanup: return ret; } -struct RecycleBin5 +class RecycleBin5 : public IRecycleBin5 { - ULONG ref; - IRecycleBin5 recycleBinImpl; - HANDLE hInfo; - HANDLE hInfoMapped; - - DWORD EnumeratorCount; - - LPWSTR VolumePath; - WCHAR Folder[ANY_SIZE]; /* [drive]:\[RECYCLE_BIN_DIRECTORY]\{SID} */ +public: + RecycleBin5(); + virtual ~RecycleBin5(); + + HRESULT Init(_In_ LPCWSTR VolumePath); + + /* IUnknown interface */ + STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ void **ppvObject) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + /* IRecycleBin interface */ + STDMETHODIMP DeleteFile(_In_ LPCWSTR szFileName) override; + STDMETHODIMP EmptyRecycleBin() override; + STDMETHODIMP EnumObjects(_Out_ IRecycleBinEnumList **ppEnumList) override; + + /* IRecycleBin5 interface */ + STDMETHODIMP Delete( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) override; + STDMETHODIMP Restore( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) override; + STDMETHODIMP OnClosing(_In_ IRecycleBinEnumList *prbel) override; + +protected: + LONG m_ref; + HANDLE m_hInfo; + HANDLE m_hInfoMapped; + DWORD m_EnumeratorCount; + CStringW m_VolumePath; + CStringW m_Folder; /* [drive]:\[RECYCLE_BIN_DIRECTORY]\{SID} */ }; -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_QueryInterface( - IRecycleBin5 *This, - REFIID riid, - void **ppvObject) +STDMETHODIMP RecycleBin5::QueryInterface(_In_ REFIID riid, _Out_ void **ppvObject) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvObject); if (!ppvObject) return E_POINTER; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppvObject = &s->recycleBinImpl; - else if (IsEqualIID(riid, &IID_IRecycleBin)) - *ppvObject = &s->recycleBinImpl; - else if (IsEqualIID(riid, &IID_IRecycleBin5)) - *ppvObject = &s->recycleBinImpl; + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IRecycleBin)) + *ppvObject = static_cast<IRecycleBin5 *>(this); + else if (IsEqualIID(riid, IID_IRecycleBin5)) + *ppvObject = static_cast<IRecycleBin5 *>(this); else { *ppvObject = NULL; return E_NOINTERFACE; } - IUnknown_AddRef(This); + AddRef(); return S_OK; } -static ULONG STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_AddRef( - IRecycleBin5 *This) +STDMETHODIMP_(ULONG) RecycleBin5::AddRef() { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); - TRACE("(%p)\n", This); - return refCount; + TRACE("(%p)\n", this); + return InterlockedIncrement(&m_ref); } -static VOID -RecycleBin5_Destructor( - struct RecycleBin5 *s) +RecycleBin5::~RecycleBin5() { - TRACE("(%p)\n", s); + TRACE("(%p)\n", this); - if (s->hInfo && s->hInfo != INVALID_HANDLE_VALUE) - CloseHandle(s->hInfo); - if (s->hInfoMapped) - CloseHandle(s->hInfoMapped); - CoTaskMemFree(s); + if (m_hInfo && m_hInfo != INVALID_HANDLE_VALUE) + CloseHandle(m_hInfo); + if (m_hInfoMapped) + CloseHandle(m_hInfoMapped); } -static ULONG STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_Release( - IRecycleBin5 *This) +STDMETHODIMP_(ULONG) RecycleBin5::Release() { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - ULONG refCount; - - TRACE("(%p)\n", This); - - refCount = InterlockedDecrement((PLONG)&s->ref); + TRACE("(%p)\n", this); + ULONG refCount = InterlockedDecrement(&m_ref); if (refCount == 0) - RecycleBin5_Destructor(s); - + delete this; return refCount; } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_DeleteFile( - IN IRecycleBin5 *This, - IN LPCWSTR szFileName) +STDMETHODIMP RecycleBin5::DeleteFile(_In_ LPCWSTR szFileName) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); LPWSTR szFullName = NULL; DWORD dwBufferLength = 0; LPWSTR lpFilePart; LPCWSTR Extension; - WCHAR DeletedFileName[MAX_PATH]; + CStringW DeletedFileName; + WCHAR szUniqueId[64]; DWORD len; HANDLE hFile = INVALID_HANDLE_VALUE; PINFO2_HEADER pHeader = NULL; @@ -194,9 +193,9 @@ RecycleBin5_RecycleBin5_DeleteFile( DWORD ClusterSize, BytesPerSector, SectorsPerCluster; HRESULT hr; - TRACE("(%p, %s)\n", This, debugstr_w(szFileName)); + TRACE("(%p, %s)\n", this, debugstr_w(szFileName)); - if (s->EnumeratorCount != 0) + if (m_EnumeratorCount != 0) return HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION); /* Get full file name */ @@ -214,7 +213,7 @@ RecycleBin5_RecycleBin5_DeleteFile( if (szFullName) CoTaskMemFree(szFullName); dwBufferLength = len; - szFullName = CoTaskMemAlloc(dwBufferLength * sizeof(WCHAR)); + szFullName = (LPWSTR)CoTaskMemAlloc(dwBufferLength * sizeof(WCHAR)); if (!szFullName) return HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); } @@ -242,18 +241,18 @@ RecycleBin5_RecycleBin5_DeleteFile( } /* Increase INFO2 file size */ - CloseHandle(s->hInfoMapped); - SetFilePointer(s->hInfo, sizeof(DELETED_FILE_RECORD), NULL, FILE_END); - SetEndOfFile(s->hInfo); - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + CloseHandle(m_hInfoMapped); + SetFilePointer(m_hInfo, sizeof(DELETED_FILE_RECORD), NULL, FILE_END); + SetEndOfFile(m_hInfo); + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } /* Open INFO2 file */ - pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); + pHeader = (PINFO2_HEADER)MapViewOfFile(m_hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -261,7 +260,7 @@ RecycleBin5_RecycleBin5_DeleteFile( } /* Get number of entries */ - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); if (FileSize.u.LowPart < sizeof(INFO2_HEADER)) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -295,7 +294,7 @@ RecycleBin5_RecycleBin5_DeleteFile( pHeader->dwTotalLogicalSize += FileSize.u.LowPart; /* Generate new name */ - Extension = wcsrchr(szFullName, '.'); + Extension = PathFindExtensionW(szFullName); ZeroMemory(pDeletedFile, sizeof(DELETED_FILE_RECORD)); if (dwEntries == 0) pDeletedFile->dwRecordUniqueId = 0; @@ -304,11 +303,18 @@ RecycleBin5_RecycleBin5_DeleteFile( PDELETED_FILE_RECORD pLastDeleted = ((PDELETED_FILE_RECORD)(pHeader + 1)) + dwEntries - 1; pDeletedFile->dwRecordUniqueId = pLastDeleted->dwRecordUniqueId + 1; } + pDeletedFile->dwDriveNumber = tolower(szFullName[0]) - 'a'; - _snwprintf(DeletedFileName, MAX_PATH, L"%s\\D%c%lu%s", s->Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); + _ultow(pDeletedFile->dwRecordUniqueId, szUniqueId, 10); + + DeletedFileName = m_Folder; + DeletedFileName += L"\\D"; + DeletedFileName += (WCHAR)(L'a' + pDeletedFile->dwDriveNumber); + DeletedFileName += szUniqueId; + DeletedFileName += Extension; /* Get cluster size */ - if (!GetDiskFreeSpaceW(s->VolumePath, &SectorsPerCluster, &BytesPerSector, NULL, NULL)) + if (!GetDiskFreeSpaceW(m_VolumePath, &SectorsPerCluster, &BytesPerSector, NULL, NULL)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; @@ -348,80 +354,69 @@ cleanup: return hr; } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_EmptyRecycleBin( - IN IRecycleBin5 *This) +STDMETHODIMP RecycleBin5::EmptyRecycleBin() { - IRecycleBinEnumList *prbel; - IRecycleBinFile *prbf; - HRESULT hr; - - TRACE("(%p)\n", This); + TRACE("(%p)\n", this); while (TRUE) { - hr = IRecycleBin5_EnumObjects(This, &prbel); + IRecycleBinEnumList *prbel; + HRESULT hr = EnumObjects(&prbel); if (!SUCCEEDED(hr)) return hr; - hr = IRecycleBinEnumList_Next(prbel, 1, &prbf, NULL); - IRecycleBinEnumList_Release(prbel); + + IRecycleBinFile *prbf; + hr = prbel->Next(1, &prbf, NULL); + prbel->Release(); if (hr == S_FALSE) return S_OK; - hr = IRecycleBinFile_Delete(prbf); - IRecycleBinFile_Release(prbf); + hr = prbf->Delete(); + prbf->Release(); if (!SUCCEEDED(hr)) return hr; } } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_EnumObjects( - IN IRecycleBin5 *This, - OUT IRecycleBinEnumList **ppEnumList) +STDMETHODIMP RecycleBin5::EnumObjects(_Out_ IRecycleBinEnumList **ppEnumList) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - IRecycleBinEnumList *prbel; - HRESULT hr; - IUnknown *pUnk; - - TRACE("(%p, %p)\n", This, ppEnumList); + TRACE("(%p, %p)\n", this, ppEnumList); - hr = RecycleBin5Enum_Constructor(This, s->hInfo, s->hInfoMapped, s->Folder, &pUnk); + IUnknown *pUnk; + HRESULT hr = RecycleBin5Enum_Constructor(this, m_hInfo, m_hInfoMapped, m_Folder, &pUnk); if (!SUCCEEDED(hr)) return hr; - hr = IUnknown_QueryInterface(pUnk, &IID_IRecycleBinEnumList, (void **)&prbel); + IRecycleBinEnumList *prbel; + hr = pUnk->QueryInterface(IID_IRecycleBinEnumList, (void **)&prbel); if (SUCCEEDED(hr)) { - s->EnumeratorCount++; + m_EnumeratorCount++; *ppEnumList = prbel; } - IUnknown_Release(pUnk); + + pUnk->Release(); return hr; } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_Delete( - IN IRecycleBin5 *This, - IN LPCWSTR pDeletedFileName, - IN DELETED_FILE_RECORD *pDeletedFile) +STDMETHODIMP RecycleBin5::Delete( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); ULARGE_INTEGER FileSize; PINFO2_HEADER pHeader; DELETED_FILE_RECORD *pRecord, *pLast; DWORD dwEntries, i; - TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); + TRACE("(%p, %s, %p)\n", this, debugstr_w(pDeletedFileName), pDeletedFile); - if (s->EnumeratorCount != 0) + if (m_EnumeratorCount != 0) return HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION); - pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); + pHeader = (PINFO2_HEADER)MapViewOfFile(m_hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) return HRESULT_FROM_WIN32(GetLastError()); - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); if (FileSize.u.LowPart == 0) { UnmapViewOfFile(pHeader); @@ -448,11 +443,11 @@ RecycleBin5_RecycleBin5_Delete( UnmapViewOfFile(pHeader); /* Resize file */ - CloseHandle(s->hInfoMapped); - SetFilePointer(s->hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); - SetEndOfFile(s->hInfo); - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + CloseHandle(m_hInfoMapped); + SetFilePointer(m_hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); + SetEndOfFile(m_hInfo); + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -462,13 +457,10 @@ RecycleBin5_RecycleBin5_Delete( return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_Restore( - IN IRecycleBin5 *This, - IN LPCWSTR pDeletedFileName, - IN DELETED_FILE_RECORD *pDeletedFile) +STDMETHODIMP RecycleBin5::Restore( + _In_ LPCWSTR pDeletedFileName, + _In_ DELETED_FILE_RECORD *pDeletedFile) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); ULARGE_INTEGER FileSize; PINFO2_HEADER pHeader; DELETED_FILE_RECORD *pRecord, *pLast; @@ -476,16 +468,16 @@ RecycleBin5_RecycleBin5_Restore( SHFILEOPSTRUCTW op; int res; - TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); + TRACE("(%p, %s, %p)\n", this, debugstr_w(pDeletedFileName), pDeletedFile); - if (s->EnumeratorCount != 0) + if (m_EnumeratorCount != 0) return HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION); - pHeader = MapViewOfFile(s->hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); + pHeader = (PINFO2_HEADER)MapViewOfFile(m_hInfoMapped, FILE_MAP_WRITE, 0, 0, 0); if (!pHeader) return HRESULT_FROM_WIN32(GetLastError()); - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); if (FileSize.u.LowPart == 0) { UnmapViewOfFile(pHeader); @@ -519,11 +511,11 @@ RecycleBin5_RecycleBin5_Restore( UnmapViewOfFile(pHeader); /* Resize file */ - CloseHandle(s->hInfoMapped); - SetFilePointer(s->hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); - SetEndOfFile(s->hInfo); - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + CloseHandle(m_hInfoMapped); + SetFilePointer(m_hInfo, -(LONG)sizeof(DELETED_FILE_RECORD), NULL, FILE_END); + SetEndOfFile(m_hInfo); + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) return HRESULT_FROM_WIN32(GetLastError()); return S_OK; } @@ -534,34 +526,17 @@ RecycleBin5_RecycleBin5_Restore( return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } -static HRESULT STDMETHODCALLTYPE -RecycleBin5_RecycleBin5_OnClosing( - IN IRecycleBin5 *This, - IN IRecycleBinEnumList *prbel) +STDMETHODIMP RecycleBin5::OnClosing(_In_ IRecycleBinEnumList *prbel) { - struct RecycleBin5 *s = CONTAINING_RECORD(This, struct RecycleBin5, recycleBinImpl); - TRACE("(%p, %p)\n", This, prbel); - s->EnumeratorCount--; + TRACE("(%p, %p)\n", this, prbel); + m_EnumeratorCount--; return S_OK; } -CONST_VTBL struct IRecycleBin5Vtbl RecycleBin5Vtbl = -{ - RecycleBin5_RecycleBin5_QueryInterface, - RecycleBin5_RecycleBin5_AddRef, - RecycleBin5_RecycleBin5_Release, - RecycleBin5_RecycleBin5_DeleteFile, - RecycleBin5_RecycleBin5_EmptyRecycleBin, - RecycleBin5_RecycleBin5_EnumObjects, - RecycleBin5_RecycleBin5_Delete, - RecycleBin5_RecycleBin5_Restore, - RecycleBin5_RecycleBin5_OnClosing, -}; - static HRESULT RecycleBin5_Create( - IN LPCWSTR Folder, - IN PSID OwnerSid OPTIONAL) + _In_ LPCWSTR Folder, + _In_ PSID OwnerSid OPTIONAL) { LPWSTR BufferName = NULL; LPWSTR Separator; /* Pointer into BufferName buffer */ @@ -573,7 +548,7 @@ RecycleBin5_Create( HRESULT hr; Needed = (wcslen(Folder) + 1 + max(wcslen(RECYCLE_BIN_FILE_NAME), wcslen(L"desktop.ini")) + 1) * sizeof(WCHAR); - BufferName = HeapAlloc(GetProcessHeap(), 0, Needed); + BufferName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, Needed); if (!BufferName) { hr = ERROR_NOT_ENOUGH_MEMORY; @@ -672,37 +647,38 @@ cleanup: return hr; } -HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown) +RecycleBin5::RecycleBin5() + : m_ref(1) + , m_hInfo(NULL) + , m_hInfoMapped(NULL) + , m_EnumeratorCount(0) +{ +} + +HRESULT RecycleBin5::Init(_In_ LPCWSTR VolumePath) { - struct RecycleBin5 *s = NULL; DWORD FileSystemFlags; LPCWSTR RecycleBinDirectory; HANDLE tokenHandle = INVALID_HANDLE_VALUE; PTOKEN_USER TokenUserInfo = NULL; - LPWSTR StringSid = NULL, p; - DWORD Needed, DirectoryLength; + LPWSTR StringSid = NULL; + DWORD Needed; INT len; HRESULT hr; - if (!ppUnknown) - return E_POINTER; + m_VolumePath = VolumePath; /* Get information about file system */ - if (!GetVolumeInformationW( - VolumePath, - NULL, - 0, - NULL, - NULL, - &FileSystemFlags, - NULL, - 0)) + if (!GetVolumeInformationW(VolumePath, NULL, 0, NULL, NULL, &FileSystemFlags, NULL, 0)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } + if (!(FileSystemFlags & FILE_PERSISTENT_ACLS)) + { RecycleBinDirectory = RECYCLE_BIN_DIRECTORY_WITHOUT_ACL; + } else { RecycleBinDirectory = RECYCLE_BIN_DIRECTORY_WITH_ACL; @@ -723,7 +699,7 @@ HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown) hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - TokenUserInfo = HeapAlloc(GetProcessHeap(), 0, Needed); + TokenUserInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, Needed); if (!TokenUserInfo) { hr = E_OUTOFMEMORY; @@ -741,55 +717,42 @@ HRESULT RecycleBin5_Constructor(IN LPCWSTR VolumePath, OUT IUnknown **ppUnknown) } } - DirectoryLength = wcslen(VolumePath) + wcslen(RecycleBinDirectory) + 1; + m_Folder = VolumePath; + m_Folder += RecycleBinDirectory; if (StringSid) - DirectoryLength += wcslen(StringSid) + 1; - DirectoryLength += 1 + wcslen(RECYCLE_BIN_FILE_NAME); - DirectoryLength += wcslen(VolumePath) + 1; - Needed = (DirectoryLength + 1) * sizeof(WCHAR); - - s = CoTaskMemAlloc(sizeof(struct RecycleBin5) + Needed); - if (!s) { - hr = E_OUTOFMEMORY; - goto cleanup; + m_Folder += L'\\'; + m_Folder += StringSid; } - ZeroMemory(s, sizeof(struct RecycleBin5)); - s->recycleBinImpl.lpVtbl = &RecycleBin5Vtbl; - s->ref = 1; - if (StringSid) - len = swprintf(s->Folder, L"%s%s\\%s", VolumePath, RecycleBinDirectory, StringSid); - else - len = swprintf(s->Folder, L"%s%s", VolumePath, RecycleBinDirectory); - p = &s->Folder[len]; - wcscpy(p, L"\\" RECYCLE_BIN_FILE_NAME); - s->hInfo = CreateFileW(s->Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - if (s->hInfo == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND)) - { - *p = UNICODE_NULL; - hr = RecycleBin5_Create(s->Folder, TokenUserInfo ? TokenUserInfo->User.Sid : NULL); - *p = L'\\'; + len = m_Folder.GetLength(); + m_Folder += L"\\" RECYCLE_BIN_FILE_NAME; + + m_hInfo = CreateFileW(m_Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (m_hInfo == INVALID_HANDLE_VALUE && + (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND)) + { + m_Folder = m_Folder.Left(len); + hr = RecycleBin5_Create(m_Folder, TokenUserInfo ? TokenUserInfo->User.Sid : NULL); + m_Folder += L"\\" RECYCLE_BIN_FILE_NAME; if (!SUCCEEDED(hr)) goto cleanup; - s->hInfo = CreateFileW(s->Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + m_hInfo = CreateFileW(m_Folder, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); } - if (s->hInfo == INVALID_HANDLE_VALUE) + + if (m_hInfo == INVALID_HANDLE_VALUE) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - s->hInfoMapped = CreateFileMappingW(s->hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); - if (!s->hInfoMapped) + + m_hInfoMapped = CreateFileMappingW(m_hInfo, NULL, PAGE_READWRITE | SEC_COMMIT, 0, 0, NULL); + if (!m_hInfoMapped) { hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } - *p = UNICODE_NULL; - s->VolumePath = p + 1; - wcscpy(s->VolumePath, VolumePath); - - *ppUnknown = (IUnknown *)&s->recycleBinImpl; + m_Folder = m_Folder.Left(len); hr = S_OK; cleanup: @@ -798,10 +761,28 @@ cleanup: HeapFree(GetProcessHeap(), 0, TokenUserInfo); if (StringSid) LocalFree(StringSid); - if (!SUCCEEDED(hr)) + return hr; +} + +EXTERN_C +HRESULT RecycleBin5_Constructor(_In_ LPCWSTR VolumePath, _Out_ IUnknown **ppUnknown) +{ + if (!ppUnknown) + return E_POINTER; + + *ppUnknown = NULL; + + RecycleBin5 *pThis = new RecycleBin5(); + if (!pThis) + return E_OUTOFMEMORY; + + HRESULT hr = pThis->Init(VolumePath); + if (FAILED(hr)) { - if (s) - RecycleBin5_Destructor(s); + delete pThis; + return hr; } - return hr; + + *ppUnknown = static_cast<IRecycleBin5 *>(pThis); + return S_OK; }

1 0

[reactos] 01/01: [SHELL32] RecycleBin5Enum: Make it C++ (#7173)
by Katayama Hirofumi MZ 28 Jul '24

28 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22b913928f4a1d13120b0… commit 22b913928f4a1d13120b0ec7a1c6889d37ec0e3a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 29 08:14:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 29 08:14:02 2024 +0900 [SHELL32] RecycleBin5Enum: Make it C++ (#7173) Modernize code. JIRA issue: CORE-19595 Rewrite RecycleBin5Enum in C++. --- dll/win32/shell32/shellrecyclebin/CMakeLists.txt | 3 +- dll/win32/shell32/shellrecyclebin/recyclebin_v5.h | 11 +- .../shellrecyclebin/recyclebin_v5_enumerator.c | 534 --------------------- .../shellrecyclebin/recyclebin_v5_enumerator.cpp | 492 +++++++++++++++++++ 4 files changed, 500 insertions(+), 540 deletions(-) diff --git a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt index 5ff948c8a95..ef5bf3da1c8 100644 --- a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt +++ b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt @@ -9,9 +9,10 @@ list(APPEND SOURCE recyclebin_generic.cpp recyclebin_generic_enumerator.cpp recyclebin_v5.c - recyclebin_v5_enumerator.c + recyclebin_v5_enumerator.cpp recyclebin_private.h) add_library(recyclebin ${SOURCE} guid.c) add_pch(recyclebin recyclebin_private.h SOURCE) add_dependencies(recyclebin psdk) +target_link_libraries(recyclebin PRIVATE atl_classes) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h index 52681b584f9..f33b3adbe54 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h @@ -80,13 +80,14 @@ DECLARE_INTERFACE_(IRecycleBin5, IUnknown) (This)->lpVtbl->OnClosing(This, prb5el) #endif +EXTERN_C HRESULT RecycleBin5Enum_Constructor( - IN IRecycleBin5 *prb, - IN HANDLE hInfo, - IN HANDLE hInfoMapped, - IN LPCWSTR szPrefix, - OUT IUnknown **ppUnknown); + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR szPrefix, + _Out_ IUnknown **ppUnknown); #ifdef __cplusplus } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c deleted file mode 100644 index 411c623b3a2..00000000000 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c +++ /dev/null @@ -1,534 +0,0 @@ -/* - * PROJECT: Recycle bin management - * LICENSE: GPL v2 - See COPYING in the top level directory - * FILE: lib/recyclebin/recyclebin_v5_enumerator.c - * PURPOSE: Enumerates contents of a MS Windows 2000/XP/2003 recyclebin - * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) - */ - -#include "recyclebin_private.h" - -struct RecycleBin5File -{ - ULONG ref; - IRecycleBin5 *recycleBin; - DELETED_FILE_RECORD deletedFile; - IRecycleBinFile recycleBinFileImpl; - WCHAR FullName[ANY_SIZE]; -}; - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetAttributes( - IN IRecycleBinFile *This, - OUT DWORD *pAttributes); - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_QueryInterface( - IN IRecycleBinFile *This, - IN REFIID riid, - OUT void **ppvObject) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); - - if (!ppvObject) - return E_POINTER; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppvObject = &s->recycleBinFileImpl; - else if (IsEqualIID(riid, &IID_IRecycleBinFile)) - *ppvObject = &s->recycleBinFileImpl; - else if (IsEqualIID(riid, &IID_IExtractIconA) || IsEqualIID(riid, &IID_IExtractIconW)) - { - DWORD dwAttributes; - if (RecycleBin5File_RecycleBinFile_GetAttributes(This, &dwAttributes) == S_OK) - return SHCreateFileExtractIconW(s->FullName, dwAttributes, riid, ppvObject); - else - return S_FALSE; - } - else - { - *ppvObject = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef(This); - return S_OK; -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_AddRef( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); - TRACE("(%p)\n", This); - return refCount; -} - -static VOID -RecycleBin5File_Destructor( - struct RecycleBin5File *s) -{ - TRACE("(%p)\n", s); - - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_Release( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - ULONG refCount; - - TRACE("(%p)\n", This); - - refCount = InterlockedDecrement((PLONG)&s->ref); - - if (refCount == 0) - RecycleBin5File_Destructor(s); - - return refCount; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetLastModificationTime( - IN IRecycleBinFile *This, - OUT FILETIME *pLastModificationTime) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - HRESULT hr; - DWORD dwAttributes; - HANDLE hFile; - - TRACE("(%p, %p)\n", This, pLastModificationTime); - - dwAttributes = GetFileAttributesW(s->FullName); - if (dwAttributes == INVALID_FILE_ATTRIBUTES) - return HRESULT_FROM_WIN32(GetLastError()); - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - hFile = CreateFileW(s->FullName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); - else - hFile = CreateFileW(s->FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); - - if (GetFileTime(hFile, NULL, NULL, pLastModificationTime)) - hr = S_OK; - else - hr = HRESULT_FROM_WIN32(GetLastError()); - CloseHandle(hFile); - return hr; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetDeletionTime( - IN IRecycleBinFile *This, - OUT FILETIME *pDeletionTime) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p, %p)\n", This, pDeletionTime); - *pDeletionTime = s->deletedFile.DeletionTime; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetFileSize( - IN IRecycleBinFile *This, - OUT ULARGE_INTEGER *pFileSize) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - HRESULT hr; - DWORD dwAttributes; - HANDLE hFile; - - TRACE("(%p, %p)\n", This, pFileSize); - - dwAttributes = GetFileAttributesW(s->FullName); - if (dwAttributes == INVALID_FILE_ATTRIBUTES) - return HRESULT_FROM_WIN32(GetLastError()); - if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - pFileSize->QuadPart = 0; - return S_OK; - } - - hFile = CreateFileW(s->FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); - pFileSize->u.LowPart = GetFileSize(hFile, &pFileSize->u.HighPart); - if (pFileSize->u.LowPart != INVALID_FILE_SIZE) - hr = S_OK; - else - hr = HRESULT_FROM_WIN32(GetLastError()); - CloseHandle(hFile); - return hr; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetPhysicalFileSize( - IN IRecycleBinFile *This, - OUT ULARGE_INTEGER *pPhysicalFileSize) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p, %p)\n", This, pPhysicalFileSize); - pPhysicalFileSize->u.HighPart = 0; - pPhysicalFileSize->u.LowPart = s->deletedFile.dwPhysicalFileSize; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetAttributes( - IN IRecycleBinFile *This, - OUT DWORD *pAttributes) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - DWORD dwAttributes; - - TRACE("(%p, %p)\n", This, pAttributes); - - dwAttributes = GetFileAttributesW(s->FullName); - if (dwAttributes == INVALID_FILE_ATTRIBUTES) - return HRESULT_FROM_WIN32(GetLastError()); - - *pAttributes = dwAttributes; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetFileName( - IN IRecycleBinFile *This, - IN SIZE_T BufferSize, - IN OUT LPWSTR Buffer, - OUT SIZE_T *RequiredSize) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - DWORD dwRequired; - - TRACE("(%p, %u, %p, %p)\n", This, BufferSize, Buffer, RequiredSize); - - dwRequired = (DWORD)(wcslen(s->deletedFile.FileNameW) + 1) * sizeof(WCHAR); - if (RequiredSize) - *RequiredSize = dwRequired; - - if (BufferSize == 0 && !Buffer) - return S_OK; - - if (BufferSize < dwRequired) - return E_OUTOFMEMORY; - CopyMemory(Buffer, s->deletedFile.FileNameW, dwRequired); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_GetTypeName( - IN IRecycleBinFile *This, - IN SIZE_T BufferSize, - IN OUT LPWSTR Buffer, - OUT SIZE_T *RequiredSize) -{ - HRESULT hr; - - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - DWORD dwRequired; - DWORD dwAttributes; - SHFILEINFOW shFileInfo; - - TRACE("(%p, %u, %p, %p)\n", This, BufferSize, Buffer, RequiredSize); - - hr = RecycleBin5File_RecycleBinFile_GetAttributes(This, &dwAttributes); - if (!SUCCEEDED(hr)) - return hr; - - hr = SHGetFileInfoW(s->FullName, dwAttributes, &shFileInfo, sizeof(shFileInfo), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES); - if (!SUCCEEDED(hr)) - return hr; - - dwRequired = (DWORD)(wcslen(shFileInfo.szTypeName) + 1) * sizeof(WCHAR); - if (RequiredSize) - *RequiredSize = dwRequired; - - if (BufferSize == 0 && !Buffer) - return S_OK; - - if (BufferSize < dwRequired) - return E_OUTOFMEMORY; - CopyMemory(Buffer, shFileInfo.szTypeName, dwRequired); - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_Delete( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p)\n", This); - return IRecycleBin5_Delete(s->recycleBin, s->FullName, &s->deletedFile); -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5File_RecycleBinFile_Restore( - IN IRecycleBinFile *This) -{ - struct RecycleBin5File *s = CONTAINING_RECORD(This, struct RecycleBin5File, recycleBinFileImpl); - TRACE("(%p)\n", This); - return IRecycleBin5_Restore(s->recycleBin, s->FullName, &s->deletedFile); -} - -CONST_VTBL struct IRecycleBinFileVtbl RecycleBin5FileVtbl = -{ - RecycleBin5File_RecycleBinFile_QueryInterface, - RecycleBin5File_RecycleBinFile_AddRef, - RecycleBin5File_RecycleBinFile_Release, - RecycleBin5File_RecycleBinFile_GetLastModificationTime, - RecycleBin5File_RecycleBinFile_GetDeletionTime, - RecycleBin5File_RecycleBinFile_GetFileSize, - RecycleBin5File_RecycleBinFile_GetPhysicalFileSize, - RecycleBin5File_RecycleBinFile_GetAttributes, - RecycleBin5File_RecycleBinFile_GetFileName, - RecycleBin5File_RecycleBinFile_GetTypeName, - RecycleBin5File_RecycleBinFile_Delete, - RecycleBin5File_RecycleBinFile_Restore, -}; - -static HRESULT -RecycleBin5File_Constructor( - IN IRecycleBin5 *prb, - IN LPCWSTR Folder, - IN PDELETED_FILE_RECORD pDeletedFile, - OUT IRecycleBinFile **ppFile) -{ - struct RecycleBin5File *s = NULL; - LPCWSTR Extension; - SIZE_T Needed; - - if (!ppFile) - return E_POINTER; - - Extension = wcsrchr(pDeletedFile->FileNameW, '.'); - if (Extension < wcsrchr(pDeletedFile->FileNameW, '\\')) - Extension = NULL; - Needed = wcslen(Folder) + 13; - if (Extension) - Needed += wcslen(Extension); - Needed *= sizeof(WCHAR); - - s = CoTaskMemAlloc(sizeof(struct RecycleBin5File) + Needed); - if (!s) - return E_OUTOFMEMORY; - ZeroMemory(s, sizeof(struct RecycleBin5File) + Needed); - s->recycleBinFileImpl.lpVtbl = &RecycleBin5FileVtbl; - s->ref = 1; - s->deletedFile = *pDeletedFile; - s->recycleBin = prb; - IRecycleBin5_AddRef(s->recycleBin); - *ppFile = &s->recycleBinFileImpl; - wsprintfW(s->FullName, L"%s\\D%c%lu%s", Folder, pDeletedFile->dwDriveNumber + 'a', pDeletedFile->dwRecordUniqueId, Extension); - if (GetFileAttributesW(s->FullName) == INVALID_FILE_ATTRIBUTES) - { - RecycleBin5File_Destructor(s); - return E_FAIL; - } - - return S_OK; -} - -struct RecycleBin5Enum -{ - ULONG ref; - IRecycleBin5 *recycleBin; - HANDLE hInfo; - INFO2_HEADER *pInfo; - DWORD dwCurrent; - IRecycleBinEnumList recycleBinEnumImpl; - WCHAR szPrefix[ANY_SIZE]; -}; - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_QueryInterface( - IN IRecycleBinEnumList *This, - IN REFIID riid, - OUT void **ppvObject) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); - - if (!ppvObject) - return E_POINTER; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppvObject = &s->recycleBinEnumImpl; - else if (IsEqualIID(riid, &IID_IRecycleBinEnumList)) - *ppvObject = &s->recycleBinEnumImpl; - else - { - *ppvObject = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef(This); - return S_OK; -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_AddRef( - IN IRecycleBinEnumList *This) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - ULONG refCount = InterlockedIncrement((PLONG)&s->ref); - TRACE("(%p)\n", This); - return refCount; -} - -static VOID -RecycleBin5Enum_Destructor( - struct RecycleBin5Enum *s) -{ - TRACE("(%p)\n", s); - - IRecycleBin5_OnClosing(s->recycleBin, &s->recycleBinEnumImpl); - UnmapViewOfFile(s->pInfo); - IRecycleBin5_Release(s->recycleBin); - CoTaskMemFree(s); -} - -static ULONG STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Release( - IN IRecycleBinEnumList *This) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - ULONG refCount; - - TRACE("(%p)\n", This); - - refCount = InterlockedDecrement((PLONG)&s->ref); - - if (refCount == 0) - RecycleBin5Enum_Destructor(s); - - return refCount; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Next( - IRecycleBinEnumList *This, - IN DWORD celt, - IN OUT IRecycleBinFile **rgelt, - OUT DWORD *pceltFetched) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - ULARGE_INTEGER FileSize; - INFO2_HEADER *pHeader = s->pInfo; - DELETED_FILE_RECORD *pDeletedFile; - DWORD fetched = 0, i; - DWORD dwEntries; - HRESULT hr; - - TRACE("(%p, %u, %p, %p)\n", This, celt, rgelt, pceltFetched); - - if (!rgelt) - return E_POINTER; - if (!pceltFetched && celt > 1) - return E_INVALIDARG; - - FileSize.u.LowPart = GetFileSize(s->hInfo, &FileSize.u.HighPart); - if (FileSize.u.LowPart == 0) - return HRESULT_FROM_WIN32(GetLastError()); - dwEntries = (DWORD)((FileSize.QuadPart - sizeof(INFO2_HEADER)) / sizeof(DELETED_FILE_RECORD)); - - i = s->dwCurrent; - pDeletedFile = (DELETED_FILE_RECORD *)(pHeader + 1) + i; - for (; i < dwEntries && fetched < celt; i++) - { - hr = RecycleBin5File_Constructor(s->recycleBin, s->szPrefix, pDeletedFile, &rgelt[fetched]); - if (SUCCEEDED(hr)) - fetched++; - pDeletedFile++; - } - - s->dwCurrent = i; - if (pceltFetched) - *pceltFetched = fetched; - if (fetched == celt) - return S_OK; - else - return S_FALSE; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Skip( - IN IRecycleBinEnumList *This, - IN DWORD celt) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - TRACE("(%p, %u)\n", This, celt); - s->dwCurrent += celt; - return S_OK; -} - -static HRESULT STDMETHODCALLTYPE -RecycleBin5Enum_RecycleBinEnumList_Reset( - IN IRecycleBinEnumList *This) -{ - struct RecycleBin5Enum *s = CONTAINING_RECORD(This, struct RecycleBin5Enum, recycleBinEnumImpl); - TRACE("(%p)\n", This); - s->dwCurrent = 0; - return S_OK; -} - -CONST_VTBL struct IRecycleBinEnumListVtbl RecycleBin5EnumVtbl = -{ - RecycleBin5Enum_RecycleBinEnumList_QueryInterface, - RecycleBin5Enum_RecycleBinEnumList_AddRef, - RecycleBin5Enum_RecycleBinEnumList_Release, - RecycleBin5Enum_RecycleBinEnumList_Next, - RecycleBin5Enum_RecycleBinEnumList_Skip, - RecycleBin5Enum_RecycleBinEnumList_Reset, -}; - -HRESULT -RecycleBin5Enum_Constructor( - IN IRecycleBin5 *prb, - IN HANDLE hInfo, - IN HANDLE hInfoMapped, - IN LPCWSTR szPrefix, - OUT IUnknown **ppUnknown) -{ - struct RecycleBin5Enum *s = NULL; - SIZE_T Needed; - - if (!ppUnknown) - return E_POINTER; - - Needed = (wcslen(szPrefix) + 1) * sizeof(WCHAR); - - s = CoTaskMemAlloc(sizeof(struct RecycleBin5Enum) + Needed); - if (!s) - return E_OUTOFMEMORY; - ZeroMemory(s, sizeof(struct RecycleBin5Enum) + Needed); - s->recycleBinEnumImpl.lpVtbl = &RecycleBin5EnumVtbl; - s->ref = 1; - s->recycleBin = prb; - wcscpy(s->szPrefix, szPrefix); - s->hInfo = hInfo; - s->pInfo = MapViewOfFile(hInfoMapped, FILE_MAP_READ, 0, 0, 0); - if (!s->pInfo) - { - CoTaskMemFree(s); - return HRESULT_FROM_WIN32(GetLastError()); - } - if (s->pInfo->dwVersion != 5 || s->pInfo->dwRecordSize != sizeof(DELETED_FILE_RECORD)) - { - UnmapViewOfFile(s->pInfo); - CoTaskMemFree(s); - return E_FAIL; - } - IRecycleBin5_AddRef(s->recycleBin); - *ppUnknown = (IUnknown *)&s->recycleBinEnumImpl; - - return S_OK; -} diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp new file mode 100644 index 00000000000..1f7855415d8 --- /dev/null +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.cpp @@ -0,0 +1,492 @@ +/* + * PROJECT: Recycle bin management + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Enumerates contents of a MS Windows 2000/XP/2003 recyclebin + * COPYRIGHT: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) + * Copyright 2024 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "recyclebin_private.h" +#include <atlstr.h> +#include <shlwapi.h> +#include <strsafe.h> + +class RecycleBin5File : public IRecycleBinFile +{ +public: + RecycleBin5File(); + virtual ~RecycleBin5File(); + + HRESULT Init( + _In_ IRecycleBin5 *prb, + _In_ LPCWSTR Folder, + _In_ PDELETED_FILE_RECORD pDeletedFile); + + /* IUnknown methods */ + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + /* IRecycleBinFile methods */ + STDMETHODIMP GetLastModificationTime(FILETIME *pLastModificationTime) override; + STDMETHODIMP GetDeletionTime(FILETIME *pDeletionTime) override; + STDMETHODIMP GetFileSize(ULARGE_INTEGER *pFileSize) override; + STDMETHODIMP GetPhysicalFileSize(ULARGE_INTEGER *pPhysicalFileSize) override; + STDMETHODIMP GetAttributes(DWORD *pAttributes) override; + STDMETHODIMP GetFileName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) override; + STDMETHODIMP GetTypeName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) override; + STDMETHODIMP Delete() override; + STDMETHODIMP Restore() override; + +protected: + LONG m_ref; + IRecycleBin5 *m_recycleBin; + DELETED_FILE_RECORD m_deletedFile; + LPWSTR m_FullName; +}; + +STDMETHODIMP RecycleBin5File::QueryInterface(REFIID riid, void **ppvObject) +{ + TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvObject); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IRecycleBinFile)) + *ppvObject = static_cast<IRecycleBinFile *>(this); + else if (IsEqualIID(riid, IID_IExtractIconA) || IsEqualIID(riid, IID_IExtractIconW)) + { + DWORD dwAttributes; + if (GetAttributes(&dwAttributes) == S_OK) + return SHCreateFileExtractIconW(m_FullName, dwAttributes, riid, ppvObject); + else + return S_FALSE; + } + else + { + *ppvObject = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; +} + +STDMETHODIMP_(ULONG) RecycleBin5File::AddRef() +{ + TRACE("(%p)\n", this); + return InterlockedIncrement(&m_ref); +} + +RecycleBin5File::~RecycleBin5File() +{ + TRACE("(%p)\n", this); + m_recycleBin->Release(); + SHFree(m_FullName); +} + +STDMETHODIMP_(ULONG) RecycleBin5File::Release() +{ + TRACE("(%p)\n", this); + ULONG refCount = InterlockedDecrement(&m_ref); + if (refCount == 0) + delete this; + return refCount; +} + +STDMETHODIMP RecycleBin5File::GetLastModificationTime(FILETIME *pLastModificationTime) +{ + TRACE("(%p, %p)\n", this, pLastModificationTime); + + DWORD dwAttributes = ::GetFileAttributesW(m_FullName); + if (dwAttributes == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + + HANDLE hFile; + hFile = CreateFileW(m_FullName, + GENERIC_READ, + FILE_SHARE_READ | + ((dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ? (FILE_SHARE_WRITE | FILE_SHARE_DELETE) : 0), + NULL, + OPEN_EXISTING, + (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_FLAG_BACKUP_SEMANTICS : 0, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + HRESULT hr; + if (GetFileTime(hFile, NULL, NULL, pLastModificationTime)) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + CloseHandle(hFile); + return hr; +} + +STDMETHODIMP RecycleBin5File::GetDeletionTime(FILETIME *pDeletionTime) +{ + TRACE("(%p, %p)\n", this, pDeletionTime); + *pDeletionTime = m_deletedFile.DeletionTime; + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetFileSize(ULARGE_INTEGER *pFileSize) +{ + TRACE("(%p, %p)\n", this, pFileSize); + + DWORD dwAttributes = GetFileAttributesW(m_FullName); + if (dwAttributes == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + pFileSize->QuadPart = 0; + return S_OK; + } + + HANDLE hFile = CreateFileW(m_FullName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + pFileSize->u.LowPart = ::GetFileSize(hFile, &pFileSize->u.HighPart); + + HRESULT hr; + if (pFileSize->u.LowPart != INVALID_FILE_SIZE) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + CloseHandle(hFile); + return hr; +} + +STDMETHODIMP RecycleBin5File::GetPhysicalFileSize(ULARGE_INTEGER *pPhysicalFileSize) +{ + TRACE("(%p, %p)\n", this, pPhysicalFileSize); + pPhysicalFileSize->u.HighPart = 0; + pPhysicalFileSize->u.LowPart = m_deletedFile.dwPhysicalFileSize; + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetAttributes(DWORD *pAttributes) +{ + DWORD dwAttributes; + + TRACE("(%p, %p)\n", this, pAttributes); + + dwAttributes = GetFileAttributesW(m_FullName); + if (dwAttributes == INVALID_FILE_ATTRIBUTES) + return HRESULT_FROM_WIN32(GetLastError()); + + *pAttributes = dwAttributes; + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetFileName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) +{ + DWORD dwRequired; + + TRACE("(%p, %u, %p, %p)\n", this, BufferSize, Buffer, RequiredSize); + + dwRequired = (DWORD)(wcslen(m_deletedFile.FileNameW) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = dwRequired; + + if (BufferSize == 0 && !Buffer) + return S_OK; + + if (BufferSize < dwRequired) + return E_OUTOFMEMORY; + CopyMemory(Buffer, m_deletedFile.FileNameW, dwRequired); + return S_OK; +} + +STDMETHODIMP RecycleBin5File::GetTypeName(SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) +{ + HRESULT hr; + DWORD dwRequired; + DWORD dwAttributes; + SHFILEINFOW shFileInfo; + + TRACE("(%p, %u, %p, %p)\n", this, BufferSize, Buffer, RequiredSize); + + hr = GetAttributes(&dwAttributes); + if (!SUCCEEDED(hr)) + return hr; + + hr = SHGetFileInfoW(m_FullName, dwAttributes, &shFileInfo, sizeof(shFileInfo), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES); + if (!SUCCEEDED(hr)) + return hr; + + dwRequired = (DWORD)(wcslen(shFileInfo.szTypeName) + 1) * sizeof(WCHAR); + if (RequiredSize) + *RequiredSize = dwRequired; + + if (BufferSize == 0 && !Buffer) + return S_OK; + + if (BufferSize < dwRequired) + return E_OUTOFMEMORY; + CopyMemory(Buffer, shFileInfo.szTypeName, dwRequired); + return S_OK; +} + +STDMETHODIMP RecycleBin5File::Delete() +{ + TRACE("(%p)\n", this); + return m_recycleBin->Delete(m_FullName, &m_deletedFile); +} + +STDMETHODIMP RecycleBin5File::Restore() +{ + TRACE("(%p)\n", this); + return m_recycleBin->Restore(m_FullName, &m_deletedFile); +} + +RecycleBin5File::RecycleBin5File() + : m_ref(1) + , m_recycleBin(NULL) + , m_FullName(NULL) +{ + ZeroMemory(&m_deletedFile, sizeof(m_deletedFile)); +} + +HRESULT +RecycleBin5File::Init( + _In_ IRecycleBin5 *prb, + _In_ LPCWSTR Folder, + _In_ PDELETED_FILE_RECORD pDeletedFile) +{ + m_recycleBin = prb; + m_recycleBin->AddRef(); + + WCHAR szUniqueId[32]; + StringCchPrintfW(szUniqueId, _countof(szUniqueId), L"%lu", pDeletedFile->dwRecordUniqueId); + + CStringW strFullName(Folder); + strFullName += L"\\D"; + strFullName += (WCHAR)(L'a' + pDeletedFile->dwDriveNumber); + strFullName += szUniqueId; + strFullName += PathFindExtensionW(pDeletedFile->FileNameW); + if (GetFileAttributesW(strFullName) == INVALID_FILE_ATTRIBUTES) + return E_FAIL; + + return SHStrDup(strFullName, &m_FullName); +} + +static HRESULT +RecycleBin5File_Constructor( + _In_ IRecycleBin5 *prb, + _In_ LPCWSTR Folder, + _In_ PDELETED_FILE_RECORD pDeletedFile, + _Out_ IRecycleBinFile **ppFile) +{ + if (!ppFile) + return E_POINTER; + + *ppFile = NULL; + + RecycleBin5File *pThis = new RecycleBin5File(); + if (!pThis) + return E_OUTOFMEMORY; + + HRESULT hr = pThis->Init(prb, Folder, pDeletedFile); + if (FAILED(hr)) + { + delete pThis; + return hr; + } + + *ppFile = static_cast<IRecycleBinFile *>(pThis); + return S_OK; +} + +class RecycleBin5Enum : public IRecycleBinEnumList +{ +public: + RecycleBin5Enum(); + virtual ~RecycleBin5Enum(); + + HRESULT Init( + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR pszPrefix); + + /* IUnknown methods */ + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + /* IRecycleBinEnumList methods */ + STDMETHODIMP Next(DWORD celt, IRecycleBinFile **rgelt, DWORD *pceltFetched) override; + STDMETHODIMP Skip(DWORD celt) override; + STDMETHODIMP Reset() override; + +protected: + LONG m_ref; + IRecycleBin5 *m_recycleBin; + HANDLE m_hInfo; + INFO2_HEADER *m_pInfo; + DWORD m_dwCurrent; + LPWSTR m_pszPrefix; +}; + +STDMETHODIMP RecycleBin5Enum::QueryInterface(REFIID riid, void **ppvObject) +{ + TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvObject); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IRecycleBinEnumList)) + *ppvObject = static_cast<IRecycleBinEnumList *>(this); + else + { + *ppvObject = NULL; + return E_NOINTERFACE; + } + + AddRef(); + return S_OK; +} + +STDMETHODIMP_(ULONG) RecycleBin5Enum::AddRef() +{ + TRACE("(%p)\n", this); + return InterlockedIncrement(&m_ref); +} + +RecycleBin5Enum::~RecycleBin5Enum() +{ + TRACE("(%p)\n", this); + + m_recycleBin->OnClosing(this); + UnmapViewOfFile(m_pInfo); + m_recycleBin->Release(); + SHFree(m_pszPrefix); +} + +STDMETHODIMP_(ULONG) RecycleBin5Enum::Release() +{ + TRACE("(%p)\n", this); + + ULONG refCount = InterlockedDecrement(&m_ref); + if (refCount == 0) + delete this; + return refCount; +} + +STDMETHODIMP RecycleBin5Enum::Next(DWORD celt, IRecycleBinFile **rgelt, DWORD *pceltFetched) +{ + HRESULT hr; + + TRACE("(%p, %u, %p, %p)\n", this, celt, rgelt, pceltFetched); + + if (!rgelt) + return E_POINTER; + if (!pceltFetched && celt > 1) + return E_INVALIDARG; + + ULARGE_INTEGER FileSize; + FileSize.u.LowPart = GetFileSize(m_hInfo, &FileSize.u.HighPart); + if (FileSize.u.LowPart == 0) + return HRESULT_FROM_WIN32(GetLastError()); + + DWORD dwEntries = + (DWORD)((FileSize.QuadPart - sizeof(INFO2_HEADER)) / sizeof(DELETED_FILE_RECORD)); + + DWORD iEntry = m_dwCurrent, fetched = 0; + PDELETED_FILE_RECORD pDeletedFile = (PDELETED_FILE_RECORD)(m_pInfo + 1) + iEntry; + for (; iEntry < dwEntries && fetched < celt; ++iEntry) + { + hr = RecycleBin5File_Constructor(m_recycleBin, m_pszPrefix, pDeletedFile, &rgelt[fetched]); + if (SUCCEEDED(hr)) + fetched++; + pDeletedFile++; + } + + m_dwCurrent = iEntry; + if (pceltFetched) + *pceltFetched = fetched; + if (fetched == celt) + return S_OK; + else + return S_FALSE; +} + +STDMETHODIMP RecycleBin5Enum::Skip(DWORD celt) +{ + TRACE("(%p, %u)\n", this, celt); + m_dwCurrent += celt; + return S_OK; +} + +STDMETHODIMP RecycleBin5Enum::Reset() +{ + TRACE("(%p)\n", this); + m_dwCurrent = 0; + return S_OK; +} + +RecycleBin5Enum::RecycleBin5Enum() + : m_ref(1) + , m_recycleBin(NULL) + , m_hInfo(NULL) + , m_pInfo(NULL) + , m_dwCurrent(0) + , m_pszPrefix(NULL) +{ +} + +HRESULT +RecycleBin5Enum::Init( + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR pszPrefix) +{ + m_recycleBin = prb; + m_recycleBin->AddRef(); + + HRESULT hr = SHStrDup(pszPrefix, &m_pszPrefix); + if (FAILED(hr)) + return hr; + + m_hInfo = hInfo; + m_pInfo = (PINFO2_HEADER)MapViewOfFile(hInfoMapped, FILE_MAP_READ, 0, 0, 0); + if (!m_pInfo) + return HRESULT_FROM_WIN32(GetLastError()); + + if (m_pInfo->dwVersion != 5 || m_pInfo->dwRecordSize != sizeof(DELETED_FILE_RECORD)) + return E_FAIL; + + return S_OK; +} + +EXTERN_C +HRESULT +RecycleBin5Enum_Constructor( + _In_ IRecycleBin5 *prb, + _In_ HANDLE hInfo, + _In_ HANDLE hInfoMapped, + _In_ LPCWSTR szPrefix, + _Out_ IUnknown **ppUnknown) +{ + if (!ppUnknown) + return E_POINTER; + + *ppUnknown = NULL; + + RecycleBin5Enum *pThis = new RecycleBin5Enum(); + if (!pThis) + return E_OUTOFMEMORY; + + HRESULT hr = pThis->Init(prb, hInfo, hInfoMapped, szPrefix); + if (FAILED(hr)) + { + delete pThis; + return hr; + } + + *ppUnknown = static_cast<IRecycleBinEnumList *>(pThis); + return S_OK; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs