https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31fdaca8c014ef916be824685e3af09712aef4dc
commit 31fdaca8c014ef916be824685e3af09712aef4dc Author: Joachim Henze <joachim.he...@reactos.org> AuthorDate: Mon May 1 16:50:01 2023 +0200 Commit: GitHub <nore...@github.com> CommitDate: Mon May 1 16:50:01 2023 +0200 [REGEDIT] Strip redundant include, minor formatting (#5264) strsafe.h is already included via regedit.h --- base/applications/regedit/childwnd.c | 2 +- base/applications/regedit/lang/el-GR.rc | 2 +- base/applications/regedit/lang/sl-SI.rc | 8 ++++---- base/applications/regedit/settings.c | 1 - base/applications/regedit/treeview.c | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 7910dcefdaa..67a88bc90a5 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -656,7 +656,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } } } - 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; diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index 0c840b3662e..5fdb8ff7a26 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -82,7 +82,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Αρχείο" BEGIN - MENUITEM "&Εισαγωγή ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Εισαγωγή...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Εξαγωγή...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Φόρτωση Hive...", ID_REGISTRY_LOADHIVE, GRAYED diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index 4d8d89eb17f..345b80f37cc 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -82,14 +82,14 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Register" BEGIN - MENUITEM "&Uvozi registrsko datoteko ...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Izvozi registrsko datoteko ...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Uvozi registrsko datoteko...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Izvozi registrsko datoteko...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "P&oveži se z omrežnim registrom ...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "P&rekini povezavo z omrežnim registrom ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + MENUITEM "P&oveži se z omrežnim registrom...", ID_REGISTRY_CONNECTNETWORKREGISTRY + MENUITEM "P&rekini povezavo z omrežnim registrom...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Na&tisni...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/regedit/settings.c b/base/applications/regedit/settings.c index 9266ec1a0c1..c82a3a0520d 100644 --- a/base/applications/regedit/settings.c +++ b/base/applications/regedit/settings.c @@ -20,7 +20,6 @@ */ #include "regedit.h" -#include <strsafe.h> const WCHAR g_szGeneralRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; DECLSPEC_IMPORT ULONG WINAPIV DbgPrint(PCCH Format,...); diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index 28222432fea..9c957cfe2ad 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -674,7 +674,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) break; case TVN_BEGINLABELEDIT: { - LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO) lParam; + LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; /* cancel label edit for rootkeys */ if (!TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem) || !TreeView_GetParent(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem))) @@ -692,7 +692,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) LPCWSTR keyPath; HKEY hRootKey; HKEY hKey = NULL; - LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO) lParam; + LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; LONG nRenResult; LONG lResult = TRUE; WCHAR szBuffer[MAX_PATH];