Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KMTESTS:MM] Fix MmReservedMapping test failures on PAE kernels.
by Thomas Faber 29 Jan '23

29 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b863f63c224a0f03ba30… commit 6b863f63c224a0f03ba3037a2f8027b225149764 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jan 29 11:34:45 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jan 29 11:39:56 2023 -0500 [KMTESTS:MM] Fix MmReservedMapping test failures on PAE kernels. --- .../rostests/kmtests/ntos_mm/MmReservedMapping.c | 76 ++++++++++++++++------ 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c b/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c index fd35a208ce3..a8204b5a3c0 100644 --- a/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c +++ b/modules/rostests/kmtests/ntos_mm/MmReservedMapping.c @@ -1,33 +1,54 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite Reserved Mapping test - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Kernel-Mode Test Suite Reserved Mapping test + * COPYRIGHT: Copyright 2015,2023 Thomas Faber (thomas.faber(a)reactos.org) + * COPYRIGHT: Copyright 2015 Pierre Schweitzer (pierre(a)reactos.org) */ #include <kmt_test.h> +static BOOLEAN g_IsPae; + #ifdef _M_IX86 +#define IS_PAE() (g_IsPae) + #define PTE_BASE 0xC0000000 -#define MiAddressToPte(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) -#define MiPteToAddress(_Pte) ((PVOID)((ULONG)(_Pte) << 10)) + +#define MiAddressToPteX86(x) \ + ((PULONG)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) +#define MiAddressToPtePAE(x) \ + ((PULONGLONG)(((((ULONG)(x)) >> 12) << 3) + PTE_BASE)) + +#define GET_PTE_VALUE_X86(Addr) (*MiAddressToPteX86(Addr)) +#define GET_PTE_VALUE_PAE(Addr) (*MiAddressToPtePAE(Addr)) +#define GET_PTE_VALUE(Addr) (IS_PAE() ? GET_PTE_VALUE_PAE(Addr) : GET_PTE_VALUE_X86(Addr)) + +#define PTE_IS_VALID(PteValue) ((PteValue) & 1) + +#define PTE_GET_PFN_X86(PteValue) (((PteValue) >> PAGE_SHIFT) & 0x0fffffULL) +#define PTE_GET_PFN_PAE(PteValue) (((PteValue) >> PAGE_SHIFT) & 0xffffffULL) +#define PTE_GET_PFN(PteValue) (IS_PAE() ? PTE_GET_PFN_PAE(PteValue) : PTE_GET_PFN_X86(PteValue)) #elif defined(_M_AMD64) #define PTI_SHIFT 12L #define PTE_BASE 0xFFFFF68000000000ULL -PMMPTE +PULONGLONG FORCEINLINE _MiAddressToPte(PVOID Address) { ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); Offset &= 0xFFFFFFFFFULL << 3; - return (PMMPTE)(PTE_BASE + Offset); + return (PULONGLONG)(PTE_BASE + Offset); } #define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) +#define GET_PTE_VALUE(Addr) (*_MiAddressToPte((PVOID)(Addr))) +#define PTE_IS_VALID(PteValue) ((PteValue) & 1) +#define PTE_GET_PFN(PteValue) (((PteValue) >> PAGE_SHIFT) & 0xFffffffffULL) + #endif static @@ -54,30 +75,45 @@ ValidateMapping( { BOOLEAN Valid = TRUE; #if defined(_M_IX86) || defined(_M_AMD64) - PMMPTE PointerPte; + PUCHAR CurrentAddress; + ULONGLONG PteValue; ULONG i; - PointerPte = MiAddressToPte(BaseAddress); for (i = 0; i < ValidPtes; i++) { + CurrentAddress = (PUCHAR)BaseAddress + i * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok(PointerPte[i].u.Hard.Valid == 1, - "[%lu] PTE %p is not valid\n", i, &PointerPte[i]); + ok(PTE_IS_VALID(PteValue), + "[%lu] PTE for %p is not valid (0x%I64x)\n", + i, CurrentAddress, PteValue); Valid = Valid && - ok(PointerPte[i].u.Hard.PageFrameNumber == Pfns[i], - "[%lu] PTE %p has PFN %Ix, expected %Ix\n", - i, &PointerPte[i], PointerPte[i].u.Hard.PageFrameNumber, Pfns[i]); + ok(PTE_GET_PFN(PteValue) == Pfns[i], + "[%lu] PTE for %p has PFN %Ix, expected %Ix\n", + i, CurrentAddress, PTE_GET_PFN(PteValue), Pfns[i]); } for (; i < TotalPtes; i++) { + CurrentAddress = (PUCHAR)BaseAddress + i * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok_eq_hex(PointerPte[i].u.Long, 0UL); + ok(PteValue == 0, + "[%lu] PTE for %p is nonzero (0x%I64x)\n", + i, CurrentAddress, PteValue); } + CurrentAddress = (PUCHAR)BaseAddress - 1 * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok_eq_tag(PointerPte[-1].u.Long, PoolTag & ~1); + ok(PteValue == (PoolTag & ~1ULL), + "PTE for %p contains 0x%I64x, expected %x\n", + CurrentAddress, PteValue, PoolTag & ~1); + CurrentAddress = (PUCHAR)BaseAddress - 2 * PAGE_SIZE; + PteValue = GET_PTE_VALUE(CurrentAddress); Valid = Valid && - ok_eq_ulong(PointerPte[-2].u.Long, (TotalPtes + 2) * 2); + ok(PteValue == (TotalPtes + 2) * 2, + "PTE for %p contains 0x%I64x, expected %x\n", + CurrentAddress, PteValue, (TotalPtes + 2) * 2); #endif return Valid; @@ -244,6 +280,8 @@ START_TEST(MmReservedMapping) { PVOID Mapping; + g_IsPae = ExIsProcessorFeaturePresent(PF_PAE_ENABLED); + pMmAllocatePagesForMdlEx = KmtGetSystemRoutineAddress(L"MmAllocatePagesForMdlEx"); /* one byte - single page */

