Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SHELL32] Improve French Folder Options
by Katayama Hirofumi MZ 23 Jun '18

23 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a33908b60f12d51bee12a… commit a33908b60f12d51bee12ac4daaf84ffc4274c98f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jun 23 11:00:11 2018 +0900 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jun 23 10:51:48 2018 +0200 [SHELL32] Improve French Folder Options --- dll/win32/shell32/lang/fr-FR.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 6146ff582a..58f991f1be 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -416,19 +416,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Tâches", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 - AUTORADIOBUTTON "Afficher les tâches habituelles dans les dossiers", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Utiliser les dossiers ReactOS class&iques", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 + AUTORADIOBUTTON "Afficher les tâches habituelles dans les dossiers", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 205, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Utiliser les dossiers ReactOS class&iques", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 205, 10 GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 - AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 - GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 60 + AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 205, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 205, 10 + GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 99 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 - AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 - PUSHBUTTON "Pa&ramètres par défaut", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP + AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 205, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 180, 205, 20, BS_MULTILINE + AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 140, 195, 20, BS_MULTILINE | WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 160, 195, 20, BS_MULTILINE + PUSHBUTTON "Pa&ramètres par défaut", IDC_FOLDER_OPTIONS_RESTORE, 167, 215, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256

1 0

01/01: [REGEDIT] Fix importing very big *.reg files (HEX values commonly) (#618)
by Getequ 22 Jun '18

22 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9415740a14918ff8aff0… commit b9415740a14918ff8aff0762fcfcaf395dc6617b Author: Getequ <Getequ(a)users.noreply.github.com> AuthorDate: Sat Jun 23 01:15:12 2018 +0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 22 20:15:12 2018 +0200 [REGEDIT] Fix importing very big *.reg files (HEX values commonly) (#618) This bug was found when I tried to import *.reg with huge HEX value (about 500 and much more lines of hex text). --- base/applications/regedit/regproc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index 8d09bb349b..c17221df5a 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -851,9 +851,15 @@ static void processRegLinesW(FILE *in) if(*s_eol == '\r' && *(s_eol+1) == '\n') NextLine++; - while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') + while(isspaceW(*NextLine)) NextLine++; + if (!*NextLine) + { + s = NextLine; + break; + } + MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); CharsInBuf -= NextLine - s_eol + 1; s_eol = 0;

1 0

01/01: [SHLWAPI][APITESTS] Add test for PathUnExpandEnvStringsForUser (#602)
by Katayama Hirofumi MZ 22 Jun '18

22 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f82659da626d647f4477… commit 6f82659da626d647f44779b3e194f05507497bcd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 22 23:44:58 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 22 16:44:58 2018 +0200 [SHLWAPI][APITESTS] Add test for PathUnExpandEnvStringsForUser (#602) ROSTESTS-308 --- dll/win32/shlwapi/shlwapi.spec | 2 +- modules/rostests/apitests/shlwapi/CMakeLists.txt | 1 + .../shlwapi/PathUnExpandEnvStringsForUser.c | 119 +++++++++++++++++++++ modules/rostests/apitests/shlwapi/testlist.c | 2 + 4 files changed, 123 insertions(+), 1 deletion(-) diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 0f5707c8d4..a369d974b8 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -463,7 +463,7 @@ 463 stdcall -noname SHExpandEnvironmentStringsForUserA(ptr str ptr long) userenv.ExpandEnvironmentStringsForUserA 464 stdcall -noname SHExpandEnvironmentStringsForUserW(ptr wstr ptr long) userenv.ExpandEnvironmentStringsForUserW 465 stub -noname PathUnExpandEnvStringsForUserA -466 stub -noname PathUnExpandEnvStringsForUserW +466 stdcall -stub -noname PathUnExpandEnvStringsForUserW(ptr wstr ptr long) 467 stub -ordinal SHRunIndirectRegClientCommand 468 stub -noname RunIndirectRegCommand 469 stub -noname RunRegCommand diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index da4c6a808f..a7d4e05d4f 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE PathIsUNCServer.c PathIsUNCServerShare.c PathUnExpandEnvStrings.c + PathUnExpandEnvStringsForUser.c SHAreIconsEqual.c StrFormatByteSizeW.c testdata.rc diff --git a/modules/rostests/apitests/shlwapi/PathUnExpandEnvStringsForUser.c b/modules/rostests/apitests/shlwapi/PathUnExpandEnvStringsForUser.c new file mode 100644 index 0000000000..3e70278fa1 --- /dev/null +++ b/modules/rostests/apitests/shlwapi/PathUnExpandEnvStringsForUser.c @@ -0,0 +1,119 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Tests for PathUnExpandEnvStringsForUser + * PROGRAMMERS: Katayama Hirofumi MZ + */ + +#include <apitest.h> +#include <shlwapi.h> +#include <strsafe.h> + +#define DO_TEST(Res, hToken, TestStr, ExpStr, Len) \ +do { \ + BOOL ret = PathUnExpandEnvStringsForUserW((hToken), (TestStr), OutStr, Len); \ + ok(ret == (Res), "Tested %s, expected returned value %d, got %d\n", \ + wine_dbgstr_w((TestStr)), (Res), ret); \ + if (ret) \ + ok(_wcsicmp(OutStr, (ExpStr)) == 0, "Tested %s, expected %s, got %s\n", \ + wine_dbgstr_w((TestStr)), wine_dbgstr_w((ExpStr)), wine_dbgstr_w(OutStr)); \ +} while (0) + +// PathUnExpandEnvStringsForUserW +typedef BOOL (WINAPI *PATHUNEXPANDENVSTRINGSFORUSERW)(HANDLE hToken, LPCWSTR pszPath, LPWSTR pszUnExpanded, INT cchUnExpanded); +PATHUNEXPANDENVSTRINGSFORUSERW pPathUnExpandEnvStringsForUserW = NULL; + +START_TEST(PathUnExpandEnvStringsForUser) +{ + DWORD ret; + WCHAR OutStr[MAX_PATH], TestStr[MAX_PATH]; + HINSTANCE hShlwapi; + + hShlwapi = GetModuleHandleW(L"shlwapi"); + if (hShlwapi == NULL) + { + skip("shlwapi.dll was not loaded\n"); + return; + } + + pPathUnExpandEnvStringsForUserW = + (PATHUNEXPANDENVSTRINGSFORUSERW)GetProcAddress(hShlwapi, "PathUnExpandEnvStringsForUserW"); + + if (pPathUnExpandEnvStringsForUserW == NULL) + { + trace("PathUnExpandEnvStringsForUserW is not public\n"); + pPathUnExpandEnvStringsForUserW = + (PATHUNEXPANDENVSTRINGSFORUSERW)GetProcAddress(hShlwapi, (LPCSTR)(LONG_PTR)466); + } + if (pPathUnExpandEnvStringsForUserW == NULL) + { + skip("PathUnExpandEnvStringsForUserW was not found\n"); + return; + } + +#define PathUnExpandEnvStringsForUserW (*pPathUnExpandEnvStringsForUserW) + + /* empty string */ + DO_TEST(FALSE, NULL, L"", L"", 0); + DO_TEST(FALSE, NULL, L"", L"", -1); + DO_TEST(FALSE, NULL, L"", L"", 2); + DO_TEST(FALSE, NULL, L"", L"", MAX_PATH); + + /* No unexpansion possible */ + DO_TEST(FALSE, NULL, L"ZZ:\\foobar\\directory", L"", 0); + DO_TEST(FALSE, NULL, L"ZZ:\\foobar\\directory", L"", -1); + DO_TEST(FALSE, NULL, L"ZZ:\\foobar\\directory", L"", 2); + DO_TEST(FALSE, NULL, L"ZZ:\\foobar\\directory", L"", MAX_PATH); + + /* %APPDATA% */ + ret = GetEnvironmentVariableW(L"APPDATA", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + DO_TEST(FALSE, NULL, TestStr, L"%APPDATA%", 0); + DO_TEST(FALSE, NULL, TestStr, L"%APPDATA%", -1); + DO_TEST(FALSE, NULL, TestStr, L"%APPDATA%", 2); + DO_TEST(TRUE, NULL, TestStr, L"%APPDATA%", MAX_PATH); + StringCbCatW(TestStr, sizeof(TestStr), L"\\TEST"); + DO_TEST(FALSE, NULL, TestStr, L"%APPDATA%\\TEST", 0); + DO_TEST(FALSE, NULL, TestStr, L"%APPDATA%\\TEST", -1); + DO_TEST(FALSE, NULL, TestStr, L"%APPDATA%\\TEST", 2); + DO_TEST(TRUE, NULL, TestStr, L"%APPDATA%\\TEST", MAX_PATH); + + /* %USERPROFILE% */ + ret = GetEnvironmentVariableW(L"USERPROFILE", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + DO_TEST(FALSE, NULL, TestStr, L"%USERPROFILE%", 0); + DO_TEST(FALSE, NULL, TestStr, L"%USERPROFILE%", -1); + DO_TEST(FALSE, NULL, TestStr, L"%USERPROFILE%", 2); + DO_TEST(TRUE, NULL, TestStr, L"%USERPROFILE%", MAX_PATH); + StringCbCatW(TestStr, sizeof(TestStr), L"\\TEST"); + DO_TEST(FALSE, NULL, TestStr, L"%USERPROFILE%\\TEST", 0); + DO_TEST(FALSE, NULL, TestStr, L"%USERPROFILE%\\TEST", -1); + DO_TEST(FALSE, NULL, TestStr, L"%USERPROFILE%\\TEST", 2); + DO_TEST(TRUE, NULL, TestStr, L"%USERPROFILE%\\TEST", MAX_PATH); + + /* %ALLUSERSPROFILE% */ + ret = GetEnvironmentVariableW(L"ALLUSERSPROFILE", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + DO_TEST(FALSE, NULL, TestStr, L"%ALLUSERSPROFILE%", 0); + DO_TEST(FALSE, NULL, TestStr, L"%ALLUSERSPROFILE%", -1); + DO_TEST(FALSE, NULL, TestStr, L"%ALLUSERSPROFILE%", 2); + DO_TEST(TRUE, NULL, TestStr, L"%ALLUSERSPROFILE%", MAX_PATH); + StringCbCatW(TestStr, sizeof(TestStr), L"\\TEST"); + DO_TEST(FALSE, NULL, TestStr, L"%ALLUSERSPROFILE%\\TEST", 0); + DO_TEST(FALSE, NULL, TestStr, L"%ALLUSERSPROFILE%\\TEST", -1); + DO_TEST(FALSE, NULL, TestStr, L"%ALLUSERSPROFILE%\\TEST", 2); + DO_TEST(TRUE, NULL, TestStr, L"%ALLUSERSPROFILE%\\TEST", MAX_PATH); + + /* %ProgramFiles% */ + ret = GetEnvironmentVariableW(L"ProgramFiles", TestStr, _countof(TestStr)); + ok(ret, "got %lu\n", ret); + DO_TEST(FALSE, NULL, TestStr, L"%ProgramFiles%", 0); + DO_TEST(FALSE, NULL, TestStr, L"%ProgramFiles%", -1); + DO_TEST(FALSE, NULL, TestStr, L"%ProgramFiles%", 2); + DO_TEST(TRUE, NULL, TestStr, L"%ProgramFiles%", MAX_PATH); + StringCbCatW(TestStr, sizeof(TestStr), L"\\TEST"); + DO_TEST(FALSE, NULL, TestStr, L"%ProgramFiles%\\TEST", 0); + DO_TEST(FALSE, NULL, TestStr, L"%ProgramFiles%\\TEST", -1); + DO_TEST(FALSE, NULL, TestStr, L"%ProgramFiles%\\TEST", 2); + DO_TEST(TRUE, NULL, TestStr, L"%ProgramFiles%\\TEST", MAX_PATH); +} diff --git a/modules/rostests/apitests/shlwapi/testlist.c b/modules/rostests/apitests/shlwapi/testlist.c index 793385e1a2..1ad20a3bf8 100644 --- a/modules/rostests/apitests/shlwapi/testlist.c +++ b/modules/rostests/apitests/shlwapi/testlist.c @@ -6,6 +6,7 @@ extern void func_isuncpath(void); extern void func_isuncpathserver(void); extern void func_isuncpathservershare(void); extern void func_PathUnExpandEnvStrings(void); +extern void func_PathUnExpandEnvStringsForUser(void); extern void func_SHAreIconsEqual(void); extern void func_StrFormatByteSizeW(void); @@ -16,6 +17,7 @@ const struct test winetest_testlist[] = { "PathIsUNCServer", func_isuncpathserver }, { "PathIsUNCServerShare", func_isuncpathservershare }, { "PathUnExpandEnvStrings", func_PathUnExpandEnvStrings }, + { "PathUnExpandEnvStringsForUser", func_PathUnExpandEnvStringsForUser }, { "SHAreIconsEqual", func_SHAreIconsEqual }, { "StrFormatByteSizeW", func_StrFormatByteSizeW }, { 0, 0 }

1 0

01/01: [SHELL32] Implement the 'General' tab of the "Folder Options" dialog (#604)
by Katayama Hirofumi MZ 22 Jun '18

22 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb6944336292fa2c13a4e… commit cb6944336292fa2c13a4ee9273c4a05bd48d05c0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 22 23:40:06 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 22 16:40:06 2018 +0200 [SHELL32] Implement the 'General' tab of the "Folder Options" dialog (#604) CORE-14678 --- dll/win32/shell32/dialogs/general.cpp | 308 +++++++++++++++++++++++++++++++++- dll/win32/shell32/lang/bg-BG.rc | 6 +- dll/win32/shell32/lang/ca-ES.rc | 6 +- dll/win32/shell32/lang/cs-CZ.rc | 6 +- dll/win32/shell32/lang/da-DK.rc | 6 +- dll/win32/shell32/lang/de-DE.rc | 6 +- dll/win32/shell32/lang/el-GR.rc | 6 +- dll/win32/shell32/lang/en-GB.rc | 6 +- dll/win32/shell32/lang/en-US.rc | 6 +- dll/win32/shell32/lang/es-ES.rc | 6 +- dll/win32/shell32/lang/et-EE.rc | 6 +- dll/win32/shell32/lang/fi-FI.rc | 6 +- dll/win32/shell32/lang/fr-FR.rc | 6 +- dll/win32/shell32/lang/he-IL.rc | 6 +- dll/win32/shell32/lang/hu-HU.rc | 6 +- dll/win32/shell32/lang/it-IT.rc | 6 +- dll/win32/shell32/lang/ja-JP.rc | 6 +- dll/win32/shell32/lang/ko-KR.rc | 6 +- dll/win32/shell32/lang/nl-NL.rc | 6 +- dll/win32/shell32/lang/no-NO.rc | 6 +- dll/win32/shell32/lang/pl-PL.rc | 6 +- dll/win32/shell32/lang/pt-BR.rc | 6 +- dll/win32/shell32/lang/pt-PT.rc | 6 +- dll/win32/shell32/lang/ro-RO.rc | 6 +- dll/win32/shell32/lang/ru-RU.rc | 6 +- dll/win32/shell32/lang/sk-SK.rc | 6 +- dll/win32/shell32/lang/sl-SI.rc | 6 +- dll/win32/shell32/lang/sq-AL.rc | 6 +- dll/win32/shell32/lang/sv-SE.rc | 6 +- dll/win32/shell32/lang/tr-TR.rc | 6 +- dll/win32/shell32/lang/uk-UA.rc | 6 +- dll/win32/shell32/lang/zh-CN.rc | 8 +- dll/win32/shell32/lang/zh-TW.rc | 6 +- dll/win32/shell32/shresdef.h | 7 +- 34 files changed, 400 insertions(+), 109 deletions(-) diff --git a/dll/win32/shell32/dialogs/general.cpp b/dll/win32/shell32/dialogs/general.cpp index e44f21cd82..5d85f08bf5 100644 --- a/dll/win32/shell32/dialogs/general.cpp +++ b/dll/win32/shell32/dialogs/general.cpp @@ -23,8 +23,179 @@ WINE_DEFAULT_DEBUG_CHANNEL (fprop); +typedef struct REGSHELLSTATE +{ + DWORD dwSize; + SHELLSTATE ss; +} REGSHELLSTATE, *PREGSHELLSTATE; + +#define REGSHELLSTATE_SIZE 0x24 + +static const LPCWSTR s_pszExplorerKey = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"; + +extern "C" +BOOL WINAPI SHSettingsChanged(LPCVOID unused, LPCVOID inpRegKey); + +///////////////////////////////////////////////////////////////////////////// +// Shell settings + +static void +IntGetDefaultShellState(REGSHELLSTATE& rss) +{ + ZeroMemory(&rss, sizeof(rss)); + rss.dwSize = REGSHELLSTATE_SIZE; + + rss.ss.fShowAllObjects = TRUE; + rss.ss.fShowExtensions = TRUE; + + rss.ss.fShowCompColor = TRUE; + rss.ss.fDoubleClickInWebView = TRUE; + rss.ss.fShowInfoTip = TRUE; + + rss.ss.iSortDirection = 1; + rss.ss.version = 0xD; + rss.ss.fStartPanelOn = TRUE; +} + +// bDoubleClick is TRUE if "Double-click to open an item (single-click to select)". +// bDoubleClick is FALSE if "Single-click to open an item (point to select)". +////////////////////////////////////////////////////////////////////////////// +// API Monitor: +// SHLWAPI.dll RegOpenKeyExW ( 0x000000c8, NULL, 0, MAXIMUM_ALLOWED, 0x00def234 ) ERROR_SUCCESS 0.0000243 +// SHLWAPI.dll RegSetValueExW ( 0x000003e8, "ShellState", 0, REG_BINARY, 0x000c2050, 36 ) ERROR_SUCCESS 0.0001028 +// SHLWAPI.dll RegCloseKey ( 0x000003e8 ) ERROR_SUCCESS 0.0000081 +// Explorer.EXE SHSettingsChanged ( 0, "ShellState" ) 0.0000131 +static BOOL +IntSetShellStateSettings(BOOL bDoubleClick, BOOL bUseCommonTasks) +{ + REGSHELLSTATE rss; + DWORD dwSize = sizeof(rss); + LSTATUS nStatus; + + // read ShellState + nStatus = SHGetValueW(HKEY_CURRENT_USER, + s_pszExplorerKey, + L"ShellState", + NULL, + &rss, + &dwSize); + if (nStatus != ERROR_SUCCESS || rss.dwSize < REGSHELLSTATE_SIZE) + { + IntGetDefaultShellState(rss); + } + + // update ShellState + rss.ss.fDoubleClickInWebView = (bDoubleClick ? TRUE : FALSE); + rss.ss.fWebView = (bUseCommonTasks ? TRUE : FALSE); + + // write ShellState + rss.dwSize = dwSize = REGSHELLSTATE_SIZE; + nStatus = SHSetValueW(HKEY_CURRENT_USER, + s_pszExplorerKey, + L"ShellState", + REG_BINARY, + &rss, + dwSize); + if (nStatus != ERROR_SUCCESS) + return FALSE; + + SHSettingsChanged(0, L"ShellState"); + return TRUE; +} + +////////////////////////////////////////////////////////////////////////////// +// API Monitor: +// SHLWAPI.dll RegOpenKeyExW ( 0x000000c8, NULL, 0, MAXIMUM_ALLOWED, 0x0007e484 ) ERROR_SUCCESS 0.0000388 +// SHLWAPI.dll RegQueryValueExW ( 0x000005a8, "ShellState", NULL, 0x0007e474, 0x000c2050, 0x0007e4fc ) ERROR_SUCCESS 0.0000271 +// SHLWAPI.dll RegCloseKey ( 0x000005a8 ) ERROR_SUCCESS 0.0000112 +static BOOL +IntGetShellStateSettings(BOOL& bDoubleClick, BOOL& bUseCommonTasks) +{ + REGSHELLSTATE rss; + DWORD dwSize = sizeof(rss); + LSTATUS nStatus; + bDoubleClick = TRUE; + bUseCommonTasks = FALSE; + + // read ShellState + nStatus = SHGetValueW(HKEY_CURRENT_USER, s_pszExplorerKey, + L"ShellState", NULL, &rss, &dwSize); + if (nStatus != ERROR_SUCCESS || rss.dwSize < REGSHELLSTATE_SIZE) + return FALSE; + + bDoubleClick = !!rss.ss.fDoubleClickInWebView; + bUseCommonTasks = !!rss.ss.fWebView; + return TRUE; +} + +// bIconUnderline is TRUE if "Underline icon titles only when I point at them". +// bIconUnderline is FALSE if "Underline icon titles consistent with my browser". +////////////////////////////////////////////////////////////////////////////// +// API Monitor: +// SHELL32.dll SHRegGetUSValueW ( "Software\Microsoft\Windows\CurrentVersion\Explorer", "IconUnderline", NULL, 0x00d2f324, 0x00d2f328, FALSE, 0x00d2f32c, 4 ) ERROR_SUCCESS 0.0002484 +// SHELL32.dll IsDlgButtonChecked ( 0x0005009e, 30104 ) BST_CHECKED 0.0000212 +// SHELL32.dll SHRegSetUSValueW ( "Software\Microsoft\Windows\CurrentVersion\Explorer", "IconUnderline", 0, 0x00d2f314, 4, 6 ) ERROR_SUCCESS 0.0008300 +// Explorer.EXE SHSettingsChanged ( 0, "Software\Microsoft\Windows\CurrentVersion\Explorer\IconUnderline" ) 0.0000092 +static BOOL IntSetUnderlineState(BOOL bIconUnderline) +{ + LSTATUS Status; + DWORD dwValue = (bIconUnderline ? 3 : 2), dwSize = sizeof(DWORD); + Status = SHRegSetUSValue(s_pszExplorerKey, L"IconUnderline", REG_NONE, + &dwValue, dwSize, SHREGSET_FORCE_HKCU | SHREGSET_HKLM); + if (Status != ERROR_SUCCESS) + return FALSE; + + SHSettingsChanged(0, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\IconUnderline"); + return TRUE; +} + +static BOOL IntGetUnderlineState(VOID) +{ + DWORD dwValue, dwDefault = 2, dwSize = sizeof(DWORD); + SHRegGetUSValue(s_pszExplorerKey, L"IconUnderline", NULL, &dwValue, &dwSize, FALSE, &dwDefault, sizeof(DWORD)); + return dwValue == 3; +} + +// bNewWindowMode is TRUE if "Open each folder in its own window". +// bNewWindowMode is FALSE if "Open each folder in the same window". +////////////////////////////////////////////////////////////////////////////// +// API Monitor: +// SHELL32.dll RegCreateKeyExW ( HKEY_CURRENT_USER, "Software\Microsoft\Windows\CurrentVersion\Explorer\CabinetState", 0, NULL, 0, KEY_SET_VALUE, NULL, 0x00d2f2b8, NULL ) ERROR_SUCCESS 0.0000455 +// SHELL32.dll RegSetValueExW ( 0x00000854, "Settings", 0, REG_BINARY, 0x0210f170, 12 ) ERROR_SUCCESS 0.0001472 +// SHELL32.dll RegSetValueExW ( 0x00000854, "FullPath", 0, REG_DWORD, 0x00d2f2ac, 4 ) ERROR_SUCCESS 0.0000168 +// SHELL32.dll RegCloseKey ( 0x00000854 ) ERROR_SUCCESS 0.0000000 +static BOOL IntSetNewWindowMode(BOOL bNewWindowMode) +{ + CABINETSTATE cs; + if (!ReadCabinetState(&cs, sizeof(cs))) + return FALSE; + + cs.fNewWindowMode = (bNewWindowMode ? TRUE : FALSE); + return WriteCabinetState(&cs); +} + +static BOOL IntGetNewWindowMode(VOID) +{ + CABINETSTATE cs; + if (!ReadCabinetState(&cs, sizeof(cs))) + return FALSE; + + return !!cs.fNewWindowMode; +} + +///////////////////////////////////////////////////////////////////////////// +// GeneralDlg + +typedef struct GENERAL_DIALOG +{ + HICON hTaskIcon; + HICON hFolderIcon; + HICON hClickIcon; +} GENERAL_DIALOG, *PGENERAL_DIALOG; + static VOID -GeneralDlg_UpdateIcons(HWND hDlg) +GeneralDlg_UpdateIcons(HWND hDlg, UINT nCtrlID, PGENERAL_DIALOG pGeneral) { HICON hTaskIcon = NULL, hFolderIcon = NULL, hClickIcon = NULL; LPTSTR lpTaskIconName = NULL, lpFolderIconName = NULL, lpClickIconName = NULL; @@ -80,13 +251,114 @@ GeneralDlg_UpdateIcons(HWND hDlg) } } - // Clean up + // Replace icons if (hTaskIcon) - DeleteObject(hTaskIcon); + { + DestroyIcon(pGeneral->hTaskIcon); + pGeneral->hTaskIcon = hTaskIcon; + } if (hFolderIcon) - DeleteObject(hFolderIcon); + { + DestroyIcon(pGeneral->hFolderIcon); + pGeneral->hFolderIcon = hFolderIcon; + } if (hClickIcon) - DeleteObject(hClickIcon); + { + DestroyIcon(pGeneral->hClickIcon); + pGeneral->hClickIcon = hClickIcon; + } + + if (nCtrlID == IDC_FOLDER_OPTIONS_SINGLECLICK) + { + EnableWindow(GetDlgItem(hDlg, IDC_FOLDER_OPTIONS_ULBROWSER), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_FOLDER_OPTIONS_ULPOINT), TRUE); + } + + if (nCtrlID == IDC_FOLDER_OPTIONS_DOUBLECLICK) + { + CheckRadioButton(hDlg, IDC_FOLDER_OPTIONS_ULBROWSER, IDC_FOLDER_OPTIONS_ULPOINT, IDC_FOLDER_OPTIONS_ULBROWSER); + EnableWindow(GetDlgItem(hDlg, IDC_FOLDER_OPTIONS_ULBROWSER), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_FOLDER_OPTIONS_ULPOINT), FALSE); + } +} + +static void +GeneralDlg_StoreToUI(HWND hwndDlg, BOOL bDoubleClick, BOOL bUseCommonTasks, + BOOL bUnderline, BOOL bNewWindowMode, PGENERAL_DIALOG pGeneral) +{ + if (bUseCommonTasks) + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_COMMONTASKS, IDC_FOLDER_OPTIONS_CLASSICFOLDERS, IDC_FOLDER_OPTIONS_COMMONTASKS); + else + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_COMMONTASKS, IDC_FOLDER_OPTIONS_CLASSICFOLDERS, IDC_FOLDER_OPTIONS_CLASSICFOLDERS); + + if (bDoubleClick) + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_SINGLECLICK, IDC_FOLDER_OPTIONS_DOUBLECLICK, IDC_FOLDER_OPTIONS_DOUBLECLICK); + else + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_SINGLECLICK, IDC_FOLDER_OPTIONS_DOUBLECLICK, IDC_FOLDER_OPTIONS_SINGLECLICK); + + if (bNewWindowMode) + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_SAMEWINDOW, IDC_FOLDER_OPTIONS_OWNWINDOW, IDC_FOLDER_OPTIONS_OWNWINDOW); + else + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_SAMEWINDOW, IDC_FOLDER_OPTIONS_OWNWINDOW, IDC_FOLDER_OPTIONS_SAMEWINDOW); + + if (!bDoubleClick) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDER_OPTIONS_ULBROWSER), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDER_OPTIONS_ULPOINT), TRUE); + if (bUnderline) + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_ULBROWSER, IDC_FOLDER_OPTIONS_ULPOINT, IDC_FOLDER_OPTIONS_ULPOINT); + else + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_ULBROWSER, IDC_FOLDER_OPTIONS_ULPOINT, IDC_FOLDER_OPTIONS_ULBROWSER); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDER_OPTIONS_ULBROWSER), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_FOLDER_OPTIONS_ULPOINT), FALSE); + CheckRadioButton(hwndDlg, IDC_FOLDER_OPTIONS_ULBROWSER, IDC_FOLDER_OPTIONS_ULPOINT, IDC_FOLDER_OPTIONS_ULBROWSER); + } +} + +static BOOL +GeneralDlg_OnInitDialog(HWND hwndDlg, PGENERAL_DIALOG pGeneral) +{ + BOOL bDoubleClick = TRUE; + BOOL bUseCommonTasks = FALSE; + BOOL bUnderline = IntGetUnderlineState(); + BOOL bNewWindowMode = IntGetNewWindowMode(); + + IntGetShellStateSettings(bDoubleClick, bUseCommonTasks); + + GeneralDlg_StoreToUI(hwndDlg, bDoubleClick, bUseCommonTasks, bUnderline, bNewWindowMode, pGeneral); + GeneralDlg_UpdateIcons(hwndDlg, 0, pGeneral); + + return TRUE; +} + +static void +GeneralDlg_OnRestoreDefaults(HWND hwndDlg, PGENERAL_DIALOG pGeneral) +{ + // default values + BOOL bDoubleClick = TRUE; + BOOL bUseCommonTasks = FALSE; + BOOL bUnderline = FALSE; + BOOL bNewWindowMode = FALSE; + + GeneralDlg_StoreToUI(hwndDlg, bDoubleClick, bUseCommonTasks, bUnderline, bNewWindowMode, pGeneral); + GeneralDlg_UpdateIcons(hwndDlg, 0, pGeneral); +} + +static BOOL +GeneralDlg_OnApply(HWND hwndDlg, PGENERAL_DIALOG pGeneral) +{ + BOOL bDoubleClick = !(IsDlgButtonChecked(hwndDlg, IDC_FOLDER_OPTIONS_SINGLECLICK) == BST_CHECKED); + BOOL bUseCommonTasks = (IsDlgButtonChecked(hwndDlg, IDC_FOLDER_OPTIONS_COMMONTASKS) == BST_CHECKED); + BOOL bUnderline = (IsDlgButtonChecked(hwndDlg, IDC_FOLDER_OPTIONS_ULPOINT) == BST_CHECKED); + BOOL bNewWindowMode = !(IsDlgButtonChecked(hwndDlg, IDC_FOLDER_OPTIONS_SAMEWINDOW) == BST_CHECKED); + + IntSetUnderlineState(bUnderline); + IntSetNewWindowMode(bNewWindowMode); + IntSetShellStateSettings(bDoubleClick, bUseCommonTasks); + return TRUE; } INT_PTR CALLBACK @@ -96,11 +368,15 @@ FolderOptionsGeneralDlg( WPARAM wParam, LPARAM lParam) { + static GENERAL_DIALOG general; + switch (uMsg) { case WM_INITDIALOG: - // FIXME - break; + general.hTaskIcon = NULL; + general.hFolderIcon = NULL; + general.hClickIcon = NULL; + return GeneralDlg_OnInitDialog(hwndDlg, &general); case WM_COMMAND: switch (LOWORD(wParam)) @@ -111,9 +387,20 @@ FolderOptionsGeneralDlg( case IDC_FOLDER_OPTIONS_OWNWINDOW: case IDC_FOLDER_OPTIONS_SINGLECLICK: case IDC_FOLDER_OPTIONS_DOUBLECLICK: + case IDC_FOLDER_OPTIONS_ULBROWSER: + case IDC_FOLDER_OPTIONS_ULPOINT: if (HIWORD(wParam) == BN_CLICKED) { - GeneralDlg_UpdateIcons(hwndDlg); + GeneralDlg_UpdateIcons(hwndDlg, LOWORD(wParam), &general); + + // Enable the 'Apply' button + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_FOLDER_OPTIONS_RESTORE: + if (HIWORD(wParam) == BN_CLICKED) + { + GeneralDlg_OnRestoreDefaults(hwndDlg, &general); // Enable the 'Apply' button PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -132,12 +419,15 @@ FolderOptionsGeneralDlg( break; case PSN_APPLY: - break; + return GeneralDlg_OnApply(hwndDlg, &general); } break; } case WM_DESTROY: + DestroyIcon(general.hTaskIcon); + DestroyIcon(general.hFolderIcon); + DestroyIcon(general.hClickIcon); break; default: diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 5dbe023dbb..a0b68c49c4 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -426,10 +426,10 @@ BEGIN GROUPBOX "Цъкането действа така:", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Отваряне с единично цъкане (избор с посочване)", IDC_FOLDER_OPTIONS_SINGLECLICK, 20, 120, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Подчертаване заглавията на значетата съгласно &обзорника ми", IDC_FOLDER_OPTIONS_ULBROWSER, 30, 220, 170, 10 - AUTORADIOBUTTON "Подчертаване на заглавията на значетата при &посочване", IDC_FOLDER_OPTIONS_ULPOINT, 30, 144, 220, 10 AUTORADIOBUTTON "&Отваряне с двойно цъкане (избиране с единично)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 20, 156, 170, 10 - PUSHBUTTON "От под&разбираните", 14011, 160, 180, 75, 14, WS_TABSTOP + AUTORADIOBUTTON "Подчертаване заглавията на значетата съгласно &обзорника ми", IDC_FOLDER_OPTIONS_ULBROWSER, 30, 220, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Подчертаване на заглавията на значетата при &посочване", IDC_FOLDER_OPTIONS_ULPOINT, 30, 144, 220, 10 + PUSHBUTTON "От под&разбираните", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 9a92161135..95f9cc776e 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 0a1905cf44..eaf95dd9b3 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -431,10 +431,10 @@ BEGIN GROUPBOX "Klikání na položky", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Jedno kliknutí k &otevření položky (vybrat ukázáním)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Podtrhávat názvy ikon podle &nastavení prohlížeče", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Podtrhávat názvy ikon jen &při ukázání na ně", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Dvojkliknutí k otevření položky (vybrat kliknutím)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "O&bnovit výchozí", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Podtrhávat názvy ikon podle &nastavení prohlížeče", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Podtrhávat názvy ikon jen &při ukázání na ně", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "O&bnovit výchozí", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index a802451416..e119183090 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -431,10 +431,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 9ae94d1281..186b4daeed 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Markieren von Elementen", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Öffnen durch &einfachen Klick (Markieren durch zeigen)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10 - AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 AUTORADIOBUTTON "&Öffnen durch &Doppelklick (Markieren durch einfachen Klick)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 - PUSHBUTTON "&Wiederherstellen", 14011, 191, 175, 65, 14, WS_TABSTOP + AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 + PUSHBUTTON "&Wiederherstellen", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 461412316e..7160496c3f 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index b1f407310c..28364b60cd 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c241717c34..8b3277d356 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -426,10 +426,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 5bcb9e93c3..be37170990 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -427,10 +427,10 @@ BEGIN GROUPBOX "Hacer clic en los elementos tal y como se indica ", -1, 7, 110, 279, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 220, 10 - AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10 AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 190, 10 - PUSHBUTTON "&Restaurar valores predeterminados", 14011, 146, 180, 140, 14, WS_TABSTOP + AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 220, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10 + PUSHBUTTON "&Restaurar valores predeterminados", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 294, 240 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 86c24be73a..da98d936c7 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -433,10 +433,10 @@ BEGIN GROUPBOX "Üksuste klõpsamine", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Kl&õps avab üksuse (osutamine valib)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Kriipsuta ikoonitiitlid &brauseri eeskujul alla", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Kriipsuta ikoonitiitlid alla ainult neile &osutamisel", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "Topeltklõps avab &üksuse (klõps valib)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Taasta vaikesätted", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Kriipsuta ikoonitiitlid &brauseri eeskujul alla", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Kriipsuta ikoonitiitlid alla ainult neile &osutamisel", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Taasta vaikesätted", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index f765907291..ca9a0eda15 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index ff9bd3aa62..6146ff582a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour le sélectionner)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "Pa&ramètres par défaut", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Toujours souligner les titres des icônes comme dans le navigateur", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "Pa&ramètres par défaut", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 3cdfd54207..2d40a8f1e4 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 20da80f245..edeaea40d2 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index ec9eee001c..ad7d311521 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click sugli elementi come segue", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10 - AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10 - PUSHBUTTON "&Ripristina le impostazioni predefinite", 14011, 120, 180, 120, 14, WS_TABSTOP + AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 + PUSHBUTTON "&Ripristina le impostazioni predefinite", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 4411c97342..a9368a78c6 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "項目のクリック方法", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "シングルクリックで項目を開く(ポイントで選択) (&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "ブラウザに合わせてアイコンタイトルに下線を引く(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10 - AUTORADIOBUTTON "ポイントしたときのみアイコンタイトルに下線を引く(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 AUTORADIOBUTTON "ダブルクリックで項目を開く(シングルクリックで選択)(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 - PUSHBUTTON "デフォルトに戻す(&R)", 14011, 180, 180, 75, 14, WS_TABSTOP + AUTORADIOBUTTON "ブラウザに合わせてアイコンタイトルに下線を引く(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ポイントしたときのみアイコンタイトルに下線を引く(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 + PUSHBUTTON "デフォルトに戻す(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 5b8e199128..ca1ae4f008 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 2f4103cac6..daf6033a27 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 5bdc11a98b..72cf948cf8 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Klikk enheter som følgende", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Enkelt-klikk for å åpne en enhet (peker for å velge)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Understrek ikon titteler konsekvent med min &utforsker", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 190, 10 - AUTORADIOBUTTON "Understrek ikon titteler bare mens jeg &peker på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10 AUTORADIOBUTTON "&Dobbelt klikk for å åpne enheten (Enkelt-klikk for å velge)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 194, 10 - PUSHBUTTON "&Bruk standard", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Understrek ikon titteler konsekvent med min &utforsker", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 190, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Understrek ikon titteler bare mens jeg &peker på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 190, 10 + PUSHBUTTON "&Bruk standard", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index cdb49c7a53..1dbc90695b 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -430,10 +430,10 @@ BEGIN GROUPBOX "Działanie przycisków myszki", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Pojedyncze kliknięcie by otworzyć cel (najechanie by wskazać)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Podkreś&laj tytuły ikon tak jak w przeglądarce", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 180, 10 - AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po najechaniu na nie kursorem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 AUTORADIOBUTTON "Po&dwójne kliknięcie by otworzyć (pojedyncze by wskazać)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 - PUSHBUTTON "Przywróć &domyślne", 14011, 175, 180, 80, 14, WS_TABSTOP + AUTORADIOBUTTON "Podkreś&laj tytuły ikon tak jak w przeglądarce", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po najechaniu na nie kursorem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 + PUSHBUTTON "Przywróć &domyślne", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 9a909a5bd7..c1cc8ebcd6 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Clique único para abrir um item (apontar para &selecionar)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Sublinhar títulos de ícones somente quando a&pontados", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "Clique &duplo para abrir um item (clique único para selecionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restaurar Padrões", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sublinhar títulos de ícones somente quando a&pontados", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restaurar Padrões", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index b839c16e96..0b5331b475 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Seleccione a seguinte opção", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Click simples para abrir um item", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Sublinhar os títulos dos ícones apenas quando &aponto para eles", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Duplo-click para abrir um item (um click para seleccionar)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restaurar valores por defeito", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Sublinhar os títulos dos ícones mantendo o aspecto do &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sublinhar os títulos dos ícones apenas quando &aponto para eles", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restaurar valores por defeito", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 105e5f59c6..692ad17b66 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -427,10 +427,10 @@ BEGIN GROUPBOX "Interacțiune elemente", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Deschide prin acțiune si&mplă (selecare prin indicare)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Subliniază titlurile la fel ca adresele &web", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Subliniază titlurile doar la pre&zența indicatorului", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "Deschide prin acțiune &dublă (selectare prin una simplă)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10 - PUSHBUTTON "&Restabilește opțiunile implicite", 14011, 130, 180, 126, 14, WS_TABSTOP + AUTORADIOBUTTON "Subliniază titlurile la fel ca adresele &web", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Subliniază titlurile doar la pre&zența indicatorului", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restabilește opțiunile implicite", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 2710757223..1932309ecc 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -427,10 +427,10 @@ BEGIN GROUPBOX "Щелчки мышью", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "От&крывать одним щелчком, выделять указателем", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 185, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Подчеркив&ать подписи значков", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Подчеркивать подписи з&начков при наведении", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 175, 10 AUTORADIOBUTTON "Откр&ывать двойным, а выделять одним щелчком", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 180, 10 - PUSHBUTTON "&Восстановить умолчания", 14011, 145, 180, 95, 14, WS_TABSTOP + AUTORADIOBUTTON "Подчеркив&ать подписи значков", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Подчеркивать подписи з&начков при наведении", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 175, 10 + PUSHBUTTON "&Восстановить умолчания", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 44ef8fc66a..82c3fff2dd 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index cf72566704..194984c2d0 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index ea81923b49..d30e49facc 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -429,10 +429,10 @@ BEGIN GROUPBOX "Klikoni artikuj si më poshtë", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Klikim-njëherësh për të hapur një objekt (pikë për të zgjedhur)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Nënvizo titull ikone në përputhje me shfletuesin tim", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Nënvizo ikonën vetëm në tituj ku unë vë pikë në ta", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "Kliko-dyherë për të hapur një objekt (klikoni-njëerësht për të zgjedhur)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Rikthe Parazgjedhjet", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Nënvizo titull ikone në përputhje me shfletuesin tim", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Nënvizo ikonën vetëm në tituj ku unë vë pikë në ta", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Rikthe Parazgjedhjet", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 4d3e6cd8db..16cfbea80f 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Klicka på objekt enligt följande", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Enkelklicka för att öppna (markera genom att peka)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Stryk under ikontitlar som min &webbläsare", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10 - AUTORADIOBUTTON "Stryk under ikontitlar endast när jag &pekar på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 AUTORADIOBUTTON "&Dubbelklicka för att öppna (markera genom att enkelklicka)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10 - PUSHBUTTON "&Återställ standardvärde", 14011, 160, 180, 90, 14, WS_TABSTOP + AUTORADIOBUTTON "Stryk under ikontitlar som min &webbläsare", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Stryk under ikontitlar endast när jag &pekar på dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 + PUSHBUTTON "&Återställ standardvärde", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 5b4027bcfa..de2688eb51 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -427,10 +427,10 @@ BEGIN GROUPBOX "Aşağıdaki Gibi Ögelere Tıkla", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Bir Öge Açmak İçin Tek Tıkla (Seçmek İçin Üzerine Git)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "T&arayıcımla Uyumlu Olarak Simge Başlıklarının Altını Çiz", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "&Simge Başlıklarının Yalnızca Onların Üzerine Gittiğimde Altını Çiz", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "B&ir Ögeyi Açmak İçin Çift Tıkla (Seçmek İçin Tek Tıkla)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Ön Tanımlıları Geri Getir", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "T&arayıcımla Uyumlu Olarak Simge Başlıklarının Altını Çiz", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "&Simge Başlıklarının Yalnızca Onların Üzerine Gittiğimde Altını Çiz", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Ön Tanımlıları Geri Getir", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index b88aca0b35..f7c390b2b4 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -425,10 +425,10 @@ BEGIN GROUPBOX "Клацання мишею", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "Від&кривати одиночним, виділяти вказівником", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Підкресл&ювати підписи значків", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Підкр&еслювати лише при наведенні", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "Відкрив&ати подвійним, виділяти одиночним", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Стандартно", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Підкресл&ювати підписи значків", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Підкр&еслювати лише при наведенні", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Стандартно", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 7912527f1d..a0ac5f220c 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -434,11 +434,11 @@ BEGIN AUTORADIOBUTTON "在不同窗口中打开不同的文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 GROUPBOX "打开项目的方式", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 - AUTORADIOBUTTON "通过单击打开项目(指向时选定)(&s)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "根据浏览器设置给图标标题加下划线(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "仅当指向图标标题时加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + AUTORADIOBUTTON "通过单击打开项目(指向时选定)(&S)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "双击要打开的项目(单击时选定)(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "还原为默认值(&R)", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "根据浏览器设置给图标标题加下划线(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "仅当指向图标标题时加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "还原为默认值(&R)", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 78fada1ff2..5dc86e8fa3 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -433,10 +433,10 @@ BEGIN GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 + PUSHBUTTON "&Restore Defaults", IDC_FOLDER_OPTIONS_RESTORE, 167, 175, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index a2c0858da4..483c9c88de 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -337,9 +337,10 @@ #define IDC_FOLDER_OPTIONS_SAMEWINDOW 14004 #define IDC_FOLDER_OPTIONS_OWNWINDOW 14005 #define IDC_FOLDER_OPTIONS_SINGLECLICK 14007 -#define IDC_FOLDER_OPTIONS_ULBROWSER 14008 -#define IDC_FOLDER_OPTIONS_ULPOINT 14009 -#define IDC_FOLDER_OPTIONS_DOUBLECLICK 14010 +#define IDC_FOLDER_OPTIONS_DOUBLECLICK 14008 +#define IDC_FOLDER_OPTIONS_ULBROWSER 14009 +#define IDC_FOLDER_OPTIONS_ULPOINT 14010 +#define IDC_FOLDER_OPTIONS_RESTORE 14011 /* Yes to all msgbox */ #define IDD_YESTOALL_MSGBOX 20

1 0

01/01: [EXPLORER] Simplify the current-shell-is-explorer check when trying to start the auto-start programs, by using the existing code.
by Hermès Bélusca-Maïto 22 Jun '18

22 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12de9654b05d0777451a4… commit 12de9654b05d0777451a43e75b640058d7d26440 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 22 16:34:16 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 22 16:34:16 2018 +0200 [EXPLORER] Simplify the current-shell-is-explorer check when trying to start the auto-start programs, by using the existing code. --- base/shell/explorer/explorer.cpp | 16 +++++++++------- base/shell/explorer/precomp.h | 1 + base/shell/explorer/startup.cpp | 17 +---------------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp index d696290322..78c308839c 100644 --- a/base/shell/explorer/explorer.cpp +++ b/base/shell/explorer/explorer.cpp @@ -24,7 +24,7 @@ HINSTANCE hExplorerInstance; HANDLE hProcessHeap; HKEY hkExplorer = NULL; -BOOL IsSelfTheShell = FALSE; +BOOL bExplorerIsShell = FALSE; class CExplorerModule : public CComModule { @@ -34,8 +34,8 @@ public: BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() -CExplorerModule gModule; -CAtlWinModule gWinModule; +CExplorerModule gModule; +CAtlWinModule gWinModule; static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) { @@ -206,16 +206,18 @@ _tWinMain(IN HINSTANCE hInstance, InitRSHELL(); -#if !WIN7_COMPAT_MODE - TRACE("Explorer starting... Commandline: %S\n", lpCmdLine); + TRACE("Explorer starting... Command line: %S\n", lpCmdLine); +#if !WIN7_COMPAT_MODE if (GetShellWindow() == NULL) - IsSelfTheShell = TRUE; + bExplorerIsShell = TRUE; - if (!IsSelfTheShell) + if (!bExplorerIsShell) { return StartWithCommandLine(hInstance); } +#else + bExplorerIsShell = TRUE; #endif return StartWithDesktop(hInstance); diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 9369106728..914add0a3e 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -61,6 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorernew); extern HINSTANCE hExplorerInstance; extern HANDLE hProcessHeap; extern HKEY hkExplorer; +extern BOOL bExplorerIsShell; #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) diff --git a/base/shell/explorer/startup.cpp b/base/shell/explorer/startup.cpp index 125bc0c39f..b8e048df41 100644 --- a/base/shell/explorer/startup.cpp +++ b/base/shell/explorer/startup.cpp @@ -386,21 +386,6 @@ INT ProcessStartupItems(VOID) return res ? 0 : 101; } -static BOOL IsSelfExplorer(VOID) -{ - WCHAR szPath[MAX_PATH], *pch; - static const WCHAR szExplorer[] = L"explorer.exe"; - - GetModuleFileName(NULL, szPath, _countof(szPath)); - - pch = PathFindFileNameW(szPath); - if (pch) - { - return (StrCmpIW(pch, szExplorer) == 0); - } - return (StrCmpIW(szPath, szExplorer) == 0); -} - BOOL DoFinishStartupItems(VOID) { if (s_hStartupMutex) @@ -416,7 +401,7 @@ BOOL DoStartStartupItems(ITrayWindow *Tray) { DWORD dwWait; - if (!IsSelfExplorer()) + if (!bExplorerIsShell) return FALSE; if (!s_hStartupMutex)

1 0

01/01: [USERINIT][EXPLORER] Fix auto startup of Start Menu (#594)
by Katayama Hirofumi MZ 22 Jun '18

22 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a8cd95cad36e7518ddb7… commit 0a8cd95cad36e7518ddb7256b3af9169789285f7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 22 23:02:25 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 22 16:02:25 2018 +0200 [USERINIT][EXPLORER] Fix auto startup of Start Menu (#594) - Remove code for Start-Menu auto-startup items from userinit and put it where it belongs: in explorer. CORE-10839 --- base/shell/explorer/explorer.cpp | 17 ++-- base/shell/explorer/precomp.h | 5 +- base/shell/explorer/startup.cpp | 191 +++++++++++++++++++++++++++++++++------ base/system/userinit/userinit.c | 49 ---------- 4 files changed, 177 insertions(+), 85 deletions(-) diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp index a596da1db7..d696290322 100644 --- a/base/shell/explorer/explorer.cpp +++ b/base/shell/explorer/explorer.cpp @@ -24,6 +24,7 @@ HINSTANCE hExplorerInstance; HANDLE hProcessHeap; HKEY hkExplorer = NULL; +BOOL IsSelfTheShell = FALSE; class CExplorerModule : public CComModule { @@ -132,10 +133,6 @@ StartWithDesktop(IN HINSTANCE hInstance) InitCommonControls(); OleInitialize(NULL); -#if !WIN7_DEBUG_MODE - ProcessStartupItems(); -#endif - #if !WIN7_COMPAT_MODE /* Initialize shell dde support */ _ShellDDEInit(TRUE); @@ -164,6 +161,12 @@ StartWithDesktop(IN HINSTANCE hInstance) /* WinXP: Notify msgina to hide the welcome screen */ if (!SetShellReadyEvent(L"msgina: ShellReadyEvent")) SetShellReadyEvent(L"Global\\msgina: ShellReadyEvent"); + + if (DoStartStartupItems(Tray)) + { + ProcessStartupItems(); + DoFinishStartupItems(); + } #endif if (Tray != NULL) @@ -204,14 +207,12 @@ _tWinMain(IN HINSTANCE hInstance, InitRSHELL(); #if !WIN7_COMPAT_MODE - BOOL CreateShellDesktop = FALSE; - TRACE("Explorer starting... Commandline: %S\n", lpCmdLine); if (GetShellWindow() == NULL) - CreateShellDesktop = TRUE; + IsSelfTheShell = TRUE; - if (!CreateShellDesktop) + if (!IsSelfTheShell) { return StartWithCommandLine(hInstance); } diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 228fc75c5f..9369106728 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -230,8 +230,9 @@ HRESULT ShutdownShellServices(HDPA hdpa); * startup.cpp */ -int -ProcessStartupItems(VOID); +BOOL DoStartStartupItems(ITrayWindow *Tray); +INT ProcessStartupItems(VOID); +BOOL DoFinishStartupItems(VOID); /* * trayprop.h diff --git a/base/shell/explorer/startup.cpp b/base/shell/explorer/startup.cpp index ab7a478a32..125bc0c39f 100644 --- a/base/shell/explorer/startup.cpp +++ b/base/shell/explorer/startup.cpp @@ -2,6 +2,7 @@ * Copyright (C) 2002 Andreas Mohr * Copyright (C) 2002 Shachar Shemesh * Copyright (C) 2013 Edijs Kolesnikovics + * Copyright (C) 2018 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +41,9 @@ #include "precomp.h" +// For the auto startup process +static HANDLE s_hStartupMutex = NULL; + #define INVALID_RUNCMD_RETURN -1 /** * This function runs the specified command in the specified dir. @@ -259,17 +263,83 @@ end: return res == ERROR_SUCCESS ? TRUE : FALSE; } +static BOOL +AutoStartupApplications(INT nCSIDL_Folder) +{ + WCHAR szPath[MAX_PATH] = { 0 }; + HRESULT hResult; + HANDLE hFind; + WIN32_FIND_DATAW FoundData; + size_t cchPathLen; + + TRACE("(%d)\n", nCSIDL_Folder); + + // Get the special folder path + hResult = SHGetFolderPathW(NULL, nCSIDL_Folder, NULL, SHGFP_TYPE_CURRENT, szPath); + cchPathLen = wcslen(szPath); + if (!SUCCEEDED(hResult) || cchPathLen == 0) + { + WARN("SHGetFolderPath() failed with error %lu\n", GetLastError()); + return FALSE; + } + + // Build a path with wildcard + StringCbCatW(szPath, sizeof(szPath), L"\\*"); + + // Start enumeration of files + hFind = FindFirstFileW(szPath, &FoundData); + if (hFind == INVALID_HANDLE_VALUE) + { + WARN("FindFirstFile(%s) failed with error %lu\n", debugstr_w(szPath), GetLastError()); + return FALSE; + } + + // Enumerate the files + do + { + // Ignore "." and ".." + if (wcscmp(FoundData.cFileName, L".") == 0 || + wcscmp(FoundData.cFileName, L"..") == 0) + { + continue; + } + + // Don't run hidden files + if (FoundData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + continue; + + // Build the path + szPath[cchPathLen + 1] = UNICODE_NULL; + StringCbCatW(szPath, sizeof(szPath), FoundData.cFileName); + + TRACE("Executing %s in directory %s\n", debugstr_w(FoundData.cFileName), debugstr_w(szPath)); + + DWORD dwType; + if (GetBinaryTypeW(szPath, &dwType)) + { + runCmd(szPath, NULL, TRUE, FALSE); + } + else + { + SHELLEXECUTEINFOW ExecInfo; + ZeroMemory(&ExecInfo, sizeof(ExecInfo)); + ExecInfo.cbSize = sizeof(ExecInfo); + ExecInfo.lpFile = szPath; + ShellExecuteExW(&ExecInfo); + } + } while (FindNextFileW(hFind, &FoundData)); + + FindClose(hFind); + return TRUE; +} -int -ProcessStartupItems(VOID) +INT ProcessStartupItems(VOID) { /* TODO: ProcessRunKeys already checks SM_CLEANBOOT -- items prefixed with * should probably run even in safe mode */ BOOL bNormalBoot = GetSystemMetrics(SM_CLEANBOOT) == 0; /* Perform the operations that are performed every boot */ /* First, set the current directory to SystemRoot */ WCHAR gen_path[MAX_PATH]; DWORD res; - HKEY hSessionKey, hKey; - HRESULT hr; res = GetWindowsDirectoryW(gen_path, _countof(gen_path)); if (res == 0) @@ -286,28 +356,9 @@ ProcessStartupItems(VOID) return 100; } - hr = SHCreateSessionKey(KEY_WRITE, &hSessionKey); - if (SUCCEEDED(hr)) - { - LONG Error; - DWORD dwDisp; - - Error = RegCreateKeyExW(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp); - RegCloseKey(hSessionKey); - if (Error == ERROR_SUCCESS) - { - RegCloseKey(hKey); - if (dwDisp == REG_OPENED_EXISTING_KEY) - { - /* Startup programs has already been run */ - return 0; - } - } - } - /* Perform the operations by order checking if policy allows it, checking if this is not Safe Mode, * stopping if one fails, skipping if necessary. - */ + */ res = TRUE; /* TODO: RunOnceEx */ @@ -320,9 +371,11 @@ ProcessStartupItems(VOID) if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0)) res = ProcessRunKeys(HKEY_CURRENT_USER, L"Run", FALSE, FALSE); - /* TODO: All users Startup folder */ + /* All users Startup folder */ + AutoStartupApplications(CSIDL_COMMON_STARTUP); - /* TODO: Current user Startup folder */ + /* Current user Startup folder */ + AutoStartupApplications(CSIDL_STARTUP); /* TODO: HKCU\RunOnce runs even if StartupHasBeenRun exists */ if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0)) @@ -332,3 +385,89 @@ ProcessStartupItems(VOID) return res ? 0 : 101; } + +static BOOL IsSelfExplorer(VOID) +{ + WCHAR szPath[MAX_PATH], *pch; + static const WCHAR szExplorer[] = L"explorer.exe"; + + GetModuleFileName(NULL, szPath, _countof(szPath)); + + pch = PathFindFileNameW(szPath); + if (pch) + { + return (StrCmpIW(pch, szExplorer) == 0); + } + return (StrCmpIW(szPath, szExplorer) == 0); +} + +BOOL DoFinishStartupItems(VOID) +{ + if (s_hStartupMutex) + { + ReleaseMutex(s_hStartupMutex); + CloseHandle(s_hStartupMutex); + s_hStartupMutex = NULL; + } + return TRUE; +} + +BOOL DoStartStartupItems(ITrayWindow *Tray) +{ + DWORD dwWait; + + if (!IsSelfExplorer()) + return FALSE; + + if (!s_hStartupMutex) + { + // Accidentally, there is possibility that the system starts multiple Explorers + // before startup of shell. We use a mutex to match the timing of shell initialization. + s_hStartupMutex = CreateMutexW(NULL, FALSE, L"ExplorerIsShellMutex"); + if (s_hStartupMutex == NULL) + return FALSE; + } + + dwWait = WaitForSingleObject(s_hStartupMutex, INFINITE); + TRACE("dwWait: 0x%08lX\n", dwWait); + if (dwWait != WAIT_OBJECT_0) + { + TRACE("LastError: %ld\n", GetLastError()); + + DoFinishStartupItems(); + return FALSE; + } + + const DWORD dwWaitTotal = 3000; // in milliseconds + DWORD dwTick = GetTickCount(); + while (GetShellWindow() == NULL && GetTickCount() - dwTick < dwWaitTotal) + { + TrayProcessMessages(Tray); + } + + if (GetShellWindow() == NULL) + { + DoFinishStartupItems(); + return FALSE; + } + + // Check the volatile "StartupHasBeenRun" key + HKEY hSessionKey, hKey; + HRESULT hr = SHCreateSessionKey(KEY_WRITE, &hSessionKey); + if (SUCCEEDED(hr)) + { + ASSERT(hSessionKey); + + DWORD dwDisp; + LONG Error = RegCreateKeyExW(hSessionKey, L"StartupHasBeenRun", 0, NULL, + REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp); + RegCloseKey(hSessionKey); + RegCloseKey(hKey); + if (Error == ERROR_SUCCESS && dwDisp == REG_OPENED_EXISTING_KEY) + { + return FALSE; // Startup programs has already been run + } + } + + return TRUE; +} diff --git a/base/system/userinit/userinit.c b/base/system/userinit/userinit.c index 4d250afa26..4369a499c2 100644 --- a/base/system/userinit/userinit.c +++ b/base/system/userinit/userinit.c @@ -182,53 +182,6 @@ GetShell( } } -static VOID -StartAutoApplications( - IN INT clsid) -{ - WCHAR szPath[MAX_PATH] = {0}; - HRESULT hResult; - HANDLE hFind; - WIN32_FIND_DATAW findData; - SHELLEXECUTEINFOW ExecInfo; - size_t len; - - TRACE("(%d)\n", clsid); - - hResult = SHGetFolderPathW(NULL, clsid, NULL, SHGFP_TYPE_CURRENT, szPath); - len = wcslen(szPath); - if (!SUCCEEDED(hResult) || len == 0) - { - WARN("SHGetFolderPath() failed with error %lu\n", GetLastError()); - return; - } - - wcscat(szPath, L"\\*"); - hFind = FindFirstFileW(szPath, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - WARN("FindFirstFile(%s) failed with error %lu\n", debugstr_w(szPath), GetLastError()); - return; - } - - do - { - if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (findData.nFileSizeHigh || findData.nFileSizeLow)) - { - ZeroMemory(&ExecInfo, sizeof(ExecInfo)); - ExecInfo.cbSize = sizeof(ExecInfo); - wcscpy(&szPath[len+1], findData.cFileName); - ExecInfo.lpVerb = L"open"; - ExecInfo.lpFile = szPath; - ExecInfo.lpDirectory = NULL; - TRACE("Executing %s in directory %s\n", - debugstr_w(findData.cFileName), debugstr_w(szPath)); - ShellExecuteExW(&ExecInfo); - } - } while (FindNextFileW(hFind, &findData)); - FindClose(hFind); -} - static BOOL TryToStartShell( IN LPCWSTR Shell) @@ -262,8 +215,6 @@ TryToStartShell( return FALSE; } - StartAutoApplications(CSIDL_STARTUP); - StartAutoApplications(CSIDL_COMMON_STARTUP); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); return TRUE;

1 0

01/01: [SHELL32] Fix desktop.ini folder icon (#595)
by Katayama Hirofumi MZ 22 Jun '18

22 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8926dccbd70aafb399e3… commit f8926dccbd70aafb399e3ba6e54b8043c5699c45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 22 22:37:03 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jun 22 15:37:03 2018 +0200 [SHELL32] Fix desktop.ini folder icon (#595) The folder icon location specified in desktop.ini of a folder should accept its relative path. CORE-9196 --- dll/win32/shell32/folders/CFSFolder.cpp | 136 ++++++++++++++++++++++---------- 1 file changed, 93 insertions(+), 43 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 15039eac60..6928bf13b5 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -129,67 +129,117 @@ HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pcl return S_OK; } -static HRESULT getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, - LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +static HRESULT +getDefaultIconLocation(LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT uFlags) { - static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; + static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; + + if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, piIndex)) + { + lstrcpynW(szIconFile, swShell32Name, cchMax); + *piIndex = -IDI_SHELL_FOLDER; + } + + if (uFlags & GIL_OPENICON) + { + // next icon + if (*piIndex < 0) + (*piIndex)--; + else + (*piIndex)++; + } + + return S_OK; +} + +static const WCHAR s_shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; + +static BOOL +getShellClassInfo(LPCWSTR Entry, LPWSTR pszValue, DWORD cchValueLen, LPCWSTR IniFile) +{ + return GetPrivateProfileStringW(s_shellClassInfo, Entry, NULL, pszValue, cchValueLen, IniFile); +} + +static HRESULT +getIconLocationForFolder(IShellFolder * psf, LPCITEMIDLIST pidl, UINT uFlags, + LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) +{ + DWORD dwFileAttrs; + WCHAR wszPath[MAX_PATH]; + WCHAR wszIniFullPath[MAX_PATH]; static const WCHAR iconFile[] = { 'I', 'c', 'o', 'n', 'F', 'i', 'l', 'e', 0 }; static const WCHAR clsid[] = { 'C', 'L', 'S', 'I', 'D', 0 }; static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; + static const WCHAR iconResource[] = { 'I', 'c', 'o', 'n', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 0 }; static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; - int icon_idx; - if (!(uFlags & GIL_DEFAULTICON) && (_ILGetFileAttributes(ILFindLastID(pidl), NULL, 0) & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0 ) - { - WCHAR wszFolderPath[MAX_PATH]; + if (uFlags & GIL_DEFAULTICON) + goto Quit; - if (!ILGetDisplayNameExW(psf, pidl, wszFolderPath, 0)) - return FALSE; + // get path + SHGetPathFromIDListW(pidl, wszPath); + if (!PathIsDirectoryW(wszPath)) + goto Quit; - PathAppendW(wszFolderPath, wszDesktopIni); + // read-only or system folder? + dwFileAttrs = GetFileAttributes(wszPath); + if ((dwFileAttrs & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) == 0) + goto Quit; - if (PathFileExistsW(wszFolderPath)) - { - WCHAR wszPath[MAX_PATH]; - WCHAR wszCLSIDValue[CHARS_IN_GUID]; + // build the full path of ini file + StringCchCopyW(wszIniFullPath, _countof(wszIniFullPath), wszPath); + PathAppendW(wszIniFullPath, wszDesktopIni); - if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) - { - ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); + WCHAR wszValue[MAX_PATH], wszTemp[MAX_PATH]; + if (getShellClassInfo(iconFile, wszValue, _countof(wszValue), wszIniFullPath)) + { + // wszValue --> wszTemp + ExpandEnvironmentStringsW(wszValue, wszTemp, _countof(wszTemp)); - *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; - } - } - } + // wszPath + wszTemp --> wszPath + if (PathIsRelativeW(wszTemp)) + PathAppendW(wszPath, wszTemp); + else + StringCchCopyW(wszPath, _countof(wszPath), wszTemp); - static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; + // wszPath --> szIconFile + GetFullPathNameW(wszPath, cchMax, szIconFile, NULL); - if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, &icon_idx)) + *piIndex = GetPrivateProfileIntW(s_shellClassInfo, iconIndex, 0, wszIniFullPath); + return S_OK; + } + else if (getShellClassInfo(clsid, wszValue, _countof(wszValue), wszIniFullPath) && + HCR_GetIconW(wszValue, szIconFile, NULL, cchMax, piIndex)) { - lstrcpynW(szIconFile, swShell32Name, cchMax); - icon_idx = -IDI_SHELL_FOLDER; + return S_OK; } + else if (getShellClassInfo(clsid2, wszValue, _countof(wszValue), wszIniFullPath) && + HCR_GetIconW(wszValue, szIconFile, NULL, cchMax, piIndex)) + { + return S_OK; + } + else if (getShellClassInfo(iconResource, wszValue, _countof(wszValue), wszIniFullPath)) + { + // wszValue --> wszTemp + ExpandEnvironmentStringsW(wszValue, wszTemp, _countof(wszTemp)); - if (uFlags & GIL_OPENICON) - *piIndex = icon_idx < 0 ? icon_idx - 1 : icon_idx + 1; - else - *piIndex = icon_idx; + // parse the icon location + *piIndex = PathParseIconLocationW(wszTemp); - return S_OK; + // wszPath + wszTemp --> wszPath + if (PathIsRelativeW(wszTemp)) + PathAppendW(wszPath, wszTemp); + else + StringCchCopyW(wszPath, _countof(wszPath), wszTemp); + + // wszPath --> szIconFile + GetFullPathNameW(wszPath, cchMax, szIconFile, NULL); + return S_OK; + } + +Quit: + return getDefaultIconLocation(szIconFile, cchMax, piIndex, uFlags); } HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID iid, LPVOID * ppvOut)

1 0

01/01: [EXPLORER] 'Run' (Win+R) should set the proper current directory (#593)
by Katayama Hirofumi MZ 21 Jun '18

21 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c84f39830697b4f1c55cc… commit c84f39830697b4f1c55ccdea1e79b6dfc7b5835b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jun 22 01:18:57 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 21 18:18:57 2018 +0200 [EXPLORER] 'Run' (Win+R) should set the proper current directory (#593) --- base/shell/explorer/traywnd.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 4095bc1046..2484b23f77 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> + * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * this library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -365,7 +366,13 @@ public: m_RunFileDlgOwner = hwnd; - RunFileDlg(hwnd, NULL, NULL, NULL, NULL, RFF_CALCDIRECTORY); + // build the default directory from two environment variables + CStringW strDefaultDir, strHomePath; + strDefaultDir.GetEnvironmentVariable(L"HOMEDRIVE"); + strHomePath.GetEnvironmentVariable(L"HOMEPATH"); + strDefaultDir += strHomePath; + + RunFileDlg(hwnd, NULL, (LPCWSTR)strDefaultDir, NULL, NULL, RFF_CALCDIRECTORY); m_RunFileDlgOwner = NULL; ::DestroyWindow(hwnd);

1 0

01/01: [WELCOME] Add Hindi translation (#620)
by Arnav Bhatt 21 Jun '18

21 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c771a6d339707e8698ce9… commit c771a6d339707e8698ce90d35953df31b315ea6d Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Thu Jun 21 17:37:03 2018 +0530 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 21 14:07:03 2018 +0200 [WELCOME] Add Hindi translation (#620) --- base/setup/welcome/lang/hi-IN.rc | 45 ++++++++++++++++++++++++++++++++++++++++ base/setup/welcome/welcome.rc | 3 +++ 2 files changed, 48 insertions(+) diff --git a/base/setup/welcome/lang/hi-IN.rc b/base/setup/welcome/lang/hi-IN.rc new file mode 100644 index 0000000000..f1924ec8c6 --- /dev/null +++ b/base/setup/welcome/lang/hi-IN.rc @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS Welcome Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: To make Hindi translation of Welcome + * COPYRIGHT: Copyright 2018 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +/* String Tables */ + +/* Default settings */ +STRINGTABLE +BEGIN + IDS_APPTITLE "रिऐक्ट ओएस - स्वागत है" + IDS_DEFAULT_TOPIC_TITLE "रिऐक्ट ओएस" + IDS_DEFAULT_TOPIC_DESC "रिऐक्ट ओएस ऑपरेटिंग सिस्टम में आपका स्वागत ह।\n\nबांए विषय पर क्लिक करें।" + IDS_FONTNAME "Kruti Dev" + IDS_CHECKTEXT "&इस डॉयलाग को दोबारा दिखाएं" + IDS_CLOSETEXT "&इग्ज़िट" +END + +/* Topic buttons */ +STRINGTABLE +BEGIN + IDS_TOPIC_BUTTON0 "&रिऐक्ट ओएस इंस्टॉल करें" + IDS_TOPIC_BUTTON1 "&इस सीडी को ब्राउज़ करें" + IDS_TOPIC_BUTTON2 "&इग्ज़िट" +END + +/* Topic titles */ +STRINGTABLE +BEGIN + IDS_TOPIC_TITLE0 "रिऐक्ट ओएस इंस्टॉल करें" + IDS_TOPIC_TITLE1 "इस सीडी को ब्राउज़ करें" + IDS_TOPIC_TITLE2 "इग्ज़िट" +END + +/* Topic descriptions */ +STRINGTABLE +BEGIN + IDS_TOPIC_DESC0 "अपने कम्प्यृटर पर नया रिऐक्ट ओएस इंस्टॉलेशन बनाएँ या वर्तमान इंस्टॉलेशन को अपग्रेड करें।" + IDS_TOPIC_DESC1 "इस सीडी को ब्राउज़ करें।" + IDS_TOPIC_DESC2 "एप्लीकेशन इग्ज़िट करने के लिए क्लिक करें।" +END diff --git a/base/setup/welcome/welcome.rc b/base/setup/welcome/welcome.rc index f179ba9700..58b25ede42 100644 --- a/base/setup/welcome/welcome.rc +++ b/base/setup/welcome/welcome.rc @@ -61,6 +61,9 @@ END #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

01/01: [LOG2LINES] translate_line(): Let 'offset' be an 'unsigned int', instead of a 'size_t' (#624)
by Serge Gautherie 21 Jun '18

21 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f1a29e1b1728b05caa28… commit 4f1a29e1b1728b05caa2813e13a36251e9759a3d Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 21 14:05:35 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 21 14:05:35 2018 +0200 [LOG2LINES] translate_line(): Let 'offset' be an 'unsigned int', instead of a 'size_t' (#624) Avoids half-uninitialized value on, i.e., Linux 64-bit (with ReactOS 32-bit). CORE-14737 --- sdk/tools/log2lines/log2lines.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/tools/log2lines/log2lines.c b/sdk/tools/log2lines/log2lines.c index b771a41ff0..606b57af14 100644 --- a/sdk/tools/log2lines/log2lines.c +++ b/sdk/tools/log2lines/log2lines.c @@ -322,7 +322,7 @@ remove_mark(char *Line) static void translate_line(FILE *outFile, char *Line, char *path, char *LineOut) { - size_t offset; + unsigned int offset; int cnt, res; char *sep, *tail, *mark, *s; unsigned char ch; @@ -346,7 +346,7 @@ translate_line(FILE *outFile, char *Line, char *path, char *LineOut) if (sep) { *sep = ' '; - cnt = sscanf(s, "<%s %x%c", path, (unsigned int *)(&offset), &ch); + cnt = sscanf(s, "<%s %x%c", path, &offset, &ch); if (opt_undo) { if (cnt == 3 && ch == ' ') @@ -360,12 +360,12 @@ translate_line(FILE *outFile, char *Line, char *path, char *LineOut) mark = opt_mark ? "* " : ""; if (opt_redo && !(res = translate_file(path, offset, LineOut))) { - log(outFile, "%s<%s:%x (%s)>%s", mark, path, (unsigned int)offset, LineOut, tail); + log(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); summ.redo++; } else { - log(outFile, "%s<%s:%x>%s", mark, path, (unsigned int)offset, tail); + log(outFile, "%s<%s:%x>%s", mark, path, offset, tail); summ.undo++; } } @@ -386,7 +386,7 @@ translate_line(FILE *outFile, char *Line, char *path, char *LineOut) if (!(res = translate_file(path, offset, LineOut))) { mark = opt_mark ? "* " : ""; - log(outFile, "%s<%s:%x (%s)>%s", mark, path, (unsigned int)offset, LineOut, tail); + log(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); summ.translated++; } else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs