https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0089017d54a601ed317e8…
commit 0089017d54a601ed317e885576471a73f96ad56c
Author: Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Sun Mar 9 22:00:16 2025 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Mar 9 22:00:16 2025 +0100
[SHELL32] Don't close icon dialog when selecting from autocomplete (#7766)
---
dll/win32/shell32/CShellLink.cpp | 2 +-
dll/win32/shell32/dialogs/dialogs.cpp | 23 ++++++-----------------
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/eu-ES.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-HK.rc | 2 +-
dll/win32/shell32/lang/zh-TW.rc | 2 +-
38 files changed, 43 insertions(+), 54 deletions(-)
diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp
index 162d91c64d8..edc482f8883 100644
--- a/dll/win32/shell32/CShellLink.cpp
+++ b/dll/win32/shell32/CShellLink.cpp
@@ -2914,7 +2914,7 @@ BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM
lParam)
HWND hWndTarget = GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT);
EnableWindow(hWndTarget, !disablecontrols);
- PostMessage(hWndTarget, EM_SETSEL, 0, -1); // Fix caret bug when first opening the
tab
+ PostMessage(hWndTarget, EM_SETSEL, 0, -1); // Fix caret bug when first opening the
tab [CORE-20016]
/* auto-completion */
SHAutoComplete(hWndTarget, SHACF_DEFAULT);
diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp
index 44f8935211a..2ef69786079 100644
--- a/dll/win32/shell32/dialogs/dialogs.cpp
+++ b/dll/win32/shell32/dialogs/dialogs.cpp
@@ -151,9 +151,8 @@ DoLoadIcons(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext, LPCWSTR
pszFile)
}
}
- // Set the text and reset the edit control's modification flag
SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath);
- SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0);
+ SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0);
if (pIconContext->nIcons == 0)
{
@@ -194,9 +193,7 @@ INT_PTR CALLBACK PickIconProc(
HICON hIcon;
INT index, count;
WCHAR szText[MAX_PATH], szFilter[100];
- CStringW strTitle;
OPENFILENAMEW ofn;
-
PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg,
DWLP_USER);
switch(uMsg)
@@ -251,18 +248,11 @@ INT_PTR CALLBACK PickIconProc(
case IDOK:
{
/* Check whether the path edit control has been modified; if so load the
icons instead of validating */
- if (SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_GETMODIFY, 0, 0))
+ GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText, _countof(szText));
+ if (lstrcmpiW(szText, pIconContext->szPath))
{
- /* Reset the edit control's modification flag and retrieve the
text */
- SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0);
- GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText, _countof(szText));
-
- // Load the icons
if (!DoLoadIcons(hwndDlg, pIconContext, szText))
NoIconsInFile(hwndDlg, pIconContext);
-
- // Set the selection
- SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0);
break;
}
@@ -293,6 +283,7 @@ INT_PTR CALLBACK PickIconProc(
case IDC_BUTTON_PATH:
{
// Choose the module path
+ CStringW strTitle;
szText[0] = 0;
szFilter[0] = 0;
ZeroMemory(&ofn, sizeof(ofn));
@@ -310,9 +301,6 @@ INT_PTR CALLBACK PickIconProc(
// Load the icons
if (!DoLoadIcons(hwndDlg, pIconContext, szText))
NoIconsInFile(hwndDlg, pIconContext);
-
- // Set the selection
- SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0);
break;
}
@@ -331,8 +319,9 @@ INT_PTR CALLBACK PickIconProc(
lpdis = (LPDRAWITEMSTRUCT)lParam;
if (lpdis->itemID == (UINT)-1)
break;
- switch (lpdis->itemAction)
+ switch (lpdis->itemAction) // FIXME: MSDN says that more than one of these
can be set
{
+ // FIXME: ODA_FOCUS
case ODA_SELECT:
case ODA_DRAWENTIRE:
{
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index ffa7fa93d77..36f71419cb5 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -637,8 +637,8 @@ CAPTION "Смяна на значе"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Добре", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index e8f729c7c9e..7a6815db73a 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 9a2a3ebec95..ad440329838 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -645,8 +645,8 @@ CAPTION "Změnit ikonu"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Vyhledat ikony v souboru:", -1, 7, 7, 179, 10
- PUSHBUTTON "Procházet...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Procházet...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Vyberte ikonu z následujícího seznamu:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 46bc8854b97..bd726f617c3 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -644,8 +644,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index 1270e5c1702..ccaeb38024c 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -637,8 +637,8 @@ CAPTION "Anderes Symbol"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Datei nach Symbolen durchsuchen:", -1, 7, 7, 179, 10
- PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 114, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14
LTEXT "Wählen Sie ein Symbol aus der folgenden Liste:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index 906192f80db..9dfb4a8ab8b 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index acc08e4f3bd..62ff8c79d1d 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index 46a403aa4d6..a2fd1bf8efa 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index 8d515c6cbc0..f780d75264c 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -646,8 +646,8 @@ CAPTION "Cambiar icono"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Buscar íconos en este archivo:", -1, 7, 7, 179, 10
- PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Seleccione un ícono de la siguiente lista:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Aceptar", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 35a11ea9b6e..6190be6c55e 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -644,8 +644,8 @@ CAPTION "Muuda ikooni"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Otsi ikoone sellest failist:", -1, 7, 7, 179, 10
- PUSHBUTTON "Sirvi...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Sirvi...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Vali ikoon alltoodud loendist:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc
index 9ce6a760948..5e8f1cdb676 100644
--- a/dll/win32/shell32/lang/eu-ES.rc
+++ b/dll/win32/shell32/lang/eu-ES.rc
@@ -644,8 +644,8 @@ CAPTION "Aldatu ikonoa"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Bilatu ikonoak fitxategi honetan:", -1, 7, 7, 179, 10
- PUSHBUTTON "&Arakatu...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "&Arakatu...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "&Hautatu ikono bat beheko zerrendan:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Ados", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 0743841d7e3..16f5171c978 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index fbd939d7941..235eaace30a 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -637,8 +637,8 @@ CAPTION "Changer l'icône"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Rechercher une icône pour ce fichier :", -1, 7, 7, 179, 10
- PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Sélectionnez une icône dans la liste ci-dessous :", -1, 7, 36, 179,
10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index 4ae2969e694..4fc4b5e6ca8 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -644,8 +644,8 @@ CAPTION "שינוי סמל"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "עיון...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "עיון...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "אישור", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index fc38faac4f1..1c682de1363 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -644,8 +644,8 @@ CAPTION "आइकॉन बदलें"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "इस फ़ाइल में आइकन देखें:", -1, 7, 7, 179, 10
- PUSHBUTTON "ब्राउज...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "ब्राउज...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "नीचे दी गई सूची में से एक आइकन चुनें:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "ठीक", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 28a7923bb29..8d71dec6e20 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -637,8 +637,8 @@ CAPTION "Ikoncsere"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Ikonok keresése ebben a fájlban:", -1, 7, 7, 179, 10
- PUSHBUTTON "Tallózás...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Tallózás...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Válasszon egy ikont a listából:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index 50250ed016b..ebddbcc7bd4 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -637,8 +637,8 @@ CAPTION "Ganti Ikon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Cari ikon di berkas ini:", -1, 7, 7, 179, 10
- PUSHBUTTON "Jelajah...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Jelajah...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Pilih ikon dari daftar di bawah ini:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index 889df335f8a..9fb0e5601d0 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -637,8 +637,8 @@ CAPTION "Cambia icona"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index a186027c5fe..7cc1dd07a19 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -637,8 +637,8 @@ CAPTION "アイコンの変更"
FONT 9, "MS UI Gothic", 400, 0, 0x1
BEGIN
LTEXT "次のファイルのアイコンを見る:", -1, 7, 7, 185, 10
- PUSHBUTTON "参照...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "参照...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "以下のリストからアイコンを選択:", -1, 7, 36, 185, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index d6a31a17bdb..d6f71216370 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -644,8 +644,8 @@ CAPTION "아이콘 변경"
FONT 9, "굴림", 400, 0, 0x1
BEGIN
LTEXT "파일에서 아이콘 찾기(&L):", -1, 7, 7, 179, 10
- PUSHBUTTON "찾아보기(&B)...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "찾아보기(&B)...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "아래 목록에서 아이콘 선택:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "확인", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index 82d22450c87..d13aceef1ac 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 0321417fb24..5ff56fce943 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -637,8 +637,8 @@ CAPTION "Endre ikon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index 1614266d238..babdb6d3183 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -646,8 +646,8 @@ CAPTION "Zmienianie Ikony"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Szukaj ikon w pliku:", -1, 7, 7, 179, 10
- PUSHBUTTON "Przeglądaj...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Przeglądaj...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Wybierz ikonę z poniższej listy:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index 0b5c46f359f..17337ac6806 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -637,8 +637,8 @@ CAPTION "Alterar Ícone"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index d606c701112..d6aa68921a1 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -647,8 +647,8 @@ CAPTION "Alterar ícone"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Procurar ícones no ficheiro:", -1, 7, 7, 179, 10
- PUSHBUTTON "&Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "&Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Seleccione um ícone na lista abaixo:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index c5109abb36d..a3666ac4eab 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -645,8 +645,8 @@ CAPTION "Modificare pictogramă"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Căutare pictograme în fişierul:", -1, 7, 7, 179, 10
- PUSHBUTTON "&Răsfoire…", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "&Răsfoire…", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Selectaţi o pictogramă din lista de mai jos:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index f81a82b00da..d9500e3b9df 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -646,8 +646,8 @@ CAPTION "Изменение значка"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Искать значки в этом файле:", -1, 7, 7, 179, 10
- PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Выберите значок из списка ниже:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index e17019cd76d..60997c55ed1 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -637,8 +637,8 @@ CAPTION "Zmena ikony"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "&Prehľadávať...", IDC_BUTTON_PATH, 128, 17, 57, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 117, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "&Prehľadávať...", IDC_BUTTON_PATH, 128, 17, 57, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index 17b3d7d9bee..1827162510d 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -637,8 +637,8 @@ CAPTION "Change Icon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index 6915235b1b3..4b8d98a62b2 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -644,8 +644,8 @@ CAPTION "Ndrysho Ikonë"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index 9628f301240..0c4df0f3782 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -637,8 +637,8 @@ CAPTION "Ändra ikon"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10
- PUSHBUTTON "Bläddra...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Bläddra...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 04a16690660..31851af7f46 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -646,8 +646,8 @@ CAPTION "Simge Değiştir"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Bu dosyadaki simgelere bak:", -1, 7, 7, 179, 10
- PUSHBUTTON "Gözat...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "Gözat...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Aşağıdaki listeden bir simge seç:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Tamam", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 0a943e91999..97fafbfec94 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -637,8 +637,8 @@ CAPTION "Зміна значка"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Значки в цьому файлі:", -1, 7, 7, 179, 10
- PUSHBUTTON "О&гляд...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "О&гляд...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "Виберіть значок зі списку нижче:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 6685c210944..bafd33dfa81 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -647,8 +647,8 @@ CAPTION "更改图标"
FONT 9, "宋体", 400, 0, 0x1
BEGIN
LTEXT "在这个文件中查找图标:", -1, 7, 7, 179, 10
- PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "从以下列表选择一个图标:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "确定", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc
index dd7d89bef55..005a2c3d7a1 100644
--- a/dll/win32/shell32/lang/zh-HK.rc
+++ b/dll/win32/shell32/lang/zh-HK.rc
@@ -645,8 +645,8 @@ CAPTION "變更圖示"
FONT 9, "新細明體", 400, 0, 0x1
BEGIN
LTEXT "在這個檔案裡尋找圖示:", -1, 7, 7, 179, 10
- PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "選擇所列出的圖示:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "確定", IDOK, 81, 179, 50, 14
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 7d5a8e2b402..8436d2d0e8c 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -646,8 +646,8 @@ CAPTION "變更圖示"
FONT 9, "新細明體", 400, 0, 0x1
BEGIN
LTEXT "在這個檔案裡尋找圖示:", -1, 7, 7, 179, 10
- PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14
EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL
+ PUSHBUTTON "瀏覽...", IDC_BUTTON_PATH, 135, 17, 50, 14
LTEXT "選擇所列出的圖示:", -1, 7, 36, 179, 10
LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT
| LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP
DEFPUSHBUTTON "確定", IDOK, 81, 179, 50, 14