1 0

[reactos] 01/01: [SHELL32] Improve StartButton context menu (#5008)
by Katayama Hirofumi MZ 29 Jan '23

29 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e036fe74d953faf8305d… commit 8e036fe74d953faf8305d6db1143840038b971af Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 29 22:40:40 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 29 22:40:40 2023 +0900 [SHELL32] Improve StartButton context menu (#5008) - Add uFlags argument to CDefaultContextMenu::AddShellExtensionsToMenu- CCopyToMenu, CMoveToMenu, and CSendToMenu check the uFlags against (CMF_NOVERBS | CMF_VERBSONLY). CORE-16544 --- dll/win32/shell32/CCopyToMenu.cpp | 3 +++ dll/win32/shell32/CDefaultContextMenu.cpp | 8 ++++---- dll/win32/shell32/CMoveToMenu.cpp | 3 +++ dll/win32/shell32/CSendToMenu.cpp | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index e72b217945b..2206f968f7a 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -271,6 +271,9 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu, TRACE("CCopyToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + m_idCmdFirst = m_idCmdLast = idCmdFirst; // insert separator if necessary diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index ecb456661ae..2559e6e0438 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -84,7 +84,7 @@ class CDefaultContextMenu : BOOL IsShellExtensionAlreadyLoaded(REFCLSID clsid); HRESULT LoadDynamicContextMenuHandler(HKEY hKey, REFCLSID clsid); BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); - UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast); + UINT AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT* IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); HRESULT DoPaste(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFOEX lpcmi); @@ -417,7 +417,7 @@ CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey) } UINT -CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast) +CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { UINT cIds = 0; @@ -429,7 +429,7 @@ CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UIN { DynamicShellEntry& info = m_DynamicEntries.GetNext(it); - HRESULT hr = info.pCM->QueryContextMenu(hMenu, *pIndexMenu, idCmdFirst + cIds, idCmdLast, CMF_NORMAL); + HRESULT hr = info.pCM->QueryContextMenu(hMenu, *pIndexMenu, idCmdFirst + cIds, idCmdLast, uFlags); if (SUCCEEDED(hr)) { info.iIdCmdFirst = cIds; @@ -636,7 +636,7 @@ CDefaultContextMenu::QueryContextMenu( idCmdNext = idCmdFirst + cIds; /* Add dynamic context menu handlers */ - cIds += AddShellExtensionsToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast); + cIds += AddShellExtensionsToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast, uFlags); m_iIdSHEFirst = m_iIdSCMLast; m_iIdSHELast = cIds; idCmdNext = idCmdFirst + cIds; diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index c0e1c83a54d..2bcb360439b 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -270,6 +270,9 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu, TRACE("CMoveToMenu::QueryContextMenu(%p, %u, %u, %u, %u)\n", hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + m_idCmdFirst = m_idCmdLast = idCmdFirst; // insert separator if necessary diff --git a/dll/win32/shell32/CSendToMenu.cpp b/dll/win32/shell32/CSendToMenu.cpp index 1f8c42ef144..41db2e13d1f 100644 --- a/dll/win32/shell32/CSendToMenu.cpp +++ b/dll/win32/shell32/CSendToMenu.cpp @@ -295,6 +295,9 @@ CSendToMenu::QueryContextMenu(HMENU hMenu, TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + HMENU hSubMenu = CreateMenu(); if (!hSubMenu) {

1 0

[reactos] 02/02: [KMTESTS:KE] Correctly handle MP builds in KeSpinLock test.
by Thomas Faber 29 Jan '23

29 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f1fff696bbc49163eaa7… commit 5f1fff696bbc49163eaa709c8e53ae507cc2c196 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 28 21:54:05 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 28 23:26:30 2023 -0500 [KMTESTS:KE] Correctly handle MP builds in KeSpinLock test. --- modules/rostests/kmtests/ntos_ke/KeSpinLock.c | 38 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/modules/rostests/kmtests/ntos_ke/KeSpinLock.c b/modules/rostests/kmtests/ntos_ke/KeSpinLock.c index 9b16648573f..32f5b8ce351 100644 --- a/modules/rostests/kmtests/ntos_ke/KeSpinLock.c +++ b/modules/rostests/kmtests/ntos_ke/KeSpinLock.c @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Spin lock test - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel-Mode Test Suite Spin lock test + * COPYRIGHT: Copyright 2011-2023 Thomas Faber (thomas.faber(a)reactos.org) + * COPYRIGHT: Copyright 2021 Jérôme Gardou (jerome.gardou(a)reactos.org) */ #ifndef _WIN64 @@ -265,13 +266,21 @@ TestSpinLock( CheckSpinLock(SpinLock, CheckData, 0); ok_bool_true(CheckData->TryAcquire(SpinLock, CheckData), "TryAcquire returned"); CheckSpinLock(SpinLock, CheckData, 1); + /* A second TryToAcquire results in SPINLOCK_ALREADY_OWNED on checked builds */ if (!KmtIsCheckedBuild) { - /* SPINLOCK_ALREADY_OWNED on checked build */ - ok_bool_true(CheckData->TryAcquire(SpinLock, CheckData), "TryAcquire returned"); - /* even a failing acquire sets irql */ - ok_eq_uint(CheckData->Irql, CheckData->IrqlWhenAcquired); - CheckData->Irql = CheckData->OriginalIrql; + if (KmtIsMultiProcessorBuild) + { + /* In MP, this fails as you would expect */ + ok_bool_false(CheckData->TryAcquire(SpinLock, CheckData), "TryAcquire returned"); + } + else + { + /* In UP, this always succeeds: recursive acquires are illegal and parallel processors don't exist */ + ok_bool_true(CheckData->TryAcquire(SpinLock, CheckData), "TryAcquire returned"); + ok_eq_uint(CheckData->Irql, CheckData->IrqlWhenAcquired); + CheckData->Irql = CheckData->OriginalIrql; + } CheckSpinLock(SpinLock, CheckData, 1); } CheckData->Release(SpinLock, CheckData); @@ -312,7 +321,16 @@ TestSpinLock( CheckSpinLock(SpinLock, CheckData, 1); if (!KmtIsCheckedBuild) { - ok_bool_true(CheckData->TryAcquireNoRaise(SpinLock, CheckData), "TryAcquireNoRaise returned"); + if (KmtIsMultiProcessorBuild) + { + /* In MP, this fails as you would expect */ + ok_bool_false(CheckData->TryAcquireNoRaise(SpinLock, CheckData), "TryAcquireNoRaise returned"); + } + else + { + /* In UP, this always succeeds: recursive acquires are illegal and parallel processors don't exist */ + ok_bool_true(CheckData->TryAcquireNoRaise(SpinLock, CheckData), "TryAcquireNoRaise returned"); + } CheckSpinLock(SpinLock, CheckData, 1); } CheckData->ReleaseNoLower(SpinLock, CheckData);

1 0

[reactos] 01/02: [KMTESTS:MM] Fix failures in MmMdl test on machines with 2GB of free RAM.
by Thomas Faber 29 Jan '23

29 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f63da62e305b6609045b… commit 2f63da62e305b6609045bf09ac0d853d610bc2fb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 28 19:55:19 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 28 23:17:52 2023 -0500 [KMTESTS:MM] Fix failures in MmMdl test on machines with 2GB of free RAM. --- modules/rostests/kmtests/ntos_mm/MmMdl.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/rostests/kmtests/ntos_mm/MmMdl.c b/modules/rostests/kmtests/ntos_mm/MmMdl.c index 3ee201f5e0d..e84e3b2ecab 100644 --- a/modules/rostests/kmtests/ntos_mm/MmMdl.c +++ b/modules/rostests/kmtests/ntos_mm/MmMdl.c @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Kernel-Mode Test Suite MDL test - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Kernel-Mode Test Suite MDL test + * COPYRIGHT: Copyright 2015,2023 Thomas Faber (thomas.faber(a)reactos.org) + * COPYRIGHT: Copyright 2017 Pierre Schweitzer (pierre(a)reactos.org) */ #include <kmt_test.h> @@ -104,7 +105,7 @@ TestMmAllocatePagesForMdl(VOID) MmFreePagesFromMdl(Mdl); ExFreePoolWithTag(Mdl, 0); - /* try to allocate 2 GB -- should succeed but not map */ + /* try to allocate 2 GB -- should succeed (possibly with fewer pages) but not map */ Mdl = MmAllocatePagesForMdl(LowAddress, HighAddress, SkipBytes, @@ -112,12 +113,12 @@ TestMmAllocatePagesForMdl(VOID) ok(Mdl != NULL, "MmAllocatePagesForMdl failed for 2 GB\n"); if (Mdl != NULL) { - ok(MmGetMdlByteCount(Mdl) != 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlByteCount(Mdl) <= 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); MdlPages = MmGetMdlPfnArray(Mdl); MdlPageCount = ADDRESS_AND_SIZE_TO_SPAN_PAGES(MmGetMdlVirtualAddress(Mdl), MmGetMdlByteCount(Mdl)); - ok(MdlPageCount < 2UL * 1024 * 1024 * 1024 / PAGE_SIZE, "MdlPageCount = %lu\n", MdlPageCount); + ok(MdlPageCount <= 2UL * 1024 * 1024 * 1024 / PAGE_SIZE, "MdlPageCount = %lu\n", MdlPageCount); for (i = 0; i < MdlPageCount; i++) { if (MdlPages[i] == 0 || @@ -135,7 +136,7 @@ TestMmAllocatePagesForMdl(VOID) ok(SystemVa == NULL, "MmMapLockedPagesSpecifyCache succeeded for 2 GB\n"); if (SystemVa != NULL) MmUnmapLockedPages(SystemVa, Mdl); - ok(MmGetMdlByteCount(Mdl) != 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); + ok(MmGetMdlByteCount(Mdl) <= 2UL * 1024 * 1024 * 1024, "Byte count: %lu\n", MmGetMdlByteCount(Mdl)); ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); MmFreePagesFromMdl(Mdl);

1 0

[reactos] 02/02: [BUTTERFLIES] Do not release the DC passed to OpenGL. CORE-18498
by Thomas Faber 28 Jan '23

28 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb953ae4dd1ca89c66dd… commit afb953ae4dd1ca89c66ddd602f22146803b0709d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 16 19:45:03 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Jan 27 22:31:37 2023 -0500 [BUTTERFLIES] Do not release the DC passed to OpenGL. CORE-18498 --- modules/rosapps/applications/screensavers/butterflies/butterflies.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/rosapps/applications/screensavers/butterflies/butterflies.c b/modules/rosapps/applications/screensavers/butterflies/butterflies.c index 4c675a757a8..6d33fd35e66 100644 --- a/modules/rosapps/applications/screensavers/butterflies/butterflies.c +++ b/modules/rosapps/applications/screensavers/butterflies/butterflies.c @@ -12,6 +12,7 @@ HINSTANCE hInstance; // Holds The Instance Of The Application GLuint texture[3]; //stores texture objects and display list +HDC hdcOpenGL; LPCTSTR registryPath = _T("Software\\Microsoft\\ScreenSavers\\Butterflies"); BOOL dRotate; @@ -136,7 +137,7 @@ HGLRC InitOGLWindow(HWND hWnd) hRC = wglCreateContext(hDC); wglMakeCurrent(hDC, hRC); - ReleaseDC(hWnd, hDC); + hdcOpenGL = hDC; return hRC; } @@ -287,6 +288,7 @@ LRESULT WINAPI ScreenSaverProc(HWND hWnd, UINT message, case WM_DESTROY: wglMakeCurrent(NULL, NULL); wglDeleteContext(hRC); + ReleaseDC(hWnd, hdcOpenGL); break; }

1 0

[reactos] 01/02: [GDI32] Fix memory leak in case of public DC. CORE-18498
by Thomas Faber 28 Jan '23

28 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b19b6ec5abcaf3603e14… commit 8b19b6ec5abcaf3603e147252fa87fce998ec79e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 16 14:24:07 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Jan 27 22:30:35 2023 -0500 [GDI32] Fix memory leak in case of public DC. CORE-18498 --- win32ss/gdi/gdi32/objects/bitmap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index 438521f69e9..b029d4ad2df 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -756,8 +756,10 @@ SetDIBitsToDevice( if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID) & pDc_Attr)) { + DPRINT1("SetDIBitsToDevice called on invalid DC %p (not owned?)\n", hdc); SetLastError(ERROR_INVALID_PARAMETER); - return 0; + LinesCopied = 0; + goto Exit; } /* if ( !pDc_Attr || // DC is Public @@ -867,8 +869,10 @@ StretchDIBits( if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID) & pDc_Attr)) { + DPRINT1("StretchDIBits called on invalid DC %p (not owned?)\n", hdc); SetLastError(ERROR_INVALID_PARAMETER); - return 0; + LinesCopied = 0; + goto Exit; } /* if ( !pDc_Attr || @@ -894,6 +898,7 @@ StretchDIBits( cjBmpScanSize, NULL ); } +Exit: if (pvSafeBits) RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpBitsInfo != pConvertedInfo)

1 0

[reactos] 07/07: [WINESYNC] msvcrt: Don't fail when _aligned_offset_malloc is used with size=0.
by Timo Kreuzer 24 Jan '23

24 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f34e425e1a2be61db3983… commit f34e425e1a2be61db3983a452a39bb0a69f24485 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 10 11:50:18 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 24 18:53:13 2023 +0100 [WINESYNC] msvcrt: Don't fail when _aligned_offset_malloc is used with size=0. wine commit id 7771552f247660acc472b4862f32c4f8426be180 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/wine/heap.c b/sdk/lib/crt/wine/heap.c index 6a49988c63b..8fc3f6c37f1 100644 --- a/sdk/lib/crt/wine/heap.c +++ b/sdk/lib/crt/wine/heap.c @@ -545,7 +545,7 @@ void * CDECL _aligned_offset_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment, } /* offset must be less than size */ - if (offset >= size) + if (offset && offset >= size) { *MSVCRT__errno() = MSVCRT_EINVAL; return NULL;

1 0

[reactos] 06/07: [WINESYNC] msvcrt: Fixed strncpy_s behavior when count equals 0.
by Timo Kreuzer 24 Jan '23

24 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=739c9a1e77d5218bdc76a… commit 739c9a1e77d5218bdc76a5ee942cbef24b497463 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 10 11:36:51 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 24 18:53:13 2023 +0100 [WINESYNC] msvcrt: Fixed strncpy_s behavior when count equals 0. wine commit id bdf9a9f9bd56354f70a7431a9682183b84353211 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/heap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/lib/crt/wine/heap.c b/sdk/lib/crt/wine/heap.c index ad809de181c..6a49988c63b 100644 --- a/sdk/lib/crt/wine/heap.c +++ b/sdk/lib/crt/wine/heap.c @@ -819,8 +819,11 @@ int CDECL MSVCRT_strncpy_s(char *dest, MSVCRT_size_t numberOfElements, TRACE("(%s %lu %s %lu)\n", dest, numberOfElements, src, count); - if(!count) + if(!count) { + if(dest && numberOfElements) + *dest = 0; return 0; + } if (!MSVCRT_CHECK_PMT(dest != NULL)) return MSVCRT_EINVAL; if (!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL;

1 0

[reactos] 05/07: [CRT] Add a number of functions from wine
by Timo Kreuzer 24 Jan '23

24 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c36ea58f32deabb044b33… commit c36ea58f32deabb044b333253b60c2ab0149835c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 10 11:21:03 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 24 18:53:13 2023 +0100 [CRT] Add a number of functions from wine This adds _aligned_msize, _recalloc, wmemmove_s, memcpy_s, wmemcpy_s --- sdk/lib/crt/wine/heap.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/sdk/lib/crt/wine/heap.c b/sdk/lib/crt/wine/heap.c index 39e2e0c44b9..ad809de181c 100644 --- a/sdk/lib/crt/wine/heap.c +++ b/sdk/lib/crt/wine/heap.c @@ -26,6 +26,7 @@ #define MSVCRT_size_t size_t #define MSVCRT_intptr_t intptr_t +#define MSVCRT_wchar_t wchar_t #define MSVCRT__HEAPBADNODE _HEAPBADNODE #define MSVCRT__HEAPOK _HEAPOK #define MSVCRT__HEAPEND _HEAPEND @@ -35,6 +36,7 @@ #define MSVCRT_EINVAL EINVAL #define MSVCRT_ENOSYS ENOSYS #define MSVCRT_ENOMEM ENOMEM +#define MSVCRT_ERANGE ERANGE #define MSVCRT__TRUNCATE _TRUNCATE #define MSVCRT__heapinfo _heapinfo #define MSVCRT__errno _errno @@ -42,6 +44,7 @@ #define MSVCRT_malloc malloc #define MSVCRT_realloc realloc #define MSVCRT_free free +#define MSVCRT_memcpy_s memcpy_s #define MSVCRT_memmove_s memmove_s #define MSVCRT_strncpy_s strncpy_s #define msvcrt_set_errno _dosmaperr @@ -394,6 +397,22 @@ MSVCRT_size_t CDECL _msize(void* mem) return size; } +/********************************************************************* + * _aligned_msize (MSVCR100.@) + */ +size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offset) +{ + void **alloc_ptr; + + if(!MSVCRT_CHECK_PMT(p)) return -1; + + if(alignment < sizeof(void*)) + alignment = sizeof(void*); + + alloc_ptr = SAVED_PTR(p); + return _msize(*alloc_ptr)-alignment-sizeof(void*); +} + /********************************************************************* * calloc (MSVCRT.@) */ @@ -432,6 +451,31 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) return NULL; } +/********************************************************************* + * _recalloc (MSVCR100.@) + */ +void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) +{ + MSVCRT_size_t old_size; + void *ret; + + if(!mem) + return MSVCRT_calloc(num, size); + + size = num*size; + old_size = _msize(mem); + + ret = MSVCRT_realloc(mem, size); + if(!ret) { + *MSVCRT__errno() = MSVCRT_ENOMEM; + return NULL; + } + + if(size>old_size) + memset((BYTE*)ret+old_size, 0, size-old_size); + return ret; +} + /********************************************************************* * __p__amblksiz (MSVCRT.@) */ @@ -690,6 +734,81 @@ int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const voi return 0; } +/********************************************************************* + * wmemmove_s (MSVCR100.@) + */ +int CDECL wmemmove_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *src, MSVCRT_size_t count) +{ + TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count); + + if (!count) + return 0; + + /* Native does not seem to conform to 6.7.1.2.3 in + * http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1225.pdf + * in that it does not zero the output buffer on constraint violation. + */ + if (!MSVCRT_CHECK_PMT(dest != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT_ERR(count <= numberOfElements, MSVCRT_ERANGE)) return MSVCRT_ERANGE; + + memmove(dest, src, sizeof(MSVCRT_wchar_t)*count); + return 0; +} + +/********************************************************************* + * memcpy_s (MSVCRT.@) + */ +int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count) +{ + TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count); + + if(!count) + return 0; + + if (!MSVCRT_CHECK_PMT(dest != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(src != NULL)) + { + memset(dest, 0, numberOfElements); + return MSVCRT_EINVAL; + } + if (!MSVCRT_CHECK_PMT_ERR( count <= numberOfElements, MSVCRT_ERANGE )) + { + memset(dest, 0, numberOfElements); + return MSVCRT_ERANGE; + } + + memcpy(dest, src, count); + return 0; +} + +/********************************************************************* + * wmemcpy_s (MSVCR100.@) + */ +int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *src, MSVCRT_size_t count) +{ + TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count); + + if (!count) + return 0; + + if (!MSVCRT_CHECK_PMT(dest != NULL)) return MSVCRT_EINVAL; + + if (!MSVCRT_CHECK_PMT(src != NULL)) { + memset(dest, 0, numberOfElements*sizeof(MSVCRT_wchar_t)); + return MSVCRT_EINVAL; + } + if (!MSVCRT_CHECK_PMT_ERR(count <= numberOfElements, MSVCRT_ERANGE)) { + memset(dest, 0, numberOfElements*sizeof(MSVCRT_wchar_t)); + return MSVCRT_ERANGE; + } + + memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count); + return 0; +} + /********************************************************************* * strncpy_s (MSVCRT.@) */

1 0

[reactos] 04/07: [CRT] Reduce diff
by Timo Kreuzer 24 Jan '23

24 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0a52a6d714cf195eb828… commit d0a52a6d714cf195eb828821fa537f135565d041 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 10 11:20:11 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jan 24 18:53:13 2023 +0100 [CRT] Reduce diff - use msvcrt_set_errno - MSVCRT_CHECK_PMT already sets the error. - NULL check is already in HeapFree --- sdk/lib/crt/wine/heap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sdk/lib/crt/wine/heap.c b/sdk/lib/crt/wine/heap.c index 2c3f5ffe260..39e2e0c44b9 100644 --- a/sdk/lib/crt/wine/heap.c +++ b/sdk/lib/crt/wine/heap.c @@ -44,6 +44,7 @@ #define MSVCRT_free free #define MSVCRT_memmove_s memmove_s #define MSVCRT_strncpy_s strncpy_s +#define msvcrt_set_errno _dosmaperr /* MT */ #define LOCK_HEAP _mlock( _HEAP_LOCK ) @@ -277,7 +278,7 @@ int CDECL _heapchk(void) if (!HeapValidate(heap, 0, NULL) || (sb_heap && !HeapValidate(sb_heap, 0, NULL))) { - _dosmaperr(GetLastError()); + msvcrt_set_errno(GetLastError()); return MSVCRT__HEAPBADNODE; } return MSVCRT__HEAPOK; @@ -292,7 +293,7 @@ int CDECL _heapmin(void) (sb_heap && !HeapCompact( sb_heap, 0 ))) { if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - _dosmaperr(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } return 0; @@ -317,7 +318,7 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) !HeapValidate( heap, 0, phe.lpData )) { UNLOCK_HEAP; - _dosmaperr(GetLastError()); + msvcrt_set_errno(GetLastError()); return MSVCRT__HEAPBADNODE; } @@ -328,7 +329,7 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) UNLOCK_HEAP; if (GetLastError() == ERROR_NO_MORE_ITEMS) return MSVCRT__HEAPEND; - _dosmaperr(GetLastError()); + msvcrt_set_errno(GetLastError()); if (!phe.lpData) return MSVCRT__HEAPBADBEGIN; return MSVCRT__HEAPBADNODE; @@ -406,7 +407,6 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) */ void CDECL MSVCRT_free(void* ptr) { - if(ptr == NULL) return; msvcrt_heap_free(ptr); } @@ -703,11 +703,9 @@ int CDECL MSVCRT_strncpy_s(char *dest, MSVCRT_size_t numberOfElements, if(!count) return 0; - if (!MSVCRT_CHECK_PMT(dest != NULL) || !MSVCRT_CHECK_PMT(src != NULL) || - !MSVCRT_CHECK_PMT(numberOfElements != 0)) { - *_errno() = EINVAL; - return EINVAL; - } + if (!MSVCRT_CHECK_PMT(dest != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(numberOfElements != 0)) return MSVCRT_EINVAL; if(count!=MSVCRT__TRUNCATE && count<numberOfElements) end = count;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs