[REGEDIT] Address Review-comment, no edit-war with Thomas is intended here

I preferred to keep it more insync with the backports, but that is no hard requirement ofc.
[REGEDIT] Addendum to 1ee9ea4518
2025-10-06 08:22:58 +02:00 · 2023-04-16 18:20:14 +02:00 · 2023-04-16 17:51:20 +02:00 · 2023-04-16 17:43:31 +02:00 · 2023-04-16 17:30:39 +02:00 · 2023-04-16 17:29:30 +02:00
35 changed files with 21 additions and 199 deletions
--- a/base/applications/regedit/childwnd.c
+++ b/base/applications/regedit/childwnd.c
@@ -24,7 +24,6 @@ ChildWnd* g_pChildWnd;
 static int last_split;
 HBITMAP SizingPattern = 0;
 HBRUSH  SizingBrush = 0;
-WCHAR Suggestions[256];

 extern LPCWSTR get_root_key_name(HKEY hRootKey)
 {
@@ -129,84 +128,6 @@ static void finish_splitbar(HWND hWnd, int x)
    ReleaseCapture();
 }

-/*******************************************************************************
- *
- *  Key suggestion
- */
-
-#define MIN(a,b)    ((a < b) ? (a) : (b))
-
-static void SuggestKeys(HKEY hRootKey, LPCWSTR pszKeyPath, LPWSTR pszSuggestions,
-                        size_t iSuggestionsLength)
-{
-    WCHAR szBuffer[256];
-    WCHAR szLastFound[256];
-    size_t i;
-    HKEY hOtherKey, hSubKey;
-    BOOL bFound;
-
-    memset(pszSuggestions, 0, iSuggestionsLength * sizeof(*pszSuggestions));
-    iSuggestionsLength--;
-
-    /* Are we a root key in HKEY_CLASSES_ROOT? */
-    if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !wcschr(pszKeyPath, L'\\'))
-    {
-        do
-        {
-            bFound = FALSE;
-
-            /* Check default key */
-            if (QueryStringValue(hRootKey, pszKeyPath, NULL,
-                                 szBuffer, ARRAY_SIZE(szBuffer)) == ERROR_SUCCESS)
-            {
-                /* Sanity check this key; it cannot be empty, nor can it be a
-                 * loop back */
-                if ((szBuffer[0] != L'\0') && _wcsicmp(szBuffer, pszKeyPath))
-                {
-                    if (RegOpenKeyW(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS)
-                    {
-                        lstrcpynW(pszSuggestions, L"HKCR\\", (int) iSuggestionsLength);
-                        i = wcslen(pszSuggestions);
-                        pszSuggestions += i;
-                        iSuggestionsLength -= i;
-
-                        lstrcpynW(pszSuggestions, szBuffer, (int) iSuggestionsLength);
-                        i = MIN(wcslen(pszSuggestions) + 1, iSuggestionsLength);
-                        pszSuggestions += i;
-                        iSuggestionsLength -= i;
-                        RegCloseKey(hOtherKey);
-
-                        bFound = TRUE;
-                        wcscpy(szLastFound, szBuffer);
-                        pszKeyPath = szLastFound;
-                    }
-                }
-            }
-        }
-        while(bFound && (iSuggestionsLength > 0));
-
-        /* Check CLSID key */
-        if (RegOpenKeyW(hRootKey, pszKeyPath, &hSubKey) == ERROR_SUCCESS)
-        {
-            if (QueryStringValue(hSubKey, L"CLSID", NULL, szBuffer,
-                                 ARRAY_SIZE(szBuffer)) == ERROR_SUCCESS)
-            {
-                lstrcpynW(pszSuggestions, L"HKCR\\CLSID\\", (int)iSuggestionsLength);
-                i = wcslen(pszSuggestions);
-                pszSuggestions += i;
-                iSuggestionsLength -= i;
-
-                lstrcpynW(pszSuggestions, szBuffer, (int)iSuggestionsLength);
-                i = MIN(wcslen(pszSuggestions) + 1, iSuggestionsLength);
-                pszSuggestions += i;
-                iSuggestionsLength -= i;
-            }
-            RegCloseKey(hSubKey);
-        }
-    }
-}
-
-
 LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    WNDPROC oldwndproc;
