14 Mar
2021
14 Mar
'21
9:35 a.m.
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);
1383
days inactive
1383
days old
0 comments
1 participants
participants (1)
-
Katayama Hirofumi MZ