Ros-diffs August 2022

ros-diffs@reactos.org

11 participants
86 discussions

[reactos] 01/09: [WIN32K] Add missing NULL checks

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=090ccb3d8e732d9545cf9… commit 090ccb3d8e732d9545cf979f5b716c985afaf2d8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 17:08:12 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [WIN32K] Add missing NULL checks Also fix an old copy-pasta. --- win32ss/gdi/ntgdi/bitmaps.c | 7 ++++++- win32ss/gdi/ntgdi/dibobj.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/bitmaps.c b/win32ss/gdi/ntgdi/bitmaps.c index c2f38c55f40..dd7aa4486e1 100644 --- a/win32ss/gdi/ntgdi/bitmaps.c +++ b/win32ss/gdi/ntgdi/bitmaps.c @@ -333,6 +333,11 @@ IntCreateCompatibleBitmap( Planes ? Planes : 1, Bpp ? Bpp : dibs.dsBm.bmBitsPixel, NULL); + if (Bmp == NULL) + { + DPRINT1("Failed to allocate a bitmap!\n"); + return NULL; + } psurfBmp = SURFACE_ShareLockSurface(Bmp); ASSERT(psurfBmp); @@ -342,7 +347,7 @@ IntCreateCompatibleBitmap( /* Set flags */ psurfBmp->flags = API_BITMAP; psurfBmp->hdc = NULL; // FIXME: - psurf->SurfObj.hdev = (HDEV)Dc->ppdev; + psurfBmp->SurfObj.hdev = (HDEV)Dc->ppdev; SURFACE_ShareUnlockSurface(psurfBmp); } else if (Count == sizeof(DIBSECTION)) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 6c6dd53e941..b7bf542446a 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -69,6 +69,11 @@ CreateDIBPalette( 0, 0, 0); + if (ppal == NULL) + { + DPRINT1("Failed to allocate palette.\n"); + return NULL; + } /* Check if the BITMAPINFO specifies how many colors to use */ if ((pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) &&

2 years, 4 months

[reactos] 01/01: [NTUSER] KLF_UNLOAD flag of NtUserGetKeyboardLayoutList (#4592)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f4db56486996351a742e… commit 5f4db56486996351a742ec52385a0b604ebc9cd3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 3 12:45:10 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 3 12:45:10 2022 +0900 [NTUSER] KLF_UNLOAD flag of NtUserGetKeyboardLayoutList (#4592) This implementation enables KLF_UNLOAD flag awareness on listing the KLs. CORE-11700 --- win32ss/user/ntuser/kbdlayout.c | 109 +++++++++++++++++++++++++++------------- win32ss/user/ntuser/winsta.c | 12 +++++ win32ss/user/ntuser/winsta.h | 1 + 3 files changed, 88 insertions(+), 34 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 82767e76388..bca41faef3b 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -6,6 +6,7 @@ * COPYRIGHT: Copyright 2007 Saveliy Tretiakov * Copyright 2008 Colin Finck * Copyright 2011 Rafal Harabien + * Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <win32k.h> @@ -17,16 +18,63 @@ DBG_DEFAULT_CHANNEL(UserKbdLayout); -PKL gspklBaseLayout = NULL; +PKL gspklBaseLayout = NULL; /* FIXME: Please move this to pWinSta->spklList */ PKBDFILE gpkfList = NULL; DWORD gSystemFS = 0; UINT gSystemCPCharSet = 0; typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); - /* PRIVATE FUNCTIONS ******************************************************/ +// Win: _GetKeyboardLayoutList +static UINT APIENTRY +IntGetKeyboardLayoutList( + _Inout_ PWINSTATION_OBJECT pWinSta, + _In_ ULONG nBuff, + _Out_ HKL *pHklBuff) +{ + UINT ret = 0; + PKL pKL, pFirstKL; + + pFirstKL = gspklBaseLayout; /* FIXME: Use pWinSta->spklList instead */ + if (!pWinSta || !pFirstKL) + return 0; + + pKL = pFirstKL; + + if (nBuff == 0) + { + /* Count the effective PKLs */ + do + { + if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + ++ret; + pKL = pKL->pklNext; + } while (pKL != pFirstKL); + } + else + { + /* Copy the effective HKLs to pHklBuff */ + do + { + if (!(pKL->dwKL_Flags & KLF_UNLOAD)) + { + *pHklBuff = pKL->hkl; + ++pHklBuff; + ++ret; + --nBuff; + + if (nBuff == 0) + break; + } + pKL = pKL->pklNext; + } while (pKL != pFirstKL); + } + + return ret; +} + #if 0 && DBG static VOID @@ -550,54 +598,47 @@ NtUserGetKeyboardLayoutList( ULONG nBuff, HKL *pHklBuff) { - UINT uRet = 0; - PKL pKl; + UINT ret = 0; + PWINSTATION_OBJECT pWinSta; if (!pHklBuff) nBuff = 0; UserEnterShared(); - if (!gspklBaseLayout) + if (nBuff > MAXULONG / sizeof(HKL)) { - UserLeave(); - return 0; + SetLastNtError(ERROR_INVALID_PARAMETER); + goto Quit; } - pKl = gspklBaseLayout; - if (nBuff == 0) + _SEH2_TRY { - do - { - uRet++; - pKl = pKl->pklNext; - } while (pKl != gspklBaseLayout); + ProbeForWrite(pHklBuff, nBuff * sizeof(HKL), 1); } - else + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_TRY - { - ProbeForWrite(pHklBuff, nBuff*sizeof(HKL), 4); + SetLastNtError(_SEH2_GetExceptionCode()); + goto Quit; + } + _SEH2_END; - while (uRet < nBuff) - { - pHklBuff[uRet] = pKl->hkl; - uRet++; - pKl = pKl->pklNext; - if (pKl == gspklBaseLayout) - break; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - uRet = 0; - } - _SEH2_END; + pWinSta = IntGetProcessWindowStation(NULL); + + _SEH2_TRY + { + ret = IntGetKeyboardLayoutList(pWinSta, nBuff, pHklBuff); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + goto Quit; } + _SEH2_END; +Quit: UserLeave(); - return uRet; + return ret; } /* diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 4c91558b497..b4c31dcf891 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -395,6 +395,18 @@ CheckWinstaAttributeAccess(ACCESS_MASK DesiredAccess) return TRUE; } +// Win: _GetProcessWindowStation +PWINSTATION_OBJECT FASTCALL +IntGetProcessWindowStation(HWINSTA *phWinSta OPTIONAL) +{ + PWINSTATION_OBJECT pWinSta; + PPROCESSINFO ppi = GetW32ProcessInfo(); + HWINSTA hWinSta = ppi->hwinsta; + if (phWinSta) + *phWinSta = hWinSta; + IntValidateWindowStationHandle(hWinSta, UserMode, 0, &pWinSta, 0); + return pWinSta; +} /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/win32ss/user/ntuser/winsta.h b/win32ss/user/ntuser/winsta.h index 2918ca510fa..e755dad5bbf 100644 --- a/win32ss/user/ntuser/winsta.h +++ b/win32ss/user/ntuser/winsta.h @@ -106,6 +106,7 @@ IntCreateWindowStation( DWORD Unknown5, DWORD Unknown6); +PWINSTATION_OBJECT FASTCALL IntGetProcessWindowStation(HWINSTA *phWinSta OPTIONAL); BOOL FASTCALL UserSetProcessWindowStation(HWINSTA hWindowStation); BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID);

2 years, 4 months

[reactos] 01/01: [WIN32KNT_APITEST] Follow-up of Follow-up of #4594 (54b3b73)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfa92268da37976978ed3… commit bfa92268da37976978ed361b9c4b8399b393d1b8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 13:25:35 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Aug 2 13:25:35 2022 +0900 [WIN32KNT_APITEST] Follow-up of Follow-up of #4594 (54b3b73) CORE-11700 --- modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c index 4ffe7ac8112..00e378dcddf 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -41,7 +41,7 @@ START_TEST(NtUserGetKeyboardLayoutName) RtlZeroMemory(szBuff, sizeof(szBuff)); ustr.Buffer = szBuff; ustr.Length = 0; - ustr.MaximumLength = RTL_NUMBER_OF(szBuff); + ustr.MaximumLength = RTL_NUMBER_OF(szBuff) * sizeof(WCHAR); ret = bHung = FALSE; _SEH2_TRY { @@ -56,4 +56,5 @@ START_TEST(NtUserGetKeyboardLayoutName) ok_int(bHung, FALSE); ok_int(ret, TRUE); ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]); + trace("szBuff: %S\n", szBuff); }

2 years, 4 months

[reactos] 01/01: [WIN32KNT_APITEST] Follow-up of #4594 (54b3b73)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8043706bf0f859b35d7b9… commit 8043706bf0f859b35d7b97091e4aeb9271e59b2e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 12:07:09 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Aug 2 12:07:09 2022 +0900 [WIN32KNT_APITEST] Follow-up of #4594 (54b3b73) CORE-11700 --- .../win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c index ea49ff9de59..4ffe7ac8112 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -15,17 +15,17 @@ START_TEST(NtUserGetKeyboardLayoutName) FN_NtUserGetKeyboardLayoutName fn = (FN_NtUserGetKeyboardLayoutName)NtUserGetKeyboardLayoutName; UNICODE_STRING ustr; WCHAR szBuff[MAX_PATH]; - BOOL bHung; + BOOL bHung, ret; /* Try NULL */ - ok_int(fn(NULL), 0); + ok_int(fn(NULL), FALSE); /* Try szBuff */ - bHung = FALSE; - szBuff[0] = 0; + ret = bHung = FALSE; + RtlZeroMemory(szBuff, sizeof(szBuff)); _SEH2_TRY { - fn(szBuff); + ret = fn(szBuff); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -34,17 +34,18 @@ START_TEST(NtUserGetKeyboardLayoutName) _SEH2_END; ok_int(bHung, FALSE); + //ok_int(ret, FALSE); // XP:TRUE, 2k3:FALSE ok(szBuff[0] == 0, "szBuff[0] was %d\n", szBuff[0]); /* Try ustr */ - szBuff[0] = 0; + RtlZeroMemory(szBuff, sizeof(szBuff)); ustr.Buffer = szBuff; ustr.Length = 0; ustr.MaximumLength = RTL_NUMBER_OF(szBuff); - bHung = FALSE; + ret = bHung = FALSE; _SEH2_TRY { - fn(&ustr); + ret = fn(&ustr); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -53,5 +54,6 @@ START_TEST(NtUserGetKeyboardLayoutName) _SEH2_END; ok_int(bHung, FALSE); + ok_int(ret, TRUE); ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]); }

2 years, 4 months

[reactos] 01/01: [WIN32KNT_APITEST] Add NtUserGetKeyboardLayoutName testcase (#4594)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54b3b73c08e5a8b111f17… commit 54b3b73c08e5a8b111f17ae00e451f31abad7da9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 10:47:49 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 2 10:47:49 2022 +0900 [WIN32KNT_APITEST] Add NtUserGetKeyboardLayoutName testcase (#4594) The type of the 1st argument of NtUserGetKeyboardLayoutName is doubtful. CORE-11700 --- modules/rostests/apitests/win32nt/CMakeLists.txt | 1 + .../win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 57 ++++++++++++++++++++++ modules/rostests/apitests/win32nt/testlist.c | 6 ++- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 2ff69348a04..7060f79f219 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -54,6 +54,7 @@ list(APPEND SOURCE ntuser/NtUserFindExistingCursorIcon.c ntuser/NtUserGetClassInfo.c # ntuser/NtUserGetIconInfo.c + ntuser/NtUserGetKeyboardLayoutName.c ntuser/NtUserGetThreadState.c ntuser/NtUserGetTitleBarInfo.c ntuser/NtUserProcessConnect.c diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c new file mode 100644 index 00000000000..ea49ff9de59 --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -0,0 +1,57 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for NtUserGetKeyboardLayoutName + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <win32nt.h> +#include <pseh/pseh2.h> + +typedef BOOL (APIENTRY *FN_NtUserGetKeyboardLayoutName)(PVOID); + +START_TEST(NtUserGetKeyboardLayoutName) +{ + FN_NtUserGetKeyboardLayoutName fn = (FN_NtUserGetKeyboardLayoutName)NtUserGetKeyboardLayoutName; + UNICODE_STRING ustr; + WCHAR szBuff[MAX_PATH]; + BOOL bHung; + + /* Try NULL */ + ok_int(fn(NULL), 0); + + /* Try szBuff */ + bHung = FALSE; + szBuff[0] = 0; + _SEH2_TRY + { + fn(szBuff); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bHung = TRUE; + } + _SEH2_END; + + ok_int(bHung, FALSE); + ok(szBuff[0] == 0, "szBuff[0] was %d\n", szBuff[0]); + + /* Try ustr */ + szBuff[0] = 0; + ustr.Buffer = szBuff; + ustr.Length = 0; + ustr.MaximumLength = RTL_NUMBER_OF(szBuff); + bHung = FALSE; + _SEH2_TRY + { + fn(&ustr); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + bHung = TRUE; + } + _SEH2_END; + + ok_int(bHung, FALSE); + ok(szBuff[0] != 0, "szBuff[0] was %d\n", szBuff[0]); +} diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32nt/testlist.c index d58f6b5a5d0..8d2be31fc2c 100644 --- a/modules/rostests/apitests/win32nt/testlist.c +++ b/modules/rostests/apitests/win32nt/testlist.c @@ -53,8 +53,9 @@ extern void func_NtUserCreateWindowEx(void); extern void func_NtUserEnumDisplaySettings(void); extern void func_NtUserFindExistingCursorIcon(void); extern void func_NtUserGetClassInfo(void); -extern void func_NtUserGetThreadState(void); //extern void func_NtUserGetIconInfo(void); +extern void func_NtUserGetKeyboardLayoutName(void); +extern void func_NtUserGetThreadState(void); extern void func_NtUserGetTitleBarInfo(void); extern void func_NtUserProcessConnect(void); extern void func_NtUserRedrawWindow(void); @@ -120,8 +121,9 @@ const struct test winetest_testlist[] = { "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings }, { "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon }, { "NtUserGetClassInfo", func_NtUserGetClassInfo }, - { "NtUserGetThreadState", func_NtUserGetThreadState }, //{ "NtUserGetIconInfo", func_NtUserGetIconInfo }, + { "NtUserGetKeyboardLayoutName", func_NtUserGetKeyboardLayoutName }, + { "NtUserGetThreadState", func_NtUserGetThreadState }, { "NtUserGetTitleBarInfo", func_NtUserGetTitleBarInfo }, { "NtUserProcessConnect", func_NtUserProcessConnect }, { "NtUserRedrawWindow", func_NtUserRedrawWindow },

2 years, 4 months

[reactos] 01/01: [NTUSER] Release WinSta->spklList at IntWinStaObjectDelete (#4593)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9ecf4b055b9187dedc24… commit b9ecf4b055b9187dedc24271e1df075ddd027e16 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 2 10:46:37 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 2 10:46:37 2022 +0900 [NTUSER] Release WinSta->spklList at IntWinStaObjectDelete (#4593) Call UserAssignmentUnlock((PVOID*)&WinSta->spklList); in IntWinStaObjectDelete function. CORE-11700 --- win32ss/user/ntuser/winsta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 88266ad5bb0..4c91558b497 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -128,6 +128,8 @@ IntWinStaObjectDelete( RtlDestroyAtomTable(WinSta->AtomTable); + UserAssignmentUnlock((PVOID*)&WinSta->spklList); + return STATUS_SUCCESS; }

2 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2022