Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 01/02: [HALX86] Rearrange files in x86 HAL

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7601fb549c7a199ae0567… commit 7601fb549c7a199ae056758ed82ea70c8339b4ce Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Mar 15 02:42:49 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Mar 15 02:48:35 2021 +0300 [HALX86] Rearrange files in x86 HAL - Rename UP -> PIC. The "up" folder in fact contains the code for managing the Intel 8259 PIC chip - Move amd64/processor.c -> apic/processor.c. The code is not tied to amd64 - Remove platform from "halinit*" files. They already reside in the corresponding folder --- hal/halx86/CMakeLists.txt | 10 ++++------ hal/halx86/apic.cmake | 3 ++- hal/halx86/apic/{halinit_apic.c => halinit.c} | 9 ++++----- hal/halx86/{amd64 => apic}/processor.c | 9 ++++----- hal/halx86/minihal/CMakeLists.txt | 8 ++++---- hal/halx86/{up/halinit_mini.c => minihal/halinit.c} | 11 ++++------- hal/halx86/pc98.cmake | 7 ++++--- hal/halx86/pic.cmake | 9 +++++---- hal/halx86/{up/halinit_up.c => pic/halinit.c} | 0 hal/halx86/{up/halup.rc => pic/halpic.rc} | 4 ++-- hal/halx86/{up => pic}/irql.c | 0 hal/halx86/{up => pic}/pic.S | 8 ++++---- hal/halx86/{up => pic}/pic.c | 0 hal/halx86/{up => pic}/processor.c | 9 ++++----- hal/halx86/up.cmake | 3 +-- hal/halx86/xbox.cmake | 9 +++++---- hal/halx86/xbox/{halinit_xbox.c => halinit.c} | 0 17 files changed, 47 insertions(+), 52 deletions(-) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 68d13839dae..890a4b4ebd6 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -44,11 +44,11 @@ endfunction() include(generic.cmake) include(acpi.cmake) include(apic.cmake) +include(up.cmake) if(ARCH STREQUAL "i386") include(pcidata.cmake) include(legacy.cmake) - include(up.cmake) include(pic.cmake) include(xbox.cmake) include(pc98.cmake) @@ -58,7 +58,7 @@ if(ARCH STREQUAL "i386") remove_definitions(-DSARCH_PC98) # hal - add_hal(hal SOURCES up/halup.rc COMPONENTS generic legacy up pic) + add_hal(hal SOURCES pic/halpic.rc COMPONENTS generic legacy up pic) add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) @@ -73,12 +73,10 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") list(APPEND HAL_SOURCE - generic/spinlock.c amd64/x86bios.c - amd64/halinit.c - amd64/processor.c) + amd64/halinit.c) - add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic) + add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic) target_link_libraries(hal fast486) endif() diff --git a/hal/halx86/apic.cmake b/hal/halx86/apic.cmake index 9c0139e3504..10857eeea8f 100644 --- a/hal/halx86/apic.cmake +++ b/hal/halx86/apic.cmake @@ -6,7 +6,8 @@ list(APPEND HAL_APIC_ASM_SOURCE list(APPEND HAL_APIC_SOURCE apic/apic.c apic/apictimer.c - apic/halinit_apic.c + apic/halinit.c + apic/processor.c apic/rtctimer.c apic/tsc.c) diff --git a/hal/halx86/apic/halinit_apic.c b/hal/halx86/apic/halinit.c similarity index 84% rename from hal/halx86/apic/halinit_apic.c rename to hal/halx86/apic/halinit.c index cd5e0daf9d6..0ade0fda11c 100644 --- a/hal/halx86/apic/halinit_apic.c +++ b/hal/halx86/apic/halinit.c @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/apic/halinit_apic.c - * PURPOSE: Initialize the x86 hal - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Initialize the x86 HAL + * COPYRIGHT: Copyright 2011 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/hal/halx86/amd64/processor.c b/hal/halx86/apic/processor.c similarity index 81% rename from hal/halx86/amd64/processor.c rename to hal/halx86/apic/processor.c index f4621190473..c9f370f7459 100644 --- a/hal/halx86/amd64/processor.c +++ b/hal/halx86/apic/processor.c @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/amd64/processor.c - * PURPOSE: HAL Processor Routines - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: HAL Processor Routines + * COPYRIGHT: Copyright 2010 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ /* INCLUDES ******************************************************************/ diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 47708f9247d..94a3e93112f 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -17,10 +17,10 @@ list(APPEND MINI_HAL_SOURCE ../generic/sysinfo.c ../generic/timer.c ../generic/usage.c - ../up/halinit_mini.c - ../up/pic.c - ../up/processor.c - ../include/hal.h) + ../pic/pic.c + ../pic/processor.c + ../include/hal.h + halinit.c) if(SARCH STREQUAL "xbox") list(APPEND MINI_HAL_SOURCE diff --git a/hal/halx86/up/halinit_mini.c b/hal/halx86/minihal/halinit.c similarity index 75% rename from hal/halx86/up/halinit_mini.c rename to hal/halx86/minihal/halinit.c index 3f2ebf94025..5be48fa8e52 100644 --- a/hal/halx86/up/halinit_mini.c +++ b/hal/halx86/minihal/halinit.c @@ -1,11 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/up/halinit_mini.c - * PURPOSE: Initialize the x86 hal - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: - * 11/06/98: Created + * PROJECT: ReactOS Mini-HAL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Initialize the x86 HAL + * COPYRIGHT: Copyright 1998 David Welch <welch(a)cwcom.net> */ /* INCLUDES *****************************************************************/ diff --git a/hal/halx86/pc98.cmake b/hal/halx86/pc98.cmake index 9f04972a212..b88fbe87ddb 100644 --- a/hal/halx86/pc98.cmake +++ b/hal/halx86/pc98.cmake @@ -27,12 +27,13 @@ list(APPEND HAL_PC98_ASM_SOURCE list(APPEND HAL_PC98_SOURCE pc98/irql.c generic/timer.c - up/halinit_up.c - up/pic.c) + pic/halinit.c + pic/pic.c + pic/processor.c) list(APPEND HAL_PC98_ASM_SOURCE generic/trap.S - up/pic.S) + pic/pic.S) # Legacy list(APPEND HAL_PC98_SOURCE diff --git a/hal/halx86/pic.cmake b/hal/halx86/pic.cmake index d8f151f6071..b6612cc413f 100644 --- a/hal/halx86/pic.cmake +++ b/hal/halx86/pic.cmake @@ -2,15 +2,16 @@ list(APPEND HAL_PIC_ASM_SOURCE generic/systimer.S generic/trap.S - up/pic.S) + pic/pic.S) list(APPEND HAL_PIC_SOURCE generic/clock.c generic/profil.c generic/timer.c - up/halinit_up.c - up/irql.c - up/pic.c) + pic/halinit.c + pic/irql.c + pic/pic.c + pic/processor.c) add_asm_files(lib_hal_pic_asm ${HAL_PIC_ASM_SOURCE}) add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE} ${lib_hal_pic_asm}) diff --git a/hal/halx86/up/halinit_up.c b/hal/halx86/pic/halinit.c similarity index 100% rename from hal/halx86/up/halinit_up.c rename to hal/halx86/pic/halinit.c diff --git a/hal/halx86/up/halup.rc b/hal/halx86/pic/halpic.rc similarity index 59% rename from hal/halx86/up/halup.rc rename to hal/halx86/pic/halpic.rc index 09edeb22851..e1abedb16f3 100644 --- a/hal/halx86/up/halup.rc +++ b/hal/halx86/pic/halpic.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer" -#define REACTOS_STR_INTERNAL_NAME "halup" -#define REACTOS_STR_ORIGINAL_FILENAME "halup.dll" +#define REACTOS_STR_INTERNAL_NAME "halpic" +#define REACTOS_STR_ORIGINAL_FILENAME "halpic.dll" #include <reactos/version.rc> diff --git a/hal/halx86/up/irql.c b/hal/halx86/pic/irql.c similarity index 100% rename from hal/halx86/up/irql.c rename to hal/halx86/pic/irql.c diff --git a/hal/halx86/up/pic.S b/hal/halx86/pic/pic.S similarity index 87% rename from hal/halx86/up/pic.S rename to hal/halx86/pic/pic.S index f93bb972a01..18d92079cb2 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/pic/pic.S @@ -1,8 +1,8 @@ /* - * FILE: hal/halx86/up/pic.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: HAL PIC Management and Control Code - * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: HAL PIC Management and Control Code + * COPYRIGHT: Copyright 2016-2018 Thomas Faber <thomas.faber(a)reactos.org> */ /* INCLUDES ******************************************************************/ diff --git a/hal/halx86/up/pic.c b/hal/halx86/pic/pic.c similarity index 100% rename from hal/halx86/up/pic.c rename to hal/halx86/pic/pic.c diff --git a/hal/halx86/up/processor.c b/hal/halx86/pic/processor.c similarity index 81% rename from hal/halx86/up/processor.c rename to hal/halx86/pic/processor.c index fbbe707c0d6..58bf6e0187e 100644 --- a/hal/halx86/up/processor.c +++ b/hal/halx86/pic/processor.c @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/up/processor.c - * PURPOSE: HAL Processor Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: HAL Processor Routines + * COPYRIGHT: Copyright 2006 Alex Ionescu <alex.ionescu(a)reactos.org> */ /* INCLUDES ******************************************************************/ diff --git a/hal/halx86/up.cmake b/hal/halx86/up.cmake index 2d40c7da185..d413710240e 100644 --- a/hal/halx86/up.cmake +++ b/hal/halx86/up.cmake @@ -1,7 +1,6 @@ list(APPEND HAL_UP_SOURCE - generic/spinlock.c - up/processor.c) + generic/spinlock.c) add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE}) add_dependencies(lib_hal_up bugcodes xdk) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index ffdbbfe8026..9b4a6dfc20f 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -3,7 +3,7 @@ list(APPEND HAL_XBOX_ASM_SOURCE generic/systimer.S generic/trap.S generic/v86.S - up/pic.S) + pic/pic.S) list(APPEND HAL_XBOX_SOURCE generic/beep.c @@ -34,10 +34,11 @@ list(APPEND HAL_XBOX_SOURCE generic/timer.c xbox/clock.c xbox/part_xbox.c - xbox/halinit_xbox.c + xbox/halinit.c xbox/reboot.c - up/irql.c - up/pic.c) + pic/irql.c + pic/pic.c + pic/processor.c) add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) add_library(lib_hal_xbox OBJECT ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) diff --git a/hal/halx86/xbox/halinit_xbox.c b/hal/halx86/xbox/halinit.c similarity index 100% rename from hal/halx86/xbox/halinit_xbox.c rename to hal/halx86/xbox/halinit.c

