Ros-diffs

ros-diffs@reactos.org

15 participants
81076 discussions

[reactos] 01/01: [TASKMGR] de-DE German Update & bug-fixes

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e15d68ba5d9906674b363… commit e15d68ba5d9906674b363cf8362ed08494e53a76 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Oct 3 02:05:28 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Oct 3 02:05:28 2023 +0200 [TASKMGR] de-DE German Update & bug-fixes This fixes several issues: - add a few missing translations, e.g. ID_PROCESS_PAGE_PROPERTIES & ID_PROCESS_PAGE_OPENFILELOCATION - IDS_TAB_PEAKMEMUSAGE translation was flipped with IDS_TAB_MEMDELTA - IDC_MEM_USAGE_FRAME had text truncation, fix that by structurally switching to "Speicher" - waste less space for the listview headers in the Processes tab so user can display more columns conveniently without the headers unnecessarily being crippled to "..." - Sync some controls sizes back to en-US in the performance tab - Translation for ID_VIEW_CPUHISTORY_ONEGRAPHALL and ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU was swapped accidentally - Strip comment lines in the end, which were outdated anyway - avoid monsters that not even a german person can read like "Auslagerungsdateiauslastungs-Verlaufsanzeige" which is like "Donaudampfschifffahrtselektrizitätenhauptbetriebswerkbauunterbeamtengesellschaft" --- base/applications/taskmgr/lang/de-DE.rc | 108 ++++++++++++++++---------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index ad0478fade4..3b5e687ffd8 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -1,4 +1,4 @@ -/* Deutsch resource file by Klemens Friedl */ +/* TRANSLATOR: Klemens Friedl */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -184,8 +184,8 @@ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU-Auslastung", IDC_CPU_USAGE_FRAME, 5, 5, 67, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Auslagerungsdatei", IDC_MEM_USAGE_FRAME, 5, 63, 67, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT // 5, 63, 60, 54 + GROUPBOX "CPU-Last", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Speicher-Last", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Insgesamt", IDC_TOTALS_FRAME, 5, 122, 117, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Zugesicherter Speicher (KB)", IDC_COMMIT_CHARGE_FRAME, 5, 166, 117, 39, 0, WS_EX_TRANSPARENT GROUPBOX "Physikalischer Speicher (KB)", IDC_PHYSICAL_MEMORY_FRAME, 126, 122, 117, 39, 0, WS_EX_TRANSPARENT @@ -199,39 +199,39 @@ BEGIN ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT, 71, 149, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 50, 8 // 27 - LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER // 15 - LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 50, 8 // 34 + LTEXT "Insgesamt", IDS_COMMIT_CHARGE_TOTAL, 12, 175, 50, 8 + LTEXT "Grenzwert", IDS_COMMIT_CHARGE_LIMIT, 12, 184, 50, 8, NOT WS_BORDER + LTEXT "Maximalwert", IDS_COMMIT_CHARGE_PEAK, 12, 193, 50, 8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL, 71, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT, 71, 184, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK, 71, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 133, 131, 50, 8 // 27 - LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 133, 140, 50, 8 // 30 - LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 133, 149, 46, 8 // 46 + LTEXT "Insgesamt", IDS_PHYSICAL_MEMORY_TOTAL, 133, 131, 50, 8 + LTEXT "Verfügbar", IDS_PHYSICAL_MEMORY_AVAILABLE, 133, 140, 50, 8 + LTEXT "Systemcache", IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, 133, 149, 46, 8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL, 192, 131, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE, 192, 140, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE, 192, 149, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 133, 174, 50, 8 // 27 - LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 133, 184, 50, 8 // 21 - LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 133, 193, 60, 8 // 34 + LTEXT "Insgesamt", IDS_KERNEL_MEMORY_TOTAL, 133, 174, 50, 8 + LTEXT "Ausgelagert", IDS_KERNEL_MEMORY_PAGED, 133, 184, 50, 8 + LTEXT "Nicht ausgelagert", IDS_KERNEL_MEMORY_NONPAGED, 133, 193, 60, 8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL, 192, 174, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED, 192, 184, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED, 192, 193, 48, 8, ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "Verlauf der CPU-Auslastung", IDC_CPU_USAGE_HISTORY_FRAME, 76, 5, 166, 54, 0, WS_EX_TRANSPARENT - GROUPBOX "Verlauf der Auslagerungsdateiauslastung", IDC_MEMORY_USAGE_HISTORY_FRAME, 76, 63, 166, 54, 0, WS_EX_TRANSPARENT - PUSHBUTTON "CPU-Auslastungsanzeige", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "Auslagerungsdateiauslastungsanzeige", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "CPU-Auslastungsverlaufsanzeige", IDC_CPU_USAGE_HISTORY_GRAPH, 82, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE - PUSHBUTTON "Auslagerungsdateiauslastungs-Verlaufsanzeige", IDC_MEM_USAGE_HISTORY_GRAPH, 82, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + GROUPBOX "CPU-Lastverlauf", IDC_CPU_USAGE_HISTORY_FRAME, 74, 5, 168, 54, 0, WS_EX_TRANSPARENT + GROUPBOX "Speicher-Lastverlauf", IDC_MEMORY_USAGE_HISTORY_FRAME, 74, 63, 168, 54, 0, WS_EX_TRANSPARENT + PUSHBUTTON "CPU-Lastanzeige", IDC_CPU_USAGE_GRAPH, 12, 17, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "Speicher-Lastanzeige", IDC_MEM_USAGE_GRAPH, 12, 75, 47, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "CPU-Lastverlaufsanzeige", IDC_CPU_USAGE_HISTORY_GRAPH, 81, 17, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE + PUSHBUTTON "Speicher-Lastverlauf", IDC_MEM_USAGE_HISTORY_GRAPH, 81, 75, 153, 37, NOT WS_TABSTOP, WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 @@ -286,40 +286,40 @@ BEGIN CONTROL "CPU 31", IDC_CPU31, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 175, 119, 41, 10 END -IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 240, 199 // 0, 0, 195, 199 +IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 240, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Spalten auswählen" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 124, 178, 50, 14 // 84 - PUSHBUTTON "Abbrechen", IDCANCEL, 178, 178, 50, 14 // 138 - LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17 // 181 + DEFPUSHBUTTON "OK", IDOK, 124, 178, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 178, 178, 50, 14 + LTEXT "Wählen Sie die Spalten aus, die auf der Registerkarte Prozesse angezeigt werden sollen.", IDC_STATIC, 7, 7, 221, 17 CONTROL "&Name", IDC_IMAGENAME, "Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP, 7, 28, 56, 10 CONTROL "&PID (Prozess-ID)", IDC_PID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 39, 88, 10 - CONTROL "&CPU-Auslastung", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 // 53 + CONTROL "&CPU %", IDC_CPUUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 50, 80, 10 CONTROL "CP&U-Zeit", IDC_CPUTIME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 61, 48, 10 - CONTROL "&Speicherauslastung", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 // 63 - CONTROL "Verän&d. der Speicherauslastung", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 // 82 - CONTROL "&Maximale Speicherauslastung", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 115, 10 // 82 + CONTROL "&Speicherlast", IDC_MEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 72, 90, 10 + CONTROL "Verän&derung der Speicherlast", IDC_MEMORYUSAGEDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 83, 120, 10 + CONTROL "&Maximale Speicherlast", IDC_PEAKMEMORYUSAGE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 94, 115, 10 CONTROL "S&eitenfehler", IDC_PAGEFAULTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 105, 53, 10 - CONTROL "BENUTZE&R-Objekte", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 90, 10 // 62 + CONTROL "BENUTZE&R-Objekte", IDC_USEROBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 116, 90, 10 CONTROL "E/A (Lesen)", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 - CONTROL "E/A-Bytes (Lesen)", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 80, 10 // 65 - CONTROL "S&itzungskennung", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 70, 10 // 50 - CONTROL "Benut&zername", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 70, 10 // 51 - CONTROL "Veränderung der Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 // 107,60 - CONTROL "Größe des &virtuellen Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 // 107, 60 - CONTROL "&Ausgelagerter Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 80, 10 // 107, 53 - CONTROL "Nicht ausgelagerter P&ool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 // 107 - CONTROL "&Basispriorität", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 // 107 - CONTROL "&Handleanzahl", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 // 107 - CONTROL "&Threadanzahl", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 // 107 - CONTROL "GDI-Obje&kte", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 // 107 - CONTROL "E/A (Schreiben)", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 // 107 - CONTROL "E/A-Bytes (Schreiben)", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 // 107 - CONTROL "E/A (Andere)", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 105, 10 // 107 - CONTROL "E/A-Bytes (Andere)", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 // 107 - CONTROL "Befeh&lszeile", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 // 107 + CONTROL "E/A-Bytes (Lesen)", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 80, 10 + CONTROL "S&itzungskennung", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 70, 10 + CONTROL "Benut&zername", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 70, 10 + CONTROL "Veränderung der Seiten&fehler", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 28, 120, 10 + CONTROL "Größe des &virtuellen Speichers", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 39, 120, 10 + CONTROL "&Ausgelagerter Pool", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 50, 80, 10 + CONTROL "Nicht ausgelagerter P&ool", IDC_NONPAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 61, 115, 10 + CONTROL "&Basispriorität", IDC_BASEPRIORITY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 72, 80, 10 + CONTROL "&Handles", IDC_HANDLECOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 83, 59, 10 + CONTROL "&Threads", IDC_THREADCOUNT, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 94, 59, 10 + CONTROL "GDI-Obje&kte", IDC_GDIOBJECTS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 105, 55, 10 + CONTROL "E/A (Schreiben)", IDC_IOWRITES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 116, 90, 10 + CONTROL "E/A-Bytes (Schreiben)", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 127, 105, 10 + CONTROL "E/A (Andere)", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 138, 105, 10 + CONTROL "E/A-Bytes (Andere)", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 149, 110, 10 + CONTROL "Befeh&lszeile", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 127, 160, 65, 10 END /* String Tables */ @@ -353,7 +353,7 @@ BEGIN ID_WINDOWS_TILEVERTICALLY "Ordnet die Fenster vertikal auf dem Desktop an." ID_WINDOWS_MINIMIZE "Minimiert die Fenster" ID_WINDOWS_MAXIMIZE "Maximiert die Fenster" - ID_WINDOWS_CASCADE "Ordnet die Fenster diagonal überlappend auf den Desktop an." + ID_WINDOWS_CASCADE "Ordnet die Fenster diagonal überlappend auf dem Desktop an." ID_WINDOWS_BRINGTOFRONT "Zeigt das Fenster im Vordergrund an, aber wechselt nicht zu diesem." ID_HELP_TOPICS "Zeigt die Hilfethemen des Taskmanagers an." ID_HELP_ABOUT "Zeigt Programminformationen, Versionsnummer und Copyright an." @@ -361,8 +361,8 @@ BEGIN ID_OPTIONS_SHOW16BITTASKS "Zeigt die 16-Bit-Tasks unter der zugehörigen ntvdm.exe an." ID_VIEW_SELECTCOLUMNS "Legt fest welche Spalten auf der Registerkarte Prozesse angezeigt werden." ID_VIEW_SHOWKERNELTIMES "Zeigt die Kernel-Zeiten in den Systemmonitordiagrammen an." - ID_VIEW_CPUHISTORY_ONEGRAPHALL "Zeigt für jede CPU-Auslastung ein Verlaufsdiagramm an." - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Zeigt die gesamte CPU-Auslastung in einem Verlaufsdiagramm an." + ID_VIEW_CPUHISTORY_ONEGRAPHALL "Zeigt alle CPUs in demselben Lastverlaufsdiagramm an." + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Zeigt für jede CPU ein eigenes Lastverlaufsdiagramm an." ID_APPLICATION_PAGE_SWITCHTO "Zeigt das Fenster im Vordergrund an und wechselt zu diesem Task." END @@ -381,8 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Legt die Priorität auf NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Legt die Priorität auf NIEDRIGER ALS NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_LOW "Legt die Priorität auf NIEDRIG fest." - ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" - ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" + ID_PROCESS_PAGE_PROPERTIES "Zeigt die Dateieigenschaften an." + ID_PROCESS_PAGE_OPENFILELOCATION "Öffnet den übergeordneten Ordner." END STRINGTABLE @@ -396,19 +396,19 @@ BEGIN IDS_TAB_PID "PID" IDS_TAB_USERNAME "Benutzername" IDS_TAB_SESSIONID "Sitzungskennung" - IDS_TAB_CPU "CPU-Auslastung" + IDS_TAB_CPU "CPU %" IDS_TAB_CPUTIME "CPU-Zeit" - IDS_TAB_MEMUSAGE "Speicherauslastung" - IDS_TAB_PEAKMEMUSAGE "Veränd. der Speicherauslastung" - IDS_TAB_MEMDELTA "Maximale Speicherauslastung" + IDS_TAB_MEMUSAGE "Speicherlast" + IDS_TAB_PEAKMEMUSAGE "Maximale Speicherlast" + IDS_TAB_MEMDELTA "Veränderung der Speicherlast" IDS_TAB_PAGEFAULT "Seitenfehler" IDS_TAB_PFDELTA "Maximale Seitenfehler" IDS_TAB_VMSIZE "Virtuelle Arbeitsspeichergröße" IDS_TAB_PAGEDPOOL "Ausgelagerter Pool" IDS_TAB_NPPOOL "Nichtausgelagerter Pool" IDS_TAB_BASEPRI "Basispriorität" - IDS_TAB_HANDLES "Handleanzahl" - IDS_TAB_THREADS "Threadanzahl" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" IDS_TAB_USERPBJECTS "Benutzer-Objekte" IDS_TAB_GDIOBJECTS "GDI-Objekte" IDS_TAB_IOREADS "E/A (Lesen)"

