https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a01398b034e7da79f44c6…
commit a01398b034e7da79f44c6a540d1a334989fa4974
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Dec 30 03:40:40 2021 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Thu Dec 30 03:42:00 2021 +0100
[FREELDR] Adjust a boot-options editor example.
---
boot/freeldr/freeldr/custom.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c
index 2422107d58e..ca8b4c612f0 100644
--- a/boot/freeldr/freeldr/custom.c
+++ b/boot/freeldr/freeldr/custom.c
@@ -37,7 +37,7 @@ const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the
const CHAR ARCPathPrompt[] = "Enter the boot ARC path.\n\nExamples:\nmulti(0)disk(0)rdisk(0)partition(1)\nmulti(0)disk(0)fdisk(0)";
const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS";
const CHAR ReactOSOptionsPrompt[] = "Enter the load options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL";
-const CHAR ReactOSSetupOptionsPrompt[] = "Enter additional load options you want passed to the ReactOS Setup.\nThese options will supplement those obtained from the TXTSETUP.SIF\nfile, unless you also specify the /SIFOPTIONSOVERRIDE option switch.\n\nExample:\n/NOGUIBOOT /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200";
+const CHAR ReactOSSetupOptionsPrompt[] = "Enter additional load options you want passed to the ReactOS Setup.\nThese options will supplement those obtained from the TXTSETUP.SIF\nfile, unless you also specify the /SIFOPTIONSOVERRIDE option switch.\n\nExample:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT";
const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup.";
/* FUNCTIONS ******************************************************************/
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f18fb7da0918f48310c9c…
commit f18fb7da0918f48310c9ceeaffe7df7d2e300017
Author: Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Thu Dec 30 01:54:09 2021 +0300
Commit: Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Thu Dec 30 01:54:09 2021 +0300
[NTOS:MM] Unrefernece some dereferences
---
ntoskrnl/mm/ARM3/virtual.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c
index 9cb0cacf23b..abe0e810074 100644
--- a/ntoskrnl/mm/ARM3/virtual.c
+++ b/ntoskrnl/mm/ARM3/virtual.c
@@ -1842,7 +1842,7 @@ MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle,
/* Check if we were attached */
if (ProcessHandle != NtCurrentProcess())
{
- /* Detach and derefernece the process */
+ /* Detach and dereference the process */
KeUnstackDetachProcess(&ApcState);
ObDereferenceObject(TargetProcess);
}
@@ -1955,7 +1955,7 @@ MiQueryMemoryBasicInformation(IN HANDLE ProcessHandle,
/* Check if we were attached */
if (ProcessHandle != NtCurrentProcess())
{
- /* Detach and derefernece the process */
+ /* Detach and dereference the process */
KeUnstackDetachProcess(&ApcState);
ObDereferenceObject(TargetProcess);
}
@@ -5617,7 +5617,7 @@ FinalPath:
goto FinalPath;
//
- // In the failure path, we detach and derefernece the target process, and
+ // In the failure path, we detach and dereference the target process, and
// return whatever failure code was sent.
//
FailPath:
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc483bd700a58a1b42b3d…
commit dc483bd700a58a1b42b3dd4e4103793cc5147384
Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua>
AuthorDate: Wed Dec 29 17:51:23 2021 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Wed Dec 29 16:51:23 2021 +0100
[WIN32SS:ENG] EngCreateBitmap: mark created bitmaps as API bitmaps (#4146)
CORE-17561
Set the API_BITMAP flag for bitmaps created by EngCreateBitmap().
This avoids failure when created bitmap is passed to NtGdiSelectBitmap(), since it checks for this flag and fails if it isn't set.
Otherwise, if failure occurs, the bitmap is hot handled properly.
Setting this flag outside of that function is not an option at all, because it is a public (exported) function, and in many cases it's called directly by the caller (in case with MS DDraw stack, it can be called also by dxg.sys from dxgthk!EngCreateBitmap, which directly calls win32k!EngCreateBitmap).
In particular, it allows Windows XP/2003 DirectDraw stack (ddraw.dll & dxg.sys) to properly work in ReactOS (in software emulation mode), even on real hardware. So now, a lot of DirectX 1-7 apps and games (whose can work withoug hardware acceleation), are working properly with ddraw.dll + dxg.sys replacement! Also Justin Miller (DarkFire01) confirmed that even Direct3D software emulation now also works correctly on real hardware!
---
win32ss/gdi/eng/surface.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/win32ss/gdi/eng/surface.c b/win32ss/gdi/eng/surface.c
index 9bce8373692..3bfe6f89276 100644
--- a/win32ss/gdi/eng/surface.c
+++ b/win32ss/gdi/eng/surface.c
@@ -332,6 +332,9 @@ EngCreateBitmap(
/* Get the handle for the bitmap */
hbmp = (HBITMAP)psurf->SurfObj.hsurf;
+ /* Mark as API bitmap */
+ psurf->flags = API_BITMAP;
+
/* Set public ownership */
GDIOBJ_vSetObjectOwner(&psurf->BaseObject, GDI_OBJ_HMGR_PUBLIC);