3 years, 9 months

[reactos] 01/01: [SHELL32] Fix SHBrowseForFolder new UI layout (#3533)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d066c93febb6da64e528… commit 2d066c93febb6da64e52824dbc97abd1f211aa5d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Mar 15 07:13:03 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 15 07:13:03 2021 +0900 [SHELL32] Fix SHBrowseForFolder new UI layout (#3533) CORE-17507 - Change layout of resource dialogs IDD_BROWSE_FOR_FOLDER_NEW. - Delete IDC_BROWSE_FOR_FOLDER_FOLDER control. - Fix focus. - Add ES_NOHIDESEL style to IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT control. - Add TVS_SHOWSELALWAYS style to IDC_BROWSE_FOR_FOLDER_TREEVIEW control. - Fix assertion failure in LayoutUpdate function in <layout.h>. --- dll/win32/shell32/lang/bg-BG.rc | 5 ++--- dll/win32/shell32/lang/ca-ES.rc | 5 ++--- dll/win32/shell32/lang/cs-CZ.rc | 5 ++--- dll/win32/shell32/lang/da-DK.rc | 5 ++--- dll/win32/shell32/lang/de-DE.rc | 5 ++--- dll/win32/shell32/lang/el-GR.rc | 5 ++--- dll/win32/shell32/lang/en-GB.rc | 5 ++--- dll/win32/shell32/lang/en-US.rc | 5 ++--- dll/win32/shell32/lang/es-ES.rc | 5 ++--- dll/win32/shell32/lang/et-EE.rc | 5 ++--- dll/win32/shell32/lang/fi-FI.rc | 5 ++--- dll/win32/shell32/lang/fr-FR.rc | 5 ++--- dll/win32/shell32/lang/he-IL.rc | 5 ++--- dll/win32/shell32/lang/hi-IN.rc | 5 ++--- dll/win32/shell32/lang/hu-HU.rc | 5 ++--- dll/win32/shell32/lang/id-ID.rc | 5 ++--- dll/win32/shell32/lang/it-IT.rc | 5 ++--- dll/win32/shell32/lang/ja-JP.rc | 5 ++--- dll/win32/shell32/lang/ko-KR.rc | 5 ++--- dll/win32/shell32/lang/nl-NL.rc | 5 ++--- dll/win32/shell32/lang/no-NO.rc | 5 ++--- dll/win32/shell32/lang/pl-PL.rc | 5 ++--- dll/win32/shell32/lang/pt-BR.rc | 5 ++--- dll/win32/shell32/lang/pt-PT.rc | 5 ++--- dll/win32/shell32/lang/ro-RO.rc | 5 ++--- dll/win32/shell32/lang/ru-RU.rc | 5 ++--- dll/win32/shell32/lang/sk-SK.rc | 5 ++--- dll/win32/shell32/lang/sl-SI.rc | 5 ++--- dll/win32/shell32/lang/sq-AL.rc | 5 ++--- dll/win32/shell32/lang/sv-SE.rc | 5 ++--- dll/win32/shell32/lang/tr-TR.rc | 5 ++--- dll/win32/shell32/lang/uk-UA.rc | 5 ++--- dll/win32/shell32/lang/zh-CN.rc | 5 ++--- dll/win32/shell32/lang/zh-TW.rc | 5 ++--- dll/win32/shell32/wine/brsfolder.c | 31 +++++++++++++++++++++++++++++++ sdk/include/reactos/layout.h | 2 +- 36 files changed, 100 insertions(+), 103 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 838c6801ddf..c7ee247b519 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -108,9 +108,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Папка:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 156, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Създаване на нова папка", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 10, 174, 92, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Добре", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отказ", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 9adf5c89ca4..10a55d2603b 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index f65e2fcab46..fe470b2d4c3 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -113,9 +113,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Složka:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Vytvořit novou složku", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Storno", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index df54721572d..efead46d7ac 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -113,9 +113,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index e82767791ea..6a50fcb7429 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Ordner:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Neuen Ordner erstellen", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index cb5709d4faf..b2b213a8d51 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Φάκελος:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 156, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Δημιουργία φακέλου", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Άκυρο", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 741b0f818f1..39b0b8be1f4 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 1dcf3b546f7..b6ef5212506 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index f7e8bd11f16..70370501bb3 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -116,9 +116,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Carpeta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Crear nueva carpeta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 0e913dfdf1b..f52aa5c2061 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -114,9 +114,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Kaust:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Loo uus kaust", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Loobu", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 013bc86fbe7..12d28bdafda 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 3423eea4665..2d37c5f7783 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Dossier :", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "Créer un nouveau dossier", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 8, 174, 90, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 4b06e36aad0..879d523ebd8 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -109,9 +109,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "תיקיה:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "צור תיקיה חדשה", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "אישור", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "ביטול", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 702bf69f9fe..81b80b160ef 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "फ़ोल्डर:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "नया फ़ोल्डर &बनाओ", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "ओके", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "रद्द करें", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 4558ba51b2b..1feddc9f590 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Mappa:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Új mappa létrehozása", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Mégse", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index f558e7fa00a..b9d0ebe7835 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Buat Folder Baru", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Batal", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 4b2fa1a7b62..ccc85c8c74f 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Cartella:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Crea una nuova cartella", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index a9be7714482..4a6a5e6c204 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -107,9 +107,8 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "フォルダ:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "新しいフォルダの作成(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 188, 85, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "キャンセル", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 7f5d0feaa7d..876fcbd96ff 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -107,9 +107,8 @@ FONT 9, "굴림" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 7e526ca6cfd..e165039bef1 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 477af1ed7b1..a7497b67c61 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Mappe:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Lag en ny mappe", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 23f393b0f29..dd5d1038c0e 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -113,9 +113,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Katalog:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Utwórz katalog", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 17e6c796761..75ea3b4dc1a 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Pasta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Criar Nova Pasta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 9520a338c4a..8865088a5b9 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Pasta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Criar nova pasta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 4e4840dc39e..89b15b3935b 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -109,9 +109,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Dosar:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Crează dosar nou", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nulează", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index aa77f0a6c3b..ed7f79700d2 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -114,9 +114,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Папка:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Создать папку", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отмена", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index edae2873b19..17e00f5de40 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Priečinok:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Vytvoriť nový priečinok", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Zrušiť", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 980279a4a87..b5fb54f0655 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 5bc0b8c79ab..30d1991d34a 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -111,9 +111,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Dosje:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Bëj Dosje T're", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anulo", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 88437075e19..a4459697b7d 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Mapp:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Skapa ny mapp", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 09cf513ca6f..f741f5eec9f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -109,9 +109,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Dizin:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "&Yeni Dizin Oluştur", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "İptal", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index adb47f0fe77..98bf4a90e79 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -107,9 +107,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Папка:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "Створити &папку", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Скасувати", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index abd369ddd52..98f52e3394f 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -117,9 +117,8 @@ FONT 9, "宋体" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "文件夹:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "创建新文件夹(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index f677e94e426..7466240c5a1 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -117,9 +117,8 @@ FONT 9, "新細明體" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "資料夾:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 - EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 12, 38, 194, 14, ES_AUTOHSCROLL | ES_NOHIDESEL | WS_GROUP + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_SHOWSELALWAYS | TVS_EDITLABELS | TVS_LINESATROOT | TVS_HASLINES | TVS_HASBUTTONS | WS_BORDER | WS_TABSTOP, 12, 58, 194, 105 PUSHBUTTON "建立新資料夾(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index 54963ac94ba..452c789ec1f 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -91,8 +91,12 @@ static const LAYOUT_INFO g_layout_info[] = {IDC_BROWSE_FOR_FOLDER_FOLDER, BF_TOP|BF_LEFT|BF_RIGHT}, #endif {IDC_BROWSE_FOR_FOLDER_TREEVIEW, BF_TOP|BF_BOTTOM|BF_LEFT|BF_RIGHT}, +#ifdef __REACTOS__ + {IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, BF_TOP|BF_LEFT|BF_RIGHT}, +#else {IDC_BROWSE_FOR_FOLDER_FOLDER, BF_BOTTOM|BF_LEFT}, {IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, BF_BOTTOM|BF_LEFT|BF_RIGHT}, +#endif {IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, BF_BOTTOM|BF_LEFT}, {IDOK, BF_BOTTOM|BF_RIGHT}, {IDCANCEL, BF_BOTTOM|BF_RIGHT} @@ -784,6 +788,22 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) RECT rcWnd; #ifdef __REACTOS__ + /* Resize the treeview if there's not editbox */ + if ((lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) + && !(lpBrowseInfo->ulFlags & BIF_EDITBOX)) + { + RECT rcEdit, rcTreeView; + INT cy; + GetWindowRect(GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT), &rcEdit); + GetWindowRect(GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_TREEVIEW), &rcTreeView); + cy = rcTreeView.top - rcEdit.top; + MapWindowPoints(NULL, hWnd, (LPPOINT)&rcTreeView, sizeof(RECT) / sizeof(POINT)); + rcTreeView.top -= cy; + MoveWindow(GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_TREEVIEW), + rcTreeView.left, rcTreeView.top, + rcTreeView.right - rcTreeView.left, + rcTreeView.bottom - rcTreeView.top, TRUE); + } if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT); else @@ -832,6 +852,7 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) { InitializeTreeView( info ); +#ifndef __REACTOS__ /* Resize the treeview if there's not editbox */ if ((lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(lpBrowseInfo->ulFlags & BIF_EDITBOX)) @@ -841,6 +862,7 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) SetWindowPos(info->hwndTreeView, HWND_TOP, 0, 0, rc.right, rc.bottom + 40, SWP_NOMOVE); } +#endif } else ERR("treeview control missing!\n"); @@ -853,9 +875,18 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) info->hNotify = SHChangeNotifyRegister(hWnd, SHCNRF_InterruptLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); +#ifdef __REACTOS__ + SetFocus(info->hwndTreeView); +#endif browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); +#ifdef __REACTOS__ + SendDlgItemMessage(hWnd, IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, EM_SETSEL, 0, -1); + SetFocus(GetDlgItem(hWnd, IDOK)); + return FALSE; +#else return TRUE; +#endif } static HRESULT BrsFolder_NewFolder(browse_info *info) diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 811e053b89f..d2ecc924291 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -189,7 +189,7 @@ LayoutUpdate(HWND ignored1, LAYOUT_DATA *pData, LPCVOID ignored2, UINT ignored3) UNREFERENCED_PARAMETER(ignored1); UNREFERENCED_PARAMETER(ignored2); UNREFERENCED_PARAMETER(ignored3); - if (pData == NULL) + if (pData == NULL || !pData->m_hwndParent) return; assert(IsWindow(pData->m_hwndParent)); _layout_ArrangeLayout(pData);

3 years, 9 months

[reactos] 01/01: [SHELL32] SHBrowseForFolder with BIF_EDITBOX should use new UI (#3532)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1a5ba188e934fbb4f5ec… commit e1a5ba188e934fbb4f5ecbc65a50a0a9a1a14649 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 14 18:35:40 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 14 18:35:40 2021 +0900 [SHELL32] SHBrowseForFolder with BIF_EDITBOX should use new UI (#3532) CORE-17506 - Convert some judgements against BIF_NEWDIALOGSTYLE to judgements against BIF_USENEWUI. Here BIF_USENEWUI == (BIF_NEWDIALOGSTYLE | BIF_EDITBOX). - Remove WS_SIZEBOX window style from new UI dialog resource (IDD_BROWSE_FOR_FOLDER_NEW). - Fix header layout.h for resizing without WS_SIZEBOX. --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- dll/win32/shell32/wine/brsfolder.c | 27 +++++++++++++++++++++++++++ sdk/include/reactos/layout.h | 10 ++++++++++ 36 files changed, 71 insertions(+), 34 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index e5c2f3fb68b..838c6801ddf 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -102,7 +102,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Търсене на папка" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 3ba72022b7a..9adf5c89ca4 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index eddcb806e50..f65e2fcab46 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -107,7 +107,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procházet pro složku" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 293fd440b4e..df54721572d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -107,7 +107,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index ef277e82f7c..e82767791ea 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Verzeichnis auswählen" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index ce106509d38..cb5709d4faf 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Αναζήτηση φακέλου" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 2bb9e8190a7..741b0f818f1 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 9359508d048..1dcf3b546f7 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index d9bcc0252e7..f7e8bd11f16 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -110,7 +110,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Buscar carpeta" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 604d3b7f09d..0e913dfdf1b 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -108,7 +108,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Vali kaust" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 39ff8185b1d..013bc86fbe7 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index d9c7c056248..3423eea4665 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Rechercher un dossier" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 49c46f5bf0e..4b06e36aad0 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -103,7 +103,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "בחירת תיקיה" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 338c1122fe0..702bf69f9fe 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "फोल्डर खोंजे" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index c5101c5142c..4558ba51b2b 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Mappák böngészése" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index a2fdca2d906..f558e7fa00a 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Jelajah Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 6b3a3cd2c0a..4b2fa1a7b62 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Selezione cartella" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 7ebf24f548d..a9be7714482 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "フォルダの参照" FONT 9, "MS UI Gothic" BEGIN diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 044323a12d2..7f5d0feaa7d 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 9, "굴림" BEGIN diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index a3277ed63fa..7e526ca6cfd 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 7a035c25f37..477af1ed7b1 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bla etter mappe" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index ce3cb3a85f0..23f393b0f29 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -107,7 +107,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wybierz katalog" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index f2d2d3e4c07..17e6c796761 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar por Pasta" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 43ae635f611..9520a338c4a 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pastas" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 8224309a356..4e4840dc39e 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -103,7 +103,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Specificare dosar" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 18dbedde257..aa77f0a6c3b 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -108,7 +108,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Обзор" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 4147ef35b1c..edae2873b19 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index e6affa59178..980279a4a87 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 34d8ba1f1f9..5bc0b8c79ab 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -105,7 +105,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Shfleto për Dosje" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 1202d6c8529..88437075e19 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bläddra efter mapp" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 30281c5adcc..09cf513ca6f 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -103,7 +103,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dizin İçin Göz At" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index f06b8302ed2..adb47f0fe77 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -101,7 +101,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Огляд папок" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index ccf2358e7cd..abd369ddd52 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -111,7 +111,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "浏览文件夹" FONT 9, "宋体" BEGIN diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 9e025b175e3..f677e94e426 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -111,7 +111,7 @@ BEGIN END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "瀏覽資料夾" FONT 9, "新細明體" BEGIN diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index 74c0f2f42b6..54963ac94ba 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -676,7 +676,11 @@ static LRESULT BrsFolder_Treeview_Keydown(browse_info *info, LPNMTVKEYDOWN keydo HTREEITEM selected_item; /* Old dialog doesn't support those advanced features */ +#ifdef __REACTOS__ + if (!(info->lpBrowseInfo->ulFlags & BIF_USENEWUI)) +#else if (!(info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) +#endif return 0; selected_item = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); @@ -771,11 +775,22 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) if (lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS) FIXME("flags %x not implemented\n", lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS); +#ifdef __REACTOS__ + if (lpBrowseInfo->ulFlags & BIF_USENEWUI) +#else if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) +#endif { RECT rcWnd; +#ifdef __REACTOS__ + if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) + info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT); + else + info->layout = NULL; +#else info->layout = LayoutInit(hWnd, g_layout_info, LAYOUT_INFO_COUNT); +#endif /* TODO: Windows allows shrinking the windows a bit */ GetWindowRect(hWnd, &rcWnd); @@ -793,7 +808,11 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_TITLE), SW_HIDE ); if (!(lpBrowseInfo->ulFlags & BIF_STATUSTEXT) +#ifdef __REACTOS__ + || (lpBrowseInfo->ulFlags & BIF_USENEWUI)) +#else || (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) +#endif ShowWindow( GetDlgItem(hWnd, IDC_BROWSE_FOR_FOLDER_STATUS), SW_HIDE ); /* Hide "Make New Folder" Button? */ @@ -1139,7 +1158,11 @@ static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL #ifndef __REACTOS__ /* This is a buggy way (resize on title bar) */ static LRESULT BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) { +#ifdef __REACTOS__ + if ((info->lpBrowseInfo->ulFlags & BIF_USENEWUI) && !(pos->flags & SWP_NOSIZE)) +#else if ((info->lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) && !(pos->flags & SWP_NOSIZE)) +#endif { if (pos->cx < info->szMin.cx) pos->cx = info->szMin.cx; @@ -1379,7 +1402,11 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) hr = OleInitialize(NULL); +#ifdef __REACTOS__ + if (lpbi->ulFlags & BIF_USENEWUI) +#else if (lpbi->ulFlags & BIF_NEWDIALOGSTYLE) +#endif wDlgId = IDD_BROWSE_FOR_FOLDER_NEW; else wDlgId = IDD_BROWSE_FOR_FOLDER; diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 7ef6d658f84..811e053b89f 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -67,6 +67,16 @@ _layout_MoveGrip(LAYOUT_DATA *pData, HDWP hDwp OPTIONAL) static __inline void LayoutShowGrip(LAYOUT_DATA *pData, BOOL bShow) { + UINT uSWP = SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_FRAMECHANGED; + DWORD style = GetWindowLongPtrW(pData->m_hwndParent, GWL_STYLE); + DWORD new_style = (bShow ? (style | WS_SIZEBOX) : (style & ~WS_SIZEBOX)); + if (style != new_style) + { + SetWindowLongPtrW(pData->m_hwndParent, GWL_STYLE, new_style); /* change style */ + SetWindowPos(pData->m_hwndParent, NULL, 0, 0, 0, 0, uSWP); /* frame changed */ + } + if (!bShow) { ShowWindow(pData->m_hwndGrip, SW_HIDE);

3 years, 9 months

[reactos] 01/01: [SDK][INCLUDE] layout.h: Use SWP_NOCOPYBITS to refresh controls

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac507691fb31d4dbf70b4… commit ac507691fb31d4dbf70b458a76dd46da26041edf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 14 12:28:48 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 14 12:28:48 2021 +0900 [SDK][INCLUDE] layout.h: Use SWP_NOCOPYBITS to refresh controls --- sdk/include/reactos/layout.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 3403ba06b3e..7ef6d658f84 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -45,7 +45,7 @@ _layout_MoveGrip(LAYOUT_DATA *pData, HDWP hDwp OPTIONAL) return hDwp; SIZE size = { GetSystemMetrics(SM_CXVSCROLL), GetSystemMetrics(SM_CYHSCROLL) }; - const UINT uFlags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER; + const UINT uFlags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOCOPYBITS; RECT rcClient; GetClientRect(pData->m_hwndParent, &rcClient); @@ -117,7 +117,7 @@ _layout_DoMoveItem(LAYOUT_DATA *pData, HDWP hDwp, const LAYOUT_INFO *pLayout, { hDwp = DeferWindowPos(hDwp, pLayout->m_hwndCtrl, NULL, NewRect.left, NewRect.top, NewRect.right - NewRect.left, NewRect.bottom - NewRect.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); } return hDwp; } @@ -138,18 +138,6 @@ _layout_ArrangeLayout(LAYOUT_DATA *pData) hDwp = _layout_MoveGrip(pData, hDwp); EndDeferWindowPos(hDwp); - - /* STATIC controls need refreshing. */ - for (iItem = 0; iItem < pData->m_cLayouts; ++iItem) - { - HWND hwndCtrl = pData->m_pLayouts[iItem].m_hwndCtrl; - WCHAR szClass[8]; - GetClassNameW(hwndCtrl, szClass, _countof(szClass)); - if (lstrcmpiW(szClass, L"STATIC") == 0) - { - InvalidateRect(hwndCtrl, NULL, TRUE); - } - } } static __inline void

3 years, 9 months

[reactos] 01/01: [ATL] Add NULL-check in CWindowImplBaseT::WindowProc assertions

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e076e0576f80d996151c0… commit e076e0576f80d996151c049ba2543c091a3ebd7c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 21:20:40 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 21:20:40 2021 +0900 [ATL] Add NULL-check in CWindowImplBaseT::WindowProc assertions CORE-17505 --- sdk/lib/atl/atlwin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 71d28fe2989..c25fd1404d0 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1579,8 +1579,8 @@ public: LONG_PTR saveWindowProc; ATLASSERT(pThis != NULL); - ATLASSERT((pThis->m_dwState & WINSTATE_DESTROYED) == 0); - ATLASSERT(pThis->m_hWnd != NULL); + ATLASSERT(pThis != NULL && (pThis->m_dwState & WINSTATE_DESTROYED) == 0); + ATLASSERT(pThis != NULL && pThis->m_hWnd != NULL); if (pThis == NULL || (pThis->m_dwState & WINSTATE_DESTROYED) != 0 || pThis->m_hWnd == NULL) return 0;

3 years, 9 months

[reactos] 01/01: [ATL][SHELL32][EXPLORER] Disable ATLASSERT (#3527)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9259ded8ae36d0f7ab117… commit 9259ded8ae36d0f7ab117ddca02a2e9a9e79bef9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 20:26:45 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 11 20:26:45 2021 +0900 [ATL][SHELL32][EXPLORER] Disable ATLASSERT (#3527) We are not ready for enabling ATLASSERT. Enabling ATL assertions takes time to realize. CORE-17505 - Disable ATLASSERT by undefining _DEBUG. - Revert currently non-fixable codes. --- base/applications/rapps/appview.cpp | 1 + base/shell/explorer/syspager.cpp | 6 ++---- base/shell/explorer/taskswnd.cpp | 3 +-- base/shell/explorer/traywnd.cpp | 6 ++---- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 3 ++- sdk/lib/atl/CMakeLists.txt | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 947df04d0bd..57442cd0e80 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -989,6 +989,7 @@ VOID CAppInfoDisplay::ResizeChildren(int Width, int Height) #if DBG ATLASSERT(dwError == ERROR_SUCCESS); #endif + UNREFERENCED_PARAMETER(dwError); UpdateWindow(); } diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index d6f729d2d7b..a71d3cf280a 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -1231,10 +1231,8 @@ void CNotifyToolbar::Initialize(HWND hWndParent, CBalloonQueue * queue) TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER; - HWND toolbar = CToolbar::Create(hWndParent, styles); - //HACK: We have not created this toolbar properly, so we need to subclass it now! - m_hWnd = NULL; - SubclassWindow(toolbar); + // HACK & FIXME: CORE-17505 + SubclassWindow(CToolbar::Create(hWndParent, styles)); // Force the toolbar tooltips window to always show tooltips even if not foreground HWND tooltipsWnd = (HWND)SendMessageW(TB_GETTOOLTIPS); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 03a2b3f02a0..5d90d36ebc3 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -287,8 +287,7 @@ public: HWND toolbar = CToolbar::Create(hWndParent, styles); SetDrawTextFlags(DT_NOPREFIX, DT_NOPREFIX); - //HACK: We have not created this toolbar properly, so we need to subclass it now! - m_hWnd = NULL; + // HACK & FIXME: CORE-17505 return SubclassWindow(toolbar); } }; diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 8dad6c4e2a1..5473e190bfa 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -200,10 +200,8 @@ public: VOID Initialize() { - //HACK: We have not created this button properly, so we need to subclass it now! - HWND button = m_hWnd; - m_hWnd = NULL; - SubclassWindow(button); + // HACK & FIXME: CORE-17505 + SubclassWindow(m_hWnd); SetWindowTheme(m_hWnd, L"Start", NULL); diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index b08097e02b0..274b780b970 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -398,7 +398,8 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) rc.bottom = 1; } - CToolbar::Create(hwndParent, tbStyles, tbExStyles); + // HACK & FIXME: CORE-17505 + SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles)); SetWindowTheme(m_hWnd, L"", L""); diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt index 000bd02060d..3a0fb3ce0dc 100644 --- a/sdk/lib/atl/CMakeLists.txt +++ b/sdk/lib/atl/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(atl_classes INTERFACE) if(DBG) - target_compile_definitions(atl_classes INTERFACE _DEBUG) + #target_compile_definitions(atl_classes INTERFACE _DEBUG) # HACK & FIXME: CORE-17505 endif() target_include_directories(atl_classes INTERFACE

3 years, 9 months

[reactos] 01/01: [SHELL32] Fix CMenuToolbarBase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4583eae4f7864f9596658… commit 4583eae4f7864f9596658a1156548840249f8908 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 17:51:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 17:51:47 2021 +0900 [SHELL32] Fix CMenuToolbarBase CORE-17505 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 2 +- dll/win32/shell32/shellmenu/CMenuToolbars.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 984be9ecfc7..b08097e02b0 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -263,7 +263,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : - m_pager(this, 1), + m_pager(WC_PAGESCROLLER, this), m_useFlatMenus(FALSE), m_disableMouseTrack(FALSE), m_timerEnabled(FALSE), diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h index a7ecb45b0ed..6463166d258 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.h +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h @@ -135,8 +135,6 @@ private: MESSAGE_HANDLER(WM_COMMAND, OnWinEventWrap) MESSAGE_HANDLER(WM_NOTIFY, OnWinEventWrap) MESSAGE_HANDLER(WM_TIMER, OnPopupTimer) - ALT_MSG_MAP(1) - // No pager specific handlers yet END_MSG_MAP() };

3 years, 9 months

[reactos] 01/01: [ATL] Split CWindowImplBaseT::WindowProc asserion

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f83032a1290fed0c5f11… commit 4f83032a1290fed0c5f11b7a21d1dea0d0570755 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 17:18:43 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 17:18:43 2021 +0900 [ATL] Split CWindowImplBaseT::WindowProc asserion CORE-9281 --- sdk/lib/atl/atlwin.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 2df36b612ee..71d28fe2989 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1578,7 +1578,9 @@ public: BOOL handled; LONG_PTR saveWindowProc; - ATLASSERT(pThis != NULL && (pThis->m_dwState & WINSTATE_DESTROYED) == 0 && pThis->m_hWnd != NULL); + ATLASSERT(pThis != NULL); + ATLASSERT((pThis->m_dwState & WINSTATE_DESTROYED) == 0); + ATLASSERT(pThis->m_hWnd != NULL); if (pThis == NULL || (pThis->m_dwState & WINSTATE_DESTROYED) != 0 || pThis->m_hWnd == NULL) return 0;

3 years, 9 months

[reactos] 01/01: [BROWSEUI] Fix CACListISF::Next assertion

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6546ad7700b0c010443bb… commit 6546ad7700b0c010443bb14dfaf0c255ac06022e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 17:12:06 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 17:12:06 2021 +0900 [BROWSEUI] Fix CACListISF::Next assertion CORE-9281 --- dll/win32/browseui/aclistisf.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/aclistisf.cpp b/dll/win32/browseui/aclistisf.cpp index 533a7af814b..15de181714a 100644 --- a/dll/win32/browseui/aclistisf.cpp +++ b/dll/win32/browseui/aclistisf.cpp @@ -251,7 +251,8 @@ STDMETHODIMP CACListISF::Next(ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) if (m_dwOptions & (ACLO_FILESYSONLY | ACLO_FILESYSDIRS)) { DWORD attrs = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM; - hr = m_pShellFolder->GetAttributesOf(1, const_cast<LPCITEMIDLIST *>(&pidlChild), &attrs); + LPCITEMIDLIST pidlRef = pidlChild; + hr = m_pShellFolder->GetAttributesOf(1, &pidlRef, &attrs); if (SUCCEEDED(hr)) { if (!(attrs & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR)))

3 years, 9 months

[reactos] 01/01: [BROWSEUI] Fix CAutoComplete::OnMeasureItem assertion

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcba9306227ade497e98b… commit bcba9306227ade497e98b50ff65feac0ae3dca3b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 11 16:55:49 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 11 16:56:01 2021 +0900 [BROWSEUI] Fix CAutoComplete::OnMeasureItem assertion CORE-17505 --- dll/win32/browseui/CAutoComplete.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 9bb6405d594..b5dfa888abd 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -1781,7 +1781,8 @@ LRESULT CAutoComplete::OnMeasureItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BO ATLASSERT(pMeasure != NULL); if (pMeasure->CtlType != ODT_LISTVIEW) return FALSE; - + if (!m_hwndList) + return FALSE; ATLASSERT(m_hwndList.GetStyle() & LVS_OWNERDRAWFIXED); pMeasure->itemHeight = m_hwndList.m_cyItem; // height of item return TRUE;

3 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

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 March 2021