1 year, 3 months

[reactos] 02/02: [EXPLORER][COMCTL32] Fix balloon tooltips and system pager alerts (#5559)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e46a8673d7c82f42e381… commit 3e46a8673d7c82f42e3819f56de8a91e16354010 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:21:03 2023 -0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 3 01:08:45 2023 +0300 [EXPLORER][COMCTL32] Fix balloon tooltips and system pager alerts (#5559) - [EXPLORER] Set maximum balloon width for notification area - [COMCTL32] Fix balloon tooltip shape - Limit balloon tooltips from extending past the edges of the monitor, not the edges of the work area. - Instead of simply repositioning the main rectangle when the balloon is too far towards one edge of the screen, try flipping the balloon the other way. This is the same behavior as Windows Server 2003. - Tweak some values used to draw the balloon tooltips to more closely follow the Windows balloon tooltip style. - Removing trailing whitespace. - While the new changes are guarded, consider cancelling our Wine sync for common controls. Our common controls are responsible for many graphical issues and lack of features throughout ReactOS. CORE-19109 --- base/shell/explorer/syspager.cpp | 8 +++--- dll/win32/comctl32/tooltips.c | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 35eb0faf75f..b039f189101 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -21,6 +21,8 @@ #include "precomp.h" +#define BALLOON_MAXWIDTH 340 + struct InternalIconData : NOTIFYICONDATA { // Must keep a separate copy since the original is unioned with uTimeout. @@ -617,19 +619,19 @@ void CBalloonQueue::Show(Info& info) // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags - const int index = IndexOf(info.pSource); + m_current = info.pSource; RECT rc; - m_toolbar->GetItemRect(index, &rc); + m_toolbar->GetItemRect(IndexOf(m_current), &rc); m_toolbar->ClientToScreen(&rc); const WORD x = (rc.left + rc.right) / 2; const WORD y = (rc.top + rc.bottom) / 2; m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); m_tooltips->TrackPosition(x, y); + m_tooltips->SetMaxTipWidth(BALLOON_MAXWIDTH); m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); - m_current = info.pSource; int timeout = info.uTimeout; if (timeout < MinTimeout) timeout = MinTimeout; if (timeout > MaxTimeout) timeout = MaxTimeout; diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 0d89a0256f9..8c8ef43eb08 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -162,10 +162,17 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ +#ifdef __REACTOS__ +#define BALLOON_ROUNDEDNESS 16 +#define BALLOON_STEMHEIGHT 18 +#define BALLOON_STEMWIDTH 18 +#define BALLOON_STEMINDENT 16 +#else #define BALLOON_ROUNDEDNESS 20 #define BALLOON_STEMHEIGHT 13 #define BALLOON_STEMWIDTH 10 #define BALLOON_STEMINDENT 20 +#endif // __REACTOS__ #define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -741,6 +748,40 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); +#ifdef __REACTOS__ + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= (rect.right - mon_info.rcMonitor.right); + rect.right = mon_info.rcMonitor.right; + } + } + + if (rect.left < mon_info.rcMonitor.left) + { + rect.right += abs(rect.left); + rect.left = 0; + } + + if (rect.bottom > mon_info.rcMonitor.bottom) + { + RECT rc; + if (toolPtr->uFlags & TTF_IDISHWND) + { + GetWindowRect((HWND)toolPtr->uId, &rc); + } + else + { + rc = toolPtr->rect; + MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); + } + rect.bottom = rc.top - 2; + rect.top = rect.bottom - size.cy; + } +#else if( rect.right > mon_info.rcWork.right ) { rect.left -= rect.right - mon_info.rcWork.right + 2; rect.right = mon_info.rcWork.right - 2; @@ -759,6 +800,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; } +#endif // __REACTOS__ AdjustWindowRectEx (&rect, GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE), FALSE, GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE)); @@ -775,7 +817,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; +#ifdef __REACTOS__ + pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -787,7 +833,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { +#ifdef __REACTOS__ + pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -805,7 +855,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, +#ifdef __REACTOS__ + (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT + 1), +#else (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), +#endif BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); CombineRgn(hRgn, hRgn, hrStem, RGN_OR);

1 year, 3 months

[reactos] 01/02: [REACTOS] Revert badly formatted commits

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f53be821586dfd6bb66b3… commit f53be821586dfd6bb66b34be439f8cf2bc73b18e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 3 01:00:07 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 3 01:00:07 2023 +0300 [REACTOS] Revert badly formatted commits This reverts commits ab1868c7bf7f700f9363a5553cb07d73b9ea962b and 1aa76275ac7aac74ef3b4d9a05e55ef9fcf7fd7b. --- base/shell/explorer/syspager.cpp | 8 +++--- dll/win32/comctl32/tooltips.c | 54 ---------------------------------------- 2 files changed, 3 insertions(+), 59 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index b039f189101..35eb0faf75f 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -21,8 +21,6 @@ #include "precomp.h" -#define BALLOON_MAXWIDTH 340 - struct InternalIconData : NOTIFYICONDATA { // Must keep a separate copy since the original is unioned with uTimeout. @@ -619,19 +617,19 @@ void CBalloonQueue::Show(Info& info) // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags - m_current = info.pSource; + const int index = IndexOf(info.pSource); RECT rc; - m_toolbar->GetItemRect(IndexOf(m_current), &rc); + m_toolbar->GetItemRect(index, &rc); m_toolbar->ClientToScreen(&rc); const WORD x = (rc.left + rc.right) / 2; const WORD y = (rc.top + rc.bottom) / 2; m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); m_tooltips->TrackPosition(x, y); - m_tooltips->SetMaxTipWidth(BALLOON_MAXWIDTH); m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); + m_current = info.pSource; int timeout = info.uTimeout; if (timeout < MinTimeout) timeout = MinTimeout; if (timeout > MaxTimeout) timeout = MaxTimeout; diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 8c8ef43eb08..0d89a0256f9 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -162,17 +162,10 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ -#ifdef __REACTOS__ -#define BALLOON_ROUNDEDNESS 16 -#define BALLOON_STEMHEIGHT 18 -#define BALLOON_STEMWIDTH 18 -#define BALLOON_STEMINDENT 16 -#else #define BALLOON_ROUNDEDNESS 20 #define BALLOON_STEMHEIGHT 13 #define BALLOON_STEMWIDTH 10 #define BALLOON_STEMINDENT 20 -#endif // __REACTOS__ #define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -748,40 +741,6 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); -#ifdef __REACTOS__ - if (rect.right > mon_info.rcMonitor.right) - { - rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); - rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); - if (rect.right > mon_info.rcMonitor.right) - { - rect.left -= (rect.right - mon_info.rcMonitor.right); - rect.right = mon_info.rcMonitor.right; - } - } - - if (rect.left < mon_info.rcMonitor.left) - { - rect.right += abs(rect.left); - rect.left = 0; - } - - if (rect.bottom > mon_info.rcMonitor.bottom) - { - RECT rc; - if (toolPtr->uFlags & TTF_IDISHWND) - { - GetWindowRect((HWND)toolPtr->uId, &rc); - } - else - { - rc = toolPtr->rect; - MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); - } - rect.bottom = rc.top - 2; - rect.top = rect.bottom - size.cy; - } -#else if( rect.right > mon_info.rcWork.right ) { rect.left -= rect.right - mon_info.rcWork.right + 2; rect.right = mon_info.rcWork.right - 2; @@ -800,7 +759,6 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; } -#endif // __REACTOS__ AdjustWindowRectEx (&rect, GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE), FALSE, GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE)); @@ -817,11 +775,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; -#ifdef __REACTOS__ - pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); -#else pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); -#endif pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -833,11 +787,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { -#ifdef __REACTOS__ - pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); -#else pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); -#endif pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -855,11 +805,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, -#ifdef __REACTOS__ - (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT + 1), -#else (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), -#endif BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); CombineRgn(hRgn, hRgn, hrStem, RGN_OR);

1 year, 3 months

[reactos] 01/01: [BROWSEUI] More settings and window refresh (#5584)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f744bb29946167810a81c… commit f744bb29946167810a81c093bad6d4e5bf6bdf8a Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Mon Oct 2 14:43:00 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 2 22:43:00 2023 +0200 [BROWSEUI] More settings and window refresh (#5584) Adds the option to set the address edit box to use the display name or the full path. Also refreshes the window title and edit box in all open explorer windows when changing these settings using the folder options dialog. ## PROPOSED CHANGES ## - Create a new CabinetStateSettings type that inherits from the CABINETSTATE type. This allows us to add additional cabinet state settings not exposed in the CABINETSTATE type as well as adding a Load() method to easily populate the cabinet state settings. - Add a global cabinet state settings object. While most settings in browseui are stored independently in each shellbrowser window, cabinet state settings are global and apply to every shellbrowser window. This can be confirmed on Windows Server 2003 and Windows 7. - When receiving the WM_SETTINGCHANGE window message from the folder options dialog, refresh the title of the window and the text in the address edit box. This is the same behavior as Windows Server 2003 and Windows 7. Add a DWORD registry value to HKCU\...\Explorer\CabinetState\FullPathAddress to allow users to toggle this setting on or off in our folder options. CORE-9277 --- boot/bootdata/hivedef.inf | 1 + dll/win32/browseui/addresseditbox.cpp | 22 ++++----- dll/win32/browseui/addresseditbox.h | 2 + dll/win32/browseui/browseui.h | 1 + dll/win32/browseui/precomp.h | 15 +----- dll/win32/browseui/settings.cpp | 20 ++++++-- dll/win32/browseui/settings.h | 30 ++++++++++++ dll/win32/browseui/shellbrowser.cpp | 90 +++++++++++++++++------------------ 8 files changed, 104 insertions(+), 77 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 6551f5a7701..57b7ea8d2f0 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1901,6 +1901,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHidden",0x00010003,0 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPath",0x00010003,0 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPathAddress",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","StatusBarOther",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Toolbar","Locked",0x00010003,1 diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 6051b43fb5b..cec978c191e 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -130,18 +130,12 @@ HRESULT CAddressEditBox::RefreshAddress() /* Set the path if filesystem; otherwise use the name */ WCHAR szPathOrName[MAX_PATH]; - if (!SHGetPathFromIDListW(absolutePIDL, szPathOrName)) - { - STRRET ret; - hr = pShellFolder->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + SHGDNF flags = SHGDN_FORADDRESSBAR; + if (gCabinetState.fFullPathAddress) + flags |= SHGDN_FORPARSING; - hr = StrRetToBufW(&ret, pidlChild, szPathOrName, _countof(szPathOrName)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - } - item.pszText = szPathOrName; + if (SUCCEEDED(IEGetNameAndFlags(absolutePIDL, flags, szPathOrName, _countof(szPathOrName), NULL))) + item.pszText = szPathOrName; /* Ownership of absolutePIDL will be moved to fCombobox. See CBEN_DELETEITEM */ item.lParam = reinterpret_cast<LPARAM>(absolutePIDL.Detach()); @@ -644,3 +638,9 @@ LPITEMIDLIST CAddressEditBox::GetItemData(int index) SendMessageW(hComboBoxEx, CBEM_GETITEMW, 0, (LPARAM)&item); return (LPITEMIDLIST)item.lParam; } + +LRESULT CAddressEditBox::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + RefreshAddress(); + return NO_ERROR; +} diff --git a/dll/win32/browseui/addresseditbox.h b/dll/win32/browseui/addresseditbox.h index 336f38ff0c9..beb043e1e1e 100644 --- a/dll/win32/browseui/addresseditbox.h +++ b/dll/win32/browseui/addresseditbox.h @@ -91,6 +91,7 @@ public: virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); // message handlers + LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); DECLARE_REGISTRY_RESOURCEID(IDR_ADDRESSEDITBOX) DECLARE_NOT_AGGREGATABLE(CAddressEditBox) @@ -98,6 +99,7 @@ public: DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_MSG_MAP(CAddressEditBox) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange) END_MSG_MAP() BEGIN_COM_MAP(CAddressEditBox) diff --git a/dll/win32/browseui/browseui.h b/dll/win32/browseui/browseui.h index 02d75a25e16..46907ad0ad7 100644 --- a/dll/win32/browseui/browseui.h +++ b/dll/win32/browseui/browseui.h @@ -24,3 +24,4 @@ HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv); HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical); HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical); HRESULT CToolsBand_CreateInstance(REFIID riid, void **ppv); +HRESULT IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut); diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index c3c26e7115d..cfed44eef59 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -36,10 +36,7 @@ #include <wine/debug.h> #include "resource.h" - -#define BWM_SETTINGCHANGE (WM_USER + 300) -#define BWM_GETSETTINGSPTR (WM_USER + 301) -struct ShellSettings; +#include "settings.h" #include "ACLCustomMRU.h" #include "aclhistory.h" @@ -69,14 +66,4 @@ struct ShellSettings; WINE_DEFAULT_DEBUG_CHANNEL(browseui); -struct ShellSettings -{ - BOOL fLocked = FALSE; - BOOL fShowGoButton = FALSE; - BOOL fStatusBarVisible = FALSE; - - BOOL Save(); - BOOL Load(); -}; - #endif /* _BROWSEUI_PCH_ */ diff --git a/dll/win32/browseui/settings.cpp b/dll/win32/browseui/settings.cpp index de7e6c04480..65af70c950e 100644 --- a/dll/win32/browseui/settings.cpp +++ b/dll/win32/browseui/settings.cpp @@ -7,7 +7,9 @@ #include "precomp.h" -BOOL ShellSettings::Save() +CabinetStateSettings gCabinetState; + +void ShellSettings::Save() { SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", REG_DWORD, &fStatusBarVisible, sizeof(fStatusBarVisible), SHREGSET_FORCE_HKCU); @@ -17,11 +19,9 @@ BOOL ShellSettings::Save() SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", REG_DWORD, &fLocked, sizeof(fLocked), SHREGSET_FORCE_HKCU); - - return TRUE; } -BOOL ShellSettings::Load() +void ShellSettings::Load() { fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"StatusBarOther", FALSE, FALSE); @@ -31,6 +31,16 @@ BOOL ShellSettings::Load() fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", L"Locked", FALSE, TRUE); +} + +void CabinetStateSettings::Load() +{ + ReadCabinetState(this, this->cLength); + + /* Overrides */ + fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", + L"FullPath", FALSE, FALSE); - return TRUE; + fFullPathAddress = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", + L"FullPathAddress", FALSE, TRUE); } diff --git a/dll/win32/browseui/settings.h b/dll/win32/browseui/settings.h new file mode 100644 index 00000000000..38e58c1fe99 --- /dev/null +++ b/dll/win32/browseui/settings.h @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS browseui + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Settings header file + * COPYRIGHT: Copyright 2023 Carl Bialorucki <cbialo2(a)outlook.com> + */ + +#include "precomp.h" + +#define BWM_SETTINGCHANGE (WM_USER + 300) +#define BWM_GETSETTINGSPTR (WM_USER + 301) + +struct ShellSettings +{ + BOOL fLocked = FALSE; + BOOL fShowGoButton = FALSE; + BOOL fStatusBarVisible = FALSE; + + void Save(); + void Load(); +}; + +struct CabinetStateSettings : CABINETSTATE +{ + BOOL fFullPathAddress = TRUE; + + void Load(); +}; + +extern CabinetStateSettings gCabinetState; diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 9c8edff1822..114d6c59553 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -296,7 +296,6 @@ private: barInfo fClientBars[3]; CComPtr<ITravelLog> fTravelLog; HMENU fCurrentMenuBar; - CABINETSTATE fCabinetState; GUID fCurrentVertBar; //The guid of the built in vertical bar that is being shown // The next three fields support persisted history for shell views. // They do not need to be reference counted. @@ -350,7 +349,8 @@ public: HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); - void LoadCabinetState(); + void RefreshCabinetState(); + void UpdateWindowTitle(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -721,6 +721,7 @@ CShellBrowser::CShellBrowser() fHistoryStream = NULL; fHistoryBindContext = NULL; m_settings.Load(); + gCabinetState.Load(); } CShellBrowser::~CShellBrowser() @@ -741,11 +742,6 @@ HRESULT CShellBrowser::Initialize() if (!menuDsa) return E_OUTOFMEMORY; - fCabinetState.cLength = sizeof(fCabinetState); - if (ReadCabinetState(&fCabinetState, sizeof(fCabinetState)) == FALSE) - { - } - // create window Create(HWND_DESKTOP); if (m_hWnd == NULL) @@ -790,8 +786,6 @@ HRESULT CShellBrowser::Initialize() fToolbarProxy.Initialize(m_hWnd, clientBar); - LoadCabinetState(); - // create status bar DWORD dwStatusStyle = WS_CHILD | WS_CLIPSIBLINGS | SBARS_SIZEGRIP | SBARS_TOOLTIPS; if (m_settings.fStatusBarVisible) @@ -923,7 +917,7 @@ cleanup: return hResult; } -long IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) +HRESULT IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) { return IEGetNameAndFlagsEx(pidl, uFlags, 0, pszBuf, cchBuf, rgfInOut); } @@ -1051,42 +1045,33 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, FireNavigateComplete(L"ERROR"); } - if (fCabinetState.fFullPathTitle) - nameFlags = SHGDN_FORADDRESSBAR | SHGDN_FORPARSING; - else - nameFlags = SHGDN_FORADDRESSBAR; - hResult = IEGetNameAndFlags(fCurrentDirectoryPIDL, nameFlags, newTitle, - sizeof(newTitle) / sizeof(wchar_t), NULL); - if (SUCCEEDED(hResult)) - { - SetWindowText(newTitle); + UpdateWindowTitle(); - LPCITEMIDLIST pidlChild; - INT index, indexOpen; - HIMAGELIST himlSmall, himlLarge; + LPCITEMIDLIST pidlChild; + INT index, indexOpen; + HIMAGELIST himlSmall, himlLarge; - CComPtr<IShellFolder> sf; - hResult = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - if (SUCCEEDED(hResult)) - { - index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + CComPtr<IShellFolder> sf; + hResult = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (SUCCEEDED(hResult)) + { + index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - Shell_GetImageLists(&himlLarge, &himlSmall); + Shell_GetImageLists(&himlLarge, &himlSmall); - HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); - HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); + HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); + HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); - /* Hack to make it possible to release the old icons */ - /* Something seems to go wrong with WM_SETICON */ - HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); - HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); + /* Hack to make it possible to release the old icons */ + /* Something seems to go wrong with WM_SETICON */ + HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); + HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); - SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); - SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); + SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); + SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); - DestroyIcon(oldSmall); - DestroyIcon(oldLarge); - } + DestroyIcon(oldSmall); + DestroyIcon(oldLarge); } FireCommandStateChangeAll(); @@ -1524,14 +1509,6 @@ void CShellBrowser::RepositionBars() clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); } -void CShellBrowser::LoadCabinetState() -{ - fCabinetState.fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", - L"FullPath", - FALSE, - FALSE); -} - HRESULT CShellBrowser::FireEvent(DISPID dispIdMember, int argCount, VARIANT *arguments) { DISPPARAMS params; @@ -3600,6 +3577,7 @@ LRESULT CShellBrowser::RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lPar LRESULT CShellBrowser::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + RefreshCabinetState(); SHPropagateMessage(m_hWnd, uMsg, wParam, lParam, TRUE); return 0; } @@ -3860,3 +3838,21 @@ HRESULT CShellBrowser_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CShellBrowser>(riid, ppv); } + +void CShellBrowser::RefreshCabinetState() +{ + gCabinetState.Load(); + UpdateWindowTitle(); +} + +void CShellBrowser::UpdateWindowTitle() +{ + WCHAR title[MAX_PATH]; + SHGDNF flags = SHGDN_FORADDRESSBAR; + + if (gCabinetState.fFullPathTitle) + flags |= SHGDN_FORPARSING; + + if (SUCCEEDED(IEGetNameAndFlags(fCurrentDirectoryPIDL, flags, title, _countof(title), NULL))) + SetWindowText(title); +}

1 year, 3 months

[reactos] 02/02: Fix balloon tooltip shape

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aa76275ac7aac74ef3b4… commit 1aa76275ac7aac74ef3b4d9a05e55ef9fcf7fd7b Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:21:03 2023 -0600 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Oct 2 22:39:10 2023 +0200 Fix balloon tooltip shape --- dll/win32/comctl32/tooltips.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index 0d89a0256f9..8c8ef43eb08 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -162,10 +162,17 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ +#ifdef __REACTOS__ +#define BALLOON_ROUNDEDNESS 16 +#define BALLOON_STEMHEIGHT 18 +#define BALLOON_STEMWIDTH 18 +#define BALLOON_STEMINDENT 16 +#else #define BALLOON_ROUNDEDNESS 20 #define BALLOON_STEMHEIGHT 13 #define BALLOON_STEMWIDTH 10 #define BALLOON_STEMINDENT 20 +#endif // __REACTOS__ #define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -741,6 +748,40 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); +#ifdef __REACTOS__ + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= (rect.right - mon_info.rcMonitor.right); + rect.right = mon_info.rcMonitor.right; + } + } + + if (rect.left < mon_info.rcMonitor.left) + { + rect.right += abs(rect.left); + rect.left = 0; + } + + if (rect.bottom > mon_info.rcMonitor.bottom) + { + RECT rc; + if (toolPtr->uFlags & TTF_IDISHWND) + { + GetWindowRect((HWND)toolPtr->uId, &rc); + } + else + { + rc = toolPtr->rect; + MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); + } + rect.bottom = rc.top - 2; + rect.top = rect.bottom - size.cy; + } +#else if( rect.right > mon_info.rcWork.right ) { rect.left -= rect.right - mon_info.rcWork.right + 2; rect.right = mon_info.rcWork.right - 2; @@ -759,6 +800,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; } +#endif // __REACTOS__ AdjustWindowRectEx (&rect, GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE), FALSE, GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE)); @@ -775,7 +817,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; +#ifdef __REACTOS__ + pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -787,7 +833,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { +#ifdef __REACTOS__ + pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); +#else pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); +#endif pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -805,7 +855,11 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, +#ifdef __REACTOS__ + (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT + 1), +#else (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), +#endif BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); CombineRgn(hRgn, hRgn, hrStem, RGN_OR);

1 year, 3 months

[reactos] 01/02: Set maximum balloon width for notification area

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab1868c7bf7f700f9363a… commit ab1868c7bf7f700f9363a5553cb07d73b9ea962b Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:21:03 2023 -0600 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Oct 2 22:39:10 2023 +0200 Set maximum balloon width for notification area --- base/shell/explorer/syspager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 35eb0faf75f..b039f189101 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -21,6 +21,8 @@ #include "precomp.h" +#define BALLOON_MAXWIDTH 340 + struct InternalIconData : NOTIFYICONDATA { // Must keep a separate copy since the original is unioned with uTimeout. @@ -617,19 +619,19 @@ void CBalloonQueue::Show(Info& info) // TODO: NIF_REALTIME, NIIF_NOSOUND, other Vista+ flags - const int index = IndexOf(info.pSource); + m_current = info.pSource; RECT rc; - m_toolbar->GetItemRect(index, &rc); + m_toolbar->GetItemRect(IndexOf(m_current), &rc); m_toolbar->ClientToScreen(&rc); const WORD x = (rc.left + rc.right) / 2; const WORD y = (rc.top + rc.bottom) / 2; m_tooltips->SetTitle(info.szInfoTitle, info.uIcon); m_tooltips->TrackPosition(x, y); + m_tooltips->SetMaxTipWidth(BALLOON_MAXWIDTH); m_tooltips->UpdateTipText(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd), info.szInfo); m_tooltips->TrackActivate(m_hwndParent, reinterpret_cast<LPARAM>(m_toolbar->m_hWnd)); - m_current = info.pSource; int timeout = info.uTimeout; if (timeout < MinTimeout) timeout = MinTimeout; if (timeout > MaxTimeout) timeout = MaxTimeout;

1 year, 3 months

[reactos] 01/01: [CALC] Use pragma once for calc.h (#5754)

by Sarthak Roy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ba8af9cae6e19d122faf… commit 4ba8af9cae6e19d122faff294622530e16b561d3 Author: Sarthak Roy <sarthakroy2002(a)gmail.com> AuthorDate: Mon Oct 2 03:28:32 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 2 00:58:32 2023 +0300 [CALC] Use pragma once for calc.h (#5754) It's simpler and only needs to be included once at the beginning of the header file. It generates an unique identifier for the file automatically, so maintainers wouldn't need to choose unique names for the macros. It will be helpful if any future refactoring takes place. Signed-off-by: Sarthak Roy <sarthakroy2002(a)gmail.com> --- base/applications/calc/calc.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index f6c2c7c8631..3af74cc3701 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -1,5 +1,4 @@ -#ifndef __CALC_H__ -#define __CALC_H__ +#pragma once #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -280,5 +279,3 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp); void ConvExecute(HWND hWnd); void ConvAdjust(HWND hWnd, int n_cat); void ConvInit(HWND hWnd); - -#endif /* __CALC_H__ */

1 year, 3 months

[reactos] 11/11: [NTDLL_WINETEST] Enable registry tests for KeyCachedInformation back

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd54cd32cf02254e9fc9e… commit dd54cd32cf02254e9fc9ef78eb544bd580cd8787 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Feb 16 21:44:37 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Oct 1 20:06:03 2023 +0200 [NTDLL_WINETEST] Enable registry tests for KeyCachedInformation back --- modules/rostests/winetests/ntdll/reg.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/modules/rostests/winetests/ntdll/reg.c b/modules/rostests/winetests/ntdll/reg.c index b03cd077dfd..1ee28ac3b34 100644 --- a/modules/rostests/winetests/ntdll/reg.c +++ b/modules/rostests/winetests/ntdll/reg.c @@ -1797,23 +1797,18 @@ static void test_NtQueryKey(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString(&str); - if (!winetest_interactive) - skip("ROSTESTS-198: Causes an assert in Cm.\n"); - else - { - status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); - ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); - if (status == STATUS_SUCCESS) - { - ok(len == sizeof(cached_info), "got unexpected length %d\n", len); - ok(cached_info.SubKeys == 1, "cached_info.SubKeys = %u\n", cached_info.SubKeys); - ok(cached_info.MaxNameLen == 24, "cached_info.MaxNameLen = %u\n", cached_info.MaxNameLen); - ok(cached_info.Values == 1, "cached_info.Values = %u\n", cached_info.Values); - ok(cached_info.MaxValueNameLen == 6, "cached_info.MaxValueNameLen = %u\n", cached_info.MaxValueNameLen); - ok(cached_info.MaxValueDataLen == 4, "cached_info.MaxValueDataLen = %u\n", cached_info.MaxValueDataLen); - ok(cached_info.NameLength == 22, "cached_info.NameLength = %u\n", cached_info.NameLength); - } + if (status == STATUS_SUCCESS) + { + ok(len == sizeof(cached_info), "got unexpected length %d\n", len); + ok(cached_info.SubKeys == 1, "cached_info.SubKeys = %u\n", cached_info.SubKeys); + ok(cached_info.MaxNameLen == 24, "cached_info.MaxNameLen = %u\n", cached_info.MaxNameLen); + ok(cached_info.Values == 1, "cached_info.Values = %u\n", cached_info.Values); + ok(cached_info.MaxValueNameLen == 6, "cached_info.MaxValueNameLen = %u\n", cached_info.MaxValueNameLen); + ok(cached_info.MaxValueDataLen == 4, "cached_info.MaxValueDataLen = %u\n", cached_info.MaxValueDataLen); + ok(cached_info.NameLength == 22, "cached_info.NameLength = %u\n", cached_info.NameLength); } status = pNtDeleteKey(subkey2);

1 year, 3 months

[reactos] 10/11: [NTOS:CM][DOCUMENTATION] Provide documentation for newly added functions

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0ea1f96eff0fa8b90972… commit c0ea1f96eff0fa8b90972bed306b2f480be29dfd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Aug 26 22:37:53 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Oct 1 20:06:03 2023 +0200 [NTOS:CM][DOCUMENTATION] Provide documentation for newly added functions --- ntoskrnl/config/cmkcbncb.c | 81 ++++++++++++++++++++ ntoskrnl/config/cmparse.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+) diff --git a/ntoskrnl/config/cmkcbncb.c b/ntoskrnl/config/cmkcbncb.c index 659aeea4ddb..9a69479c4b0 100644 --- a/ntoskrnl/config/cmkcbncb.c +++ b/ntoskrnl/config/cmkcbncb.c @@ -1134,6 +1134,13 @@ DelistKeyBodyFromKCB(IN PCM_KEY_BODY KeyBody, if (!LockHeld) CmpReleaseKcbLock(KeyBody->KeyControlBlock); } +/** + * @brief + * Unlocks a number of KCBs provided by a KCB array. + * + * @param[in] KcbArray + * A pointer to an array of KCBs to be unlocked. + */ VOID CmpUnLockKcbArray( _In_ PULONG KcbArray) @@ -1147,6 +1154,24 @@ CmpUnLockKcbArray( } } +/** + * @brief + * Locks a given number of KCBs. + * + * @param[in] KcbArray + * A pointer to an array of KCBs to be locked. + * The count of KCBs to be locked is defined by the + * first element in the array. + * + * @param[in] KcbLockFlags + * Define a lock flag to lock the KCBs. + * + * CMP_LOCK_KCB_ARRAY_EXCLUSIVE -- indicates the KCBs are locked + * exclusively and owned by the calling thread. + * + * CMP_LOCK_KCB_ARRAY_SHARED -- indicates the KCBs are locked + * in shared mode by the owning threads. + */ static VOID CmpLockKcbArray( @@ -1169,6 +1194,18 @@ CmpLockKcbArray( } } +/** + * @brief + * Sorts an array of KCB hashes in ascending order + * and removes any key indices that are duplicates. + * The purpose of sorting the KCB elements is to + * ensure consistent and proper locking order, so + * that we can prevent a deadlock. + * + * @param[in,out] KcbArray + * A pointer to an array of KCBs of which the key + * indices are to be sorted. + */ static VOID CmpSortKcbArray( @@ -1216,6 +1253,50 @@ CmpSortKcbArray( KcbArray[0] = KcbCount; } +/** + * @brief + * Builds an array of KCBs and locks them. Whether these + * KCBs are locked exclusively or in shared mode by the calling + * thread, is specified by the KcbLockFlags parameter. The array + * is sorted. + * + * @param[in] HashCacheStack + * A pointer to a hash cache stack. This stack parameter + * stores the convkey hashes of interested KCBs of a + * key path name that need to be locked. + * + * @param[in] KcbLockFlags + * Define a lock flag to lock the KCBs. Consult the + * CmpLockKcbArray documentation for more information. + * + * @param[in] Kcb + * A pointer to a key control block to be given. This + * KCB is included in the array for locking, that is, + * given by the CmpParseKey from the parser object. + * + * @param[in,out] OuterStackArray + * A pointer to an array that lives on the caller's + * stack. It acts like an auxiliary array used by + * the function to store the KCB elements for locking. + * The expected size of the array is up to 32 elements, + * which is the imposed limit by CMP_HASH_STACK_LIMIT. + * This limit also corresponds to the maximum depth of + * subkey levels. + * + * @param[in] TotalRemainingSubkeys + * The number of total remaining subkey levels. + * + * @param[in] MatchRemainSubkeyLevel + * The number of remaining subkey levels that match. + * + * @return + * Returns a pointer to an array of KCBs that have been + * locked. + * + * @remarks + * The caller HAS THE RESPONSIBILITY to unlock the KCBs + * after the necessary operations are done! + */ PULONG NTAPI CmpBuildAndLockKcbArray( diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index dec2fd72cda..b9bc5c7e596 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -1111,6 +1111,31 @@ CmpHandleExitNode(IN OUT PHHIVE *Hive, } } +/** + * @brief + * Computes the hashes of each subkey in key path name + * and stores them in a hash stack for cache lookup. + * + * @param[in] RemainingName + * A Unicode string structure consisting of the remaining + * registry key path name. + * + * @param[in] ConvKey + * The hash convkey of the current KCB to be supplied. + * + * @param[in,out] HashCacheStack + * An array stack. This function uses this array to store + * all the computed hashes of a key pathname. + * + * @param[out] TotalSubKeys + * The number of total subkeys that have been found, returned + * by this function to the caller. If no subkey levels are found + * the function returns 0. + * + * @return + * Returns the number of remaining subkey levels to caller. + * If no subkey levels are found then this function returns 0. + */ static ULONG CmpComputeHashValue( @@ -1229,6 +1254,31 @@ CmpComputeHashValue( return RemainingSubkeysInTotal; } +/** + * @brief + * Compares each subkey's hash and name with those + * captured in the hash cache stack. + * + * @param[in] HashCacheStack + * A pointer to a hash cache stack array filled with + * subkey hashes and names for comparison. + * + * @param[in] CurrentKcb + * A pointer to the currently given KCB. + * + * @param[in] RemainingSubkeys + * The remaining subkey levels to be supplied. + * + * @param[out] ParentKcb + * A pointer to the parent KCB returned to the caller. + * This parameter points to the parent of the current + * KCB if all the subkeys match, otherwise it points + * to the actual current KCB. + * + * @return + * Returns TRUE if all the subkey levels match, otherwise + * FALSE is returned. + */ static BOOLEAN CmpCompareSubkeys( @@ -1290,6 +1340,22 @@ CmpCompareSubkeys( return TRUE; } +/** + * @brief + * Removes the subkeys on a remaining key pathname. + * + * @param[in] HashCacheStack + * A pointer to a hash cache stack array filled with + * subkey hashes and names. + * + * @param[in] RemainingSubkeys + * The remaining subkey levels to be supplied. + * + * @param[in,out] RemainingName + * A Unicode string structure consisting of the remaining + * registry key path name, where the subkeys of such path + * are to be removed. + */ static VOID CmpRemoveSubkeysInRemainingName( @@ -1326,6 +1392,69 @@ CmpRemoveSubkeysInRemainingName( } } +/** + * @brief + * Looks up in the pool cache for key pathname that matches + * with one in the said cache and returns a KCB pointing + * to that name. This function performs locking of KCBs + * during cache lookup. + * + * @param[in] HashCacheStack + * A pointer to a hash cache stack array filled with + * subkey hashes and names. + * + * @param[in] LockKcbsExclusive + * If set to TRUE, the KCBs are locked exclusively by the + * calling thread, otherwise they are locked in shared mode. + * See Remarks for further information. + * + * @param[in] TotalRemainingSubkeys + * The total remaining subkey levels to be supplied. + * + * @param[in,out] RemainingName + * A Unicode string structure consisting of the remaining + * registry key path name. The remaining name is updated + * by the function if a key pathname is found in cache. + * + * @param[in,out] OuterStackArray + * A pointer to an array that lives on the caller's stack. + * The expected size of the array is up to 32 elements, + * which is the imposed limit by CMP_HASH_STACK_LIMIT. + * This limit also corresponds to the maximum depth of + * subkey levels. + * + * @param[in,out] Kcb + * A pointer to a KCB, this KCB is changed if the key pathname + * is found in cache. + * + * @param[out] Hive + * A pointer to a hive, this hive is changed if the key pathname + * is found in cache. + * + * @param[out] Cell + * A pointer to a cell, this cell is changed if the key pathname + * is found in cache. + * + * @param[out] MatchRemainSubkeyLevel + * A pointer to match subkey levels returned by the function. + * If no match levels are found, this is 0. + * + * @return + * Returns STATUS_SUCCESS if cache lookup has completed successfully. + * STATUS_OBJECT_NAME_NOT_FOUND is returned if the current KCB of + * the key pathname has been deleted. STATUS_RETRY is returned if + * at least the current KCB or its parent have been deleted + * and a cache lookup must be retried again. STATUS_UNSUCCESSFUL is + * returned if a KCB is referenced too many times. + * + * @remarks + * The function attempts to do a cache lookup with a shared lock + * on KCBs so that other threads can simultaneously get access + * to these KCBs. When the captured KCB is being deleted on us + * we have to retry a lookup with exclusive look so that no other + * threads will mess with the KCBs and perform appropriate actions + * if a KCB is deleted. + */ static NTSTATUS CmpLookInCache( @@ -1505,6 +1634,63 @@ CmpLookInCache( return STATUS_SUCCESS; } +/** + * @brief + * Builds a hash stack cache and looks up in the + * pool cache for a matching key pathname. + * + * @param[in] ParseObject + * A pointer to a parse object, acting as a key + * body. This parameter is unused. + * + * @param[in,out] Kcb + * A pointer to a KCB. This KCB is used by the + * registry parser after hash stack and cache + * lookup are done. This KCB might change if the + * key is found to be cached in the cache pool. + * + * @param[in] Current + * The current remaining key pathname. + * + * @param[out] Hive + * A pointer to a registry hive, returned by the caller. + * + * @param[out] Cell + * A pointer to a hive cell, returned by the caller. + * + * @param[out] TotalRemainingSubkeys + * A pointer to a number of total remaining subkey levels, + * returned by the caller. This can be 0 if no subkey levels + * have been found. + * + * @param[out] MatchRemainSubkeyLevel + * A pointer to a number of remaining subkey levels that match, + * returned by the caller. This can be 0 if no matching levels + * are found. + * + * @param[out] TotalSubkeys + * A pointer to a number of total subkeys. This can be 0 if no + * subkey levels are found. By definition, both MatchRemainSubkeyLevel + * and TotalRemainingSubkeys are 0 as well. + * + * @param[in,out] OuterStackArray + * A pointer to an array that lives on the caller's stack. + * The expected size of the array is up to 32 elements, + * which is the imposed limit by CMP_HASH_STACK_LIMIT. + * This limit also corresponds to the maximum depth of + * subkey levels. + * + * @param[out] LockedKcbs + * A pointer to an array of locked KCBs, returned by the caller. + * + * @return + * Returns STATUS_SUCCESS if all the operations have succeeded without + * problems. STATUS_NAME_TOO_LONG is returned if the key pathname has + * too many subkey levels (more than 32 levels deep). A failure NTSTATUS + * code is returned otherwise. Refer to CmpLookInCache documentation + * for more information about other returned status codes. + * STATUS_UNSUCCESSFUL is returned if a KCB is referenced too many times. + */ NTSTATUS NTAPI CmpBuildHashStackAndLookupCache(

1 year, 3 months

[reactos] 09/11: [NTOS:CM] Implement cache lookup and cleanup subkey information for cache consistency

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4de5ceb9e5338c7346ae… commit f4de5ceb9e5338c7346ae52705441c069e9e8ea2 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Feb 16 21:42:26 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Oct 1 20:06:02 2023 +0200 [NTOS:CM] Implement cache lookup and cleanup subkey information for cache consistency During an open or create procedure of a registry key, the registry parser grabs a key control block (KCB) from the parser object and uses its information to do the necessary work in order to obtain a pointer to the newly created or opened registry key. However, the registry parsers faces several issues. First, we don't do subkey cache cleaning information against gathered KCBs so whenever we do a registry parse we end up with KCBs that have cache inconsistencies. Moreover we don't do any locking of whatever KCB we are grabing during a parse procedure. === PROPOSED CHANGES === * Implement CmpComputeHashValue and CmpLookInCache functions. With CmpComputeHashValue we can compute the convkey hashes of each subkey in the path name of a key so we can lock them with CmpBuildAndLockKcbArray. CmpLookInCache is a function that searches for the suitable KCB in the cache. The factors that determine if a KCB is "suitable" are: -- the currently found KCB in the hash list has the same levels as that of the given KCB from the parse object; -- The key names from the computed hash values match with the block name of the KCB; -- The currently found KCB is not deleted. The KCB will be changed if the key path name points to a partial match name in the cache. The KCB from the parse object will be used if we have a full match of remaining levels. * Add missing CMP_LOCK_HASHES_FOR_KCB flags on CmpCreateKeyControlBlock calls that create KCBs during a parse procedure. Such lock has to be preserved until we're done with the registry parsing. * On CmpDoCreateChild, preserve the exclusive lock of the KCB when we are enlisting the key body. * On CmpDoCreate, make sure that the passed parent KCB is locked exclusively and lock the hiver flusher as we don't want the flusher to kick in during a key creation on the given hive. Cleanup the subkey info when we're creating a key object. Also implement missing cleanup path codes. Furthermore, avoid key object creation if the parent KCB is protected with a read-only switch. * Soft rewrite the CmpDoOpen function, namely how we manage a direct open vs create KCB on open scenario. When a KCB is found in cache avoid touching the key node. If the symbolic link has been resolved (aka found) then lock exclusively the symbolic KCB. Otherwise just give the cached KCB to the caller. If it were for the caller to request a KCB creation, we must check the passed KCB from the parser object is locked exclusively, unlike on the case above the caller doesn't want to create a KCB because there's already one in the cache. We don't want anybody to touch our KCB while we are still toying with it during its birth. Furthermore, enlist the key body but mind the kind of lock it's been used. * On CmpCreateLinkNode, avoid creating a key object if the parent KCB is protected with a read-only switch. In addition, add missing hive flusher locks for both the target hive and its child. Cleanup the subkey information of the KCB when creating a link node, this ensures our cached KCB data remains consistent. * Do a direct open on CmpParseKey if no remaining subkey levels have been found during hash computation and cache lookup, in this case the given KCB is the block that points to the exact key. This happens when for example someone tried to call RegOpenKeyExW but submitting NULL to the lpSubKey argument parameter. CORE-10581 ROSTESTS-198 --- ntoskrnl/config/cmparse.c | 832 +++++++++++++++++++++++++++++++++++++---- ntoskrnl/include/internal/cm.h | 2 +- 2 files changed, 761 insertions(+), 73 deletions(-) diff --git a/ntoskrnl/config/cmparse.c b/ntoskrnl/config/cmparse.c index 38346c2501d..dec2fd72cda 100644 --- a/ntoskrnl/config/cmparse.c +++ b/ntoskrnl/config/cmparse.c @@ -336,7 +336,7 @@ CmpDoCreateChild(IN PHHIVE Hive, *KeyCell, KeyNode, ParentKcb, - 0, // CMP_LOCK_HASHES_FOR_KCB, + CMP_LOCK_HASHES_FOR_KCB, Name); if (!Kcb) { @@ -355,7 +355,7 @@ CmpDoCreateChild(IN PHHIVE Hive, KeyBody->KeyControlBlock = Kcb; /* Link it with the KCB */ - EnlistKeyBodyWithKCB(KeyBody, 0); + EnlistKeyBodyWithKCB(KeyBody, CMP_ENLIST_KCB_LOCKED_EXCLUSIVE); /* Assign security */ Status = SeAssignSecurity(ParentDescriptor, @@ -419,6 +419,17 @@ CmpDoCreate(IN PHHIVE Hive, LARGE_INTEGER TimeStamp; PCM_KEY_NODE KeyNode; + /* Make sure the KCB is locked and lock the flusher */ + CMP_ASSERT_KCB_LOCK(ParentKcb); + CmpLockHiveFlusherShared((PCMHIVE)Hive); + + /* Bail out on read-only KCBs */ + if (ParentKcb->ExtFlags & CM_KCB_READ_ONLY_KEY) + { + Status = STATUS_ACCESS_DENIED; + goto Exit; + } + /* Check if the parent is being deleted */ if (ParentKcb->Delete) { @@ -493,8 +504,17 @@ CmpDoCreate(IN PHHIVE Hive, /* Now add the subkey */ if (!CmpAddSubKey(Hive, Cell, KeyCell)) { - /* Failure! We don't handle this yet! */ - ASSERT(FALSE); + /* Free the created child */ + CmpFreeKeyByCell(Hive, KeyCell, FALSE); + + /* Purge out this KCB */ + KeyBody->KeyControlBlock->Delete = TRUE; + CmpRemoveKeyControlBlock(KeyBody->KeyControlBlock); + + /* And cleanup the key body object */ + ObDereferenceObjectDeferDelete(*Object); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; } /* Get the key node */ @@ -502,9 +522,21 @@ CmpDoCreate(IN PHHIVE Hive, if (!KeyNode) { /* Fail, this shouldn't happen */ - ASSERT(FALSE); + CmpFreeKeyByCell(Hive, KeyCell, TRUE); // Subkey linked above + + /* Purge out this KCB */ + KeyBody->KeyControlBlock->Delete = TRUE; + CmpRemoveKeyControlBlock(KeyBody->KeyControlBlock); + + /* And cleanup the key body object */ + ObDereferenceObjectDeferDelete(*Object); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; } + /* Clean up information on this subkey */ + CmpCleanUpSubKeyInfo(KeyBody->KeyControlBlock->ParentKcb); + /* Sanity checks */ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); @@ -539,7 +571,16 @@ CmpDoCreate(IN PHHIVE Hive, if (!CellData) { /* This shouldn't happen */ - ASSERT(FALSE); + CmpFreeKeyByCell(Hive, KeyCell, TRUE); // Subkey linked above + + /* Purge out this KCB */ + KeyBody->KeyControlBlock->Delete = TRUE; + CmpRemoveKeyControlBlock(KeyBody->KeyControlBlock); + + /* And cleanup the key body object */ + ObDereferenceObjectDeferDelete(*Object); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Exit; } /* Update the flags */ @@ -551,6 +592,7 @@ CmpDoCreate(IN PHHIVE Hive, Exit: /* Release the flusher lock and return status */ + CmpUnlockHiveFlusher((PCMHIVE)Hive); return Status; } @@ -565,10 +607,13 @@ CmpDoOpen(IN PHHIVE Hive, IN PCM_PARSE_CONTEXT Context OPTIONAL, IN ULONG ControlFlags, IN OUT PCM_KEY_CONTROL_BLOCK *CachedKcb, + IN PULONG KcbsLocked, IN PUNICODE_STRING KeyName, OUT PVOID *Object) { NTSTATUS Status; + BOOLEAN LockKcb = FALSE; + BOOLEAN IsLockShared = FALSE; PCM_KEY_BODY KeyBody = NULL; PCM_KEY_CONTROL_BLOCK Kcb = NULL; @@ -600,37 +645,87 @@ CmpDoOpen(IN PHHIVE Hive, Context->Disposition = REG_OPENED_EXISTING_KEY; } - /* Do this in the registry lock */ - CmpLockRegistry(); - - /* If we have a KCB, make sure it's locked */ - //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); + /* Lock the KCB on creation if asked */ + if (ControlFlags & CMP_CREATE_KCB_KCB_LOCKED) + { + LockKcb = TRUE; + } /* Check if caller doesn't want to create a KCB */ if (ControlFlags & CMP_OPEN_KCB_NO_CREATE) { + /* + * The caller doesn't want to create a KCB. This means the KCB + * is already in cache and other threads may take use of it + * so it has to be locked in share mode. + */ + IsLockShared = TRUE; + /* Check if this is a symlink */ - if ((Node->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) + if (((*CachedKcb)->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) { - /* This case for a cached KCB is not implemented yet */ - ASSERT(FALSE); + /* Is this symlink found? */ + if ((*CachedKcb)->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* Get the real KCB, is this deleted? */ + Kcb = (*CachedKcb)->ValueCache.RealKcb; + if (Kcb->Delete) + { + /* + * The real KCB is gone, do a reparse. We used to lock the KCB in + * shared mode as others may have taken use of it but since we + * must do a reparse of the key the only thing that matter is us. + * Lock the KCB exclusively so nobody is going to mess with the KCB. + */ + DPRINT1("The real KCB is deleted, attempt a reparse\n"); + CmpUnLockKcbArray(KcbsLocked); + CmpAcquireKcbLockExclusiveByIndex(GET_HASH_INDEX((*CachedKcb)->ConvKey)); + CmpCleanUpKcbValueCache(*CachedKcb); + KcbsLocked[0] = 1; + KcbsLocked[1] = GET_HASH_INDEX((*CachedKcb)->ConvKey); + return STATUS_REPARSE; + } + + /* + * The symlink has been found. As in the similar case above, + * the KCB of the symlink exclusively, we don't want anybody + * to mess it up. + */ + CmpUnLockKcbArray(KcbsLocked); + CmpAcquireKcbLockExclusiveByIndex(GET_HASH_INDEX((*CachedKcb)->ConvKey)); + KcbsLocked[0] = 1; + KcbsLocked[1] = GET_HASH_INDEX((*CachedKcb)->ConvKey); + } + else + { + /* We must do a reparse */ + DPRINT("The symlink is not found, attempt a reparse\n"); + return STATUS_REPARSE; + } + } + else + { + /* This is not a symlink, just give the cached KCB already */ + Kcb = *CachedKcb; } /* The caller wants to open a cached KCB */ - if (!CmpReferenceKeyControlBlock(*CachedKcb)) + if (!CmpReferenceKeyControlBlock(Kcb)) { - /* Release the registry lock */ - CmpUnlockRegistry(); - /* Return failure code */ return STATUS_INSUFFICIENT_RESOURCES; } - - /* Our kcb is that one */ - Kcb = *CachedKcb; } else { + /* + * The caller wants to create a new KCB. Unlike the code path above, here + * we must check if the lock is exclusively held because in the scenario + * where the caller doesn't want to create a KCB is because it is already + * in the cache and it must have a shared lock instead. + */ + ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); + /* Check if this is a symlink */ if ((Node->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) { @@ -639,47 +734,39 @@ CmpDoOpen(IN PHHIVE Hive, Cell, Node, *CachedKcb, - 0, + LockKcb ? CMP_LOCK_HASHES_FOR_KCB : 0, KeyName); if (!Kcb) { - /* Release registry lock and return failure */ - CmpUnlockRegistry(); + /* Return failure */ return STATUS_INSUFFICIENT_RESOURCES; } /* Make sure it's also locked, and set the pointer */ - //ASSERT(CmpIsKcbLockedExclusive(Kcb)); + ASSERT(CmpIsKcbLockedExclusive(Kcb)); *CachedKcb = Kcb; - /* Release the registry lock */ - CmpUnlockRegistry(); - /* Return reparse required */ return STATUS_REPARSE; } - /* Create the KCB. FIXME: Use lock flag */ + /* Create the KCB */ Kcb = CmpCreateKeyControlBlock(Hive, Cell, Node, *CachedKcb, - 0, + LockKcb ? CMP_LOCK_HASHES_FOR_KCB : 0, KeyName); if (!Kcb) { - /* Release registry lock and return failure */ - CmpUnlockRegistry(); + /* Return failure */ return STATUS_INSUFFICIENT_RESOURCES; } - } - /* Make sure it's also locked, and set the pointer */ - //ASSERT(CmpIsKcbLockedExclusive(Kcb)); - *CachedKcb = Kcb; - - /* Release the registry lock */ - CmpUnlockRegistry(); + /* Make sure it's also locked, and set the pointer */ + ASSERT(CmpIsKcbLockedExclusive(Kcb)); + *CachedKcb = Kcb; + } /* Allocate the key object */ Status = ObCreateObject(AccessMode, @@ -701,7 +788,7 @@ CmpDoOpen(IN PHHIVE Hive, KeyBody->NotifyBlock = NULL; /* Link to the KCB */ - EnlistKeyBodyWithKCB(KeyBody, 0); + EnlistKeyBodyWithKCB(KeyBody, IsLockShared ? CMP_ENLIST_KCB_LOCKED_SHARED : CMP_ENLIST_KCB_LOCKED_EXCLUSIVE); /* * We are already holding a lock against the KCB that is assigned @@ -748,6 +835,7 @@ CmpCreateLinkNode(IN PHHIVE Hive, IN ULONG CreateOptions, IN PCM_PARSE_CONTEXT Context, IN PCM_KEY_CONTROL_BLOCK ParentKcb, + IN PULONG KcbsLocked, OUT PVOID *Object) { NTSTATUS Status; @@ -765,6 +853,18 @@ CmpCreateLinkNode(IN PHHIVE Hive, return STATUS_ACCESS_DENIED; } + /* Make sure the KCB is locked and lock the flusher */ + CMP_ASSERT_KCB_LOCK(ParentKcb); + CmpLockHiveFlusherShared((PCMHIVE)Hive); + CmpLockHiveFlusherShared((PCMHIVE)Context->ChildHive.KeyHive); + + /* Bail out on read-only KCBs */ + if (ParentKcb->ExtFlags & CM_KCB_READ_ONLY_KEY) + { + Status = STATUS_ACCESS_DENIED; + goto Exit; + } + /* Check if the parent is being deleted */ if (ParentKcb->Delete) { @@ -827,8 +927,9 @@ CmpCreateLinkNode(IN PHHIVE Hive, AccessMode, CreateOptions, NULL, - 0, + CMP_CREATE_KCB_KCB_LOCKED, &Kcb, + KcbsLocked, &Name, Object); HvReleaseCell(Context->ChildHive.KeyHive, KeyCell); @@ -930,6 +1031,9 @@ CmpCreateLinkNode(IN PHHIVE Hive, /* Get the key body */ KeyBody = (PCM_KEY_BODY)*Object; + /* Clean up information on this subkey */ + CmpCleanUpSubKeyInfo(KeyBody->KeyControlBlock->ParentKcb); + /* Sanity checks */ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); @@ -966,6 +1070,8 @@ CmpCreateLinkNode(IN PHHIVE Hive, Exit: /* Release the flusher locks and return status */ + CmpUnlockHiveFlusher((PCMHIVE)Context->ChildHive.KeyHive); + CmpUnlockHiveFlusher((PCMHIVE)Hive); return Status; } @@ -1005,40 +1111,550 @@ CmpHandleExitNode(IN OUT PHHIVE *Hive, } } +static +ULONG +CmpComputeHashValue( + _In_ PUNICODE_STRING RemainingName, + _In_ ULONG ConvKey, + _Inout_ PCM_HASH_CACHE_STACK HashCacheStack, + _Out_ PULONG TotalSubKeys) +{ + ULONG CopyConvKey; + ULONG SubkeysInTotal; + ULONG RemainingSubkeysInTotal; + PWCHAR RemainingNameBuffer; + USHORT RemainingNameLength; + USHORT KeyNameLength; + + /* Don't compute the hashes on a NULL remaining name */ + RemainingNameBuffer = RemainingName->Buffer; + RemainingNameLength = RemainingName->Length; + if (RemainingNameLength == 0) + { + *TotalSubKeys = 0; + return 0; + } + + /* Skip any leading separator */ + while (RemainingNameLength >= sizeof(WCHAR) && + *RemainingNameBuffer == OBJ_NAME_PATH_SEPARATOR) + { + RemainingNameBuffer++; + RemainingNameLength -= sizeof(WCHAR); + } + + /* Now set up the hash stack entries and compute the hashes */ + SubkeysInTotal = 0; + RemainingSubkeysInTotal = 0; + KeyNameLength = 0; + CopyConvKey = ConvKey; + HashCacheStack[RemainingSubkeysInTotal].NameOfKey.Buffer = RemainingNameBuffer; + while (RemainingNameLength > 0) + { + /* Is this character a separator? */ + if (*RemainingNameBuffer != OBJ_NAME_PATH_SEPARATOR) + { + /* It's not, add it to the hash */ + CopyConvKey = COMPUTE_HASH_CHAR(CopyConvKey, *RemainingNameBuffer); + + /* Go to the next character (add up the length of the character as well) */ + RemainingNameBuffer++; + KeyNameLength += sizeof(WCHAR); + RemainingNameLength -= sizeof(WCHAR); + + /* + * We are at the end of the key name path. Take into account + * the last character and if we still have space in the hash + * stack, add it up in the remaining list. + */ + if (RemainingNameLength == 0) + { + if (RemainingSubkeysInTotal < CMP_SUBKEY_LEVELS_DEPTH_LIMIT) + { + HashCacheStack[RemainingSubkeysInTotal].NameOfKey.Length = KeyNameLength; + HashCacheStack[RemainingSubkeysInTotal].NameOfKey.MaximumLength = KeyNameLength; + HashCacheStack[RemainingSubkeysInTotal].ConvKey = CopyConvKey; + RemainingSubkeysInTotal++; + } + + SubkeysInTotal++; + } + } + else + { + /* Skip any leading separator */ + while (RemainingNameLength >= sizeof(WCHAR) && + *RemainingNameBuffer == OBJ_NAME_PATH_SEPARATOR) + { + RemainingNameBuffer++; + RemainingNameLength -= sizeof(WCHAR); + } + + /* + * It would be possible that a malformed key pathname may be passed + * to the registry parser such as a path with only separators like + * "\\\\" for example. This would trick the function into believing + * the key path has subkeys albeit that is not the case. + */ + ASSERT(RemainingNameLength != 0); + + /* Take into account this subkey */ + SubkeysInTotal++; + + /* And add it up to the hash stack */ + if (RemainingSubkeysInTotal < CMP_SUBKEY_LEVELS_DEPTH_LIMIT) + { + HashCacheStack[RemainingSubkeysInTotal].NameOfKey.Length = KeyNameLength; + HashCacheStack[RemainingSubkeysInTotal].NameOfKey.MaximumLength = KeyNameLength; + HashCacheStack[RemainingSubkeysInTotal].ConvKey = CopyConvKey; + + RemainingSubkeysInTotal++; + KeyNameLength = 0; + + /* + * Precaution check -- we have added up a remaining + * subkey above but we must ensure we still have space + * to hold up the new subkey for which we will compute + * the hashes, so that we don't blow up the hash stack. + */ + if (RemainingSubkeysInTotal < CMP_SUBKEY_LEVELS_DEPTH_LIMIT) + { + HashCacheStack[RemainingSubkeysInTotal].NameOfKey.Buffer = RemainingNameBuffer; + } + } + } + } + + *TotalSubKeys = SubkeysInTotal; + return RemainingSubkeysInTotal; +} + +static +BOOLEAN +CmpCompareSubkeys( + _In_ PCM_HASH_CACHE_STACK HashCacheStack, + _In_ PCM_KEY_CONTROL_BLOCK CurrentKcb, + _In_ ULONG RemainingSubkeys, + _Out_ PCM_KEY_CONTROL_BLOCK *ParentKcb) +{ + LONG HashStackIndex; + LONG Result; + PCM_NAME_CONTROL_BLOCK NameBlock; + UNICODE_STRING CurrentNameBlock; + + ASSERT(CurrentKcb != NULL); + + /* Loop each hash and check that they match */ + HashStackIndex = RemainingSubkeys; + while (HashStackIndex >= 0) + { + /* Does the subkey hash match? */ + if (CurrentKcb->ConvKey != HashCacheStack[HashStackIndex].ConvKey) + { + *ParentKcb = CurrentKcb; + return FALSE; + } + + /* Compare the subkey string, is the name compressed? */ + NameBlock = CurrentKcb->NameBlock; + if (NameBlock->Compressed) + { + Result = CmpCompareCompressedName(&HashCacheStack[HashStackIndex].NameOfKey, + NameBlock->Name, + NameBlock->NameLength); + } + else + { + CurrentNameBlock.Buffer = NameBlock->Name; + CurrentNameBlock.Length = NameBlock->NameLength; + CurrentNameBlock.MaximumLength = NameBlock->NameLength; + + Result = RtlCompareUnicodeString(&HashCacheStack[HashStackIndex].NameOfKey, + &CurrentNameBlock, + TRUE); + } + + /* Do the subkey names match? */ + if (Result) + { + *ParentKcb = CurrentKcb; + return FALSE; + } + + /* Go to the next subkey hash */ + HashStackIndex--; + } + + /* All the subkeys match */ + *ParentKcb = CurrentKcb->ParentKcb; + return TRUE; +} + +static +VOID +CmpRemoveSubkeysInRemainingName( + _In_ PCM_HASH_CACHE_STACK HashCacheStack, + _In_ ULONG RemainingSubkeys, + _Inout_ PUNICODE_STRING RemainingName) +{ + ULONG HashStackIndex = 0; + + /* Skip any leading separator on matching name */ + while (RemainingName->Length >= sizeof(WCHAR) && + RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + RemainingName->Buffer++; + RemainingName->Length -= sizeof(WCHAR); + } + + /* Skip the subkeys as well */ + while (HashStackIndex <= RemainingSubkeys) + { + RemainingName->Buffer += HashCacheStack[HashStackIndex].NameOfKey.Length / sizeof(WCHAR); + RemainingName->Length -= HashCacheStack[HashStackIndex].NameOfKey.Length; + + /* Skip any leading separator */ + while (RemainingName->Length >= sizeof(WCHAR) && + RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + RemainingName->Buffer++; + RemainingName->Length -= sizeof(WCHAR); + } + + /* Go to the next hash */ + HashStackIndex++; + } +} + +static +NTSTATUS +CmpLookInCache( + _In_ PCM_HASH_CACHE_STACK HashCacheStack, + _In_ BOOLEAN LockKcbsExclusive, + _In_ ULONG TotalRemainingSubkeys, + _Inout_ PUNICODE_STRING RemainingName, + _Inout_ PULONG OuterStackArray, + _Inout_ PCM_KEY_CONTROL_BLOCK *Kcb, + _Out_ PHHIVE *Hive, + _Out_ PHCELL_INDEX Cell, + _Out_ PULONG MatchRemainSubkeyLevel) +{ + LONG RemainingSubkeys; + ULONG TotalLevels; + BOOLEAN SubkeysMatch; + PCM_KEY_CONTROL_BLOCK CurrentKcb, ParentKcb; + PCM_KEY_HASH HashEntry = NULL; + BOOLEAN KeyFoundInCache = FALSE; + PULONG LockedKcbs = NULL; + + /* Reference the KCB */ + if (!CmpReferenceKeyControlBlock(*Kcb)) + { + /* This key is opened too many times, bail out */ + DPRINT1("Could not reference the KCB, too many references (KCB 0x%p)\n", Kcb); + return STATUS_UNSUCCESSFUL; + } + + /* Prepare to lock the KCBs */ + LockedKcbs = CmpBuildAndLockKcbArray(HashCacheStack, + LockKcbsExclusive ? CMP_LOCK_KCB_ARRAY_EXCLUSIVE : CMP_LOCK_KCB_ARRAY_SHARED, + *Kcb, + OuterStackArray, + TotalRemainingSubkeys, + 0); + NT_ASSERT(LockedKcbs); + + /* Lookup in the cache */ + RemainingSubkeys = TotalRemainingSubkeys - 1; + TotalLevels = TotalRemainingSubkeys + (*Kcb)->TotalLevels + 1; + while (RemainingSubkeys >= 0) + { + /* Get the hash entry from the cache */ + HashEntry = GET_HASH_ENTRY(CmpCacheTable, HashCacheStack[RemainingSubkeys].ConvKey)->Entry; + + /* Take one level down as we are processing this hash entry */ + TotalLevels--; + + while (HashEntry != NULL) + { + /* Validate this hash and obtain the current KCB */ + ASSERT_VALID_HASH(HashEntry); + CurrentKcb = CONTAINING_RECORD(HashEntry, CM_KEY_CONTROL_BLOCK, KeyHash); + + /* Does this KCB have matching levels? */ + if (TotalLevels == CurrentKcb->TotalLevels) + { + /* + * We have matching subkey levels but don't directly assume we have + * a matching key path in cache. Start comparing each subkey. + */ + SubkeysMatch = CmpCompareSubkeys(HashCacheStack, + CurrentKcb, + RemainingSubkeys, + &ParentKcb); + if (SubkeysMatch) + { + /* All subkeys match, now check if the base KCB matches with parent */ + if (*Kcb == ParentKcb) + { + /* Is the KCB marked as deleted? */ + if (CurrentKcb->Delete || + CurrentKcb->ParentKcb->Delete) + { + /* + * Either the current or its parent KCB is marked + * but we had a shared lock so probably a naughty + * thread was deleting it. Retry doing a cache + * lookup again with exclusive lock. + */ + if (!LockKcbsExclusive) + { + CmpUnLockKcbArray(LockedKcbs); + CmpDereferenceKeyControlBlock(*Kcb); + DPRINT1("The current KCB or its parent is deleted, retrying looking in the cache\n"); + return STATUS_RETRY; + } + + /* We're under an exclusive lock, is the KCB deleted yet? */ + if (CurrentKcb->Delete) + { + /* The KCB is gone, the key should no longer belong in the cache */ + CmpRemoveKeyControlBlock(CurrentKcb); + CmpUnLockKcbArray(LockedKcbs); + CmpDereferenceKeyControlBlock(*Kcb); + DPRINT1("The current KCB is deleted (KCB 0x%p)\n", CurrentKcb); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* + * The parent is deleted so it must be that somebody created + * a fake key. Assert ourselves that is the case. + */ + ASSERT(CurrentKcb->ExtFlags & CM_KCB_KEY_NON_EXIST); + + /* Remove this KCB out of cache if someone still uses it */ + if (CurrentKcb->RefCount != 0) + { + CurrentKcb->Delete = TRUE; + CmpRemoveKeyControlBlock(CurrentKcb); + } + else + { + /* Otherwise expunge it */ + CmpRemoveFromDelayedClose(CurrentKcb); + CmpCleanUpKcbCacheWithLock(CurrentKcb, FALSE); + } + + /* Stop looking for next hashes as the KCB is kaput */ + break; + } + + /* We finally found the key in cache, acknowledge it */ + KeyFoundInCache = TRUE; + + /* Remove the subkeys in the remaining name and stop looking in the cache */ + CmpRemoveSubkeysInRemainingName(HashCacheStack, RemainingSubkeys, RemainingName); + break; + } + } + } + + /* Go to the next hash */ + HashEntry = HashEntry->NextHash; + } + + /* Stop looking in cache if we found the matching key */ + if (KeyFoundInCache) + { + DPRINT("Key found in cache, stop looking\n"); + break; + } + + /* Keep looking in the cache until we run out of remaining subkeys */ + RemainingSubkeys--; + } + + /* Return the matching subkey levels */ + *MatchRemainSubkeyLevel = RemainingSubkeys + 1; + + /* We have to update the KCB if the key was found in cache */ + if (KeyFoundInCache) + { + /* + * Before we change the KCB we must dereference the prior + * KCB that we no longer need it. + */ + CmpDereferenceKeyControlBlock(*Kcb); + *Kcb = CurrentKcb; + + /* Reference the new KCB now */ + if (!CmpReferenceKeyControlBlock(*Kcb)) + { + /* This key is opened too many times, bail out */ + DPRINT1("Could not reference the KCB, too many references (KCB 0x%p)\n", Kcb); + return STATUS_UNSUCCESSFUL; + } + + /* Update hive and cell data from current KCB */ + *Hive = CurrentKcb->KeyHive; + *Cell = CurrentKcb->KeyCell; + } + + /* Unlock the KCBs */ + CmpUnLockKcbArray(LockedKcbs); + return STATUS_SUCCESS; +} + NTSTATUS NTAPI -CmpBuildHashStackAndLookupCache(IN PCM_KEY_BODY ParseObject, - IN OUT PCM_KEY_CONTROL_BLOCK *Kcb, - IN PUNICODE_STRING Current, - OUT PHHIVE *Hive, - OUT HCELL_INDEX *Cell, - OUT PULONG TotalRemainingSubkeys, - OUT PULONG MatchRemainSubkeyLevel, - OUT PULONG TotalSubkeys, - OUT PULONG OuterStackArray, - OUT PULONG *LockedKcbs) +CmpBuildHashStackAndLookupCache( + _In_ PCM_KEY_BODY ParseObject, + _Inout_ PCM_KEY_CONTROL_BLOCK *Kcb, + _In_ PUNICODE_STRING Current, + _Out_ PHHIVE *Hive, + _Out_ PHCELL_INDEX Cell, + _Out_ PULONG TotalRemainingSubkeys, + _Out_ PULONG MatchRemainSubkeyLevel, + _Out_ PULONG TotalSubkeys, + _Inout_ PULONG OuterStackArray, + _Out_ PULONG *LockedKcbs) { - /* We don't lock anything for now */ - *LockedKcbs = NULL; + NTSTATUS Status; + ULONG ConvKey; + ULONG SubkeysInTotal, RemainingSubkeysInTotal, MatchRemainingSubkeys; + CM_HASH_CACHE_STACK HashCacheStack[CMP_SUBKEY_LEVELS_DEPTH_LIMIT]; - /* Calculate hash values */ - *TotalRemainingSubkeys = 0xBAADF00D; + /* Make sure it's not a dead KCB */ + ASSERT((*Kcb)->RefCount > 0); /* Lock the registry */ CmpLockRegistry(); + /* Calculate hash values for every subkey this key path has */ + ConvKey = (*Kcb)->ConvKey; + RemainingSubkeysInTotal = CmpComputeHashValue(Current, + ConvKey, + HashCacheStack, + &SubkeysInTotal); + + /* This key path has too many subkeys */ + if (SubkeysInTotal > CMP_SUBKEY_LEVELS_DEPTH_LIMIT) + { + DPRINT1("The key path has too many subkeys - %lu\n", SubkeysInTotal); + *LockedKcbs = NULL; + return STATUS_NAME_TOO_LONG; + } + /* Return hive and cell data */ *Hive = (*Kcb)->KeyHive; *Cell = (*Kcb)->KeyCell; - /* Make sure it's not a dead KCB */ - ASSERT((*Kcb)->RefCount > 0); + /* Do we have any subkeys? */ + if (!RemainingSubkeysInTotal && !SubkeysInTotal) + { + /* + * We don't have any subkeys nor remaining levels, the + * KCB points to the actual key. Lock it. + */ + if (!CmpReferenceKeyControlBlock(*Kcb)) + { + /* This key is opened too many times, bail out */ + DPRINT1("Could not reference the KCB, too many references (KCB 0x%p)\n", Kcb); + return STATUS_UNSUCCESSFUL; + } - /* Reference it */ - (VOID)CmpReferenceKeyControlBlock(*Kcb); + CmpAcquireKcbLockSharedByIndex(GET_HASH_INDEX(ConvKey)); - /* Return success for now */ - return STATUS_SUCCESS; + /* Add this KCB in the array of locked KCBs */ + OuterStackArray[0] = 1; + OuterStackArray[1] = GET_HASH_INDEX(ConvKey); + *LockedKcbs = OuterStackArray; + + /* And return all the subkey level counters */ + *TotalRemainingSubkeys = RemainingSubkeysInTotal; + *MatchRemainSubkeyLevel = 0; + *TotalSubkeys = SubkeysInTotal; + return STATUS_SUCCESS; + } + + /* Lookup in the cache */ + Status = CmpLookInCache(HashCacheStack, + FALSE, + RemainingSubkeysInTotal, + Current, + OuterStackArray, + Kcb, + Hive, + Cell, + &MatchRemainingSubkeys); + if (!NT_SUCCESS(Status)) + { + /* Bail out if cache lookup failed for other reasons */ + if (Status != STATUS_RETRY) + { + DPRINT1("CmpLookInCache() failed (Status 0x%lx)\n", Status); + *LockedKcbs = NULL; + return Status; + } + + /* Retry looking in the cache but with KCBs locked exclusively */ + Status = CmpLookInCache(HashCacheStack, + TRUE, + RemainingSubkeysInTotal, + Current, + OuterStackArray, + Kcb, + Hive, + Cell, + &MatchRemainingSubkeys); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CmpLookInCache() failed after retry (Status 0x%lx)\n", Status); + *LockedKcbs = NULL; + return Status; + } + } + + /* + * Check if we have a full match of remaining levels. + * + * FIXME: It is possible we can catch a fake key from the cache + * when we did the lookup, in such case we should not do any + * locking as such KCB does not point to any real information. + * Currently ReactOS doesn't create fake KCBs so we are good + * for now. + */ + if (RemainingSubkeysInTotal == MatchRemainingSubkeys) + { + /* + * Just simply lock this KCB as it points to the full + * subkey levels in cache. + */ + CmpAcquireKcbLockSharedByIndex(GET_HASH_INDEX((*Kcb)->ConvKey)); + OuterStackArray[0] = 1; + OuterStackArray[1] = GET_HASH_INDEX((*Kcb)->ConvKey); + *LockedKcbs = OuterStackArray; + } + else + { + /* + * We only have a partial match so other subkey levels + * have each KCB. Simply just lock them. + */ + *LockedKcbs = CmpBuildAndLockKcbArray(HashCacheStack, + CMP_LOCK_KCB_ARRAY_EXCLUSIVE, + *Kcb, + OuterStackArray, + RemainingSubkeysInTotal, + MatchRemainingSubkeys); + NT_ASSERT(*LockedKcbs); + } + + /* Return all the subkey level counters */ + *TotalRemainingSubkeys = RemainingSubkeysInTotal; + *MatchRemainSubkeyLevel = MatchRemainingSubkeys; + *TotalSubkeys = SubkeysInTotal; + return Status; } NTSTATUS @@ -1064,7 +1680,9 @@ CmpParseKey(IN PVOID ParseObject, UNICODE_STRING Current, NextName; PCM_PARSE_CONTEXT ParseContext = Context; ULONG TotalRemainingSubkeys = 0, MatchRemainSubkeyLevel = 0, TotalSubkeys = 0; - PULONG LockedKcbs = NULL; + ULONG LockedKcbArray[CMP_KCBS_IN_ARRAY_LIMIT]; + PULONG LockedKcbs; + BOOLEAN IsKeyCached = FALSE; BOOLEAN Result, Last; PAGED_CODE(); @@ -1109,8 +1727,15 @@ CmpParseKey(IN PVOID ParseObject, &TotalRemainingSubkeys, &MatchRemainSubkeyLevel, &TotalSubkeys, - NULL, + LockedKcbArray, &LockedKcbs); + CMP_ASSERT_REGISTRY_LOCK(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to look in cache, stop parsing (Status 0x%lx)\n", Status); + ParentKcb = NULL; + goto Quickie; + } /* This is now the parent */ ParentKcb = Kcb; @@ -1118,10 +1743,6 @@ CmpParseKey(IN PVOID ParseObject, /* Sanity check */ ASSERT(ParentKcb != NULL); - /* Check if everything was found cached */ - if (!TotalRemainingSubkeys) - ASSERTMSG("Caching not implemented\n", FALSE); - /* Don't do anything if we're being deleted */ if (Kcb->Delete) { @@ -1129,6 +1750,51 @@ CmpParseKey(IN PVOID ParseObject, goto Quickie; } + /* Check if everything was found cached */ + if (!TotalRemainingSubkeys) + { + /* + * We don't have any remaining subkey levels so we're good + * that we have an already perfect candidate for a KCB, just + * do the open directly. + */ + DPRINT("No remaining subkeys, the KCB points to the actual key\n"); + IsKeyCached = TRUE; + goto KeyCachedOpenNow; + } + + /* Check if we have a matching level */ + if (MatchRemainSubkeyLevel) + { + /* + * We have a matching level, check if that matches + * with the total levels of subkeys. Do the open directly + * if that is the case, because the whole subkeys levels + * is cached. + */ + if (MatchRemainSubkeyLevel == TotalSubkeys) + { + DPRINT("We have a full matching level, open the key now\n"); + IsKeyCached = TRUE; + goto KeyCachedOpenNow; + } + + /* + * We only have a partial match, make sure we did not + * get mismatched hive data. + */ + ASSERT(Hive == Kcb->KeyHive); + ASSERT(Cell == Kcb->KeyCell); + } + + /* + * FIXME: Currently the registry parser doesn't check for fake + * KCBs. CmpCreateKeyControlBlock does have the necessary implementation + * to create such fake keys but we don't create these fake keys anywhere. + * When we will do, we must improve the registry parser routine to handle + * fake keys a bit differently here. + */ + /* Check if this is a symlink */ if (Kcb->Flags & KEY_SYM_LINK) { @@ -1154,6 +1820,10 @@ CmpParseKey(IN PVOID ParseObject, } Current.MaximumLength += NextName.MaximumLength; + /* CmpGetSymbolicLink doesn't want a lock */ + CmpUnLockKcbArray(LockedKcbs); + LockedKcbs = NULL; + /* Parse the symlink */ if (CmpGetSymbolicLink(Hive, CompleteName, @@ -1221,6 +1891,7 @@ CmpParseKey(IN PVOID ParseObject, } } +KeyCachedOpenNow: /* Do the open */ Status = CmpDoOpen(Hive, Cell, @@ -1229,12 +1900,17 @@ CmpParseKey(IN PVOID ParseObject, AccessMode, Attributes, ParseContext, - 0, + IsKeyCached ? CMP_OPEN_KCB_NO_CREATE : CMP_CREATE_KCB_KCB_LOCKED, &Kcb, + LockedKcbs, &NextName, Object); if (Status == STATUS_REPARSE) { + /* CmpGetSymbolicLink doesn't want a lock */ + CmpUnLockKcbArray(LockedKcbs); + LockedKcbs = NULL; + /* Parse the symlink */ if (!CmpGetSymbolicLink(Hive, CompleteName, @@ -1272,7 +1948,7 @@ CmpParseKey(IN PVOID ParseObject, Cell, Node, ParentKcb, - 0, + CMP_LOCK_HASHES_FOR_KCB, &NextName); if (!Kcb) { @@ -1282,7 +1958,7 @@ CmpParseKey(IN PVOID ParseObject, } /* Dereference the parent and set the new one */ - CmpDereferenceKeyControlBlock(ParentKcb); + CmpDereferenceKeyControlBlockWithLock(ParentKcb, FALSE); ParentKcb = Kcb; } else @@ -1302,6 +1978,7 @@ CmpParseKey(IN PVOID ParseObject, Attributes, ParseContext, ParentKcb, + LockedKcbs, Object); } else if (Hive == &CmiVolatileHive->Hive && CmpNoVolatileCreates) @@ -1360,6 +2037,10 @@ CmpParseKey(IN PVOID ParseObject, } Current.MaximumLength += NextName.MaximumLength; + /* CmpGetSymbolicLink doesn't want a lock */ + CmpUnLockKcbArray(LockedKcbs); + LockedKcbs = NULL; + /* Parse the symlink */ if (CmpGetSymbolicLink(Hive, CompleteName, @@ -1406,8 +2087,9 @@ CmpParseKey(IN PVOID ParseObject, AccessMode, Attributes, ParseContext, - CMP_OPEN_KCB_NO_CREATE /* | CMP_CREATE_KCB_KCB_LOCKED */, + CMP_OPEN_KCB_NO_CREATE, &Kcb, + LockedKcbs, &NextName, Object); if (Status == STATUS_REPARSE) @@ -1426,8 +2108,14 @@ CmpParseKey(IN PVOID ParseObject, } } - /* Dereference the parent if it exists */ Quickie: + /* Unlock all the KCBs */ + if (LockedKcbs != NULL) + { + CmpUnLockKcbArray(LockedKcbs); + } + + /* Dereference the parent if it exists */ if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index eab9a1c9b61..db702bd8b28 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -1133,12 +1133,12 @@ CmpCreateLinkNode( IN PHHIVE Hive, IN HCELL_INDEX Cell, IN PACCESS_STATE AccessState, - IN PULONG KcbsLocked, IN UNICODE_STRING Name, IN KPROCESSOR_MODE AccessMode, IN ULONG CreateOptions, IN PCM_PARSE_CONTEXT Context, IN PCM_KEY_CONTROL_BLOCK ParentKcb, + IN PULONG KcbsLocked, OUT PVOID *Object );

1 year, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs