Ros-diffs July 2021

ros-diffs@reactos.org

18 participants
142 discussions

[reactos] 01/01: [DESK] Update de-DE.rc regarding IDC_ADVAPPEARANCE_DISCLAIMER

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=728f90dd18da477a6d3fa… commit 728f90dd18da477a6d3fa088414d49b59607060a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Jul 6 10:59:03 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Jul 6 10:59:03 2021 +0200 [DESK] Update de-DE.rc regarding IDC_ADVAPPEARANCE_DISCLAIMER It was recently added during 0.4.15-dev'ing. --- dll/cpl/desk/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index ff36b9b078a..64ad5b7d4b8 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -76,7 +76,7 @@ CAPTION "Erweiterte Darstellung" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE + LTEXT "Die Auswahl eines anderen als des klassischen Themes wird die folgenden Einstellungen überschreiben, außer in einigen älteren Programmen.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP

3 years, 5 months

[reactos] 01/01: [NTDLL] LdrpWalkImportDescriptor(): Fix 'Status' copypasta

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=513f3d179cff234821c35… commit 513f3d179cff234821c359db034409e94a278320 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jun 14 13:49:22 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 6 08:26:26 2021 +0200 [NTDLL] LdrpWalkImportDescriptor(): Fix 'Status' copypasta Addendum to f6cd52a (r70646). --- dll/ntdll/ldr/ldrpe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/ldr/ldrpe.c b/dll/ntdll/ldr/ldrpe.c index 7a3f4336e71..19d00f35e80 100644 --- a/dll/ntdll/ldr/ldrpe.c +++ b/dll/ntdll/ldr/ldrpe.c @@ -703,7 +703,7 @@ LdrpWalkImportDescriptor(IN LPWSTR DllPath OPTIONAL, DPFLTR_WARNING_LEVEL, "LDR: LdrpWalkImportDescriptor() failed to probe %wZ for its " "manifest, ntstatus = 0x%08lx\n", - &LdrEntry->FullDllName, Status); + &LdrEntry->FullDllName, Status2); } }

3 years, 5 months

[reactos] 01/01: [BTRFS] Do not rely on mountmgr when mounting volumes

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4359f488386c604c2e67a… commit 4359f488386c604c2e67a03c1fadadb27f40f1ea Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Jul 6 02:37:34 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jul 6 02:37:34 2021 +0300 [BTRFS] Do not rely on mountmgr when mounting volumes This turns off mountmgr listening on new devices. Now BTRFS will only be mounted on demand when OS asks for it. RAID is not going to work this way probably (have anybody checked it at all?) This is a temporary workaround for CORE-17469 --- drivers/filesystems/btrfs/btrfs.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 84495cd36c8..2f3858cd1c6 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -4218,8 +4218,8 @@ static NTSTATUS check_mount_device(_In_ PDEVICE_OBJECT DeviceObject, _Out_ bool* NTSTATUS Status; ULONG to_read; superblock* sb; - UNICODE_STRING pnp_name; - const GUID* guid; + // UNICODE_STRING pnp_name; + // const GUID* guid; to_read = DeviceObject->SectorSize == 0 ? sizeof(superblock) : (ULONG)sector_align(sizeof(superblock), DeviceObject->SectorSize); @@ -4247,18 +4247,19 @@ static NTSTATUS check_mount_device(_In_ PDEVICE_OBJECT DeviceObject, _Out_ bool* DeviceObject->Flags &= ~DO_VERIFY_VOLUME; - pnp_name.Buffer = NULL; + // pnp_name.Buffer = NULL; - Status = get_device_pnp_name(DeviceObject, &pnp_name, &guid); - if (!NT_SUCCESS(Status)) { - WARN("get_device_pnp_name returned %08lx\n", Status); - pnp_name.Length = 0; - } + // Status = get_device_pnp_name(DeviceObject, &pnp_name, &guid); + // if (!NT_SUCCESS(Status)) { + // WARN("get_device_pnp_name returned %08lx\n", Status); + // pnp_name.Length = 0; + // } - *pno_pnp = pnp_name.Length == 0; + // *pno_pnp = pnp_name.Length == 0; + *pno_pnp = true; - if (pnp_name.Buffer) - ExFreePool(pnp_name.Buffer); + // if (pnp_name.Buffer) + // ExFreePool(pnp_name.Buffer); Status = STATUS_SUCCESS; @@ -6406,9 +6407,9 @@ NTSTATUS __stdcall DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_S KeInitializeEvent(&mountmgr_thread_event, NotificationEvent, false); - Status = PsCreateSystemThread(&mountmgr_thread_handle, 0, &system_thread_attributes, NULL, NULL, mountmgr_thread, NULL); - if (!NT_SUCCESS(Status)) - WARN("PsCreateSystemThread returned %08lx\n", Status); + // Status = PsCreateSystemThread(&mountmgr_thread_handle, 0, &system_thread_attributes, NULL, NULL, mountmgr_thread, NULL); + // if (!NT_SUCCESS(Status)) + // WARN("PsCreateSystemThread returned %08lx\n", Status); IoRegisterFileSystem(DeviceObject);

3 years, 5 months

[reactos] 04/04: [VBEMP][VGAMP] Correctly fill VdmPhysicalVideoMemoryAddress/VdmPhysicalVideoMemoryLength

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93f986463a94ffb457ea3… commit 93f986463a94ffb457ea3b3c57e9d147a67f134d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jul 5 23:31:10 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Jul 5 23:46:16 2021 +0200 [VBEMP][VGAMP] Correctly fill VdmPhysicalVideoMemoryAddress/VdmPhysicalVideoMemoryLength These variables must be filled by miniport if miniport is VGA-compatible. --- win32ss/drivers/miniport/vbe/vbemp.c | 2 ++ win32ss/drivers/miniport/vga/vgamp.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/win32ss/drivers/miniport/vbe/vbemp.c b/win32ss/drivers/miniport/vbe/vbemp.c index 5cb0f9f9cf6..7525b78561c 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.c +++ b/win32ss/drivers/miniport/vbe/vbemp.c @@ -76,6 +76,8 @@ VBEFindAdapter( if (VideoPortIsNoVesa()) return ERROR_DEV_NOT_EXIST; + ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0xa000; + ConfigInfo->VdmPhysicalVideoMemoryLength = 0x2000; return NO_ERROR; } diff --git a/win32ss/drivers/miniport/vga/vgamp.c b/win32ss/drivers/miniport/vga/vgamp.c index 8c0c27e9de6..f4cd3a26c41 100644 --- a/win32ss/drivers/miniport/vga/vgamp.c +++ b/win32ss/drivers/miniport/vga/vgamp.c @@ -85,6 +85,8 @@ VGAFindAdapter(PVOID DeviceExtension, /* FIXME: Determine if the adapter is present */ *Again = FALSE; + ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0xa000; + ConfigInfo->VdmPhysicalVideoMemoryLength = 0x2000; return NO_ERROR; /* FIXME: Claim any necessary memory/IO resources for the adapter */

3 years, 5 months

[reactos] 03/04: [BOOTDATA][VBEMP] Merge duplicated registry settings to vbemp_reg.inf

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d24de7805ffd9dbc38e0… commit 8d24de7805ffd9dbc38e01f76961f2a1025a1f4f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jul 5 00:02:56 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Jul 5 23:44:35 2021 +0200 [BOOTDATA][VBEMP] Merge duplicated registry settings to vbemp_reg.inf --- boot/bootdata/hiveinst.inf | 7 ------- win32ss/drivers/miniport/vbe/vbemp_reg.inf | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/boot/bootdata/hiveinst.inf b/boot/bootdata/hiveinst.inf index e4066a74011..6ecfd4236bc 100644 --- a/boot/bootdata/hiveinst.inf +++ b/boot/bootdata/hiveinst.inf @@ -8,12 +8,5 @@ Signature = "$Windows NT$" ; Display driver section ; -; VBE SVGA driver -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,32 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600 - ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001 diff --git a/win32ss/drivers/miniport/vbe/vbemp_reg.inf b/win32ss/drivers/miniport/vbe/vbemp_reg.inf index 00a92c14c3b..3b532c9fe9c 100644 --- a/win32ss/drivers/miniport/vbe/vbemp_reg.inf +++ b/win32ss/drivers/miniport/vbe/vbemp_reg.inf @@ -9,9 +9,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,32 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0

3 years, 5 months

[reactos] 02/04: [FRAMEBUF] Early return if we got 0 available mode from video driver

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b5d029c7a45402f46f93… commit 9b5d029c7a45402f46f93265888f137ea0669d98 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 4 23:27:01 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Jul 5 23:44:35 2021 +0200 [FRAMEBUF] Early return if we got 0 available mode from video driver This prevents allocating 0 bytes of memory a few lines later. --- win32ss/drivers/displays/framebuf/screen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/drivers/displays/framebuf/screen.c b/win32ss/drivers/displays/framebuf/screen.c index b97a0274695..7ec7ecff138 100644 --- a/win32ss/drivers/displays/framebuf/screen.c +++ b/win32ss/drivers/displays/framebuf/screen.c @@ -51,6 +51,11 @@ GetAvailableModes( return 0; } + if (Modes.NumModes == 0) + { + return 0; + } + *ModeInfoSize = Modes.ModeInformationLength; /*

3 years, 5 months

[reactos] 01/04: [PSDK] Add missing field 'pdo' in VIDEO_MONITOR_DEVICE structure

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f26fe3f1f85052e334c1a… commit f26fe3f1f85052e334c1af53920a0b5fa32f5a3c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 4 23:29:07 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Jul 5 23:44:35 2021 +0200 [PSDK] Add missing field 'pdo' in VIDEO_MONITOR_DEVICE structure --- sdk/include/psdk/ntddvdeo.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/ntddvdeo.h b/sdk/include/psdk/ntddvdeo.h index 5e2b63b7214..d8717fd3792 100644 --- a/sdk/include/psdk/ntddvdeo.h +++ b/sdk/include/psdk/ntddvdeo.h @@ -210,6 +210,7 @@ typedef struct _VIDEO_REGISTER_VDM { typedef struct tagVIDEO_MONITOR_DEVICE { ULONG flag; + HANDLE pdo; ULONG HwID; BOOLEAN Internal; } VIDEO_MONITOR_DEVICE, *PVIDEO_MONITOR_DEVICE;

3 years, 5 months

[reactos] 01/01: [CMAKE] Turn ENABLE_ROSAPPS, ENABLE_ROSTESTS & ENABLE_WALLPAPERS into options

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7448f4b807757998bcb9f… commit 7448f4b807757998bcb9f7f5111bcef46fa32de3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Jul 5 14:49:26 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Jul 5 15:24:46 2021 +0200 [CMAKE] Turn ENABLE_ROSAPPS, ENABLE_ROSTESTS & ENABLE_WALLPAPERS into options Enabling UI tools to toggle them easily --- modules/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 4c68bfb1e5d..ca002635b33 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,4 +1,8 @@ +option(ENABLE_ROSAPPS "Enable building the ReactOS extra applications" OFF) +option(ENABLE_ROSTESTS "Enable building the ReactOS test suite" OFF) +option(ENABLE_WALLPAPERS "Integrate wallpapers into the built ISOs" OFF) + if(ENABLE_ROSAPPS) add_subdirectory(rosapps) endif()

3 years, 5 months

[reactos] 01/01: [IMM32] Rewrite ImmGetConversionStatus (#3790)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c238b554b19e685bcb50d… commit c238b554b19e685bcb50d8d947968ada581320a5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 5 21:20:20 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 5 21:20:20 2021 +0900 [IMM32] Rewrite ImmGetConversionStatus (#3790) Implementing Japanese input... CORE-11700 --- dll/win32/imm32/imm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index ca026d473f0..5bdd37a031a 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1641,6 +1641,23 @@ DWORD WINAPI ImmGetConversionListW( BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { +#ifdef __REACTOS__ + LPINPUTCONTEXT pIC; + + TRACE("ImmGetConversionStatus(%p %p %p)\n", hIMC, lpfdwConversion, lpfdwSentence); + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + if (lpfdwConversion) + *lpfdwConversion = pIC->fdwConversion; + if (lpfdwSentence) + *lpfdwSentence = pIC->fdwSentence; + + ImmUnlockIMC(hIMC); + return TRUE; +#else InputContextData *data = get_imc_data(hIMC); TRACE("%p %p %p\n", hIMC, lpfdwConversion, lpfdwSentence); @@ -1654,6 +1671,7 @@ BOOL WINAPI ImmGetConversionStatus( *lpfdwSentence = data->IMC.fdwSentence; return TRUE; +#endif } static BOOL needs_ime_window(HWND hwnd)

3 years, 5 months

[reactos] 02/02: Merge branch 'se-qos' of https://github.com/GeoB99/reactos into GeoB99-se-qos

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b0cdceda0cdef65e90e3… commit 6b0cdceda0cdef65e90e375486e7e9aafef07eeb Merge: 6e0d8de0131 7fb0d13a46e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Jul 5 11:01:49 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Jul 5 11:01:49 2021 +0200 Merge branch 'se-qos' of https://github.com/GeoB99/reactos into GeoB99-se-qos ntoskrnl/include/internal/se.h | 18 ++-- ntoskrnl/ntos.cmake | 1 + ntoskrnl/se/sd.c | 172 ----------------------------- ntoskrnl/se/sqos.c | 239 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 249 insertions(+), 181 deletions(-)

3 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2021