Ros-diffs August 2024

ros-diffs@reactos.org

26 participants
139 discussions

[reactos] 01/01: [EXPLORER] Restore windows on second click of Show Desktop button (#7184)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=045333e8904a0eebc8bbf… commit 045333e8904a0eebc8bbf0416df5121e53fc5023 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Aug 2 15:36:26 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 17:36:26 2024 +0300 [EXPLORER] Restore windows on second click of Show Desktop button (#7184) On the second click on "Show desktop" button, the minimized windows are not restored, because after the first click, and the addition to `CSimpleArray<MINWNDPOS> g_MinimizedAll`, a call to `RestoreMinimizedNonTaskWnds()` via `HSHELL_WINDOWACTIVATED` message clears the list of minimized windows. Don't empty `g_MinimizedAll` while processing HSHELL_WINDOWCREATED or HSHELL_WINDOWACTIVATED messages (bDestroyed=FALSE). Empty `g_MinimizedAll` only when SendPulseToTray is called with bDestroyed=TRUE. Addendum to e6bced7a353 and 70d7009ad95. CORE-19703 CORE-15369 --- base/shell/explorer/traywnd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index a2d49f8010d..868447796fc 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -3049,9 +3049,9 @@ HandleTrayContextMenu: } } - g_MinimizedAll.RemoveAll(); - - if (!bDestroyed) + if (bDestroyed) + g_MinimizedAll.RemoveAll(); + else ::SetForegroundWindow(hwndActive); }

4 months, 3 weeks

[reactos] 02/02: [SHDOCVW] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=191d716cb2242ec0e8c99… commit 191d716cb2242ec0e8c99be94c0d14b91bb84ab0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 2 16:38:11 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Aug 2 16:38:11 2024 +0300 [SHDOCVW] Update Russian (ru-RU) translation Addendum to 69931a4a7d1. CORE-19686 --- dll/win32/shdocvw/lang/ru-RU.rc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/shdocvw/lang/ru-RU.rc b/dll/win32/shdocvw/lang/ru-RU.rc index 7c0b549f78c..7db8c0b0fd9 100644 --- a/dll/win32/shdocvw/lang/ru-RU.rc +++ b/dll/win32/shdocvw/lang/ru-RU.rc @@ -2,14 +2,15 @@ * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Russian resource file - * TRANSLATOR: Copyright 2014 Petr Akhlamov <petr-akhlamov(a)yandex.ru> + * TRANSLATORS: Copyright 2014 Petr Akhlamov <petr-akhlamov(a)yandex.ru> + * Copyright 2024 Stanislav Motylkov <binarymaster(a)mail.ru> */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_ADD "Add..." - IDS_ORGANIZE "Organize..." + IDS_ADD "Добавить..." + IDS_ORGANIZE "Упорядочить..." IDS_FOLDERSLABEL "Папки" END

4 months, 3 weeks

[reactos] 01/02: [SHDOCVW] Add missing file headers and fix existing

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fe3564ba99b5b8937158… commit 1fe3564ba99b5b893715811f43158bd89a1d0880 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 2 16:32:46 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Aug 2 16:32:46 2024 +0300 [SHDOCVW] Add missing file headers and fix existing Addendum to 69931a4a7d1 and 960a305e5c5. --- dll/win32/shdocvw/CExplorerBand.cpp | 2 +- dll/win32/shdocvw/CExplorerBand.h | 2 +- dll/win32/shdocvw/CFavBand.cpp | 2 +- dll/win32/shdocvw/CFavBand.h | 2 +- dll/win32/shdocvw/lang/bg-BG.rc | 6 ++++++ dll/win32/shdocvw/lang/de-DE.rc | 6 ++++++ dll/win32/shdocvw/lang/en-US.rc | 7 +++++++ dll/win32/shdocvw/lang/es-ES.rc | 6 ++++++ dll/win32/shdocvw/lang/et-EE.rc | 6 ++++++ dll/win32/shdocvw/lang/eu-ES.rc | 6 ++++++ dll/win32/shdocvw/lang/fr-FR.rc | 6 ++++++ dll/win32/shdocvw/lang/he-IL.rc | 6 ++++++ dll/win32/shdocvw/lang/hi-IN.rc | 6 ++++++ dll/win32/shdocvw/lang/hu-HU.rc | 6 ++++++ dll/win32/shdocvw/lang/id-ID.rc | 8 +++++++- dll/win32/shdocvw/lang/it-IT.rc | 6 ++++++ dll/win32/shdocvw/lang/ja-JP.rc | 6 ++++++ dll/win32/shdocvw/lang/pl-PL.rc | 6 ++++++ dll/win32/shdocvw/lang/pt-BR.rc | 6 ++++++ dll/win32/shdocvw/lang/pt-PT.rc | 6 ++++++ dll/win32/shdocvw/lang/ro-RO.rc | 6 ++++++ dll/win32/shdocvw/lang/ru-RU.rc | 6 ++++++ dll/win32/shdocvw/lang/sq-AL.rc | 6 ++++++ dll/win32/shdocvw/lang/tr-TR.rc | 6 ++++++ dll/win32/shdocvw/lang/uk-UA.rc | 6 ++++++ dll/win32/shdocvw/lang/zh-CN.rc | 6 ++++++ dll/win32/shdocvw/lang/zh-TW.rc | 6 ++++++ dll/win32/shdocvw/objects.cpp | 4 ++-- dll/win32/shdocvw/objects.h | 4 ++-- dll/win32/shdocvw/utility.cpp | 4 ++-- dll/win32/shdocvw/utility.h | 4 ++-- 31 files changed, 152 insertions(+), 13 deletions(-) diff --git a/dll/win32/shdocvw/CExplorerBand.cpp b/dll/win32/shdocvw/CExplorerBand.cpp index ab65442d847..d47964f08ab 100644 --- a/dll/win32/shdocvw/CExplorerBand.cpp +++ b/dll/win32/shdocvw/CExplorerBand.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Explorer bar * COPYRIGHT: Copyright 2016 Sylvain Deverre <deverre.sylv(a)gmail.com> diff --git a/dll/win32/shdocvw/CExplorerBand.h b/dll/win32/shdocvw/CExplorerBand.h index 5498dc605f0..5c307deacce 100644 --- a/dll/win32/shdocvw/CExplorerBand.h +++ b/dll/win32/shdocvw/CExplorerBand.h @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Explorer bar * COPYRIGHT: Copyright 2016 Sylvain Deverre <deverre dot sylv at gmail dot com> diff --git a/dll/win32/shdocvw/CFavBand.cpp b/dll/win32/shdocvw/CFavBand.cpp index 38e7a4ebbdc..bc00c3943bb 100644 --- a/dll/win32/shdocvw/CFavBand.cpp +++ b/dll/win32/shdocvw/CFavBand.cpp @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Favorites bar * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> diff --git a/dll/win32/shdocvw/CFavBand.h b/dll/win32/shdocvw/CFavBand.h index ff6f86c282e..1b91e04779c 100644 --- a/dll/win32/shdocvw/CFavBand.h +++ b/dll/win32/shdocvw/CFavBand.h @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Favorites bar * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> diff --git a/dll/win32/shdocvw/lang/bg-BG.rc b/dll/win32/shdocvw/lang/bg-BG.rc index f83e20b8019..55adac3a09a 100644 --- a/dll/win32/shdocvw/lang/bg-BG.rc +++ b/dll/win32/shdocvw/lang/bg-BG.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATOR: Copyright 2010 S. Stanev (CCTAHEB) <sstpr(a)narod.ru> + */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/de-DE.rc b/dll/win32/shdocvw/lang/de-DE.rc index 3c9eac042ed..959c1f16f22 100644 --- a/dll/win32/shdocvw/lang/de-DE.rc +++ b/dll/win32/shdocvw/lang/de-DE.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: German resource file + * TRANSLATOR: Copyright 2014 Christoph von Wittich <christoph_vw(a)reactos.org> + */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/en-US.rc b/dll/win32/shdocvw/lang/en-US.rc index 12d6bbe94dd..2ae4b74e92e 100644 --- a/dll/win32/shdocvw/lang/en-US.rc +++ b/dll/win32/shdocvw/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATORS: Copyright 2009 Andrew Hill <ash77(a)reactos.org> + * Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US diff --git a/dll/win32/shdocvw/lang/es-ES.rc b/dll/win32/shdocvw/lang/es-ES.rc index cedac65d717..08be15ee008 100644 --- a/dll/win32/shdocvw/lang/es-ES.rc +++ b/dll/win32/shdocvw/lang/es-ES.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Spanish resource file + * TRANSLATOR: Copyright 2009 Javier Remacha <remialdo(a)gmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/et-EE.rc b/dll/win32/shdocvw/lang/et-EE.rc index a3a46d82942..920ed4823e6 100644 --- a/dll/win32/shdocvw/lang/et-EE.rc +++ b/dll/win32/shdocvw/lang/et-EE.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Estonian resource file + * TRANSLATOR: Copyright 2018 Joann Mõndresku <joann.mondresku(a)gmail.com> + */ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/eu-ES.rc b/dll/win32/shdocvw/lang/eu-ES.rc index 6f37fee0a8e..db45767c3e9 100644 --- a/dll/win32/shdocvw/lang/eu-ES.rc +++ b/dll/win32/shdocvw/lang/eu-ES.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Spanish (Basque) resource file + * TRANSLATOR: Copyright 2021 Julen Urizar Compains <julenuri(a)hotmail.com> + */ LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/fr-FR.rc b/dll/win32/shdocvw/lang/fr-FR.rc index 3abed1c22b6..542ce26081b 100644 --- a/dll/win32/shdocvw/lang/fr-FR.rc +++ b/dll/win32/shdocvw/lang/fr-FR.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: French resource file + * TRANSLATOR: Copyright 2015 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/he-IL.rc b/dll/win32/shdocvw/lang/he-IL.rc index 7a933a2f963..1eb2d336c31 100644 --- a/dll/win32/shdocvw/lang/he-IL.rc +++ b/dll/win32/shdocvw/lang/he-IL.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hebrew resource file + * TRANSLATOR: Copyright 2019 Shy Zedaka <shaytzedaka(a)outlook.com> + */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/hi-IN.rc b/dll/win32/shdocvw/lang/hi-IN.rc index 91c4b047f50..e46cfba795e 100644 --- a/dll/win32/shdocvw/lang/hi-IN.rc +++ b/dll/win32/shdocvw/lang/hi-IN.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hindi (India) resource file + * TRANSLATOR: Copyright 2019 Arnav Bhatt <arnavbhatt288(a)gmail.com> + */ LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA diff --git a/dll/win32/shdocvw/lang/hu-HU.rc b/dll/win32/shdocvw/lang/hu-HU.rc index 257148a8114..d27294919fb 100644 --- a/dll/win32/shdocvw/lang/hu-HU.rc +++ b/dll/win32/shdocvw/lang/hu-HU.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATOR: Copyright 2020 Eszényi Tamás (7OMI) <esztomi(a)gmx.com> + */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/id-ID.rc b/dll/win32/shdocvw/lang/id-ID.rc index de3b981a694..0bc8e1cb5c9 100644 --- a/dll/win32/shdocvw/lang/id-ID.rc +++ b/dll/win32/shdocvw/lang/id-ID.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATOR: Copyright 2019 Mas Ahmad Muhammad <m.charly81(a)gmail.com> + */ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT @@ -5,5 +11,5 @@ STRINGTABLE BEGIN IDS_ADD "Add..." IDS_ORGANIZE "Organize..." - IDS_FOLDERSLABEL "Folder" + IDS_FOLDERSLABEL "Folder" /* Translated */ END diff --git a/dll/win32/shdocvw/lang/it-IT.rc b/dll/win32/shdocvw/lang/it-IT.rc index 80b1d4c8f37..48f1b1f561a 100644 --- a/dll/win32/shdocvw/lang/it-IT.rc +++ b/dll/win32/shdocvw/lang/it-IT.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Italian resource file + * TRANSLATOR: Copyright 2012 Paolo Devoti <devotip(a)tiscali.it> + */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/ja-JP.rc b/dll/win32/shdocvw/lang/ja-JP.rc index 5b03707daa8..b600e681e54 100644 --- a/dll/win32/shdocvw/lang/ja-JP.rc +++ b/dll/win32/shdocvw/lang/ja-JP.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Japanese resource file + * TRANSLATOR: Copyright 2016-2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/pl-PL.rc b/dll/win32/shdocvw/lang/pl-PL.rc index 023ee07f7a4..c6fc9953fe1 100644 --- a/dll/win32/shdocvw/lang/pl-PL.rc +++ b/dll/win32/shdocvw/lang/pl-PL.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Polish resource file + * TRANSLATOR: Copyright 2015 Adam Stachowicz <saibamenppl(a)gmail.com> + */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/pt-BR.rc b/dll/win32/shdocvw/lang/pt-BR.rc index 8eb8b6bbf24..1ecc9c667d2 100644 --- a/dll/win32/shdocvw/lang/pt-BR.rc +++ b/dll/win32/shdocvw/lang/pt-BR.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Brazil) resource file + * TRANSLATOR: Copyright 2016 Edison Henrique Andreassy <ehasis(a)hotmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN diff --git a/dll/win32/shdocvw/lang/pt-PT.rc b/dll/win32/shdocvw/lang/pt-PT.rc index ff2ed6ebeae..bb73324df87 100644 --- a/dll/win32/shdocvw/lang/pt-PT.rc +++ b/dll/win32/shdocvw/lang/pt-PT.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATOR: Copyright 2019 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/ro-RO.rc b/dll/win32/shdocvw/lang/ro-RO.rc index 26a2005fb85..30fc6dbb79a 100644 --- a/dll/win32/shdocvw/lang/ro-RO.rc +++ b/dll/win32/shdocvw/lang/ro-RO.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATOR: Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/ru-RU.rc b/dll/win32/shdocvw/lang/ru-RU.rc index b96b547feba..7c0b549f78c 100644 --- a/dll/win32/shdocvw/lang/ru-RU.rc +++ b/dll/win32/shdocvw/lang/ru-RU.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Russian resource file + * TRANSLATOR: Copyright 2014 Petr Akhlamov <petr-akhlamov(a)yandex.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/sq-AL.rc b/dll/win32/shdocvw/lang/sq-AL.rc index 9d5ec92b41e..c06a5e04737 100644 --- a/dll/win32/shdocvw/lang/sq-AL.rc +++ b/dll/win32/shdocvw/lang/sq-AL.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2014 Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/dll/win32/shdocvw/lang/tr-TR.rc b/dll/win32/shdocvw/lang/tr-TR.rc index 1ff52043ffa..de4dc269bdb 100644 --- a/dll/win32/shdocvw/lang/tr-TR.rc +++ b/dll/win32/shdocvw/lang/tr-TR.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Turkish resource file + * TRANSLATOR: Copyright 2016 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/uk-UA.rc b/dll/win32/shdocvw/lang/uk-UA.rc index d009579a7cd..73f0e21e189 100644 --- a/dll/win32/shdocvw/lang/uk-UA.rc +++ b/dll/win32/shdocvw/lang/uk-UA.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATOR: Copyright 2010 Igor Paliychuk <igor-hkr(a)mail.ru> + */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/dll/win32/shdocvw/lang/zh-CN.rc b/dll/win32/shdocvw/lang/zh-CN.rc index 37f2630ac3e..63eb7067d9c 100644 --- a/dll/win32/shdocvw/lang/zh-CN.rc +++ b/dll/win32/shdocvw/lang/zh-CN.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATOR: Copyright 2015 Henry Tang Ih <henrytang2(a)hotmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED diff --git a/dll/win32/shdocvw/lang/zh-TW.rc b/dll/win32/shdocvw/lang/zh-TW.rc index b02ae00c74e..690df19fdbe 100644 --- a/dll/win32/shdocvw/lang/zh-TW.rc +++ b/dll/win32/shdocvw/lang/zh-TW.rc @@ -1,3 +1,9 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Chinese (Traditional) resource file + * TRANSLATOR: Copyright 2015 Henry Tang Ih <henrytang2(a)hotmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL diff --git a/dll/win32/shdocvw/objects.cpp b/dll/win32/shdocvw/objects.cpp index 8891cb70260..2ad4275d4e3 100644 --- a/dll/win32/shdocvw/objects.cpp +++ b/dll/win32/shdocvw/objects.cpp @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: shdocvw.dll objects + * PURPOSE: Shell objects * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/shdocvw/objects.h b/dll/win32/shdocvw/objects.h index 91a02218f1e..9720fbec060 100644 --- a/dll/win32/shdocvw/objects.h +++ b/dll/win32/shdocvw/objects.h @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: shdocvw.dll objects + * PURPOSE: Shell objects header file * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/shdocvw/utility.cpp b/dll/win32/shdocvw/utility.cpp index fdf3550d548..d9453696d3d 100644 --- a/dll/win32/shdocvw/utility.cpp +++ b/dll/win32/shdocvw/utility.cpp @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Utility for shdocvw.dll + * PURPOSE: Utility routines * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> */ diff --git a/dll/win32/shdocvw/utility.h b/dll/win32/shdocvw/utility.h index 94c7ac5a3eb..46399da02f1 100644 --- a/dll/win32/shdocvw/utility.h +++ b/dll/win32/shdocvw/utility.h @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS Explorer + * PROJECT: ReactOS shdocvw * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Utility for shdocvw.dll + * PURPOSE: Utility header file * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> */