@@ -555,13 +476,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
            HMENU hContextMenu;
            TVITEMW item;
            MENUITEMINFOW mii;
-            WCHAR resource[256];
            WCHAR buffer[256];
-            LPWSTR s;
-            LPCWSTR keyPath;
-            HKEY hRootKey;
-            int iLastPos;
-            WORD wID;
            BOOL isRoot;

            pt.x = (short) LOWORD(lParam);
@@ -595,7 +510,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem);

                isRoot = (TreeView_GetParent(g_pChildWnd->hTreeWnd, hti.hItem) == NULL);
-                hContextMenu = GetSubMenu(hPopupMenus, isRoot ?  PM_ROOTITEM : PM_TREECONTEXT);
+                hContextMenu = GetSubMenu(hPopupMenus, isRoot ? PM_ROOTITEM : PM_TREECONTEXT);

                memset(&item, 0, sizeof(item));
                item.mask = TVIF_STATE | TVIF_CHILDREN;
@@ -611,52 +526,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
                mii.wID = (item.state & TVIS_EXPANDED) ? ID_TREE_COLLAPSEBRANCH : ID_TREE_EXPANDBRANCH;
                mii.dwTypeData = (LPWSTR) buffer;
                SetMenuItemInfo(hContextMenu, 0, TRUE, &mii);
-
-                if (isRoot == FALSE)
-                {
-                    /* Remove any existing suggestions */
-                    memset(&mii, 0, sizeof(mii));
-                    mii.cbSize = sizeof(mii);
-                    mii.fMask = MIIM_ID;
-                    GetMenuItemInfo(hContextMenu, GetMenuItemCount(hContextMenu) - 1, TRUE, &mii);
-                    if ((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX))
-                    {
-                        do
-                        {
-                            iLastPos = GetMenuItemCount(hContextMenu) - 1;
-                            GetMenuItemInfo(hContextMenu, iLastPos, TRUE, &mii);
-                            RemoveMenu(hContextMenu, iLastPos, MF_BYPOSITION);
-                        }
-                        while((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX));
-                    }
-
-                    /* Come up with suggestions */
-                    keyPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hRootKey);
-                    SuggestKeys(hRootKey, keyPath, Suggestions, ARRAY_SIZE(Suggestions));
-                    if (Suggestions[0])
-                    {
-                        AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL);
-
-                        LoadStringW(hInst, IDS_GOTO_SUGGESTED_KEY, resource, ARRAY_SIZE(resource));
-
-                        s = Suggestions;
-                        wID = ID_TREE_SUGGESTION_MIN;
-                        while(*s && (wID <= ID_TREE_SUGGESTION_MAX))
-                        {
-                            _snwprintf(buffer, ARRAY_SIZE(buffer), resource, s);
-
-                            memset(&mii, 0, sizeof(mii));
-                            mii.cbSize = sizeof(mii);
-                            mii.fMask = MIIM_STRING | MIIM_ID;
-                            mii.wID = wID++;
-                            mii.dwTypeData = buffer;
-                            InsertMenuItem(hContextMenu, GetMenuItemCount(hContextMenu), TRUE, &mii);
-
-                            s += wcslen(s) + 1;
-                        }
-                    }
-                }
-                TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd/*g_pChildWnd->hWnd*/, NULL);
+                TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL);
            }
        }
        break;
--- a/base/applications/regedit/clb/lang/tr-TR.rc
+++ b/base/applications/regedit/clb/lang/tr-TR.rc
@@ -1,4 +1,4 @@
-/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+/* TRANSLATOR: 2013-2014 Erdem Ersoy (eersoy93) <erdemersoy@erdemersoy.net> */

 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

@@ -9,7 +9,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
   GROUPBOX "Sütün Listesi Kutusu Biçimleri", -1, 6, 7, 158, 71
   CHECKBOX "&Standart", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&Sınır", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+   CHECKBOX "&Hudut", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   CHECKBOX "&Diz", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   CHECKBOX "&Bildir", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   CHECKBOX "D&ikey Kaydırma Çubuğu", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
