Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [MSPAINT] Remember status bar visibility (#5145)
by Katayama Hirofumi MZ 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff9295a2267c94076fbc… commit 9ff9295a2267c94076fbc095093b39b08bfed41d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 11 11:41:52 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 11 11:41:52 2023 +0900 [MSPAINT] Remember status bar visibility (#5145) - Add ShowStatusBar registry setting. - Save ShowStatusBar status and restore the status on startup. CORE-18867 --- base/applications/mspaint/main.cpp | 4 +++- base/applications/mspaint/registry.cpp | 3 +++ base/applications/mspaint/registry.h | 1 + base/applications/mspaint/winproc.cpp | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index f040ad7d300..4b8ed0c5fbe 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -239,9 +239,11 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* creating the status bar */ hStatusBar = - CreateWindowEx(0, STATUSCLASSNAME, NULL, SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, + CreateWindowEx(0, STATUSCLASSNAME, NULL, SBARS_SIZEGRIP | WS_CHILD, 0, 0, 0, 0, hwnd, NULL, hThisInstance, NULL); SendMessage(hStatusBar, SB_SETMINHEIGHT, 21, 0); + if (registrySettings.ShowStatusBar) + ShowWindow(hStatusBar, SW_SHOWNOACTIVATE); RECT scrlClientWindowPos = {0, 0, 0 + 500, 0 + 500}; scrlClientWindow.Create(scrollboxWindow.m_hWnd, scrlClientWindowPos, NULL, WS_CHILD | WS_VISIBLE); diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index fd83a4b3243..1702c8d2c01 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -74,6 +74,7 @@ void RegistrySettings::LoadPresets() FontsPositionX = 0; FontsPositionY = 0; ShowTextTool = TRUE; + ShowStatusBar = TRUE; LOGFONT lf; GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); @@ -100,6 +101,7 @@ void RegistrySettings::Load() ReadDWORD(view, _T("ThumbXPos"), ThumbXPos, TRUE); ReadDWORD(view, _T("ThumbYPos"), ThumbYPos, TRUE); ReadDWORD(view, _T("UnitSetting"), UnitSetting, FALSE); + ReadDWORD(view, _T("ShowStatusBar"), ShowStatusBar, FALSE); ULONG pnBytes = sizeof(WINDOWPLACEMENT); view.QueryBinaryValue(_T("WindowPlacement"), &WindowPlacement, &pnBytes); @@ -152,6 +154,7 @@ void RegistrySettings::Store() view.SetDWORDValue(_T("ThumbXPos"), ThumbXPos); view.SetDWORDValue(_T("ThumbYPos"), ThumbYPos); view.SetDWORDValue(_T("UnitSetting"), UnitSetting); + view.SetDWORDValue(_T("ShowStatusBar"), ShowStatusBar); view.SetBinaryValue(_T("WindowPlacement"), &WindowPlacement, sizeof(WINDOWPLACEMENT)); } diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index 33c1be4054b..be90c104d9c 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -41,6 +41,7 @@ public: DWORD FontsPositionX; DWORD FontsPositionY; DWORD ShowTextTool; + DWORD ShowStatusBar; enum WallpaperStyle { TILED, diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 779db8ff51d..3a064799c40 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -729,7 +729,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH alignChildrenToMainWindow(); break; case IDM_VIEWSTATUSBAR: - ::ShowWindow(hStatusBar, ::IsWindowVisible(hStatusBar) ? SW_HIDE : SW_SHOW); + registrySettings.ShowStatusBar = !::IsWindowVisible(hStatusBar); + ::ShowWindow(hStatusBar, (registrySettings.ShowStatusBar ? SW_SHOWNOACTIVATE : SW_HIDE)); alignChildrenToMainWindow(); break; case IDM_FORMATICONBAR:

1 0

[reactos] 01/01: [NTOS:KD][KDBG] Rework the BootPhase >= 2 initialization of the KD/KDBG kernel debugger. (#4892) CORE-17470
by Hermès Bélusca-Maïto 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ce819ca5a7de11a1b77e… commit 4ce819ca5a7de11a1b77e05124d2d2f0d35871c4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 19:35:18 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 11 01:22:19 2023 +0100 [NTOS:KD][KDBG] Rework the BootPhase >= 2 initialization of the KD/KDBG kernel debugger. (#4892) CORE-17470 + KdpDebugLogInit: Add resources cleanup in failure code paths. Fix, in an NT-compatible manner, how (and when) the KD/KDBG BootPhase >=2 initialization steps are performed. These are necessary for any functionality KDBG needs, that would depend on the NT I/O Manager and the storage and filesystem stacks to be running. This includes, creating the debug log file, and for KDBG, loading its KDBinit initialization file. As a result, file debug logging is fixed. The old ReactOS-specific (NT-incompatible) callback we did in the middle of IoInitSystem() is removed, in favor of a runtime mechanism that should work on Windows as well. The idea for this new mechanism is loosely inspired by the TDL4 rootkit, see http://blog.w4kfu.com/public/tdl4_article/draft_tdl4article.html but contrary to it, a specific hook is used instead, as well as the technique of driver reinitialization: https://web.archive.org/web/20211021050515/https://driverentry.com.br/en/bl… Its rationale is as follows: We want to be able to perform I/O-related initialization (starting a logger thread for file log debugging, loading KDBinit file for KDBG, etc.). A good place for this would be as early as possible, once the I/O Manager has started the storage and the boot filesystem drivers. Here is an overview of the initialization steps of the NT Kernel and Executive: ---- KiSystemStartup(KeLoaderBlock) if (Cpu == 0) KdInitSystem(0, KeLoaderBlock); KiSwitchToBootStack() -> KiSystemStartupBootStack() -> KiInitializeKernel() -> ExpInitializeExecutive(Cpu, KeLoaderBlock) (NOTE: Any unexpected debugger break will call KdInitSystem(0, NULL); ) KdInitSystem(0, LoaderBlock) -> KdDebuggerInitialize0(LoaderBlock); ExpInitializeExecutive(Cpu == 0): ExpInitializationPhase = 0; HalInitSystem(0, KeLoaderBlock); <-- Sets HalInitPnpDriver callback. ... PsInitSystem(LoaderBlock) PsCreateSystemThread(Phase1Initialization) Phase1Initialization(Discard): ExpInitializationPhase = 1; HalInitSystem(1, KeLoaderBlock); ... Early initialization of Ob, Ex, Ke. KdInitSystem(1, KeLoaderBlock); ... KdDebuggerInitialize1(LoaderBlock); ... IoInitSystem(LoaderBlock); ... ---- As we can see, KdDebuggerInitialize1() is the last KD initialization routine the kernel calls, and is called *before* the I/O Manager starts. Thus, direct Nt/ZwCreateFile ... calls done there would fail. Also, we want to do the I/O initialization as soon as possible. There does not seem to be any exported way to be notified about the I/O manager initialization steps... that is, unless we somehow become a driver and insert ourselves in the flow! Since we are not a regular driver, we need to invoke IoCreateDriver() to create one. However, remember that we are currently running *before* IoInitSystem(), the I/O subsystem is not initialized yet. Due to this, calling IoCreateDriver(), much like any other IO functions, would lead to a crash, because it calls ObCreateObject(..., IoDriverObjectType, ...), and IoDriverObjectType is non-initialized yet (it's NULL). The chosen solution is to hook a "known" exported callback: namely, the HalInitPnpDriver() callback (it initializes the "HAL Root Bus Driver"). It is set very early on by the HAL via the HalInitSystem(0, ...) call, and is called early on by IoInitSystem() before any driver is loaded, but after the I/O Manager has been minimally set up so that new drivers can be created. When the hook: KdpInitDriver() is called, we create our driver with IoCreateDriver(), specifying its entrypoint KdpDriverEntry(), then restore and call the original HalInitPnpDriver() callback. Another possible unexplored alternative, could be to insert ourselves in the KeLoaderBlock->LoadOrderListHead boot modules list, or in the KeLoaderBlock->BootDriverListHead boot-driver list. (Note that while we may be able to do this, because boot-drivers are resident in memory, much like we are, we cannot insert ourselves in the system-driver list however, since those drivers are expected to come from PE image files.) Once the KdpDriverEntry() driver entrypoint is called, we register KdpDriverReinit() for re-initialization with the I/O Manager, in order to provide more initialization points. KdpDriverReinit() calls the KD providers at BootPhase >= 2, and schedules further reinitializations (at most 3 more) if any of the providers request so. --- ntoskrnl/include/internal/kd.h | 9 +- ntoskrnl/io/iomgr/iomgr.c | 8 -- ntoskrnl/kd/kdio.c | 121 +++++++++-------- ntoskrnl/kd/kdmain.c | 291 ++++++++++++++++++++++++++++++++++++++--- ntoskrnl/kdbg/kdb.h | 4 +- ntoskrnl/kdbg/kdb_cli.c | 51 ++++++-- 6 files changed, 384 insertions(+), 100 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 325e0b0ea3c..424ae89fe1f 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -39,7 +39,7 @@ typedef enum _KD_CONTINUE_TYPE } KD_CONTINUE_TYPE; typedef -VOID +NTSTATUS (NTAPI *PKDP_INIT_ROUTINE)( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, _In_ ULONG BootPhase); @@ -70,19 +70,19 @@ KdpScreenAcquire(VOID); VOID KdpScreenRelease(VOID); -VOID +NTSTATUS NTAPI KdpScreenInit( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, _In_ ULONG BootPhase); -VOID +NTSTATUS NTAPI KdpSerialInit( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, _In_ ULONG BootPhase); -VOID +NTSTATUS NTAPI KdpDebugLogInit( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, @@ -168,6 +168,7 @@ typedef struct _KD_DISPATCH_TABLE LIST_ENTRY KdProvidersList; PKDP_INIT_ROUTINE KdpInitRoutine; PKDP_PRINT_ROUTINE KdpPrintRoutine; + NTSTATUS InitStatus; } KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; /* The current Debugging Mode */ diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 380a8518661..b982414e270 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -588,14 +588,6 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) * We can finally load other drivers from the boot volume. */ PnPBootDriversInitialized = TRUE; -#if !defined(_WINKD_) && defined(KDBG) - /* Read KDB Data */ - KdbpCliInit(); - - /* I/O is now setup for disk access, so phase 3 */ - KdInitSystem(3, LoaderBlock); -#endif - /* Load system start drivers */ IopInitializeSystemDrivers(); PnpSystemInit = TRUE; diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 129db8b9b5e..4575b9a2e8b 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -19,7 +19,6 @@ #define KdpBufferSize (1024 * 512) static BOOLEAN KdpLoggingEnabled = FALSE; -static BOOLEAN KdpLoggingStarting = FALSE; static PCHAR KdpDebugBuffer = NULL; static volatile ULONG KdpCurrentPosition = 0; static volatile ULONG KdpFreeBytes = 0; @@ -39,14 +38,14 @@ static ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; KDP_DEBUG_MODE KdpDebugMode; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; -KD_DISPATCH_TABLE DispatchTable[KdMax]; +KD_DISPATCH_TABLE DispatchTable[KdMax] = {0}; PKDP_INIT_ROUTINE InitRoutines[KdMax] = { KdpScreenInit, KdpSerialInit, KdpDebugLogInit, -#ifdef KDBG +#ifdef KDBG // See kdb_cli.c KdpKdbgInit #endif }; @@ -158,7 +157,6 @@ KdpPrintToLogFile(PCHAR String, { KIRQL OldIrql; ULONG beg, end, num; - BOOLEAN DoReinit = FALSE; if (KdpDebugBuffer == NULL) return; @@ -185,45 +183,31 @@ KdpPrintToLogFile(PCHAR String, } /* Release the spinlock */ - if (OldIrql == PASSIVE_LEVEL && !KdpLoggingStarting && !KdpLoggingEnabled && ExpInitializationPhase >= 2) - { - DoReinit = TRUE; - } KdbpReleaseLock(&KdpDebugLogSpinLock, OldIrql); - if (DoReinit) - { - KdpLoggingStarting = TRUE; - KdpDebugLogInit(NULL, 3); - } - /* Signal the logger thread */ if (OldIrql <= DISPATCH_LEVEL && KdpLoggingEnabled) KeSetEvent(&KdpLoggerThreadEvent, IO_NO_INCREMENT, FALSE); } -VOID +NTSTATUS NTAPI KdpDebugLogInit( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { - NTSTATUS Status; - UNICODE_STRING FileName; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK Iosb; - HANDLE ThreadHandle; - KPRIORITY Priority; + NTSTATUS Status = STATUS_SUCCESS; - if (!KdpDebugMode.File) return; + if (!KdpDebugMode.File) + return STATUS_PORT_DISCONNECTED; if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpDebugLogInit; DispatchTable->KdpPrintRoutine = KdpPrintToLogFile; - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdpDebugLogInit; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) @@ -235,20 +219,35 @@ KdpDebugLogInit( if (!KdpDebugBuffer) { KdpDebugMode.File = FALSE; - return; + RemoveEntryList(&DispatchTable->KdProvidersList); + return STATUS_NO_MEMORY; } KdpFreeBytes = KdpBufferSize; /* Initialize spinlock */ KeInitializeSpinLock(&KdpDebugLogSpinLock); + /* Register for later BootPhase 2 reinitialization */ + DispatchTable->KdpInitRoutine = KdpDebugLogInit; + HalDisplayString("\r\n File log debugging enabled\r\n\r\n"); } - else if (BootPhase == 3) + else if (BootPhase >= 2) { + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + HANDLE ThreadHandle; + KPRIORITY Priority; + + /* If we have already successfully opened the log file, bail out */ + if (KdpLogFileHandle != NULL) + return STATUS_SUCCESS; + /* Setup the log name */ Status = RtlAnsiStringToUnicodeString(&FileName, &KdpLogFileName, TRUE); - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) + goto Failure; InitializeObjectAttributes(&ObjectAttributes, &FileName, @@ -274,8 +273,16 @@ KdpDebugLogInit( if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open log file: 0x%08x\n", Status); - return; + DPRINT1("Failed to open log file: 0x%08lx\n", Status); + + /* Schedule an I/O reinitialization if needed */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND || + Status == STATUS_OBJECT_PATH_NOT_FOUND) + { + DispatchTable->KdpInitRoutine = KdpDebugLogInit; + return Status; + } + goto Failure; } /** HACK for FILE_APPEND_DATA ** @@ -323,18 +330,29 @@ KdpDebugLogInit( NULL); if (!NT_SUCCESS(Status)) { + DPRINT1("Failed to create log file thread: 0x%08lx\n", Status); ZwClose(KdpLogFileHandle); - return; + goto Failure; } - Priority = 7; + Priority = HIGH_PRIORITY; ZwSetInformationThread(ThreadHandle, ThreadPriority, &Priority, sizeof(Priority)); ZwClose(ThreadHandle); + return Status; + +Failure: + KdpFreeBytes = 0; + ExFreePoolWithTag(KdpDebugBuffer, TAG_KDBG); + KdpDebugBuffer = NULL; + KdpDebugMode.File = FALSE; + RemoveEntryList(&DispatchTable->KdProvidersList); } + + return Status; } /* SERIAL FUNCTIONS **********************************************************/ @@ -365,38 +383,41 @@ KdpSerialPrint(PCHAR String, KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); } -VOID +NTSTATUS NTAPI KdpSerialInit( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { - if (!KdpDebugMode.Serial) return; + if (!KdpDebugMode.Serial) + return STATUS_PORT_DISCONNECTED; if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpSerialInit; DispatchTable->KdpPrintRoutine = KdpSerialPrint; /* Initialize the Port */ if (!KdPortInitializeEx(&SerialPortInfo, SerialPortNumber)) { KdpDebugMode.Serial = FALSE; - return; + return STATUS_DEVICE_DOES_NOT_EXIST; } KdComPortInUse = SerialPortInfo.Address; /* Initialize spinlock */ KeInitializeSpinLock(&KdpSerialSpinLock); - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdpSerialInit; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) { HalDisplayString("\r\n Serial debugging enabled\r\n\r\n"); } + + return STATUS_SUCCESS; } /* SCREEN FUNCTIONS **********************************************************/ @@ -483,21 +504,22 @@ KdpScreenPrint(PCHAR String, } } -VOID +NTSTATUS NTAPI KdpScreenInit( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { - if (!KdpDebugMode.Screen) return; + if (!KdpDebugMode.Screen) + return STATUS_PORT_DISCONNECTED; if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpScreenInit; DispatchTable->KdpPrintRoutine = KdpScreenPrint; - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdpScreenInit; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) @@ -507,16 +529,13 @@ KdpScreenInit( HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); } + + return STATUS_SUCCESS; } /* GENERAL FUNCTIONS *********************************************************/ -BOOLEAN -NTAPI -KdpPrintString( - _In_ PSTRING Output); - extern STRING KdbPromptString; VOID @@ -551,20 +570,16 @@ KdSendPacket( if (!KdpDebugMode.Value) return; - /* Call the registered handlers */ - CurrentEntry = KdProviders.Flink; - while (CurrentEntry != &KdProviders) + /* Call the registered providers */ + for (CurrentEntry = KdProviders.Flink; + CurrentEntry != &KdProviders; + CurrentEntry = CurrentEntry->Flink) { - /* Get the current table */ CurrentTable = CONTAINING_RECORD(CurrentEntry, KD_DISPATCH_TABLE, KdProvidersList); - /* Call it */ CurrentTable->KdpPrintRoutine(MessageData->Buffer, MessageData->Length); - - /* Next Table */ - CurrentEntry = CurrentEntry->Flink; } return; } diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index be749a705a9..abd358da0fc 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -1,10 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/kd/kdmain.c - * PURPOSE: Kernel Debugger Initialization - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel Debugger Initialization + * COPYRIGHT: Copyright 2005 Alex Ionescu <alex.ionescu(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include <ntoskrnl.h> @@ -13,8 +13,6 @@ /* VARIABLES ***************************************************************/ -VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); - extern ANSI_STRING KdpLogFileName; /* PUBLIC FUNCTIONS *********************************************************/ @@ -86,8 +84,9 @@ NTAPI KdDebuggerInitialize0( _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG i; PCHAR CommandLine, Port = NULL; + ULONG i; + BOOLEAN Success = FALSE; if (LoaderBlock) { @@ -127,15 +126,174 @@ KdDebuggerInitialize0( if (KdpDebugMode.Value == 0) KdpDebugMode.Serial = TRUE; - /* Call Providers at Phase 0 */ - for (i = 0; i < KdMax; i++) + /* Call the providers at Phase 0 */ + for (i = 0; i < RTL_NUMBER_OF(DispatchTable); i++) + { + DispatchTable[i].InitStatus = InitRoutines[i](&DispatchTable[i], 0); + Success = (Success || NT_SUCCESS(DispatchTable[i].InitStatus)); + } + + /* Return success if at least one of the providers succeeded */ + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + + +/** + * @brief Reinitialization routine. + * DRIVER_REINITIALIZE + * + * Calls each registered provider for reinitialization at Phase >= 2. + * I/O is now set up for disk access, at different phases. + **/ +static VOID +NTAPI +KdpDriverReinit( + _In_ PDRIVER_OBJECT DriverObject, + _In_opt_ PVOID Context, + _In_ ULONG Count) +{ + PLIST_ENTRY CurrentEntry; + PKD_DISPATCH_TABLE CurrentTable; + PKDP_INIT_ROUTINE KdpInitRoutine; + ULONG BootPhase = (Count + 1); // Do BootPhase >= 2 + BOOLEAN ScheduleReinit = FALSE; + + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + DPRINT("*** KD %sREINITIALIZATION - Phase %d ***\n", + Context ? "" : "BOOT ", BootPhase); + + /* Call the registered providers */ + for (CurrentEntry = KdProviders.Flink; + CurrentEntry != &KdProviders; NOTHING) + { + /* Get the provider */ + CurrentTable = CONTAINING_RECORD(CurrentEntry, + KD_DISPATCH_TABLE, + KdProvidersList); + /* Go to the next entry (the Init routine may unlink us) */ + CurrentEntry = CurrentEntry->Flink; + + /* Call it if it requires a reinitialization */ + if (CurrentTable->KdpInitRoutine) + { + /* Get the initialization routine and reset it */ + KdpInitRoutine = CurrentTable->KdpInitRoutine; + CurrentTable->KdpInitRoutine = NULL; + CurrentTable->InitStatus = KdpInitRoutine(CurrentTable, BootPhase); + DPRINT("KdpInitRoutine(%p) returned 0x%08lx\n", + CurrentTable, CurrentTable->InitStatus); + + /* Check whether it needs to be reinitialized again */ + ScheduleReinit = (ScheduleReinit || CurrentTable->KdpInitRoutine); + } + } + + DPRINT("ScheduleReinit: %s\n", ScheduleReinit ? "TRUE" : "FALSE"); + if (ScheduleReinit) + { + /* + * Determine when to reinitialize. + * If Context == NULL, we are doing a boot-driver reinitialization. + * It is initially done once (Count == 1), and is rescheduled once + * after all other boot drivers get loaded (Count == 2). + * If further reinitialization is needed, switch to system-driver + * reinitialization and do it again, not more than twice. + */ + if (Count <= 1) + { + IoRegisterBootDriverReinitialization(DriverObject, + KdpDriverReinit, + (PVOID)FALSE); + } + else if (Count <= 3) + { + IoRegisterDriverReinitialization(DriverObject, + KdpDriverReinit, + (PVOID)TRUE); + } + else + { + /* Too late, no more reinitializations! */ + DPRINT("Cannot reinitialize anymore!\n"); + ScheduleReinit = FALSE; + } + } + + if (!ScheduleReinit) { - InitRoutines[i](&DispatchTable[i], 0); + /* All the necessary reinitializations are done, + * the driver object is not needed anymore. */ + ObMakeTemporaryObject(DriverObject); + IoDeleteDriver(DriverObject); } +} +/** + * @brief Entry point for the auxiliary driver. + * DRIVER_INITIALIZE + **/ +static NTSTATUS +NTAPI +KdpDriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + UNREFERENCED_PARAMETER(RegistryPath); + + /* Register for reinitialization after the other drivers are loaded */ + IoRegisterBootDriverReinitialization(DriverObject, + KdpDriverReinit, + (PVOID)FALSE); + + /* Set the driver as initialized */ + DriverObject->Flags |= DRVO_INITIALIZED; return STATUS_SUCCESS; } +/** + * @brief Hooked HalInitPnpDriver() callback. + * It is initially set by the HAL when HalInitSystem(0, ...) + * is called earlier on. + **/ +static pHalInitPnpDriver orgHalInitPnpDriver = NULL; + +/** + * @brief + * HalInitPnpDriver() callback hook installed by KdDebuggerInitialize1(). + * + * It is called during initialization of the I/O manager and is where + * the auxiliary driver is created. This driver is needed for receiving + * reinitialization callbacks in KdpDriverReinit() later. + * This hook must *always* call the original HalInitPnpDriver() function + * and return its returned value, or return STATUS_SUCCESS. + **/ +static NTSTATUS +NTAPI +KdpInitDriver(VOID) +{ + static BOOLEAN InitCalled = FALSE; + NTSTATUS Status; + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\KdDriver"); + + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + /* Ensure we are not called more than once */ + if (_InterlockedCompareExchange8((char*)&InitCalled, TRUE, FALSE) != FALSE) + return STATUS_SUCCESS; + + /* Create the driver */ + Status = IoCreateDriver(&DriverName, KdpDriverEntry); + if (!NT_SUCCESS(Status)) + DPRINT1("IoCreateDriver failed: 0x%08lx\n", Status); + /* Ignore any failure from IoCreateDriver(). If it fails, no I/O-related + * initialization will happen (no file log debugging, etc.). */ + + /* Finally, restore and call the original HalInitPnpDriver() */ + InterlockedExchangePointer((PVOID*)&HalInitPnpDriver, orgHalInitPnpDriver); + return (HalInitPnpDriver ? HalInitPnpDriver() : STATUS_SUCCESS); +} + NTSTATUS NTAPI KdDebuggerInitialize1( @@ -143,26 +301,119 @@ KdDebuggerInitialize1( { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; + PKDP_INIT_ROUTINE KdpInitRoutine; + BOOLEAN Success = FALSE; + BOOLEAN ReinitForPhase2 = FALSE; - /* Call the registered handlers */ - CurrentEntry = KdProviders.Flink; - while (CurrentEntry != &KdProviders) + /* Call the registered providers */ + for (CurrentEntry = KdProviders.Flink; + CurrentEntry != &KdProviders; NOTHING) { - /* Get the current table */ + /* Get the provider */ CurrentTable = CONTAINING_RECORD(CurrentEntry, KD_DISPATCH_TABLE, KdProvidersList); + /* Go to the next entry (the Init routine may unlink us) */ + CurrentEntry = CurrentEntry->Flink; + + /* Get the initialization routine and reset it */ + ASSERT(CurrentTable->KdpInitRoutine); + KdpInitRoutine = CurrentTable->KdpInitRoutine; + CurrentTable->KdpInitRoutine = NULL; /* Call it */ - CurrentTable->KdpInitRoutine(CurrentTable, 1); + CurrentTable->InitStatus = KdpInitRoutine(CurrentTable, 1); - /* Next Table */ - CurrentEntry = CurrentEntry->Flink; + /* Check whether it needs to be reinitialized for Phase 2 */ + Success = (Success || NT_SUCCESS(CurrentTable->InitStatus)); + ReinitForPhase2 = (ReinitForPhase2 || CurrentTable->KdpInitRoutine); } NtGlobalFlag |= FLG_STOP_ON_EXCEPTION; + /* If we don't need to reinitialize providers for Phase 2, we are done */ + if (!ReinitForPhase2) + { + /* Return success if at least one of them succeeded */ + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + } + + /** + * We want to be able to perform I/O-related initialization (starting a + * logger thread for file log debugging, loading KDBinit file for KDBG, + * etc.). A good place for this would be as early as possible, once the + * I/O Manager has started the storage and the boot filesystem drivers. + * + * Here is an overview of the initialization steps of the NT Kernel and + * Executive: + * ---- + * KiSystemStartup(KeLoaderBlock) + * if (Cpu == 0) KdInitSystem(0, KeLoaderBlock); + * KiSwitchToBootStack() -> KiSystemStartupBootStack() + * -> KiInitializeKernel() -> ExpInitializeExecutive(Cpu, KeLoaderBlock) + * + * (NOTE: Any unexpected debugger break will call KdInitSystem(0, NULL); ) + * KdInitSystem(0, LoaderBlock) -> KdDebuggerInitialize0(LoaderBlock); + * + * ExpInitializeExecutive(Cpu == 0): ExpInitializationPhase = 0; + * HalInitSystem(0, KeLoaderBlock); <-- Sets HalInitPnpDriver callback. + * ... + * PsInitSystem(LoaderBlock) + * PsCreateSystemThread(Phase1Initialization) + * + * Phase1Initialization(Discard): ExpInitializationPhase = 1; + * HalInitSystem(1, KeLoaderBlock); + * ... + * Early initialization of Ob, Ex, Ke. + * KdInitSystem(1, KeLoaderBlock); + * ... + * KdDebuggerInitialize1(LoaderBlock); + * ... + * IoInitSystem(LoaderBlock); + * ... + * ---- + * As we can see, KdDebuggerInitialize1() is the last KD initialization + * routine the kernel calls, and is called *before* the I/O Manager starts. + * Thus, direct Nt/ZwCreateFile ... calls done there would fail. Also, + * we want to do the I/O initialization as soon as possible. There does + * not seem to be any exported way to be notified about the I/O manager + * initialization steps... that is, unless we somehow become a driver and + * insert ourselves in the flow! + * + * Since we are not a regular driver, we need to invoke IoCreateDriver() + * to create one. However, remember that we are currently running *before* + * IoInitSystem(), the I/O subsystem is not initialized yet. Due to this, + * calling IoCreateDriver(), much like any other IO functions, would lead + * to a crash, because it calls + * ObCreateObject(..., IoDriverObjectType, ...), and IoDriverObjectType + * is non-initialized yet (it's NULL). + * + * The chosen solution is to hook a "known" exported callback: namely, the + * HalInitPnpDriver() callback (it initializes the "HAL Root Bus Driver"). + * It is set very early on by the HAL via the HalInitSystem(0, ...) call, + * and is called early on by IoInitSystem() before any driver is loaded, + * but after the I/O Manager has been minimally set up so that new drivers + * can be created. + * When the hook: KdpInitDriver() is called, we create our driver with + * IoCreateDriver(), specifying its entrypoint KdpDriverEntry(), then + * restore and call the original HalInitPnpDriver() callback. + * + * Another possible unexplored alternative, could be to insert ourselves + * in the KeLoaderBlock->LoadOrderListHead boot modules list, or in the + * KeLoaderBlock->BootDriverListHead boot-driver list. (Note that while + * we may be able to do this, because boot-drivers are resident in memory, + * much like we are, we cannot insert ourselves in the system-driver list + * however, since those drivers are expected to come from PE image files.) + * + * Once the KdpDriverEntry() driver entrypoint is called, we register + * KdpDriverReinit() for re-initialization with the I/O Manager, in order + * to provide more initialization points. KdpDriverReinit() calls the KD + * providers at BootPhase >= 2, and schedules further reinitializations + * (at most 3 more) if any of the providers request so. + **/ + orgHalInitPnpDriver = + InterlockedExchangePointer((PVOID*)&HalInitPnpDriver, KdpInitDriver); return STATUS_SUCCESS; } - /* EOF */ +/* EOF */ diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 11bc4cb452f..4424dd4837c 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -82,7 +82,7 @@ KdbpStackSwitchAndCall( extern PCHAR KdbInitFileBuffer; -VOID +NTSTATUS NTAPI KdbInitialize( _In_ PKD_DISPATCH_TABLE DispatchTable, @@ -94,7 +94,7 @@ KdbRegisterCliCallback( PVOID Callback, BOOLEAN Deregister); -VOID +NTSTATUS KdbpCliInit(VOID); VOID diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index fdd5d694924..aaebf573cf8 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3795,11 +3795,13 @@ KdbpCliInterpretInitFile(VOID) DPRINT("KDB: KDBinit executed\n"); } -/*!\brief Called when KDB is initialized +/** + * @brief Called when KDB is initialized. * - * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory and executes it. - */ -VOID + * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory + * and executes it. + **/ +NTSTATUS KdbpCliInit(VOID) { NTSTATUS Status; @@ -3812,6 +3814,10 @@ KdbpCliInit(VOID) PCHAR FileBuffer; ULONG OldEflags; + /* Don't load the KDBinit file if its buffer is already lying around */ + if (KdbInitFileBuffer) + return STATUS_SUCCESS; + /* Initialize the object attributes */ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\System32\\drivers\\etc\\KDBinit"); InitializeObjectAttributes(&ObjectAttributes, @@ -3828,7 +3834,7 @@ KdbpCliInit(VOID) if (!NT_SUCCESS(Status)) { DPRINT("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); - return; + return Status; } /* Get the size of the file */ @@ -3839,7 +3845,7 @@ KdbpCliInit(VOID) { ZwClose(hFile); DPRINT("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); - return; + return Status; } FileSize = FileStdInfo.EndOfFile.u.LowPart; @@ -3849,7 +3855,7 @@ KdbpCliInit(VOID) { ZwClose(hFile); DPRINT("Could not allocate %d bytes for KDBinit file\n", FileSize); - return; + return Status; } /* Load file into memory */ @@ -3860,7 +3866,7 @@ KdbpCliInit(VOID) { ExFreePool(FileBuffer); DPRINT("Could not read KDBinit file into memory (Status 0x%lx)\n", Status); - return; + return Status; } FileSize = min(FileSize, (INT)Iosb.Information); @@ -3872,13 +3878,15 @@ KdbpCliInit(VOID) /* Interpret the init file... */ KdbInitFileBuffer = FileBuffer; - //KdbEnter(); // FIXME + //KdbEnter(); // FIXME, see commit baa47fa5e KdbInitFileBuffer = NULL; /* Leave critical section */ __writeeflags(OldEflags); ExFreePool(FileBuffer); + + return STATUS_SUCCESS; } @@ -3947,10 +3955,10 @@ KdbDebugPrint( * @param[in] BootPhase * Phase of initialization. * - * @return None. + * @return A status value. * @note Also known as "KdpKdbgInit". **/ -VOID +NTSTATUS NTAPI KdbInitialize( _In_ PKD_DISPATCH_TABLE DispatchTable, @@ -3959,14 +3967,17 @@ KdbInitialize( if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdbInitialize; DispatchTable->KdpPrintRoutine = KdbDebugPrint; - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdbInitialize; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) { + /* Register for later BootPhase 2 reinitialization */ + DispatchTable->KdpInitRoutine = KdbInitialize; + /* Initialize Dmesg support */ /* Allocate a buffer for Dmesg log buffer. +1 for terminating null, @@ -3987,6 +3998,20 @@ KdbInitialize( /* Initialize symbols support */ KdbSymInit(BootPhase); } + else if (BootPhase >= 2) + { + /* I/O is now set up for disk access: Read KDB Data */ + NTSTATUS Status = KdbpCliInit(); + + /* Schedule an I/O reinitialization if needed */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND || + Status == STATUS_OBJECT_PATH_NOT_FOUND) + { + DispatchTable->KdpInitRoutine = KdbInitialize; + } + } + + return STATUS_SUCCESS; } /* EOF */

1 0

[reactos] 01/01: [NTOS:KD] Move handling of Dmesg buffer from screen provider to KDBG provider. (#5143) CORE-10749
by Hervé Poussineau 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf734e5373ef476083109… commit bf734e5373ef4760831098b23279e568935c83e1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 10 15:01:01 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 10 23:59:08 2023 +0100 [NTOS:KD] Move handling of Dmesg buffer from screen provider to KDBG provider. (#5143) CORE-10749 The dmesg command is now available even if screen output is disabled. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- ntoskrnl/include/internal/kd.h | 11 ++++++ ntoskrnl/kd/kdio.c | 68 --------------------------------- ntoskrnl/kdbg/kdb_cli.c | 85 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 85 insertions(+), 79 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 75ffd8be63f..325e0b0ea3c 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -53,6 +53,17 @@ VOID /* INIT ROUTINES *************************************************************/ +KIRQL +NTAPI +KdbpAcquireLock( + _In_ PKSPIN_LOCK SpinLock); + +VOID +NTAPI +KdbpReleaseLock( + _In_ PKSPIN_LOCK SpinLock, + _In_ KIRQL OldIrql); + VOID KdpScreenAcquire(VOID); diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 9c8a486fad8..129db8b9b5e 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -37,14 +37,6 @@ CPPORT SerialPortInfo = {0, DEFAULT_DEBUG_BAUD_RATE, 0}; static CHAR KdpScreenLineBuffer[KdpScreenLineLengthDefault + 1] = ""; static ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; -const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; -PCHAR KdpDmesgBuffer = NULL; -volatile ULONG KdpDmesgCurrentPosition = 0; -volatile ULONG KdpDmesgFreeBytes = 0; -volatile ULONG KdbDmesgTotalWritten = 0; -volatile BOOLEAN KdbpIsInDmesgMode = FALSE; -static KSPIN_LOCK KdpDmesgLogSpinLock; - KDP_DEBUG_MODE KdpDebugMode; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; @@ -440,20 +432,12 @@ KdpScreenRelease(VOID) } } -/* - * Screen debug logger function KdpScreenPrint() writes text strings into - * KdpDmesgBuffer, using it as a circular buffer. KdpDmesgBuffer contents could - * be later (re)viewed using dmesg command of kdbg. KdpScreenPrint() protects - * KdpDmesgBuffer from simultaneous writes by use of KdpDmesgLogSpinLock. - */ static VOID NTAPI KdpScreenPrint(PCHAR String, ULONG Length) { PCHAR pch = String; - KIRQL OldIrql; - ULONG beg, end, num; while (pch < String + Length && *pch) { @@ -497,45 +481,6 @@ KdpScreenPrint(PCHAR String, HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); KdpScreenLineBufferPos = KdpScreenLineLength; } - - /* Dmesg: store the string in the buffer to show it later */ - if (KdbpIsInDmesgMode) - return; - - if (KdpDmesgBuffer == NULL) - return; - - /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); - - beg = KdpDmesgCurrentPosition; - /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); */ - num = min(Length, KdpDmesgFreeBytes); - if (num != 0) - { - end = (beg + num) % KdpDmesgBufferSize; - if (end > beg) - { - RtlCopyMemory(KdpDmesgBuffer + beg, String, Length); - } - else - { - RtlCopyMemory(KdpDmesgBuffer + beg, String, KdpDmesgBufferSize - beg); - RtlCopyMemory(KdpDmesgBuffer, String + (KdpDmesgBufferSize - beg), end); - } - KdpDmesgCurrentPosition = end; - - /* Counting the total bytes written */ - KdbDmesgTotalWritten += num; - } - - /* Release the spinlock */ - KdbpReleaseLock(&KdpDmesgLogSpinLock, OldIrql); - - /* Optional step(?): find out a way to notify about buffer exhaustion, - * and possibly fall into kbd to use dmesg command: user will read - * debug strings before they will be wiped over by next writes. - */ } VOID @@ -557,22 +502,9 @@ KdpScreenInit( } else if (BootPhase == 1) { - /* Allocate a buffer for dmesg log buffer. +1 for terminating null, - * see kdbp_cli.c:KdbpCmdDmesg()/2 - */ - KdpDmesgBuffer = ExAllocatePoolZero(NonPagedPool, - KdpDmesgBufferSize + 1, - TAG_KDBG); - /* Ignore failure if KdpDmesgBuffer is NULL */ - KdpDmesgFreeBytes = KdpDmesgBufferSize; - KdbDmesgTotalWritten = 0; - /* Take control of the display */ KdpScreenAcquire(); - /* Initialize spinlock */ - KeInitializeSpinLock(&KdpDmesgLogSpinLock); - HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); } } diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index c12f19554ef..fdd5d694924 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -155,14 +155,14 @@ static LONG KdbNumberOfColsTerminal = -1; PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ BOOLEAN KdbpBugCheckRequested = FALSE; -/* Vars for dmesg */ -/* defined in ../kd/kdio.c, declare here: */ -extern volatile BOOLEAN KdbpIsInDmesgMode; -extern const ULONG KdpDmesgBufferSize; -extern PCHAR KdpDmesgBuffer; -extern volatile ULONG KdpDmesgCurrentPosition; -extern volatile ULONG KdpDmesgFreeBytes; -extern volatile ULONG KdbDmesgTotalWritten; +/* Variables for Dmesg */ +static const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; +static PCHAR KdpDmesgBuffer = NULL; +static volatile ULONG KdpDmesgCurrentPosition = 0; +static volatile ULONG KdpDmesgFreeBytes = 0; +static volatile ULONG KdbDmesgTotalWritten = 0; +static volatile BOOLEAN KdbpIsInDmesgMode = FALSE; +static KSPIN_LOCK KdpDmesgLogSpinLock; STRING KdbPromptString = RTL_CONSTANT_STRING("kdb:> "); @@ -3882,13 +3882,60 @@ KdbpCliInit(VOID) } +/** + * @brief Debug logger function. + * + * This function writes text strings into KdpDmesgBuffer, using it as + * a circular buffer. KdpDmesgBuffer contents can be later (re)viewed + * using the dmesg command. KdbDebugPrint() protects KdpDmesgBuffer + * from simultaneous writes by use of KdpDmesgLogSpinLock. + **/ static VOID NTAPI KdbDebugPrint( - PCH Message, - ULONG Length) + _In_ PCHAR String, + _In_ ULONG Length) { - /* Nothing here */ + KIRQL OldIrql; + ULONG beg, end, num; + + /* Avoid recursive calling if we already are in Dmesg mode */ + if (KdbpIsInDmesgMode) + return; + + if (KdpDmesgBuffer == NULL) + return; + + /* Acquire the printing spinlock without waiting at raised IRQL */ + OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); + + beg = KdpDmesgCurrentPosition; + /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); */ + num = min(Length, KdpDmesgFreeBytes); + if (num != 0) + { + end = (beg + num) % KdpDmesgBufferSize; + if (end > beg) + { + RtlCopyMemory(KdpDmesgBuffer + beg, String, Length); + } + else + { + RtlCopyMemory(KdpDmesgBuffer + beg, String, KdpDmesgBufferSize - beg); + RtlCopyMemory(KdpDmesgBuffer, String + (KdpDmesgBufferSize - beg), end); + } + KdpDmesgCurrentPosition = end; + + /* Counting the total bytes written */ + KdbDmesgTotalWritten += num; + } + + /* Release the spinlock */ + KdbpReleaseLock(&KdpDmesgLogSpinLock, OldIrql); + + /* Optional step(?): find out a way to notify about buffer exhaustion, + * and possibly fall into kbd to use dmesg command: user will read + * debug strings before they will be wiped over by next writes. */ } /** @@ -3918,6 +3965,22 @@ KdbInitialize( /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } + else if (BootPhase == 1) + { + /* Initialize Dmesg support */ + + /* Allocate a buffer for Dmesg log buffer. +1 for terminating null, + * see kdbp_cli.c:KdbpCmdDmesg()/2 */ + KdpDmesgBuffer = ExAllocatePoolZero(NonPagedPool, + KdpDmesgBufferSize + 1, + TAG_KDBG); + /* Ignore failure if KdpDmesgBuffer is NULL */ + KdpDmesgFreeBytes = KdpDmesgBufferSize; + KdbDmesgTotalWritten = 0; + + /* Initialize spinlock */ + KeInitializeSpinLock(&KdpDmesgLogSpinLock); + } if (BootPhase <= 1) {

1 0

[reactos] 01/01: [MSPAINT] There were two "main" windows (#5147)
by Katayama Hirofumi MZ 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86e2f9e635b82c49002b1… commit 86e2f9e635b82c49002b1e522e83facbeeaec373 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 11 07:42:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 11 07:42:04 2023 +0900 [MSPAINT] There were two "main" windows (#5147) Our mspaint had two windows of window class "MainWindow". class CToolBox should inherit CWindowImpl<CToolBox> instead of CWindowImpl<CMainWindow>. CORE-18867 --- base/applications/mspaint/toolbox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 772ff2df1e2..f7cdfc91288 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -9,7 +9,7 @@ #pragma once -class CToolBox : public CWindowImpl<CMainWindow> +class CToolBox : public CWindowImpl<CToolBox> { public: DECLARE_WND_CLASS_EX(_T("ToolBox"), CS_DBLCLKS, COLOR_BTNFACE)

1 0

[reactos] 01/01: [SYSSETUP] Tweak resources CORE-18870
by Joachim Henze 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=784946db8c743bf5c66b1… commit 784946db8c743bf5c66b14223d3b756df457874e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Mar 10 21:36:17 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Mar 10 21:36:46 2023 +0100 [SYSSETUP] Tweak resources CORE-18870 de-DE: Harmonize the length of IDC_COMPUTERNAME with IDC_ADMINPASSWORD1 and IDC_ADMINPASSWORD2 which looks better and is already done like that in en-US. de-DE: Also harmonize some 2nd stage captions. Some were named "Setup" and some were named "Installation". I harmonized to "Setup" everywhere as that is what is also used in 1st stage, is shorter and no german person will have any issue understanding that. It is also more likely to be kept in sync in the future if new dlgs would be added, as it is the same word as used in en-US. de-DE: Align the IDC_PROJECTS with the GPL button (which is slightly more wide in de-DE). All languages: Use same width for IDC_PRODUCT_OPTIONS as for IDC_PRODUCT_DESCRIPTION. --- dll/win32/syssetup/lang/bg-BG.rc | 2 +- dll/win32/syssetup/lang/cs-CZ.rc | 2 +- dll/win32/syssetup/lang/da-DK.rc | 2 +- dll/win32/syssetup/lang/de-DE.rc | 23 +++++++++++------------ dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/en-GB.rc | 2 +- dll/win32/syssetup/lang/en-US.rc | 2 +- dll/win32/syssetup/lang/es-ES.rc | 2 +- dll/win32/syssetup/lang/et-EE.rc | 2 +- dll/win32/syssetup/lang/eu-ES.rc | 2 +- dll/win32/syssetup/lang/fi-FI.rc | 2 +- dll/win32/syssetup/lang/fr-FR.rc | 2 +- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/hi-IN.rc | 2 +- dll/win32/syssetup/lang/hr-HR.rc | 2 +- dll/win32/syssetup/lang/hu-HU.rc | 2 +- dll/win32/syssetup/lang/id-ID.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/ja-JP.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 2 +- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/no-NO.rc | 2 +- dll/win32/syssetup/lang/pl-PL.rc | 2 +- dll/win32/syssetup/lang/pt-BR.rc | 2 +- dll/win32/syssetup/lang/pt-PT.rc | 2 +- dll/win32/syssetup/lang/ro-RO.rc | 2 +- dll/win32/syssetup/lang/ru-RU.rc | 2 +- dll/win32/syssetup/lang/sk-SK.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 2 +- dll/win32/syssetup/lang/sv-SE.rc | 2 +- dll/win32/syssetup/lang/th-TH.rc | 2 +- dll/win32/syssetup/lang/tr-TR.rc | 2 +- dll/win32/syssetup/lang/uk-UA.rc | 2 +- dll/win32/syssetup/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-HK.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 2 +- 36 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index b9e86724c35..216d3fb38b5 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 0fce822af5f..d41f7a3c3b3 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 0c76f80322f..9bf69780f95 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 7f3b551e04e..dd9ef728895 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Willkommen beim ReactOS Installationsassistenten.", IDC_WELCOMETITLE, 115, 9, 189, 31 @@ -12,11 +12,11 @@ END IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Die Entwicklung von ReactOS wurde teilweise durch folgende Open-Source-Projekte ermöglicht:", IDC_STATIC, 15, 7, 286, 19 - LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_PROJECTS, 15, 30, 291, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS ist unter der GNU General Public License (GPL) veröffentlicht. Wenn Sie ReactOS oder Teile davon weiterverwenden wollen, müssen Sie die Bestimmungen der GPL anerkennen.", IDC_STATIC, 15, 110, 227, 24 PUSHBUTTON "GPL &ansehen...", IDC_VIEWGPL, 251, 110, 55, 19 LTEXT "Klicken Sie auf Weiter, um mit der Einrichtung fortzufahren.", IDC_STATIC, 15, 136, 195, 17 @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Bitte wählen Sie eines der folgenden Produkte:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Produktauswahl:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Produktinformation", IDC_STATIC, 5, 50, 305, 85 LTEXT "Beschreibung:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL @@ -38,7 +38,7 @@ END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 @@ -51,13 +51,13 @@ END IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Bitte geben Sie einen Computernamen maximal 15 Zeichen ein. Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computername:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 132, 35, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Das Installationsprogramm wird ein Administratorkonto erstellen. Benutzen Sie es, wenn Sie vollen Zugriff auf Ihren Computer benötigen.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Geben Sie ein Passwort für das Administratorkonto mit max. 127 Zeichen ein.", IDC_STATIC, 54, 87, 250, 8 @@ -69,7 +69,7 @@ END IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 @@ -86,7 +86,7 @@ END IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 @@ -108,14 +108,13 @@ END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Registrieren der Komponenten", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installieren der Elemente des Startmenüs", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Speichern der Einstellungen", IDC_TASKTEXT3, 65, 51, 232, 8 LTEXT "Löschen der temporären Dateien", IDC_TASKTEXT4, 65, 63, 232, 8 - LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END @@ -191,7 +190,7 @@ END STRINGTABLE BEGIN - IDS_REACTOS_SETUP "ReactOS-Installation" + IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unbekannter Fehler" IDS_LOADLIBRARY_FAILED "LoadLibrary fehlgeschlagen: " IDS_GETPROCADDR_FAILED "GetProcAddr fehlgeschlagen: " diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 758afb2ebc2..6c7414eef7c 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index cac3c294b4f..2db95470d24 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index c4606839be8..469674558c0 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 32433d97d4c..7d2032e6372 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Por favor, escriba una opción de producto:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Opciones de producto:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Información de producto", IDC_STATIC, 5, 50, 305, 85 LTEXT "Descripción:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 3b1379caf99..a197c6263bb 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/eu-ES.rc b/dll/win32/syssetup/lang/eu-ES.rc index ba1465f6079..f3dc7b259f0 100644 --- a/dll/win32/syssetup/lang/eu-ES.rc +++ b/dll/win32/syssetup/lang/eu-ES.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Mesedez, idatzi produktuaren aukera bat:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Produktuen aukerak:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Produktuaren informazioa", IDC_STATIC, 5, 50, 305, 85 LTEXT "Deskribapena:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 277d6c66f9f..6d7cc24251f 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 45bf7b2e2ed..b88606343f1 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Veuillez choisir une option produit :", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Options produit :", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informations produit", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description :", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 88b9575c2e6..72de93e5b18 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 6d98ffe752b..3ae65fa361a 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hr-HR.rc b/dll/win32/syssetup/lang/hr-HR.rc index 644efe3987c..4579c40a465 100644 --- a/dll/win32/syssetup/lang/hr-HR.rc +++ b/dll/win32/syssetup/lang/hr-HR.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Molimo odaberite opciju proizvoda:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Opcija &proizvoda:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informacije o proizvodu", IDC_STATIC, 5, 50, 305, 85 LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 2392d9ac043..871fa65bc4a 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Kérjük válasszon egy kiadást:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Kiadások:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Kiadási információk", IDC_STATIC, 5, 50, 305, 85 LTEXT "Leírás:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 34186a8adf0..5fe2428acf5 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Silahkan pilih opsi produk:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Pilihan Pr&oduk:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informasi Produk", IDC_STATIC, 5, 50, 305, 85 LTEXT "Deskripsi:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index d3c16f093e4..2b1e3759634 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 671bd6319f4..282136f2d04 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "製品オプションをお選び下さい:", IDC_STATIC, 35, 7, 230, 12 LTEXT "製品オプション(&O):", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "製品情報", IDC_STATIC, 5, 50, 305, 85 LTEXT "説明:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index a5152697c96..4c9de69b0d2 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index dc68051a598..6ee368434bc 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 402c97e2717..88320f8bfd2 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index e96f716272b..b702155f2f9 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Wybierz opcję produktu:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Opcje produktu:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informacje o produkcie", IDC_STATIC, 5, 50, 305, 85 LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 8cd91638d45..01fc23f3b01 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index ff839c6a443..c10b791c079 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Por favor escolha uma opção de produto:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Opções de produto:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informação de produto", IDC_STATIC, 5, 50, 305, 85 LTEXT "Descrição:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 7d2c6859715..91a43e9b08b 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Alegeți o opțiune de produs:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Opțiuni de p&rodus:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informații despre produs", IDC_STATIC, 5, 50, 305, 85 LTEXT "Descriere:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index ca4035e6a20..03e07368777 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Пожалуйста, укажите тип продкута:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Тип продукта:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Информация о продукте", IDC_STATIC, 5, 50, 305, 85 LTEXT "Описание:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 11670124b2c..285e5d35cf1 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 7d339527e0f..43087340c53 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index ca4f4eb697f..964086a63a0 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 33ae67d0d12..82d4c7ba4b4 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index d4217ee58a4..a504f2cce5a 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Lütfen bir ürün seçeneği seçiniz:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Ü&rün seçenekleri:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ürün Bilgisi", IDC_STATIC, 5, 50, 305, 85 LTEXT "Tanım:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index c3e57b46e63..41dac4e1872 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Будь ласка, виберіть тип продукту:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Тип &продукту:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Інформація про продукт", IDC_STATIC, 5, 50, 305, 85 LTEXT "Опис:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 30f1ae8ca0b..c2ab72e03ba 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "请选择您要安装的软件版本：", IDC_STATIC, 35, 7, 230, 12 LTEXT "产品选项(&O)：", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "版本信息", IDC_STATIC, 5, 50, 305, 85 LTEXT "描述：", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-HK.rc b/dll/win32/syssetup/lang/zh-HK.rc index 4cad49a51a0..c4619d2673e 100644 --- a/dll/win32/syssetup/lang/zh-HK.rc +++ b/dll/win32/syssetup/lang/zh-HK.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "請選擇您要安裝的版本：", IDC_STATIC, 35, 7, 230, 12 LTEXT "版本(&O)：", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "版本資訊", IDC_STATIC, 5, 50, 305, 85 LTEXT "説明：", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 112373ab73a..c0c6672d528 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "請選擇您要安裝的版本︰", IDC_STATIC, 35, 7, 230, 12 LTEXT "版本(&O)︰", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "版本資訊", IDC_STATIC, 5, 50, 305, 85 LTEXT "說明︰", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL

1 0

[reactos] 01/01: [NTOS:KDBG] Split KdbInitialize into KdbSymInit and KDBG initialization proper.
by Hermès Bélusca-Maïto 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfb6996b4542fa88595e4… commit dfb6996b4542fa88595e4bdbfdb0e2e06a2dc360 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 10 18:12:32 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 10 20:56:21 2023 +0100 [NTOS:KDBG] Split KdbInitialize into KdbSymInit and KDBG initialization proper. - KdbSymInit() in kdb_symbols.c only initializes symbols implementation support. - The rest of KdbInitialize gets moved into kdb_cli.c and initializes the KDBG debugger itself. - Move KdbDebugPrint to kdb_cli.c as well. --- ntoskrnl/include/internal/kd.h | 6 +---- ntoskrnl/kd/kdio.c | 18 --------------- ntoskrnl/kdbg/kdb.h | 13 +++++++++-- ntoskrnl/kdbg/kdb_cli.c | 47 ++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/kdb_symbols.c | 52 +++++++++++++++++------------------------- 5 files changed, 80 insertions(+), 56 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index ef014a2c6a5..75ffd8be63f 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -78,11 +78,7 @@ KdpDebugLogInit( _In_ ULONG BootPhase); #ifdef KDBG -VOID -NTAPI -KdpKdbgInit( - _In_ struct _KD_DISPATCH_TABLE *DispatchTable, - _In_ ULONG BootPhase); +#define KdpKdbgInit KdbInitialize #endif diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 742121e08fb..9c8a486fad8 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -577,24 +577,6 @@ KdpScreenInit( } } -#ifdef KDBG -/* KDBG FUNCTIONS ************************************************************/ - -/* NOTE: This may be moved completely into kdb_symbols.c */ -VOID NTAPI -KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); - -VOID -NTAPI -KdpKdbgInit( - _In_ PKD_DISPATCH_TABLE DispatchTable, - _In_ ULONG BootPhase) -{ - /* Forward the call */ - KdbInitialize(DispatchTable, BootPhase); -} -#endif - /* GENERAL FUNCTIONS *********************************************************/ diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 8d1e9af2a47..11bc4cb452f 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -82,6 +82,12 @@ KdbpStackSwitchAndCall( extern PCHAR KdbInitFileBuffer; +VOID +NTAPI +KdbInitialize( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase); + BOOLEAN NTAPI KdbRegisterCliCallback( @@ -158,14 +164,17 @@ KdbpSymFindModule( BOOLEAN KdbSymPrintAddress( IN PVOID Address, - IN PCONTEXT Context -); + IN PCONTEXT Context); VOID KdbSymProcessSymbols( _Inout_ PLDR_DATA_TABLE_ENTRY LdrEntry, _In_ BOOLEAN Load); +VOID +KdbSymInit( + _In_ ULONG BootPhase); + /* from kdb.c */ extern PEPROCESS KdbCurrentProcess; diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 114f4116838..c12f19554ef 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3880,3 +3880,50 @@ KdbpCliInit(VOID) ExFreePool(FileBuffer); } + + +static VOID +NTAPI +KdbDebugPrint( + PCH Message, + ULONG Length) +{ + /* Nothing here */ +} + +/** + * @brief Initializes the KDBG debugger. + * + * @param[in] DispatchTable + * Pointer to the KD dispatch table. + * + * @param[in] BootPhase + * Phase of initialization. + * + * @return None. + * @note Also known as "KdpKdbgInit". + **/ +VOID +NTAPI +KdbInitialize( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) +{ + if (BootPhase == 0) + { + /* Write out the functions that we support for now */ + DispatchTable->KdpInitRoutine = KdbInitialize; + DispatchTable->KdpPrintRoutine = KdbDebugPrint; + + /* Register as a Provider */ + InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + } + + if (BootPhase <= 1) + { + /* Initialize symbols support */ + KdbSymInit(BootPhase); + } +} + +/* EOF */ diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 06325b65fb6..46294733d89 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -330,31 +330,19 @@ KdbSymProcessSymbols( KeSetEvent(&SymbolsToLoadEvent, IO_NO_INCREMENT, FALSE); } -VOID -NTAPI -KdbDebugPrint( - PCH Message, - ULONG Length) -{ - /* Nothing here */ -} - -/*! \brief Initializes the KDB symbols implementation. +/** + * @brief Initializes the KDB symbols implementation. * - * \param DispatchTable Pointer to the KD dispatch table - * \param BootPhase Phase of initialization - */ + * @param[in] BootPhase + * Phase of initialization. + * + * @return None. + **/ VOID -NTAPI -KdbInitialize( - _In_ PKD_DISPATCH_TABLE DispatchTable, +KdbSymInit( _In_ ULONG BootPhase) { - PCHAR p1, p2; - SHORT Found = FALSE; - CHAR YesNo; - DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase); LoadSymbols = FALSE; @@ -367,19 +355,16 @@ KdbInitialize( if (BootPhase == 0) { - /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdbInitialize; - DispatchTable->KdpPrintRoutine = KdbDebugPrint; - - /* Register as a Provider */ - InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + PCHAR p1, p2; + SHORT Found = FALSE; + CHAR YesNo; /* Perform actual initialization of symbol module */ //NtoskrnlModuleObject->PatchInformation = NULL; //LdrHalModuleObject->PatchInformation = NULL; /* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS, - * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ + * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ ASSERT(KeLoaderBlock); p1 = KeLoaderBlock->LoadOptions; while ('\0' != *p1 && NULL != (p2 = strchr(p1, '/'))) @@ -425,13 +410,18 @@ KdbInitialize( HANDLE Thread; NTSTATUS Status; KIRQL OldIrql; + PLIST_ENTRY ListEntry; /* Launch our worker thread */ InitializeListHead(&SymbolsToLoad); KeInitializeSpinLock(&SymbolsToLoadLock); KeInitializeEvent(&SymbolsToLoadEvent, SynchronizationEvent, FALSE); - Status = PsCreateSystemThread(&Thread, THREAD_ALL_ACCESS, NULL, NULL, NULL, LoadSymbolsRoutine, NULL); + Status = PsCreateSystemThread(&Thread, + THREAD_ALL_ACCESS, + NULL, NULL, NULL, + LoadSymbolsRoutine, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed starting symbols loader thread: 0x%08x\n", Status); @@ -443,12 +433,12 @@ KdbInitialize( KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql); - PLIST_ENTRY ListEntry = PsLoadedModuleList.Flink; - while (ListEntry != &PsLoadedModuleList) + for (ListEntry = PsLoadedModuleList.Flink; + ListEntry != &PsLoadedModuleList; + ListEntry = ListEntry->Flink) { PLDR_DATA_TABLE_ENTRY LdrEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); KdbSymProcessSymbols(LdrEntry, TRUE); - ListEntry = ListEntry->Flink; } KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql);

1 0

[reactos] 01/01: [DXDIAG] Fix text truncation on button for french fr-FR.rc CORE-18853
by Joachim Henze 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=793e9f20ef84873705a78… commit 793e9f20ef84873705a782165e5c446b133e19e7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Mar 10 18:03:02 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Mar 10 18:03:02 2023 +0100 [DXDIAG] Fix text truncation on button for french fr-FR.rc CORE-18853 By shortening the text to what MS Windows uses there. See the 2k3sp2 pic in the ticket. --- base/applications/dxdiag/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index c3e48b23fe9..9cecdaf4a59 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -185,7 +185,7 @@ BEGIN LTEXT "Vous ne trouvez pas les informations que vous cherchez ? Voici ce que vous pouvez faire :", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Informations système", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Affiche des informations système complémentaires", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "Remplacer la freq. de rafraichissement", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + PUSHBUTTON "Remplacer...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED LTEXT "Remplacer la freq. de rafraichissement pour DirectDraw", IDC_STATIC, 90, 43, 300, 10 END

1 0

[reactos] 01/01: [MSPAINT] Fix use of uninitialized variable on startup (#5140)
by Katayama Hirofumi MZ 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02c647802f609a3f4cb9a… commit 02c647802f609a3f4cb9a18a623ea0b35eae1c0a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 10 07:31:31 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 10 07:31:31 2023 +0900 [MSPAINT] Fix use of uninitialized variable on startup (#5140) There was an exception in starting up of mspaint of Visual Studio 2019 build. CORE-18594, CORE-18867 --- base/applications/mspaint/winproc.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 640e596215b..779db8ff51d 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -72,17 +72,18 @@ void CMainWindow::alignChildrenToMainWindow() h = clientRect.bottom - 3; } - RECT statusBarRect0; - int statusBarBorders[3]; - if (::IsWindow(hStatusBar)) + INT statusBarHeight = 0; + if (::IsWindowVisible(hStatusBar)) { - ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); - ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + RECT Rect; + INT borders[3]; + ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&Rect); + ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&borders); + statusBarHeight = Rect.bottom - Rect.top + borders[1]; } - int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; if (scrollboxWindow.IsWindow()) - scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); + scrollboxWindow.MoveWindow(x, y, w, h - statusBarHeight, TRUE); if (paletteWindow.IsWindow()) paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); }

1 0

[reactos] 01/01: [DXDIAG] Fix text truncation german de-DE.rc CORE-18853 (#5137)
by Joachim Henze 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29d0deef1384e7050098e… commit 29d0deef1384e7050098ee2f04900009550ec5d0 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Mar 9 23:27:49 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 23:27:49 2023 +0100 [DXDIAG] Fix text truncation german de-DE.rc CORE-18853 (#5137) --- base/applications/dxdiag/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/dxdiag/lang/de-DE.rc b/base/applications/dxdiag/lang/de-DE.rc index c2f084a9674..e5b46e54aad 100644 --- a/base/applications/dxdiag/lang/de-DE.rc +++ b/base/applications/dxdiag/lang/de-DE.rc @@ -182,7 +182,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Informationen, die Sie suchen immer noch nicht gefunden? Hier sind einige zusätzliche Dinge, die Sie tun können:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Information noch nicht gefunden? Hier sind einige zusätzliche Dinge, die Sie tun können:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Systeminformationen...", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Zeigt zusätzliche Systeminformationen an", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Außer Kraft setzen...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED

1 0

[reactos] 01/01: [NOTEPAD] Use Globals.hMainWnd in ShowLastError (#5132)
by Katayama Hirofumi MZ 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87e905ecd8d529c5e17ee… commit 87e905ecd8d529c5e17ee3053c77f19edc84aa22 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 10 07:25:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 10 07:25:06 2023 +0900 [NOTEPAD] Use Globals.hMainWnd in ShowLastError (#5132) Improving UI/UX by making Globals.hMainWnd the owner of the message box. CORE-18837 --- base/applications/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 345f76a9fbd..e31d8d6f038 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -75,7 +75,7 @@ VOID ShowLastError(VOID) 0, NULL); - MessageBox(NULL, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); + MessageBox(Globals.hMainWnd, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } }

1 0

← Newer
1
...
8
9
10
11
12
13
14
Older →

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 March 2023