4 months, 3 weeks

[reactos] 01/01: [BROWSEUI] Fix mistake (IDR_EXPLORERBAND -> IDR_FILESEARCHBAND) (#7210)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b41146dd808e21d663a2e… commit b41146dd808e21d663a2e8ede58723e7bd90da4c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 08:47:46 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 08:47:46 2024 +0900 [BROWSEUI] Fix mistake (IDR_EXPLORERBAND -> IDR_FILESEARCHBAND) (#7210) JIRA issue: CORE-19705 #7163 (960a305) made a regression on DllRegisterServer. The cause is lacking IDR_EXPLORERBAND that CSearchBar wants. IDR_EXPLORERBAND for CSearchBar is a mistake. - Use IDR_FILESEARCHBAND resource instead of IDR_EXPLORERBAND resource for CSearchBar class. --- dll/win32/browseui/resource.h | 1 - dll/win32/browseui/shellfind/CSearchBar.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index ca58cf9651c..d6c1a39b558 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -99,7 +99,6 @@ #define IDR_INTERNETTOOLBAR 136 #define IDR_GLOBALFOLDERSETTINGS 137 #define IDR_REGTREEOPTIONS 138 -#define IDR_EXPLORERBAND 139 #define IDR_PROGRESSDIALOG 140 #define IDR_AUTOCOMPLETE 141 #define IDR_ACLISTISF 142 diff --git a/dll/win32/browseui/shellfind/CSearchBar.h b/dll/win32/browseui/shellfind/CSearchBar.h index c6795ced539..a798e368d5c 100644 --- a/dll/win32/browseui/shellfind/CSearchBar.h +++ b/dll/win32/browseui/shellfind/CSearchBar.h @@ -80,7 +80,7 @@ public: enum { IDD = IDD_SEARCH_DLG }; - DECLARE_REGISTRY_RESOURCEID(IDR_EXPLORERBAND) + DECLARE_REGISTRY_RESOURCEID(IDR_FILESEARCHBAND) DECLARE_NOT_AGGREGATABLE(CSearchBar) DECLARE_PROTECT_FINAL_CONSTRUCT()

4 months, 3 weeks

[reactos] 01/01: [NTUSER] Use co_UserActivateKeyboardLayout in loading (#7200)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e8de0466d76209bc0652… commit 7e8de0466d76209bc0652d763c2cf64336ec6c46 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 04:35:05 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 04:35:05 2024 +0900 [NTUSER] Use co_UserActivateKeyboardLayout in loading (#7200) Refactoring on keyboard layout. JIRA issue: CORE-19268 - Delete co_UserActivateKbl function. Use co_UserActivateKeyboardLayout function instead of co_UserActivateKbl in co_IntLoadKeyboardLayoutEx function. - Improve co_UserActivateKeyboardLayout. --- win32ss/user/ntuser/kbdlayout.c | 79 +++++++++++++---------------------------- 1 file changed, 24 insertions(+), 55 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index d72b561a38b..62afa1a8a75 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -23,7 +23,7 @@ PKL gspklBaseLayout = NULL; /* FIXME: Please move this to pWinSta->spklList */ PKBDFILE gpkfList = NULL; DWORD gSystemFS = 0; UINT gSystemCPCharSet = 0; -DWORD gLCIDSentToShell = 0; +HKL ghKLSentToShell = NULL; typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); @@ -592,41 +592,6 @@ UserSetDefaultInputLang(HKL hKl) return TRUE; } -/* - * co_UserActivateKbl - * - * Activates given layout in specified thread - */ -static PKL -co_UserActivateKbl(PTHREADINFO pti, PKL pKl, UINT Flags) -{ - PKL pklPrev; - PWND pWnd; - - pklPrev = pti->KeyboardLayout; - - UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pKl); - pti->pClientInfo->hKL = pKl->hkl; - - if (Flags & KLF_SETFORPROCESS) - { - FIXME("KLF_SETFORPROCESS\n"); - } - - if (!(pWnd = pti->MessageQueue->spwndFocus)) - { - pWnd = pti->MessageQueue->spwndActive; - } - - // Send WM_INPUTLANGCHANGE to thread's focus window - co_IntSendMessage( pWnd ? UserHMGetHandle(pWnd) : 0, - WM_INPUTLANGCHANGE, - (WPARAM)pKl->iBaseCharset, // FIXME: How to set it? - (LPARAM)pKl->hkl); // hkl - - return pklPrev; -} - VOID APIENTRY IntImmActivateLayout( _Inout_ PTHREADINFO pti, @@ -702,10 +667,10 @@ HKL APIENTRY co_UserActivateKeyboardLayout( _Inout_ PKL pKL, _In_ ULONG uFlags, - _Inout_ PWND pWnd) + _In_opt_ PWND pWnd) { HKL hOldKL = NULL; - PKL pOldKL = NULL; + PKL pOldKL; PTHREADINFO pti = GetW32ThreadInfo(); PWND pTargetWnd, pImeWnd; HWND hTargetWnd, hImeWnd; @@ -716,12 +681,9 @@ co_UserActivateKeyboardLayout( IntReferenceThreadInfo(pti); ClientInfo = pti->pClientInfo; - if (pti->KeyboardLayout) - { - pOldKL = pti->KeyboardLayout; - if (pOldKL) - hOldKL = pOldKL->hkl; - } + pOldKL = pti->KeyboardLayout; + if (pOldKL) + hOldKL = pOldKL->hkl; if (uFlags & KLF_RESET) { @@ -734,7 +696,7 @@ co_UserActivateKeyboardLayout( return hOldKL; } - pKL->wchDiacritic = 0; + pKL->wchDiacritic = UNICODE_NULL; if (pOldKL) UserRefObjectCo(pOldKL, &Ref1); @@ -760,10 +722,15 @@ co_UserActivateKeyboardLayout( ClientInfo->hKL = pKL->hkl; } - if (gptiForeground && (gptiForeground->ppi == pti->ppi)) + /* Send shell message if necessary */ + if (gptiForeground && (gptiForeground->ppi == pti->ppi) && ISITHOOKED(WH_SHELL)) { - /* Send shell message */ - co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)pKL->hkl); + /* Send the HKL if needed and remember it */ + if (ghKLSentToShell != pKL->hkl) + { + co_IntShellHookNotify(HSHELL_LANGUAGE, 0, (LPARAM)pKL->hkl); + ghKLSentToShell = pKL->hkl; + } } if (pti->MessageQueue) @@ -787,14 +754,15 @@ co_UserActivateKeyboardLayout( } } - /* Send WM_IME_SYSTEM:IMS_SENDNOTIFICATION message if necessary */ - if (pti && !(pti->TIF_flags & TIF_CSRSSTHREAD)) + // Refresh IME UI via WM_IME_SYSTEM:IMS_SENDNOTIFICATION messaging + if (!(pti->TIF_flags & TIF_CSRSSTHREAD)) { - if (IS_IME_HKL(pKL->hkl) || IS_CICERO_MODE()) + if (IS_IME_HKL(pKL->hkl) || (IS_CICERO_MODE() && !IS_16BIT_MODE())) { pImeWnd = pti->spwndDefaultIme; if (pImeWnd) { + bSetForProcess &= !IS_16BIT_MODE(); UserRefObjectCo(pImeWnd, &Ref2); hImeWnd = UserHMGetHandle(pImeWnd); co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_SENDNOTIFICATION, bSetForProcess); @@ -815,7 +783,7 @@ co_IntActivateKeyboardLayout( _Inout_ PWINSTATION_OBJECT pWinSta, _In_ HKL hKL, _In_ ULONG uFlags, - _Inout_ PWND pWnd) + _In_opt_ PWND pWnd) { PKL pKL; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); @@ -871,10 +839,10 @@ co_IntUnloadKeyboardLayoutEx( UserDerefObjectCo(pKL); /* Release reference */ - if (pti->pDeskInfo->fsHooks) + if (ISITHOOKED(WH_SHELL)) { co_IntShellHookNotify(HSHELL_LANGUAGE, 0, 0); - gLCIDSentToShell = 0; + ghKLSentToShell = NULL; } return TRUE; @@ -892,6 +860,7 @@ IntUnloadKeyboardLayout(_Inout_ PWINSTATION_OBJECT pWinSta, _In_ HKL hKL) return co_IntUnloadKeyboardLayoutEx(pWinSta, pKL, 0); } +/// Invokes imm32!ImmLoadLayout and returns PIMEINFOEX PIMEINFOEX FASTCALL co_UserImmLoadLayout(_In_ HKL hKL) { PIMEINFOEX piiex; @@ -980,7 +949,7 @@ co_IntLoadKeyboardLayoutEx( /* Activate this layout in current thread */ if (Flags & KLF_ACTIVATE) - co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pNewKL, Flags); + co_UserActivateKeyboardLayout(pNewKL, Flags, NULL); /* Send shell message */ if (!(Flags & KLF_NOTELLSHELL))

4 months, 3 weeks

[reactos] 01/01: [BROWSEUI][SHELL32] Fix shell path parsing (#7202)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea936478f53f370957972… commit ea936478f53f3709579726b7112d486458a1734e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 04:16:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 04:16:02 2024 +0900 [BROWSEUI][SHELL32] Fix shell path parsing (#7202) Fix shell path parsing. JIRA issue: CORE-19693 JIRA issue: CORE-19694 - Fix CACListISF class by using PIDL attributes. - Use min macro instead of max macro in Shell_ParseSpecialFolder function. --- dll/win32/browseui/aclistisf.cpp | 20 +++++++++++++++----- dll/win32/shell32/wine/shellpath.c | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/aclistisf.cpp b/dll/win32/browseui/aclistisf.cpp index 458ab046b5b..392f6510fea 100644 --- a/dll/win32/browseui/aclistisf.cpp +++ b/dll/win32/browseui/aclistisf.cpp @@ -246,9 +246,15 @@ STDMETHODIMP CACListISF::Next(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) if (!pszRawPath || !pszExpanded) continue; - if ((m_dwOptions & ACLO_FILESYSDIRS) && !PathIsDirectoryW(pszExpanded)) + DWORD attrs = SFGAO_FOLDER | SFGAO_FILESYSTEM; + LPCITEMIDLIST pidlRef = pidlChild; + hr = m_pShellFolder->GetAttributesOf(1, &pidlRef, &attrs); + if (FAILED_UNEXPECTEDLY(hr)) continue; - else if ((m_dwOptions & ACLO_FILESYSONLY) && !PathFileExistsW(pszExpanded)) + + if ((m_dwOptions & ACLO_FILESYSDIRS) && !(attrs & SFGAO_FOLDER)) + continue; + if ((m_dwOptions & (ACLO_FILESYSONLY | ACLO_FILESYSDIRS)) && !(attrs & SFGAO_FILESYSTEM)) continue; hr = S_OK; @@ -339,12 +345,16 @@ STDMETHODIMP CACListISF::Expand(LPCOLESTR pszExpand) { if (PathIsRelativeW(pszExpand) && SHGetPathFromIDListW(m_pidlCurDir, szPath1) && - PathCombineW(szPath2, szPath1, pszExpand)) + PathCombineW(szPath2, szPath1, pszExpand) && + PathFileExistsW(szPath2)) { pszExpand = szPath2; } - GetFullPathNameW(pszExpand, _countof(szPath1), szPath1, NULL); - pszExpand = szPath1; + else if (PathFileExistsW(pszExpand)) + { + GetFullPathNameW(pszExpand, _countof(szPath1), szPath1, NULL); + pszExpand = szPath1; + } } CComHeapPtr<ITEMIDLIST> pidl; diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index cd05e1ed010..6537e052a0d 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -1866,7 +1866,7 @@ INT Shell_ParseSpecialFolder(_In_ LPCWSTR pszStart, _Out_ LPWSTR *ppch, _Out_ IN { *ppch = (LPWSTR)(pchBackslash + 1); *pcch = (pchBackslash - pszStart) + 1; - StrCpyNW(szPath, pszStart, max(*pcch, _countof(szPath))); + StrCpyNW(szPath, pszStart, min(*pcch, _countof(szPath))); pszPath = szPath; } else

4 months, 3 weeks

[reactos] 01/01: [BROWSEUI][SHDOCVW] Move CExplorerBand to shdocvw (#7163)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=960a305e5c5f503363d7c… commit 960a305e5c5f503363d7cc8914d1839b61b0187a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 04:12:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 04:12:02 2024 +0900 [BROWSEUI][SHDOCVW] Move CExplorerBand to shdocvw (#7163) CExplorerBand should be implemented in shdocvw.dll. https://github.com/reactos/reactos/blob/894ad4f17d119d312d4ae816cb41db12369… JIRA issue: CORE-19698 - Move CExplorerBand code from browseui to shdocvw. - Delete IDS_FOLDERSLABEL resource string from browseui. - Add IDS_FOLDERSLABEL resource string to shdocvw. - Adapt code to these changes. - Add sdk/include/reactos/ shdocvw_undoc.h. - Implement IEILIsEqual function. --- dll/win32/browseui/CMakeLists.txt | 2 - dll/win32/browseui/browseui.cpp | 2 +- dll/win32/browseui/browseui.h | 2 +- dll/win32/browseui/browseui.rc | 1 - dll/win32/browseui/lang/bg-BG.rc | 5 -- dll/win32/browseui/lang/de-DE.rc | 5 -- dll/win32/browseui/lang/en-US.rc | 5 -- dll/win32/browseui/lang/es-ES.rc | 5 -- dll/win32/browseui/lang/et-EE.rc | 5 -- dll/win32/browseui/lang/eu-ES.rc | 5 -- dll/win32/browseui/lang/fr-FR.rc | 5 -- dll/win32/browseui/lang/he-IL.rc | 5 -- dll/win32/browseui/lang/hi-IN.rc | 5 -- dll/win32/browseui/lang/hu-HU.rc | 5 -- dll/win32/browseui/lang/id-ID.rc | 5 -- dll/win32/browseui/lang/it-IT.rc | 5 -- dll/win32/browseui/lang/ja-JP.rc | 5 -- dll/win32/browseui/lang/pl-PL.rc | 5 -- dll/win32/browseui/lang/pt-BR.rc | 5 -- dll/win32/browseui/lang/pt-PT.rc | 5 -- dll/win32/browseui/lang/ro-RO.rc | 5 -- dll/win32/browseui/lang/ru-RU.rc | 5 -- dll/win32/browseui/lang/sq-AL.rc | 5 -- dll/win32/browseui/lang/tr-TR.rc | 5 -- dll/win32/browseui/lang/uk-UA.rc | 5 -- dll/win32/browseui/lang/zh-CN.rc | 5 -- dll/win32/browseui/lang/zh-TW.rc | 5 -- dll/win32/browseui/precomp.h | 1 - dll/win32/browseui/resource.h | 1 - dll/win32/browseui/utility.h | 8 -- .../explorerband.cpp => shdocvw/CExplorerBand.cpp} | 10 +-- .../explorerband.h => shdocvw/CExplorerBand.h} | 0 dll/win32/shdocvw/CFavBand.cpp | 83 +----------------- dll/win32/shdocvw/CFavBand.h | 6 -- dll/win32/shdocvw/CMakeLists.txt | 10 ++- dll/win32/shdocvw/lang/bg-BG.rc | 9 ++ dll/win32/shdocvw/lang/de-DE.rc | 9 ++ dll/win32/shdocvw/lang/en-US.rc | 5 +- dll/win32/shdocvw/lang/es-ES.rc | 9 ++ dll/win32/shdocvw/lang/et-EE.rc | 9 ++ dll/win32/shdocvw/lang/eu-ES.rc | 9 ++ dll/win32/shdocvw/lang/fr-FR.rc | 9 ++ dll/win32/shdocvw/lang/he-IL.rc | 9 ++ dll/win32/shdocvw/lang/hi-IN.rc | 9 ++ dll/win32/shdocvw/lang/hu-HU.rc | 9 ++ dll/win32/shdocvw/lang/id-ID.rc | 9 ++ dll/win32/shdocvw/lang/it-IT.rc | 9 ++ dll/win32/shdocvw/lang/ja-JP.rc | 9 ++ dll/win32/shdocvw/lang/pl-PL.rc | 9 ++ dll/win32/shdocvw/lang/pt-BR.rc | 9 ++ dll/win32/shdocvw/lang/pt-PT.rc | 9 ++ dll/win32/shdocvw/lang/ro-RO.rc | 9 ++ dll/win32/shdocvw/lang/ru-RU.rc | 9 ++ dll/win32/shdocvw/lang/sq-AL.rc | 9 ++ dll/win32/shdocvw/lang/tr-TR.rc | 9 ++ dll/win32/shdocvw/lang/uk-UA.rc | 9 ++ dll/win32/shdocvw/lang/zh-CN.rc | 9 ++ dll/win32/shdocvw/lang/zh-TW.rc | 9 ++ dll/win32/shdocvw/mrulist.cpp | 42 ++------- dll/win32/shdocvw/objects.cpp | 99 ++++++++++++++++++++++ dll/win32/shdocvw/objects.h | 42 +++++++++ .../{browseui => shdocvw}/res/explorerband.rgs | 0 dll/win32/shdocvw/{ => res}/favband.rgs | 0 dll/win32/shdocvw/{ => res}/shdocvw_v1.idl | 0 dll/win32/shdocvw/{ => res}/shdocvw_v1.rgs | 0 dll/win32/shdocvw/resource.h | 6 +- dll/win32/shdocvw/shdocvw.h | 9 +- dll/win32/shdocvw/shdocvw.rc | 73 +++++++++++++++- dll/win32/shdocvw/shdocvw.spec | 2 +- dll/win32/shdocvw/shdocvw_main.c | 30 ++----- dll/win32/{browseui => shdocvw}/utility.cpp | 60 ++++++++----- dll/win32/shdocvw/utility.h | 13 +++ sdk/include/reactos/shdocvw_undoc.h | 22 +++++ 73 files changed, 523 insertions(+), 319 deletions(-) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 83a78e085dc..e420dc69686 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -25,7 +25,6 @@ list(APPEND SOURCE CTaskbarList.h commonbrowser.cpp desktopipc.cpp - explorerband.cpp globalfoldersettings.cpp internettoolbar.cpp parsecmdline.cpp @@ -34,7 +33,6 @@ list(APPEND SOURCE shellbrowser.cpp toolsband.cpp travellog.cpp - utility.cpp CProgressDialog.cpp CUserAssist.cpp CUserAssist.h) diff --git a/dll/win32/browseui/browseui.cpp b/dll/win32/browseui/browseui.cpp index 8634429bfc9..80812ba7d25 100644 --- a/dll/win32/browseui/browseui.cpp +++ b/dll/win32/browseui/browseui.cpp @@ -153,7 +153,7 @@ OBJECT_ENTRY(CLSID_InternetToolbar, CInternetToolbar) OBJECT_ENTRY(CLSID_CRegTreeOptions, CRegTreeOptions) OBJECT_ENTRY(CLSID_ShellTaskScheduler, CShellTaskScheduler) OBJECT_ENTRY(CLSID_TaskbarList, CTaskbarList) -OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) +//OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) // Moved to shdocvw.dll OBJECT_ENTRY(CLSID_FileSearchBand, CSearchBar) OBJECT_ENTRY(CLSID_ProgressDialog, CProgressDialog) OBJECT_ENTRY(CLSID_ISFBand, CISFBand) diff --git a/dll/win32/browseui/browseui.h b/dll/win32/browseui/browseui.h index 46907ad0ad7..9702bd5fa88 100644 --- a/dll/win32/browseui/browseui.h +++ b/dll/win32/browseui/browseui.h @@ -6,7 +6,7 @@ #define USE_CUSTOM_ADDRESSEDITBOX 1 #define USE_CUSTOM_BANDPROXY 1 #define USE_CUSTOM_BRANDBAND 1 -#define USE_CUSTOM_EXPLORERBAND 1 +#define USE_CUSTOM_EXPLORERBAND 0 // Moved to shdocvw.dll #define USE_CUSTOM_SEARCHBAND 1 #define USE_CUSTOM_INTERNETTOOLBAR 1 diff --git a/dll/win32/browseui/browseui.rc b/dll/win32/browseui/browseui.rc index 789486938cb..0db5999a2c1 100644 --- a/dll/win32/browseui/browseui.rc +++ b/dll/win32/browseui/browseui.rc @@ -43,7 +43,6 @@ IDR_GLOBALFOLDERSETTINGS REGISTRY "res/globalfoldersettings.rgs" IDR_INTERNETTOOLBAR REGISTRY "res/internettoolbar.rgs" IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" IDR_SHELLTASKSCHEDULER REGISTRY "res/shelltaskscheduler.rgs" -IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" IDR_PROGRESSDIALOG REGISTRY "res/progressdialog.rgs" IDR_AUTOCOMPLETE REGISTRY "res/autocomplete.rgs" IDR_ACLISTISF REGISTRY "res/shellautocomplete.rgs" diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 85eb1cd35eb..37dbe925083 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -291,11 +291,6 @@ BEGIN IDS_ADDRESSBANDLABEL "&Адрес" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Папки" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Адрес" diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index c38adff1d86..825dc9b7962 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -298,11 +298,6 @@ BEGIN IDS_ADDRESSBANDLABEL "Adre&sse" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Ordner" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index 0cc96a612a8..64098afe576 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -309,11 +309,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&ddress" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Folders" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index 97be2a77f22..567ff90a0bc 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -300,11 +300,6 @@ BEGIN IDS_ADDRESSBANDLABEL "Dire&cción" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Carpetas" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc index 692178b4aeb..3cd0d001535 100644 --- a/dll/win32/browseui/lang/et-EE.rc +++ b/dll/win32/browseui/lang/et-EE.rc @@ -298,11 +298,6 @@ BEGIN IDS_ADDRESSBANDLABEL "Aa&dress" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Kaustad" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/eu-ES.rc b/dll/win32/browseui/lang/eu-ES.rc index 71f1a4b89da..19aa87830de 100644 --- a/dll/win32/browseui/lang/eu-ES.rc +++ b/dll/win32/browseui/lang/eu-ES.rc @@ -298,11 +298,6 @@ BEGIN IDS_ADDRESSBANDLABEL "Dire&cción" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Carpetas" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index dc4eec607ae..63dd8eb93b7 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -309,11 +309,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&dresse" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Dossiers" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index d8514bd5b2a..30c0a9c8f5c 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -293,11 +293,6 @@ BEGIN IDS_ADDRESSBANDLABEL "&כתובת" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "תיקיות" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc index a9869c7f850..a26363efd33 100644 --- a/dll/win32/browseui/lang/hi-IN.rc +++ b/dll/win32/browseui/lang/hi-IN.rc @@ -291,11 +291,6 @@ BEGIN IDS_ADDRESSBANDLABEL "&एड्रेस" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "फ़ोल्डरों" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc index 6e3a31ac28f..463c43710a6 100644 --- a/dll/win32/browseui/lang/hu-HU.rc +++ b/dll/win32/browseui/lang/hu-HU.rc @@ -309,11 +309,6 @@ BEGIN IDS_ADDRESSBANDLABEL "&Cím" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Mappák" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Cím" diff --git a/dll/win32/browseui/lang/id-ID.rc b/dll/win32/browseui/lang/id-ID.rc index 317e25762ee..c1d397fd70f 100644 --- a/dll/win32/browseui/lang/id-ID.rc +++ b/dll/win32/browseui/lang/id-ID.rc @@ -310,11 +310,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&lamat" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Folder" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Alamat" diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index 5138b3cece3..e0813a0cf7f 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -291,11 +291,6 @@ BEGIN IDS_ADDRESSBANDLABEL "Indirizzo" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Cartelle" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Indirizzo" diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 4ffed19d1b7..ea4f0583ea7 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -309,11 +309,6 @@ BEGIN IDS_ADDRESSBANDLABEL "アドレス(&D)" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "フォルダー" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "アドレス(&A)" diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index b9aa53ff175..f7526430f54 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -300,11 +300,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&dres" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Foldery" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Adres" diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index 845176e3e43..1a49d763777 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -293,11 +293,6 @@ BEGIN IDS_ADDRESSBANDLABEL "E&ndereço" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Pastas" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 2d4b6d03f69..961b84e66a9 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -293,11 +293,6 @@ BEGIN IDS_ADDRESSBANDLABEL "E&ndereço" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Pastas" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index ea065d92cfa..3ce2a8fa364 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -299,11 +299,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&dresă" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Foldere" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Adresă" diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 582a53e31ac..c4eeffd39e9 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -300,11 +300,6 @@ BEGIN IDS_ADDRESSBANDLABEL "А&дрес" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Папки" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Адрес" diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 1d34450e988..0298e254089 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -310,11 +310,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&dresa" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Dosje" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index 5578a1e2f75..71039340ddd 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -293,11 +293,6 @@ BEGIN IDS_ADDRESSBANDLABEL "A&dres" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Dizinler" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index 9e606fa86b8..a5dc172200c 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -299,11 +299,6 @@ BEGIN IDS_ADDRESSBANDLABEL "А&дреса" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "Папки" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index b5b58963be5..86c1ca80181 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -313,11 +313,6 @@ BEGIN IDS_ADDRESSBANDLABEL "地址(&D)" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "文件夹" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "地址(&A)" diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 89b59c0672a..15665202889 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -315,11 +315,6 @@ BEGIN IDS_ADDRESSBANDLABEL "網址(&D)" END -STRINGTABLE -BEGIN - IDS_FOLDERSLABEL "資料夾" -END - STRINGTABLE BEGIN IDS_ADDRESSMENUTEXT "&Address" diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index cfed44eef59..a3175a99156 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -58,7 +58,6 @@ #include "regtreeoptions.h" #include "CShellTaskScheduler.h" #include "CTaskbarList.h" -#include "explorerband.h" #include "CProgressDialog.h" #include "CUserAssist.h" #include "browseui.h" diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index fecbd49a2df..ca58cf9651c 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -125,7 +125,6 @@ #define IDS_SEARCHLABEL 12897 #define IDS_STANDARD_TOOLBAR 12624 #define IDS_ADDRESSBANDLABEL 12902 -#define IDS_FOLDERSLABEL 12919 #define IDS_ADDRESSMENUTEXT 13137 #define IDS_HISTORYTEXT 13169 #define IDS_UP 58434 diff --git a/dll/win32/browseui/utility.h b/dll/win32/browseui/utility.h deleted file mode 100644 index b40d18c34a4..00000000000 --- a/dll/win32/browseui/utility.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -void *operator new(size_t size); -void operator delete(void *p); - -HRESULT SHELL_GetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl); -BOOL SHELL_IsEqualAbsoluteID(PCIDLIST_ABSOLUTE a, PCIDLIST_ABSOLUTE b); -BOOL SHELL_IsVerb(IContextMenu *pcm, UINT_PTR idCmd, LPCWSTR Verb); diff --git a/dll/win32/browseui/explorerband.cpp b/dll/win32/shdocvw/CExplorerBand.cpp similarity index 99% rename from dll/win32/browseui/explorerband.cpp rename to dll/win32/shdocvw/CExplorerBand.cpp index 5922c74f612..ab65442d847 100644 --- a/dll/win32/browseui/explorerband.cpp +++ b/dll/win32/shdocvw/CExplorerBand.cpp @@ -6,16 +6,12 @@ * Copyright 2020-2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include "precomp.h" +#include "objects.h" #include <commoncontrols.h> #include <undocshell.h> -#include "utility.h" -#if 1 -#undef UNIMPLEMENTED - -#define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) -#endif +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /* * TODO: diff --git a/dll/win32/browseui/explorerband.h b/dll/win32/shdocvw/CExplorerBand.h similarity index 100% rename from dll/win32/browseui/explorerband.h rename to dll/win32/shdocvw/CExplorerBand.h diff --git a/dll/win32/shdocvw/CFavBand.cpp b/dll/win32/shdocvw/CFavBand.cpp index b839f2cfdcd..38e7a4ebbdc 100644 --- a/dll/win32/shdocvw/CFavBand.cpp +++ b/dll/win32/shdocvw/CFavBand.cpp @@ -5,47 +5,11 @@ * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <windows.h> -#include <shlobj.h> -#include <shlwapi.h> -#include <atlbase.h> -#include <atlcom.h> -#include <atlwin.h> -#include <undocshell.h> -#include <shlobj_undoc.h> -#include <shlguid_undoc.h> -#include <shlwapi_undoc.h> -#include <shdeprecated.h> -#include <olectlid.h> -#include <exdispid.h> -#include <shellutils.h> -#include <ui/rosctrls.h> -#include "shdocvw.h" -#include "CFavBand.h" +#include "objects.h" #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -void *operator new(size_t size) -{ - return ::LocalAlloc(LPTR, size); -} - -void operator delete(void *ptr) -{ - ::LocalFree(ptr); -} - -void operator delete(void *ptr, size_t size) -{ - ::LocalFree(ptr); -} - -#if 1 -#undef UNIMPLEMENTED -#define UNIMPLEMENTED ERR("%s is UNIMPLEMENTED!\n", __FUNCTION__) -#endif - CFavBand::CFavBand() : m_fVisible(FALSE) , m_bFocused(FALSE) @@ -53,7 +17,7 @@ CFavBand::CFavBand() , m_hToolbarImageList(NULL) , m_hTreeViewImageList(NULL) { - ::InterlockedIncrement(&SHDOCVW_refCount); + SHDOCVW_LockModule(); SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &m_pidlFav); } @@ -69,7 +33,7 @@ CFavBand::~CFavBand() ImageList_Destroy(m_hTreeViewImageList); m_hTreeViewImageList = NULL; } - ::InterlockedDecrement(&SHDOCVW_refCount); + SHDOCVW_UnlockModule(); } VOID CFavBand::OnFinalMessage(HWND) @@ -615,44 +579,3 @@ STDMETHODIMP CFavBand::Invoke( } return E_INVALIDARG; } - -BEGIN_OBJECT_MAP(ObjectMap) - OBJECT_ENTRY(CLSID_SH_FavBand, CFavBand) -END_OBJECT_MAP() - -class CFavBandModule : public CComModule -{ -public: -}; - -static CFavBandModule gModule; - -EXTERN_C VOID -CFavBand_Init(HINSTANCE hInstance) -{ - gModule.Init(ObjectMap, hInstance, NULL); -} - -EXTERN_C HRESULT -CFavBand_DllCanUnloadNow(VOID) -{ - return gModule.DllCanUnloadNow(); -} - -EXTERN_C HRESULT -CFavBand_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) -{ - return gModule.DllGetClassObject(rclsid, riid, ppv); -} - -EXTERN_C HRESULT -CFavBand_DllRegisterServer(VOID) -{ - return gModule.DllRegisterServer(FALSE); -} - -EXTERN_C HRESULT -CFavBand_DllUnregisterServer(VOID) -{ - return gModule.DllUnregisterServer(FALSE); -} diff --git a/dll/win32/shdocvw/CFavBand.h b/dll/win32/shdocvw/CFavBand.h index 9386a309784..ff6f86c282e 100644 --- a/dll/win32/shdocvw/CFavBand.h +++ b/dll/win32/shdocvw/CFavBand.h @@ -7,12 +7,6 @@ #pragma once -EXTERN_C VOID CFavBand_Init(HINSTANCE hInstance); -EXTERN_C HRESULT CFavBand_DllCanUnloadNow(VOID); -EXTERN_C HRESULT CFavBand_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); -EXTERN_C HRESULT CFavBand_DllRegisterServer(VOID); -EXTERN_C HRESULT CFavBand_DllUnregisterServer(VOID); - #define FAVBANDCLASSNAME L"ReactOS Favorites Band" #ifdef __cplusplus diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 6110906a268..71ab7e8ddb3 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -10,12 +10,11 @@ list(APPEND SOURCE precomp.h ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c) -add_typelib(shdocvw_v1.idl) +add_typelib(res/shdocvw_v1.idl) set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb) add_library(shdocvw MODULE ${SOURCE} - mrulist.cpp shdocvw.rc $<TARGET_OBJECTS:shdocvw_sublib> ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) @@ -32,7 +31,12 @@ add_dependencies(shdocvw stdole2) add_pch(shdocvw precomp.h SOURCE) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) -add_library(shdocvw_sublib OBJECT CFavBand.cpp) +add_library(shdocvw_sublib OBJECT + CExplorerBand.cpp + CFavBand.cpp + mrulist.cpp + objects.cpp + utility.cpp) target_link_libraries(shdocvw_sublib PRIVATE atl_classes) target_compile_definitions(shdocvw_sublib PRIVATE $<TARGET_PROPERTY:shdocvw,COMPILE_DEFINITIONS>) target_compile_options(shdocvw_sublib PRIVATE $<TARGET_PROPERTY:shdocvw,COMPILE_OPTIONS>) diff --git a/dll/win32/shdocvw/lang/bg-BG.rc b/dll/win32/shdocvw/lang/bg-BG.rc new file mode 100644 index 00000000000..f83e20b8019 --- /dev/null +++ b/dll/win32/shdocvw/lang/bg-BG.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Папки" +END diff --git a/dll/win32/shdocvw/lang/de-DE.rc b/dll/win32/shdocvw/lang/de-DE.rc new file mode 100644 index 00000000000..3c9eac042ed --- /dev/null +++ b/dll/win32/shdocvw/lang/de-DE.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Ordner" +END diff --git a/dll/win32/shdocvw/lang/en-US.rc b/dll/win32/shdocvw/lang/en-US.rc index a5691c65715..12d6bbe94dd 100644 --- a/dll/win32/shdocvw/lang/en-US.rc +++ b/dll/win32/shdocvw/lang/en-US.rc @@ -3,6 +3,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_ADD "Add" - IDS_ORGANIZE "Organize" + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Folders" END diff --git a/dll/win32/shdocvw/lang/es-ES.rc b/dll/win32/shdocvw/lang/es-ES.rc new file mode 100644 index 00000000000..cedac65d717 --- /dev/null +++ b/dll/win32/shdocvw/lang/es-ES.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Carpetas" +END diff --git a/dll/win32/shdocvw/lang/et-EE.rc b/dll/win32/shdocvw/lang/et-EE.rc new file mode 100644 index 00000000000..a3a46d82942 --- /dev/null +++ b/dll/win32/shdocvw/lang/et-EE.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Kaustad" +END diff --git a/dll/win32/shdocvw/lang/eu-ES.rc b/dll/win32/shdocvw/lang/eu-ES.rc new file mode 100644 index 00000000000..6f37fee0a8e --- /dev/null +++ b/dll/win32/shdocvw/lang/eu-ES.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_BASQUE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Carpetas" +END diff --git a/dll/win32/shdocvw/lang/fr-FR.rc b/dll/win32/shdocvw/lang/fr-FR.rc new file mode 100644 index 00000000000..3abed1c22b6 --- /dev/null +++ b/dll/win32/shdocvw/lang/fr-FR.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Dossiers" +END diff --git a/dll/win32/shdocvw/lang/he-IL.rc b/dll/win32/shdocvw/lang/he-IL.rc new file mode 100644 index 00000000000..7a933a2f963 --- /dev/null +++ b/dll/win32/shdocvw/lang/he-IL.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "תיקיות" +END diff --git a/dll/win32/shdocvw/lang/hi-IN.rc b/dll/win32/shdocvw/lang/hi-IN.rc new file mode 100644 index 00000000000..91c4b047f50 --- /dev/null +++ b/dll/win32/shdocvw/lang/hi-IN.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "फ़ोल्डरों" +END diff --git a/dll/win32/shdocvw/lang/hu-HU.rc b/dll/win32/shdocvw/lang/hu-HU.rc new file mode 100644 index 00000000000..257148a8114 --- /dev/null +++ b/dll/win32/shdocvw/lang/hu-HU.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Mappák" +END diff --git a/dll/win32/shdocvw/lang/id-ID.rc b/dll/win32/shdocvw/lang/id-ID.rc new file mode 100644 index 00000000000..de3b981a694 --- /dev/null +++ b/dll/win32/shdocvw/lang/id-ID.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Folder" +END diff --git a/dll/win32/shdocvw/lang/it-IT.rc b/dll/win32/shdocvw/lang/it-IT.rc new file mode 100644 index 00000000000..80b1d4c8f37 --- /dev/null +++ b/dll/win32/shdocvw/lang/it-IT.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Cartelle" +END diff --git a/dll/win32/shdocvw/lang/ja-JP.rc b/dll/win32/shdocvw/lang/ja-JP.rc new file mode 100644 index 00000000000..5b03707daa8 --- /dev/null +++ b/dll/win32/shdocvw/lang/ja-JP.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "追加..." + IDS_ORGANIZE "整理..." + IDS_FOLDERSLABEL "フォルダー" +END diff --git a/dll/win32/shdocvw/lang/pl-PL.rc b/dll/win32/shdocvw/lang/pl-PL.rc new file mode 100644 index 00000000000..023ee07f7a4 --- /dev/null +++ b/dll/win32/shdocvw/lang/pl-PL.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Foldery" +END diff --git a/dll/win32/shdocvw/lang/pt-BR.rc b/dll/win32/shdocvw/lang/pt-BR.rc new file mode 100644 index 00000000000..8eb8b6bbf24 --- /dev/null +++ b/dll/win32/shdocvw/lang/pt-BR.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Pastas" +END diff --git a/dll/win32/shdocvw/lang/pt-PT.rc b/dll/win32/shdocvw/lang/pt-PT.rc new file mode 100644 index 00000000000..ff2ed6ebeae --- /dev/null +++ b/dll/win32/shdocvw/lang/pt-PT.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Pastas" +END diff --git a/dll/win32/shdocvw/lang/ro-RO.rc b/dll/win32/shdocvw/lang/ro-RO.rc new file mode 100644 index 00000000000..26a2005fb85 --- /dev/null +++ b/dll/win32/shdocvw/lang/ro-RO.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Foldere" +END diff --git a/dll/win32/shdocvw/lang/ru-RU.rc b/dll/win32/shdocvw/lang/ru-RU.rc new file mode 100644 index 00000000000..b96b547feba --- /dev/null +++ b/dll/win32/shdocvw/lang/ru-RU.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Папки" +END diff --git a/dll/win32/shdocvw/lang/sq-AL.rc b/dll/win32/shdocvw/lang/sq-AL.rc new file mode 100644 index 00000000000..9d5ec92b41e --- /dev/null +++ b/dll/win32/shdocvw/lang/sq-AL.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Dosje" +END diff --git a/dll/win32/shdocvw/lang/tr-TR.rc b/dll/win32/shdocvw/lang/tr-TR.rc new file mode 100644 index 00000000000..1ff52043ffa --- /dev/null +++ b/dll/win32/shdocvw/lang/tr-TR.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Dizinler" +END diff --git a/dll/win32/shdocvw/lang/uk-UA.rc b/dll/win32/shdocvw/lang/uk-UA.rc new file mode 100644 index 00000000000..d009579a7cd --- /dev/null +++ b/dll/win32/shdocvw/lang/uk-UA.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "Папки" +END diff --git a/dll/win32/shdocvw/lang/zh-CN.rc b/dll/win32/shdocvw/lang/zh-CN.rc new file mode 100644 index 00000000000..37f2630ac3e --- /dev/null +++ b/dll/win32/shdocvw/lang/zh-CN.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "文件夹" +END diff --git a/dll/win32/shdocvw/lang/zh-TW.rc b/dll/win32/shdocvw/lang/zh-TW.rc new file mode 100644 index 00000000000..b02ae00c74e --- /dev/null +++ b/dll/win32/shdocvw/lang/zh-TW.rc @@ -0,0 +1,9 @@ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + IDS_ADD "Add..." + IDS_ORGANIZE "Organize..." + IDS_FOLDERSLABEL "資料夾" +END diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp index ba3fcb11fc2..5714e6e8ae5 100644 --- a/dll/win32/shdocvw/mrulist.cpp +++ b/dll/win32/shdocvw/mrulist.cpp @@ -7,21 +7,11 @@ #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> -#include <oleauto.h> -#include <shlobj.h> -#include <shlobj_undoc.h> -#include <shlguid_undoc.h> -#include <shlwapi.h> -#include <shlwapi_undoc.h> +#include "objects.h" +#include <tchar.h> #include <strsafe.h> -#include "shdocvw.h" #include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); class CSafeMutex; @@ -32,22 +22,6 @@ class CMruBase; class CMruPidlList; class CMruClassFactory; -extern "C" void __cxa_pure_virtual(void) -{ - ERR("__cxa_pure_virtual\n"); - ::DebugBreak(); -} - -BOOL IEILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, BOOL bUnknown) -{ - UINT cb1 = ILGetSize(pidl1), cb2 = ILGetSize(pidl2); - if (cb1 == cb2 && memcmp(pidl1, pidl2, cb1) == 0) - return TRUE; - - FIXME("%p, %p\n", pidl1, pidl2); - return FALSE; -} - // The flags for SLOTITEMDATA.dwFlags #define SLOT_LOADED 0x1 #define SLOT_SET 0x2 @@ -155,7 +129,7 @@ public: CMruBase::CMruBase() { - ::InterlockedIncrement(&SHDOCVW_refCount); + SHDOCVW_LockModule(); } CMruBase::~CMruBase() @@ -176,7 +150,7 @@ CMruBase::~CMruBase() m_pSlots = (SLOTITEMDATA*)::LocalFree(m_pSlots); } - ::InterlockedDecrement(&SHDOCVW_refCount); + SHDOCVW_UnlockModule(); } STDMETHODIMP CMruBase::QueryInterface(REFIID riid, void **ppvObj) @@ -1321,11 +1295,11 @@ protected: public: CMruClassFactory() { - ::InterlockedIncrement(&SHDOCVW_refCount); + SHDOCVW_LockModule(); } virtual ~CMruClassFactory() { - ::InterlockedDecrement(&SHDOCVW_refCount); + SHDOCVW_UnlockModule(); } // IUnknown methods @@ -1389,9 +1363,9 @@ STDMETHODIMP CMruClassFactory::CreateInstance(IUnknown *pUnkOuter, REFIID riid, STDMETHODIMP CMruClassFactory::LockServer(BOOL fLock) { if (fLock) - ::InterlockedIncrement(&SHDOCVW_refCount); + SHDOCVW_LockModule(); else - ::InterlockedDecrement(&SHDOCVW_refCount); + SHDOCVW_UnlockModule(); return S_OK; } diff --git a/dll/win32/shdocvw/objects.cpp b/dll/win32/shdocvw/objects.cpp new file mode 100644 index 00000000000..8891cb70260 --- /dev/null +++ b/dll/win32/shdocvw/objects.cpp @@ -0,0 +1,99 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: shdocvw.dll objects + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "objects.h" + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +void *operator new(size_t size) +{ + return ::LocalAlloc(LMEM_FIXED, size); +} + +void operator delete(void *ptr) +{ + ::LocalFree(ptr); +} + +void operator delete(void *ptr, size_t size) +{ + ::LocalFree(ptr); +} + +EXTERN_C void __cxa_pure_virtual(void) +{ + ERR("__cxa_pure_virtual\n"); + ::DebugBreak(); +} + +BEGIN_OBJECT_MAP(ObjectMap) + OBJECT_ENTRY(CLSID_SH_FavBand, CFavBand) + OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) +END_OBJECT_MAP() + +class SHDOCVW_Module : public CComModule +{ +public: +}; + +static SHDOCVW_Module gModule; + +EXTERN_C VOID +SHDOCVW_Init(HINSTANCE hInstance) +{ + gModule.Init(ObjectMap, hInstance, NULL); +} + +EXTERN_C HRESULT +SHDOCVW_DllCanUnloadNow(VOID) +{ + return gModule.DllCanUnloadNow(); +} + +EXTERN_C HRESULT CMruLongList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); +EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); +EXTERN_C HRESULT CMruClassFactory_CreateInstance(REFIID riid, void **ppv); + +EXTERN_C HRESULT +SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + HRESULT hr = gModule.DllGetClassObject(rclsid, riid, ppv); + if (SUCCEEDED(hr)) + return hr; + + if (IsEqualGUID(riid, IID_IClassFactory) || IsEqualGUID(riid, IID_IUnknown)) + { + if (IsEqualGUID(rclsid, CLSID_MruLongList) || + IsEqualGUID(rclsid, CLSID_MruPidlList)) + { + return CMruClassFactory_CreateInstance(riid, ppv); + } + } + else if (IsEqualGUID(riid, IID_IMruDataList)) + { + return CMruLongList_CreateInstance(0, ppv, 0); + } + else if (IsEqualGUID(riid, IID_IMruPidlList)) + { + return CMruPidlList_CreateInstance(0, ppv, 0); + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + +EXTERN_C HRESULT +SHDOCVW_DllRegisterServer(VOID) +{ + return gModule.DllRegisterServer(FALSE); +} + +EXTERN_C HRESULT +SHDOCVW_DllUnregisterServer(VOID) +{ + return gModule.DllUnregisterServer(FALSE); +} diff --git a/dll/win32/shdocvw/objects.h b/dll/win32/shdocvw/objects.h new file mode 100644 index 00000000000..91a02218f1e --- /dev/null +++ b/dll/win32/shdocvw/objects.h @@ -0,0 +1,42 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: shdocvw.dll objects + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include <windows.h> +#include <shlobj.h> +#include <shlwapi.h> +#include <olectlid.h> +#include <exdispid.h> +#include "shdocvw.h" + +#ifdef __cplusplus +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <undocshell.h> +#include <shlobj_undoc.h> +#include <shlguid_undoc.h> +#include <shlwapi_undoc.h> +#include <shdocvw_undoc.h> +#include <shdeprecated.h> +#include <shellutils.h> +#include <ui/rosctrls.h> +#include "CExplorerBand.h" +#include "CFavBand.h" +#include "utility.h" +void *operator new(size_t size); +void operator delete(void *ptr); +void operator delete(void *ptr, size_t size); +EXTERN_C void __cxa_pure_virtual(void); +#endif /* def C++ */ + +EXTERN_C VOID SHDOCVW_Init(HINSTANCE hInstance); +EXTERN_C HRESULT SHDOCVW_DllCanUnloadNow(VOID); +EXTERN_C HRESULT SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +EXTERN_C HRESULT SHDOCVW_DllRegisterServer(VOID); +EXTERN_C HRESULT SHDOCVW_DllUnregisterServer(VOID); diff --git a/dll/win32/browseui/res/explorerband.rgs b/dll/win32/shdocvw/res/explorerband.rgs similarity index 100% rename from dll/win32/browseui/res/explorerband.rgs rename to dll/win32/shdocvw/res/explorerband.rgs diff --git a/dll/win32/shdocvw/favband.rgs b/dll/win32/shdocvw/res/favband.rgs similarity index 100% rename from dll/win32/shdocvw/favband.rgs rename to dll/win32/shdocvw/res/favband.rgs diff --git a/dll/win32/shdocvw/shdocvw_v1.idl b/dll/win32/shdocvw/res/shdocvw_v1.idl similarity index 100% rename from dll/win32/shdocvw/shdocvw_v1.idl rename to dll/win32/shdocvw/res/shdocvw_v1.idl diff --git a/dll/win32/shdocvw/shdocvw_v1.rgs b/dll/win32/shdocvw/res/shdocvw_v1.rgs similarity index 100% rename from dll/win32/shdocvw/shdocvw_v1.rgs rename to dll/win32/shdocvw/res/shdocvw_v1.rgs diff --git a/dll/win32/shdocvw/resource.h b/dll/win32/shdocvw/resource.h index b7c1b8f1d0e..12e0b62ce5d 100644 --- a/dll/win32/shdocvw/resource.h +++ b/dll/win32/shdocvw/resource.h @@ -1,5 +1,6 @@ #define IDR_SHDOCVW 1 #define IDR_FAVBAND 2 +#define IDR_EXPLORERBAND 3 #define IDR_TYPELIB 1 #define IDW_TOOLBAR 2 @@ -8,5 +9,6 @@ #define ID_ADD 100 #define ID_ORGANIZE 101 -#define IDS_ADD 1000 -#define IDS_ORGANIZE 1001 +#define IDS_ADD 1000 +#define IDS_ORGANIZE 1001 +#define IDS_FOLDERSLABEL 1002 diff --git a/dll/win32/shdocvw/shdocvw.h b/dll/win32/shdocvw/shdocvw.h index 5119561691d..c086913518b 100644 --- a/dll/win32/shdocvw/shdocvw.h +++ b/dll/win32/shdocvw/shdocvw.h @@ -61,15 +61,8 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r #ifdef __REACTOS__ #include "resource.h" -EXTERN_C HRESULT CMruLongList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); -EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD_PTR dwUnused1, void **ppv, DWORD_PTR dwUnused3); -EXTERN_C HRESULT CMruClassFactory_CreateInstance(REFIID riid, void **ppv); +#include "objects.h" #define ARRAY_SIZE(array) _countof(array) -#ifdef __cplusplus -void *operator new(size_t size); -void operator delete(void *ptr); -void operator delete(void *ptr, size_t size); -#endif EXTERN_C HINSTANCE instance; #endif // def __REACTOS__ diff --git a/dll/win32/shdocvw/shdocvw.rc b/dll/win32/shdocvw/shdocvw.rc index 4bbcdbd5889..0990bd00269 100644 --- a/dll/win32/shdocvw/shdocvw.rc +++ b/dll/win32/shdocvw/shdocvw.rc @@ -19,10 +19,9 @@ #include "windef.h" #include "resource.h" -IDR_SHDOCVW WINE_REGISTRY "shdocvw_v1.rgs" - -IDR_FAVBAND REGISTRY "favband.rgs" - +IDR_SHDOCVW WINE_REGISTRY "res/shdocvw_v1.rgs" +IDR_FAVBAND REGISTRY "res/favband.rgs" +IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" IDR_TYPELIB TYPELIB "shdocvw_v1.tlb" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -40,6 +39,72 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_ET_EE + #include "lang/et-EE.rc" +#endif +#ifdef LANGUAGE_EU_ES + #include "lang/eu-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/zh-TW.rc" +#endif diff --git a/dll/win32/shdocvw/shdocvw.spec b/dll/win32/shdocvw/shdocvw.spec index f90cd11c6f9..0a8bd10cd84 100644 --- a/dll/win32/shdocvw/shdocvw.spec +++ b/dll/win32/shdocvw/shdocvw.spec @@ -111,7 +111,7 @@ 216 stub -noname GetDefaultInternetSearchUrlW 217 stub -noname GetDefaultInternetSearchUrlA 218 stdcall -noname IEParseDisplayNameWithBCW(long wstr ptr ptr) -219 stub -noname IEILIsEqual +219 stdcall -noname IEILIsEqual(ptr ptr long) 221 stub -noname IECreateFromPathCPWithBCA 222 stub -noname IECreateFromPathCPWithBCW 223 stub -noname ResetWebSettings # FIXME: Inspect diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index 1dd0b88c4ad..c817bbb3c5f 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -32,7 +32,7 @@ #include "winnls.h" #include <shlguid_undoc.h> #include <rpcproxy.h> /* for __wine_register_resources / __wine_unregister_resources */ -#include "CFavBand.h" +#include "objects.h" #endif #include "shlwapi.h" #include "wininet.h" @@ -95,26 +95,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) #ifdef __REACTOS__ { - HRESULT hr = CFavBand_DllGetClassObject(rclsid, riid, ppv); - if (hr != CLASS_E_CLASSNOTAVAILABLE) + HRESULT hr = SHDOCVW_DllGetClassObject(rclsid, riid, ppv); + if (SUCCEEDED(hr)) return hr; } - if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) - { - if (IsEqualGUID(rclsid, &CLSID_MruLongList) || - IsEqualGUID(rclsid, &CLSID_MruPidlList)) - { - return CMruClassFactory_CreateInstance(riid, ppv); - } - } - else if (IsEqualGUID(riid, &IID_IMruDataList)) - { - return CMruLongList_CreateInstance(0, ppv, 0); - } - else if (IsEqualGUID(riid, &IID_IMruPidlList)) - { - return CMruPidlList_CreateInstance(0, ppv, 0); - } #endif /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ @@ -128,7 +112,7 @@ HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); #ifdef __REACTOS__ - CFavBand_DllRegisterServer(); + SHDOCVW_DllRegisterServer(); return __wine_register_resources(instance); #else return S_OK; @@ -142,7 +126,7 @@ HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); #ifdef __REACTOS__ - CFavBand_DllUnregisterServer(); + SHDOCVW_DllUnregisterServer(); return __wine_unregister_resources(instance); #else return S_OK; @@ -189,7 +173,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: #ifdef __REACTOS__ instance = hinst; - CFavBand_Init(hinst); + SHDOCVW_Init(hinst); #endif DisableThreadLibraryCalls(hinst); break; @@ -208,7 +192,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) HRESULT WINAPI DllCanUnloadNow(void) { #ifdef __REACTOS__ - if (CFavBand_DllCanUnloadNow() != S_OK) + if (SHDOCVW_DllCanUnloadNow() != S_OK) return S_FALSE; #endif return SHDOCVW_refCount ? S_FALSE : S_OK; diff --git a/dll/win32/browseui/utility.cpp b/dll/win32/shdocvw/utility.cpp similarity index 57% rename from dll/win32/browseui/utility.cpp rename to dll/win32/shdocvw/utility.cpp index ead564a1f6e..fdf3550d548 100644 --- a/dll/win32/browseui/utility.cpp +++ b/dll/win32/shdocvw/utility.cpp @@ -1,24 +1,21 @@ -#include "precomp.h" -#ifndef SHCIDS_CANONICALONLY -#define SHCIDS_CANONICALONLY 0x10000000L -#endif +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Utility for shdocvw.dll + * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> + */ -void *operator new(size_t size) -{ - return LocalAlloc(LMEM_ZEROINIT, size); -} +#include "objects.h" -void operator delete(void *p) -{ - LocalFree(p); -} +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -void operator delete(void *p, UINT_PTR) -{ - LocalFree(p); -} +#ifndef SHCIDS_CANONICALONLY +#define SHCIDS_CANONICALONLY 0x10000000L +#endif -HRESULT SHELL_GetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl) +EXTERN_C HRESULT +SHELL_GetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl) { #if DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA && 0 // FIXME: SHELL32 not ready yet return SHGetIDListFromObject(punk, ppidl); @@ -51,12 +48,14 @@ static HRESULT SHELL_CompareAbsoluteIDs(LPARAM lParam, PCIDLIST_ABSOLUTE a, PCID return hr; } -BOOL SHELL_IsEqualAbsoluteID(PCIDLIST_ABSOLUTE a, PCIDLIST_ABSOLUTE b) +EXTERN_C BOOL +SHELL_IsEqualAbsoluteID(PCIDLIST_ABSOLUTE a, PCIDLIST_ABSOLUTE b) { return !SHELL_CompareAbsoluteIDs(SHCIDS_CANONICALONLY, a, b); } -BOOL SHELL_IsVerb(IContextMenu *pcm, UINT_PTR idCmd, LPCWSTR Verb) +EXTERN_C BOOL +SHELL_IsVerb(IContextMenu *pcm, UINT_PTR idCmd, LPCWSTR Verb) { HRESULT hr; WCHAR wide[MAX_PATH]; @@ -71,3 +70,26 @@ BOOL SHELL_IsVerb(IContextMenu *pcm, UINT_PTR idCmd, LPCWSTR Verb) } return FALSE; } + +EXTERN_C BOOL +_ILIsDesktop(LPCITEMIDLIST pidl) +{ + return (pidl == NULL || pidl->mkid.cb == 0); +} + +/************************************************************************* + * IEILIsEqual [SHDOCVW.219] + */ +EXTERN_C BOOL WINAPI +IEILIsEqual( + _In_ LPCITEMIDLIST pidl1, + _In_ LPCITEMIDLIST pidl2, + _In_ BOOL bUnknown) +{ + UINT cb1 = ILGetSize(pidl1), cb2 = ILGetSize(pidl2); + if (cb1 == cb2 && memcmp(pidl1, pidl2, cb1) == 0) + return TRUE; + + FIXME("%p, %p\n", pidl1, pidl2); + return FALSE; +} diff --git a/dll/win32/shdocvw/utility.h b/dll/win32/shdocvw/utility.h new file mode 100644 index 00000000000..94c7ac5a3eb --- /dev/null +++ b/dll/win32/shdocvw/utility.h @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Utility for shdocvw.dll + * COPYRIGHT: Copyright 2024 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#pragma once + +EXTERN_C HRESULT SHELL_GetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl); +EXTERN_C BOOL SHELL_IsEqualAbsoluteID(PCIDLIST_ABSOLUTE a, PCIDLIST_ABSOLUTE b); +EXTERN_C BOOL SHELL_IsVerb(IContextMenu *pcm, UINT_PTR idCmd, LPCWSTR Verb); +EXTERN_C BOOL _ILIsDesktop(LPCITEMIDLIST pidl); diff --git a/sdk/include/reactos/shdocvw_undoc.h b/sdk/include/reactos/shdocvw_undoc.h new file mode 100644 index 00000000000..57e3ee8b9d7 --- /dev/null +++ b/sdk/include/reactos/shdocvw_undoc.h @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Headers + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: shdocvw.dll undocumented APIs + * COPYRIGHT: Copyright 2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +BOOL WINAPI +IEILIsEqual( + _In_ LPCITEMIDLIST pidl1, + _In_ LPCITEMIDLIST pidl2, + _In_ BOOL bUnknown); + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */

4 months, 3 weeks

[reactos] 01/01: [SHELL32] shlexec: Do not expand without SEE_MASK_DOENVSUBST (#7206)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=766d04d937896699a5a0f… commit 766d04d937896699a5a0ff6a6e4a7797195856d0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 04:03:25 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 04:03:25 2024 +0900 [SHELL32] shlexec: Do not expand without SEE_MASK_DOENVSUBST (#7206) JIRA issue: N/A Don't expand the application name unless SEE_MASK_DOENVSUBST is not specified. --- dll/win32/shell32/shlexec.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index c5c121eaf18..6134aaf311b 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2068,7 +2068,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } - if (sei_tmp.fMask & SEE_MASK_DOENVSUBST) + if ((sei_tmp.fMask & SEE_MASK_DOENVSUBST) && !StrIsNullOrEmpty(sei_tmp.lpFile)) { WCHAR *tmp = expand_environment(sei_tmp.lpFile); if (tmp) @@ -2076,13 +2076,6 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) wszApplicationName.Attach(tmp); sei_tmp.lpFile = wszApplicationName; } - - tmp = expand_environment(sei_tmp.lpDirectory); - if (tmp) - { - wszDirAlloc.Attach(tmp); - sei_tmp.lpDirectory = wszDir = wszDirAlloc; - } } if ((sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST) @@ -2095,7 +2088,6 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) } } - if (ERROR_SUCCESS == ShellExecute_FromContextMenuHandlers(&sei_tmp)) { sei->hInstApp = (HINSTANCE) 33; @@ -2156,16 +2148,6 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) wszApplicationName.Attach(buf.Detach()); sei_tmp.lpFile = wszApplicationName; } - else /* or expand environment strings (not both!) */ - { - LPWSTR tmp = expand_environment(sei_tmp.lpFile); - if (tmp) - { - wszApplicationName.Attach(tmp); - /* appKnownSingular unmodified */ - sei_tmp.lpFile = wszApplicationName; - } - } /* Else, try to execute the filename */ TRACE("execute: %s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir));

4 months, 3 weeks

[reactos] 01/01: [SHELL32] shlexec: Support SEE_MASK_FLAG_SEPVDM (#7205)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51b662f90daff72ee30f2… commit 51b662f90daff72ee30f20137e5acf1277111c47 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 2 04:02:27 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 2 04:02:27 2024 +0900 [SHELL32] shlexec: Support SEE_MASK_FLAG_SEPVDM (#7205) JIRA issue: N/A Add CREATE_SEPARATE_WOW_VDM flag to creation flags on SEE_MASK_FLAG_SEPVDM. --- dll/win32/shell32/shlexec.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 8bdaf70d3ad..c5c121eaf18 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -512,6 +512,8 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; + if (psei->fMask & SEE_MASK_FLAG_SEPVDM) + dwCreationFlags |= CREATE_SEPARATE_WOW_VDM; startup.lpTitle = (LPWSTR)(psei->fMask & (SEE_MASK_HASLINKNAME | SEE_MASK_HASTITLE) ? psei->lpClass : NULL); if (psei->fMask & SEE_MASK_HASLINKNAME)

4 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2024