@@ -19,7 +19,7 @@ BEGIN
   CHECKBOX "&Esnek Sütunlar", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   GROUPBOX "Temel Biçimler", -1, 6, 80, 158, 34
   CHECKBOX "Gö&rünür", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "Dev&re Dışı", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+   CHECKBOX "Edi&lgin", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   CHECKBOX "Gru&plama", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   CHECKBOX "&Sekme Durağı", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
   PUSHBUTTON "Tamam", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
--- a/base/applications/regedit/framewnd.c
+++ b/base/applications/regedit/framewnd.c
@@ -33,8 +33,6 @@
 static WCHAR s_szFavoritesRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit\\Favorites";

 static BOOL bInMenuLoop = FALSE;        /* Tells us if we are in the menu loop */
-
-extern WCHAR Suggestions[256];
 /*******************************************************************************
 * Local module support methods
 */
@@ -1319,18 +1317,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                ChooseFavorite(szFavorite);
            }
        }
-        else if ((LOWORD(wParam) >= ID_TREE_SUGGESTION_MIN) && (LOWORD(wParam) <= ID_TREE_SUGGESTION_MAX))
-        {
-            WORD wID = LOWORD(wParam);
-            LPCWSTR s = Suggestions;
-            while(wID > ID_TREE_SUGGESTION_MIN)
-            {
-                if (*s)
-                    s += wcslen(s) + 1;
-                wID--;
-            }
-            SelectNode(g_pChildWnd->hTreeWnd, s);
-        }
        else
        {
            result = FALSE;
--- a/base/applications/regedit/lang/bg-BG.rc
+++ b/base/applications/regedit/lang/bg-BG.rc
@@ -455,7 +455,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Разгръщане"
    IDS_COLLAPSE "&Свиване"
-    IDS_GOTO_SUGGESTED_KEY "&Отиване на '%s'"
    IDS_FINISHEDFIND "Търсенето в регистъра приключи."
 END

--- a/base/applications/regedit/lang/cs-CZ.rc
+++ b/base/applications/regedit/lang/cs-CZ.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Rozbalit"
    IDS_COLLAPSE "&Sbalit"
-    IDS_GOTO_SUGGESTED_KEY "&Jít na '%s'"
    IDS_FINISHEDFIND "Prohledávání registru bylo dokončeno."
 END

--- a/base/applications/regedit/lang/de-DE.rc
+++ b/base/applications/regedit/lang/de-DE.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expandieren"
    IDS_COLLAPSE "&Schließen"
-    IDS_GOTO_SUGGESTED_KEY "&Gehe zu '%s'"
    IDS_FINISHEDFIND "Durchsuchen der Registry beendet."
 END

--- a/base/applications/regedit/lang/el-GR.rc
+++ b/base/applications/regedit/lang/el-GR.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Μετάβαση σε '%s'"
    IDS_FINISHEDFIND "Τέλος αναζήτησης στη registry."
 END

--- a/base/applications/regedit/lang/en-US.rc
+++ b/base/applications/regedit/lang/en-US.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/es-ES.rc
+++ b/base/applications/regedit/lang/es-ES.rc
@@ -453,7 +453,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expandir"
    IDS_COLLAPSE "&Contraer"
-    IDS_GOTO_SUGGESTED_KEY "&Ir a '%s'"
    IDS_FINISHEDFIND "Ha terminado la búsqueda en el Registro."
 END

--- a/base/applications/regedit/lang/fr-FR.rc
+++ b/base/applications/regedit/lang/fr-FR.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "Dérouler"
    IDS_COLLAPSE "Réduire"
-    IDS_GOTO_SUGGESTED_KEY "Aller à '%s'"
    IDS_FINISHEDFIND "Recherche dans le registre terminée."
 END

--- a/base/applications/regedit/lang/he-IL.rc
+++ b/base/applications/regedit/lang/he-IL.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "הרחב"
    IDS_COLLAPSE "כווץ"
-    IDS_GOTO_SUGGESTED_KEY "עבור אל '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/hu-HU.rc
+++ b/base/applications/regedit/lang/hu-HU.rc
@@ -128,7 +128,7 @@ BEGIN
        MENUITEM SEPARATOR
        MENUITEM "&Refresh\tF5", ID_VIEW_REFRESH
    END
-    POPUP "&Favorites"
+    POPUP "F&avorites"
    BEGIN
        MENUITEM "&Add to Favorites", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED
        MENUITEM "&Remove Favorite", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/id-ID.rc
+++ b/base/applications/regedit/lang/id-ID.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "Pe&rluas"
    IDS_COLLAPSE "Per&sempit"
-    IDS_GOTO_SUGGESTED_KEY "&Pergi ke '%s'"
    IDS_FINISHEDFIND "Selesai mencari di seluruh registri."
 END

--- a/base/applications/regedit/lang/it-IT.rc
+++ b/base/applications/regedit/lang/it-IT.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Espandi"
    IDS_COLLAPSE "&Raccogli"
-    IDS_GOTO_SUGGESTED_KEY "&Vai a '%s'"
    IDS_FINISHEDFIND "Fine ricerca nel registro."
 END

--- a/base/applications/regedit/lang/ja-JP.rc
+++ b/base/applications/regedit/lang/ja-JP.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "展開(&E)"
    IDS_COLLAPSE "閉じる(&C)"
-    IDS_GOTO_SUGGESTED_KEY "'%s' へ移動する(&G)"
    IDS_FINISHEDFIND "レジストリをすべて検索しました。"
 END

--- a/base/applications/regedit/lang/ko-KR.rc
+++ b/base/applications/regedit/lang/ko-KR.rc
@@ -452,7 +452,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "확장(&E)"
    IDS_COLLAPSE "축소(&C)"
-    IDS_GOTO_SUGGESTED_KEY "'%s'로 가기(&G)"
    IDS_FINISHEDFIND "레지스트리 검색을 완료했습니다."
 END

--- a/base/applications/regedit/lang/nl-NL.rc
+++ b/base/applications/regedit/lang/nl-NL.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/no-NO.rc
+++ b/base/applications/regedit/lang/no-NO.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Utvid"
    IDS_COLLAPSE "&Minimer"
-    IDS_GOTO_SUGGESTED_KEY "&Gå til '%s'"
    IDS_FINISHEDFIND "Søket i registret er fullført."
 END

--- a/base/applications/regedit/lang/pl-PL.rc
+++ b/base/applications/regedit/lang/pl-PL.rc
@@ -460,7 +460,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Rozwiń"
    IDS_COLLAPSE "&Zwiń"
-    IDS_GOTO_SUGGESTED_KEY "&Idź do '%s'"
    IDS_FINISHEDFIND "Przeszukiwanie rejestru zakończone."
 END

--- a/base/applications/regedit/lang/pt-BR.rc
+++ b/base/applications/regedit/lang/pt-BR.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expandir"
    IDS_COLLAPSE "&Reduzir"
-    IDS_GOTO_SUGGESTED_KEY "&Ir para '%s'"
    IDS_FINISHEDFIND "Pesquisa do Registro concluída."
 END

--- a/base/applications/regedit/lang/pt-PT.rc
+++ b/base/applications/regedit/lang/pt-PT.rc
@@ -149,7 +149,7 @@ BEGIN
        MENUITEM "Modificar dados binários", ID_EDIT_MODIFY_BIN
        MENUITEM SEPARATOR
        MENUITEM "&Excluir\tDel", ID_EDIT_DELETE
-        MENUITEM "&Mudar o nome", ID_EDIT_RENAME
+        MENUITEM "&Renomear", ID_EDIT_RENAME
    END
    POPUP ""
    BEGIN
@@ -179,8 +179,8 @@ BEGIN
        END
        MENUITEM "&Localizar...", ID_EDIT_FIND
        MENUITEM SEPARATOR
-        MENUITEM "&Eliminar", ID_TREE_DELETE
-        MENUITEM "&Mudar o nome", ID_TREE_RENAME
+        MENUITEM "&Apagar", ID_TREE_DELETE
+        MENUITEM "&Renomear", ID_TREE_RENAME
        MENUITEM SEPARATOR
        MENUITEM "&Exportar", ID_TREE_EXPORT
        MENUITEM "&Permissões...", ID_TREE_PERMISSIONS
@@ -199,8 +199,8 @@ BEGIN
    BEGIN
        MENUITEM "C&ortar", ID_HEXEDIT_CUT
        MENUITEM "&Copiar", ID_HEXEDIT_COPY
-        MENUITEM "&Colar", ID_HEXEDIT_PASTE
-        MENUITEM "&Excluir", ID_HEXEDIT_DELETE
+        MENUITEM "Co&lar", ID_HEXEDIT_PASTE
+        MENUITEM "&Apagar", ID_HEXEDIT_DELETE
        MENUITEM SEPARATOR
        MENUITEM "Seleccionar &Tudo", ID_HEXEDIT_SELECT_ALL
    END
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expandir"
    IDS_COLLAPSE "&Recolher"
-    IDS_GOTO_SUGGESTED_KEY "&ir para '%s'"
    IDS_FINISHEDFIND "Concluída a pesquisa no registo."
 END

@@ -572,7 +571,7 @@ BEGIN
    DEFPUSHBUTTON "&Localizar seguinte", IDOK, 177, 7, 70, 14
    PUSHBUTTON "Cancelar", IDCANCEL, 177, 24, 70, 14
    GROUPBOX "Observar", IDC_STATIC, 7, 25, 63, 51
-    LTEXT "&Localizar:", IDC_STATIC, 7, 8, 37, 10
+    LTEXT "&Procurar:", IDC_STATIC, 7, 8, 37, 10
    EDITTEXT IDC_FINDWHAT, 47, 7, 122, 13, ES_AUTOHSCROLL
    CONTROL "&Chaves", IDC_LOOKAT_KEYS, "Button", BS_AUTOCHECKBOX |
            WS_TABSTOP, 14, 36, 35, 8
--- a/base/applications/regedit/lang/ro-RO.rc
+++ b/base/applications/regedit/lang/ro-RO.rc
@@ -452,7 +452,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Extinde"
    IDS_COLLAPSE "&Restrânge"
-    IDS_GOTO_SUGGESTED_KEY "S&alt la „%s”"
    IDS_FINISHEDFIND "Căutarea în registru a fost finalizată."
 END

--- a/base/applications/regedit/lang/ru-RU.rc
+++ b/base/applications/regedit/lang/ru-RU.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Развернуть"
    IDS_COLLAPSE "&Свернуть"
-    IDS_GOTO_SUGGESTED_KEY "&Перейти к '%s'"
    IDS_FINISHEDFIND "Поиск в реестре завершен."
 END

--- a/base/applications/regedit/lang/sk-SK.rc
+++ b/base/applications/regedit/lang/sk-SK.rc
@@ -455,7 +455,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/sl-SI.rc
+++ b/base/applications/regedit/lang/sl-SI.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/sq-AL.rc
+++ b/base/applications/regedit/lang/sq-AL.rc
@@ -454,7 +454,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "Zgjat"
    IDS_COLLAPSE "Zgjero"
-    IDS_GOTO_SUGGESTED_KEY "Shko tek '%s'"
    IDS_FINISHEDFIND "Përfunduar kërkimin përmes regjistrit."
 END

--- a/base/applications/regedit/lang/sv-SE.rc
+++ b/base/applications/regedit/lang/sv-SE.rc
@@ -450,7 +450,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Visa nivå"
    IDS_COLLAPSE "&Dölj nivå"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Slutfört sökningen av registret."
 END

--- a/base/applications/regedit/lang/th-TH.rc
+++ b/base/applications/regedit/lang/th-TH.rc
@@ -452,7 +452,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Expand"
    IDS_COLLAPSE "&Collapse"
-    IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
    IDS_FINISHEDFIND "Finished searching through the registry."
 END

--- a/base/applications/regedit/lang/tr-TR.rc
+++ b/base/applications/regedit/lang/tr-TR.rc
@@ -82,7 +82,7 @@ END

 IDR_REGEDIT_MENU MENU
 BEGIN
-    POPUP "&Dosya"
+    POPUP "D&osya"
    BEGIN
        MENUITEM "&Al...", ID_REGISTRY_IMPORTREGISTRYFILE
        MENUITEM "&Ver...", ID_REGISTRY_EXPORTREGISTRYFILE
@@ -200,7 +200,7 @@ BEGIN
    POPUP ""
    BEGIN
        MENUITEM "&Kes", ID_HEXEDIT_CUT
-        MENUITEM "&Kopyala", ID_HEXEDIT_COPY
+        MENUITEM "K&opyala", ID_HEXEDIT_COPY
        MENUITEM "&Yapıştır", ID_HEXEDIT_PASTE
        MENUITEM "&Sil", ID_HEXEDIT_DELETE
        MENUITEM SEPARATOR
@@ -452,7 +452,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Genişlet"
    IDS_COLLAPSE "&Daralt"
-    IDS_GOTO_SUGGESTED_KEY "G&it: %s"
    IDS_FINISHEDFIND "Kayıt Defteri içerisinde arama bitti."
 END

--- a/base/applications/regedit/lang/uk-UA.rc
+++ b/base/applications/regedit/lang/uk-UA.rc
@@ -452,7 +452,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "&Розгорнути"
    IDS_COLLAPSE "&Згорнути"
-    IDS_GOTO_SUGGESTED_KEY "&Перейти до '%s'"
    IDS_FINISHEDFIND "Пошук у реєстрі завершений."
 END

--- a/base/applications/regedit/lang/zh-CN.rc
+++ b/base/applications/regedit/lang/zh-CN.rc
@@ -460,7 +460,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "展开"
    IDS_COLLAPSE "折叠"
-    IDS_GOTO_SUGGESTED_KEY "转到(&G)“%s”"
    IDS_FINISHEDFIND "注册表搜索完毕。"
 END

--- a/base/applications/regedit/lang/zh-HK.rc
+++ b/base/applications/regedit/lang/zh-HK.rc
@@ -458,7 +458,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "展開"
    IDS_COLLAPSE "摺疊"
-    IDS_GOTO_SUGGESTED_KEY "轉到「%s」(&G)"
    IDS_FINISHEDFIND "登錄搜尋完畢。"
 END

--- a/base/applications/regedit/lang/zh-TW.rc
+++ b/base/applications/regedit/lang/zh-TW.rc
@@ -1,7 +1,6 @@
 /*
 * PROJECT:     ReactOS Registry Editor
 * LICENSE:     LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
- * PURPOSE:     Chinese (Traditional) resource file
 * TRANSLATORS: Copyright 2016 Henry Tang Ih <henrytang2@hotmail.com>
 *              Copyright 2018 Luke Luo <njlyf2011@hotmail.com>
 *              Copyright 2021 Chan Chilung <eason066@gmail.com>
@@ -459,7 +458,6 @@ STRINGTABLE
 BEGIN
    IDS_EXPAND "展開"
    IDS_COLLAPSE "摺疊"
-    IDS_GOTO_SUGGESTED_KEY "轉到「%s」(&G)"
    IDS_FINISHEDFIND "登錄搜尋完畢。"
 END

--- a/base/applications/regedit/resource.h
+++ b/base/applications/regedit/resource.h
@@ -153,8 +153,6 @@
 #define IDS_QUERY_DELETE_KEY_ONE     32875
 #define IDS_QUERY_DELETE_KEY_MORE    32876
 #define IDS_QUERY_DELETE_KEY_CONFIRM 32877
-#define ID_TREE_SUGGESTION_MIN       32878
-#define ID_TREE_SUGGESTION_MAX       32887
 #define ID_TREE_EXPORT               32888
 #define ID_TREE_PERMISSIONS          32889
 #define ID_ADDRESS_FOCUS             32890
@@ -189,7 +187,6 @@
 #define IDS_COLLAPSE                  31204
 #define IDS_NEW_KEY                   31205
 #define IDS_NEW_VALUE                 31206
-#define IDS_GOTO_SUGGESTED_KEY        31207

 #define IDS_IMPORT_PROMPT 31300
 #define IDS_IMPORT_OK     31301
--- a/base/applications/regedit/treeview.c
+++ b/base/applications/regedit/treeview.c
@@ -781,7 +781,7 @@ BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath)

    /* Load "My Computer" string... */
    LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, ARRAY_SIZE(szBuffer));
-    StringCbCatW(szBuffer, sizeof(szBuffer), L"\\");
+    wcscat(szBuffer, L"\\");

    /* ... and remove it from the key path */
    if (!_wcsnicmp(keyPath, szBuffer, wcslen(szBuffer)))
@@ -811,17 +811,17 @@ BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath)
        if (hItem == hRoot)
        {
            if (!_wcsicmp(szPathPart, L"HKCR"))
-                StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_CLASSES_ROOT");
+                wcscpy(szPathPart, L"HKEY_CLASSES_ROOT");
            else if (!_wcsicmp(szPathPart, L"HKCU"))
-                StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_CURRENT_USER");
+                wcscpy(szPathPart, L"HKEY_CURRENT_USER");
            else if (!_wcsicmp(szPathPart, L"HKLM"))
-                StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_LOCAL_MACHINE");
+                wcscpy(szPathPart, L"HKEY_LOCAL_MACHINE");
            else if (!_wcsicmp(szPathPart, L"HKU"))
-                StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_USERS");
+                wcscpy(szPathPart, L"HKEY_USERS");
            else if (!_wcsicmp(szPathPart, L"HKCC"))
-                StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_CURRENT_CONFIG");
+                wcscpy(szPathPart, L"HKEY_CURRENT_CONFIG");
            else if (!_wcsicmp(szPathPart, L"HKDD"))
-                StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_DYN_DATA");
+                wcscpy(szPathPart, L"HKEY_DYN_DATA");
        }

        for (hChildItem = TreeView_GetChild(hwndTV, hItem); hChildItem;
Author	SHA1	Message	Date
Joachim Henze	3da5c31bfb	[REGEDIT] Address Review-comment, no edit-war with Thomas is intended here I preferred to keep it more insync with the backports, but that is no hard requirement ofc.	2023-04-16 18:20:14 +02:00
Joachim Henze	c2cd95a2ef	[REGEDIT] Addendum to `1ee9ea4518` wcscpy() is absolutely safe here for these specific strings of fixed size length. It gives much shorter code and shrinks the binary size by 1-2 KByte. There is only one single place in [REGEDIT] where we current use and have to use StringCbCopyNW(). And that is the place where we introduced it to fix the crash from CORE18602. I marked the location by the "{}"-change. Same with "\\" cat. That is absolutely safe and has no risk at runtime, as IDS_MY_COMPUTER is 100% under our control at compile-time. I checked: Changing that back also reduces obj-size.	2023-04-16 17:51:20 +02:00
Joachim Henze	4f44baa4b2	[REGEDIT] Strip unneeded suggestion code	2023-04-16 17:43:31 +02:00
Joachim Henze	7c23362602	[REGEDIT] tr-TR.rc fix accelerator collision "&Kes" vs. "&Kopyala"	2023-04-16 17:30:39 +02:00
Joachim Henze	8b7520a881	[REGEDIT] tr-TR.rc fix accelerator collision POPUP "&Dosya" vs. POPUP "&Düzen"	2023-04-16 17:29:30 +02:00
Joachim Henze	977c37de58	[REGEDIT] pt-PT.rc fix accelerator collision "&Localizar seguinte" vs. "&Localizar:"	2023-04-16 17:16:43 +02:00
Joachim Henze	ef86399d6d	[REGEDIT] pt-PT.rc Consistency	2023-04-16 17:13:21 +02:00
Joachim Henze	617d44cc58	[REGEDIT] pt-PT.rc fix accelerator collision "&Copiar" vs. "&Colar"	2023-04-16 17:11:51 +02:00
Joachim Henze	b2bf4b356b	[REGEDIT] pt-PT.rc fix accelerator collision "&Eliminar" vs. "&Exportar"	2023-04-16 17:09:54 +02:00
Joachim Henze	5b3fd8d54a	[REGEDIT] pt-PT.rc Consistency to last commit	2023-04-16 17:08:05 +02:00
Joachim Henze	c89a41e695	[REGEDIT] pt-PT.rc fix accelerator collision "&Modificar" vs. "&Modificar"	2023-04-16 17:06:12 +02:00
Joachim Henze	a830203969	[CLB] tr-TR.rc Fix accelerator collisions "&Sınır" vs "&Standart", "Dev&re Dışı" vs "Gö&rünür"	2023-04-16 16:58:26 +02:00
Joachim Henze	241e4949f4	[REGEDIT] hu-HU.rc Fix accelerator collision &File vs &Favorites	2023-04-16 16:55:50 +02:00