Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [APPWIZ] Update Romanian (ro-RO) translation (#4700)
by Andrei Miloiu 18 Sep '22

18 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f0132ee9553f15a04f98… commit 5f0132ee9553f15a04f988702c5dcf82e9c3a661 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Sep 19 02:10:49 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 02:10:49 2022 +0300 [APPWIZ] Update Romanian (ro-RO) translation (#4700) --- dll/cpl/appwiz/lang/ro-RO.rc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 530a0948127..2b7f0a4a4ce 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -1,7 +1,9 @@ /* - * FILE: dll/cpl/appwiz/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Software Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -88,8 +90,8 @@ BEGIN IDS_DWL_FAILED "Descărcarea pachetului Gecko a eșuat. Asigurați-vă că aveți conexiune la internet pentru a putea descărca. Asistentul va continua fără a instala pachetul Gecko." IDS_CANTMAKEINETSHORTCUT "Eșec în crearea scurtăturii la Internet." IDS_CANTMAKESHORTCUT "Eșec în crearea scurtăturii." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_NO_MEMORY "Nu a putut fi alocată memorie!" + IDS_NO_DIRECTORY "Nu a fost dat niciun director!" + IDS_INVALID_PATH "Calea dată este nevalidă!" + IDS_INVALID_NAME "Numele comenzii rapide pe care l-ați introdus conținea fie caractere nevalide pentru numele fișierelor, fie era prea lung." END

1 0

[reactos] 01/01: [ZIPFLDR] Set large icon correctly (#4708)
by Thamatip Chitpong 18 Sep '22

18 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7244a4a2f5a53571b7e3a… commit 7244a4a2f5a53571b7e3a287c860e1277ea902d3 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Sep 19 05:56:35 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 19 01:56:35 2022 +0300 [ZIPFLDR] Set large icon correctly (#4708) Now it's correctly displayed in Alt+Tab window selection. --- dll/shellext/zipfldr/CZipExtract.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 24a744f2e2d..20a8087a029 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -331,10 +331,23 @@ public: }; + /* NOTE: This callback is needed to set large icon correctly. */ + static INT CALLBACK s_PropSheetCallbackProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) + { + if (uMsg == PSCB_INITIALIZED) + { + HICON hIcon = LoadIconW(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCEW(IDI_ZIPFLDR)); + CWindow dlg(hwndDlg); + dlg.SetIcon(hIcon, TRUE); + } + + return 0; + } + void runWizard() { PROPSHEETHEADERW psh = { sizeof(psh), 0 }; - psh.dwFlags = PSH_WIZARD97 | PSH_HEADER | PSH_USEICONID; + psh.dwFlags = PSH_WIZARD97 | PSH_HEADER | PSH_USEICONID | PSH_USECALLBACK; psh.hInstance = _AtlBaseModule.GetResourceInstance(); CExtractSettingsPage extractPage(this, &m_Password); @@ -350,6 +363,7 @@ public: psh.pszIcon = MAKEINTRESOURCE(IDI_ZIPFLDR); psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + psh.pfnCallback = s_PropSheetCallbackProc; PropertySheetW(&psh); }

1 0

[reactos] 01/01: [DDRAW] Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags() CORE-18378 (#4713)
by Joachim Henze 18 Sep '22

18 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=305aae75f59a9e0e43b92… commit 305aae75f59a9e0e43b9213d86dbafe9e750c525 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Sep 18 20:53:30 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 18 20:53:30 2022 +0200 [DDRAW] Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags() CORE-18378 (#4713) Mutes the logging: fixme:(dll/directx/wine/ddraw/utils.c:584) Unhandled flags 0x20. gets logged many times per second. It does affect several applications, e.g. the game 'Anno 1602' from 1998, and the 'Diablo 2 demo' from rapps, For both games it can be observed with both: our VBEMP driver and the VBox4.3.12 3D-accelerated-driver. Muting may improve performance a bit in such apps. It gets logged although no missing features can be perceived visually in the rendering. Fix it by importing Wine-commit b943c7910b3261c9603343369cd632f7a3b56bba ddraw: Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dll/directx/wine/ddraw/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/ddraw/utils.c b/dll/directx/wine/ddraw/utils.c index 65f24dc13fd..b0a028d4a57 100644 --- a/dll/directx/wine/ddraw/utils.c +++ b/dll/directx/wine/ddraw/utils.c @@ -570,7 +570,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS))) + if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS | DDLOCK_WRITEONLY))) wined3d_flags |= WINED3D_MAP_READ; if (!(flags & DDLOCK_READONLY)) wined3d_flags |= WINED3D_MAP_WRITE; @@ -578,7 +578,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; if (flags & DDLOCK_NODIRTYUPDATE) wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; - flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_NODIRTYUPDATE); + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_WRITEONLY | DDLOCK_NODIRTYUPDATE); if (flags) FIXME("Unhandled flags %#x.\n", flags);

1 0

[reactos] 01/01: [GDI32] Fix ExtTextOutA with ETO_GLYPH_INDEX
by Mark Jansen 18 Sep '22

18 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d84b76a69e3e57264860f… commit d84b76a69e3e57264860fa2fc3245f6f02dac9ec Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 14 20:53:04 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 18 20:51:12 2022 +0200 [GDI32] Fix ExtTextOutA with ETO_GLYPH_INDEX CORE-18365 --- win32ss/gdi/gdi32/objects/text.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 2a3831aff27..4ba8c9a5d4d 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -465,9 +465,16 @@ ExtTextOutA( UNICODE_STRING StringU; BOOL ret; - RtlInitAnsiString(&StringA, (LPSTR)lpString); + if (fuOptions & ETO_GLYPH_INDEX) + return ExtTextOutW(hdc, x, y, fuOptions, lprc, (LPCWSTR)lpString, cch, lpDx); + + StringA.Buffer = (PCHAR)lpString; + StringA.Length = StringA.MaximumLength = cch; RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); + if (StringU.Length != StringA.Length * sizeof(WCHAR)) + DPRINT1("ERROR: Should convert lpDx properly!\n"); + ret = ExtTextOutW(hdc, x, y, fuOptions, lprc, StringU.Buffer, cch, lpDx); RtlFreeUnicodeString(&StringU);

1 0

[reactos] 01/01: [NTOS] Add some sanity checks when synchronizing PDEs
by Jérôme Gardou 17 Sep '22

17 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75125228be048a899bb9d… commit 75125228be048a899bb9d03efb2a55c8c3a8b60e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 9 19:17:14 2022 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Sep 17 13:48:56 2022 +0200 [NTOS] Add some sanity checks when synchronizing PDEs --- ntoskrnl/include/internal/mm.h | 12 ++--- ntoskrnl/mm/ARM3/miarm.h | 18 +++++-- ntoskrnl/mm/i386/page.c | 117 +++++++++++++++++++++-------------------- ntoskrnl/mm/marea.c | 7 ++- ntoskrnl/mm/rmap.c | 18 +++++-- ntoskrnl/mm/section.c | 14 ++++- 6 files changed, 112 insertions(+), 74 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index af281b26ff3..c7bf663d1c8 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1288,13 +1288,13 @@ NTSTATUS NTAPI MmGetExecuteOptions(IN PULONG ExecuteOptions); -VOID -NTAPI +_Success_(return) +BOOLEAN MmDeleteVirtualMapping( - struct _EPROCESS *Process, - PVOID Address, - BOOLEAN* WasDirty, - PPFN_NUMBER Page + _In_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN* WasDirty, + _Out_opt_ PPFN_NUMBER Page ); /* arch/procsup.c ************************************************************/ diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index b5fd1de3409..60197cda74e 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -2428,21 +2428,29 @@ FORCEINLINE BOOLEAN MiSynchronizeSystemPde(PMMPDE PointerPde) { - MMPDE SystemPde; ULONG Index; /* Get the Index from the PDE */ Index = ((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE); + if (PointerPde->u.Hard.Valid != 0) + { + NT_ASSERT(PointerPde->u.Long == MmSystemPagePtes[Index].u.Long); + return TRUE; + } + + if (MmSystemPagePtes[Index].u.Hard.Valid == 0) + { + return FALSE; + } /* Copy the PDE from the double-mapped system page directory */ - SystemPde = MmSystemPagePtes[Index]; - *PointerPde = SystemPde; + MI_WRITE_VALID_PDE(PointerPde, MmSystemPagePtes[Index]); /* Make sure we re-read the PDE and PTE */ KeMemoryBarrierWithoutFence(); - /* Return, if we had success */ - return SystemPde.u.Hard.Valid != 0; + /* Return success */ + return TRUE; } #endif diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index a9ba2eb1179..791aeb93490 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -119,7 +119,12 @@ BOOLEAN MiIsPageTablePresent(PVOID Address) { #if _MI_PAGING_LEVELS == 2 - return MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] != 0; + BOOLEAN Ret = MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] != 0; + + /* Some sanity check while we're here */ + ASSERT(Ret == (MiAddressToPde(Address)->u.Hard.Valid != 0)); + + return Ret; #else PMMPDE PointerPde; PMMPPE PointerPpe; @@ -217,16 +222,29 @@ MmGetPfnForProcess(PEPROCESS Process, return Page; } -VOID -NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, - BOOLEAN* WasDirty, PPFN_NUMBER Page) -/* - * FUNCTION: Delete a virtual mapping +/** + * @brief Deletes the virtual mapping and optionally gives back the page & dirty bit. + * + * @param Process - The process this address belongs to, or NULL if system address. + * @param Address - The address to unmap. + * @param WasDirty - Optional param receiving the dirty bit of the PTE. + * @param Page - Optional param receiving the page number previously mapped to this address. + * + * @return Whether there was actually a page mapped at the given address. */ +_Success_(return) +BOOLEAN +MmDeleteVirtualMapping( + _In_opt_ PEPROCESS Process, + _In_ PVOID Address, + _Out_opt_ BOOLEAN* WasDirty, + _Out_opt_ PPFN_NUMBER Page) { PMMPTE PointerPte; MMPTE OldPte; + BOOLEAN ValidPde; + + OldPte.u.Long = 0; DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", Process, Address, WasDirty, Page); @@ -244,18 +262,10 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, KeBugCheck(MEMORY_MANAGEMENT); } #if (_MI_PAGING_LEVELS == 2) - if (!MiSynchronizeSystemPde(MiAddressToPde(Address))) + ValidPde = MiSynchronizeSystemPde(MiAddressToPde(Address)); #else - if (!MiIsPdeForAddressValid(Address)) + ValidPde = MiIsPdeForAddressValid(Address); #endif - { - /* There can't be a page if there is no PDE */ - if (WasDirty) - *WasDirty = FALSE; - if (Page) - *Page = 0; - return; - } } else { @@ -266,61 +276,56 @@ MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, } /* Only for current process !!! */ - ASSERT(Process = PsGetCurrentProcess()); + ASSERT(Process == PsGetCurrentProcess()); MiLockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - /* No PDE --> No page */ - if (!MiIsPageTablePresent(Address)) + ValidPde = MiIsPageTablePresent(Address); + if (ValidPde) { - MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - if (WasDirty) - *WasDirty = 0; - if (Page) - *Page = 0; - return; + MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); } - - MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); } - PointerPte = MiAddressToPte(Address); - OldPte.u.Long = InterlockedExchangePte(PointerPte, 0); - - if (OldPte.u.Long == 0) + /* Get the PTE if we're having anything */ + if (ValidPde) { - /* There was nothing here */ - if (Address < MmSystemRangeStart) - MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); - if (WasDirty) - *WasDirty = 0; - if (Page) - *Page = 0; - return; - } + PointerPte = MiAddressToPte(Address); + OldPte.u.Long = InterlockedExchangePte(PointerPte, 0); - /* It must have been present, or not a swap entry */ - ASSERT(OldPte.u.Hard.Valid || !FlagOn(OldPte.u.Long, 0x800)); - - if (OldPte.u.Hard.Valid) KeInvalidateTlbEntry(Address); - if (Address < MmSystemRangeStart) + if (OldPte.u.Long != 0) + { + /* It must have been present, or not a swap entry */ + ASSERT(OldPte.u.Hard.Valid || !FlagOn(OldPte.u.Long, 0x800)); + if (WasDirty != NULL) + { + *WasDirty = !!OldPte.u.Hard.Dirty; + } + if (Page != NULL) + { + *Page = OldPte.u.Hard.PageFrameNumber; + } + } + } + + if (Process != NULL) { - /* Remove PDE reference */ - if (MiDecrementPageTableReferences(Address) == 0) + /* Remove PDE reference, if needed */ + if (OldPte.u.Long != 0) { - KIRQL OldIrql = MiAcquirePfnLock(); - MiDeletePde(MiAddressToPde(Address), Process); - MiReleasePfnLock(OldIrql); + if (MiDecrementPageTableReferences(Address) == 0) + { + KIRQL OldIrql = MiAcquirePfnLock(); + MiDeletePde(MiAddressToPde(Address), Process); + MiReleasePfnLock(OldIrql); + } } MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); } - if (WasDirty) - *WasDirty = !!OldPte.u.Hard.Dirty; - if (Page) - *Page = OldPte.u.Hard.PageFrameNumber; + return OldPte.u.Long != 0; } @@ -631,7 +636,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, } /* Only for current process !!! */ - ASSERT(Process = PsGetCurrentProcess()); + ASSERT(Process == PsGetCurrentProcess()); MiLockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); MiMakePdeExistAndMakeValid(MiAddressToPde(Address), Process, MM_NOIRQL); diff --git a/ntoskrnl/mm/marea.c b/ntoskrnl/mm/marea.c index 78d07c75cd6..8bf8ab72630 100644 --- a/ntoskrnl/mm/marea.c +++ b/ntoskrnl/mm/marea.c @@ -314,16 +314,19 @@ MmFreeMemoryArea( BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; PFN_NUMBER Page = 0; + BOOLEAN DoFree; if (MmIsPageSwapEntry(Process, (PVOID)Address)) { MmDeletePageFileMapping(Process, (PVOID)Address, &SwapEntry); + /* We'll have to do some cleanup when we're on the page file */ + DoFree = TRUE; } else { - MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); + DoFree = MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); } - if (FreePage != NULL) + if (DoFree && (FreePage != NULL)) { FreePage(FreePageContext, MemoryArea, (PVOID)Address, Page, SwapEntry, (BOOLEAN)Dirty); diff --git a/ntoskrnl/mm/rmap.c b/ntoskrnl/mm/rmap.c index e27e31de820..9c2f00eff22 100644 --- a/ntoskrnl/mm/rmap.c +++ b/ntoskrnl/mm/rmap.c @@ -135,6 +135,7 @@ GetEntry: PFN_NUMBER MapPage; LARGE_INTEGER Offset; BOOLEAN Released; + BOOLEAN Unmapped; Offset.QuadPart = MemoryArea->SectionData.ViewOffset + ((ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea)); @@ -158,10 +159,19 @@ GetEntry: /* Delete this virtual mapping in the process */ MmDeleteRmap(Page, Process, Address); - MmDeleteVirtualMapping(Process, Address, &Dirty, &MapPage); - - /* We checked this earlier */ - ASSERT(MapPage == Page); + Unmapped = MmDeleteVirtualMapping(Process, Address, &Dirty, &MapPage); + if (!Unmapped || (MapPage != Page)) + { + /* + * Something's corrupted, we got there because this process is + * supposed to be mapping this page there. + */ + KeBugCheckEx(MEMORY_MANAGEMENT, + (ULONG_PTR)Process, + (ULONG_PTR)Address, + (ULONG_PTR)__FILE__, + __LINE__); + } if (Page != PFN_FROM_SSE(Entry)) { diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 44b5710f6f4..0ab7da4a648 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1897,6 +1897,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, PMM_SECTION_SEGMENT Segment; PFN_NUMBER OldPage; PFN_NUMBER NewPage; + PFN_NUMBER UnmappedPage; PVOID PAddress; LARGE_INTEGER Offset; PMM_REGION Region; @@ -1904,6 +1905,7 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); BOOLEAN Cow = FALSE; ULONG NewProtect; + BOOLEAN Unmapped; DPRINT("MmAccessFaultSectionView(%p, %p, %p)\n", AddressSpace, MemoryArea, Address); @@ -2003,7 +2005,17 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, * Unshare the old page. */ DPRINT("Swapping page (Old %x New %x)\n", OldPage, NewPage); - MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); + Unmapped = MmDeleteVirtualMapping(Process, PAddress, NULL, &UnmappedPage); + if (!Unmapped || (UnmappedPage != OldPage)) + { + /* Uh , we had a page just before, but suddenly it changes. Someone corrupted us. */ + KeBugCheckEx(MEMORY_MANAGEMENT, + (ULONG_PTR)Process, + (ULONG_PTR)PAddress, + (ULONG_PTR)__FILE__, + __LINE__); + } + if (Process) MmDeleteRmap(OldPage, Process, PAddress); MmUnsharePageEntrySectionSegment(MemoryArea, Segment, &Offset, FALSE, FALSE, NULL);

1 0

[reactos] 01/01: [CPL] Boundary check of Control Panel applets (#4706)
by Katayama Hirofumi MZ 17 Sep '22

17 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5ebbc8afaf104eff2db2… commit e5ebbc8afaf104eff2db274a73131e83e6bed4dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 17 13:59:51 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 17 13:59:51 2022 +0900 [CPL] Boundary check of Control Panel applets (#4706) - Check the boundary (i < NUM_APPLETS) of the variable i in CPlApplet functions. - Use UINT type for the variable i. --- dll/cpl/access/access.c | 16 +++++++++++++--- dll/cpl/desk/desk.c | 16 +++++++++++++--- dll/cpl/hotplug/hotplug.c | 14 ++++++++++++-- dll/cpl/input/input.c | 26 +++++++++++++++++--------- dll/cpl/intl/intl.c | 32 +++++++++++++++++++++----------- dll/cpl/joy/joy.c | 26 +++++++++++++++++--------- dll/cpl/main/main.c | 35 +++++++++++++++++++++-------------- dll/cpl/mmsys/mmsys.c | 38 +++++++++++++++++++++----------------- dll/cpl/powercfg/powercfg.c | 28 +++++++++++++++++----------- dll/cpl/sysdm/sysdm.c | 17 +++++++++++++---- dll/cpl/timedate/timedate.c | 32 +++++++++++++++++++------------- dll/cpl/usrmgr/usrmgr.c | 12 ++++++++++-- 12 files changed, 194 insertions(+), 98 deletions(-) diff --git a/dll/cpl/access/access.c b/dll/cpl/access/access.c index d840adfe99e..82ebb52ac04 100644 --- a/dll/cpl/access/access.c +++ b/dll/cpl/access/access.c @@ -240,7 +240,7 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -251,6 +251,7 @@ CPlApplet(HWND hwndCPl, return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -258,14 +259,23 @@ CPlApplet(HWND hwndCPl, CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 213ec6c8ff9..a5df62885a2 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -252,7 +252,7 @@ cleanup: LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -263,6 +263,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -270,14 +271,23 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index da848bf2cbe..7f2930f26cc 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -548,6 +548,7 @@ CPlApplet( return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -555,14 +556,23 @@ CPlApplet( CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; } diff --git a/dll/cpl/input/input.c b/dll/cpl/input/input.c index d621f2f9cf7..cd8a0291cb5 100644 --- a/dll/cpl/input/input.c +++ b/dll/cpl/input/input.c @@ -87,9 +87,7 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { CPLINFO *CPlInfo; - int i; - - i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -100,15 +98,25 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + if (i < NUM_APPLETS) + { + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; } diff --git a/dll/cpl/intl/intl.c b/dll/cpl/intl/intl.c index 054a8f1e674..bce915ce177 100644 --- a/dll/cpl/intl/intl.c +++ b/dll/cpl/intl/intl.c @@ -232,6 +232,8 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch (uMsg) { case CPL_INIT: @@ -241,23 +243,31 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; - - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index f58c874c9e6..057ec4c8534 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -319,11 +319,9 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { CPLINFO *CPlInfo; - DWORD i; - + UINT i = (UINT)lParam1; UNREFERENCED_PARAMETER(hwndCPl); - i = (DWORD)lParam1; switch (uMsg) { case CPL_INIT: @@ -333,15 +331,25 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + if (i < NUM_APPLETS) + { + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; } diff --git a/dll/cpl/main/main.c b/dll/cpl/main/main.c index 6e1294b3bd0..70c432a2504 100644 --- a/dll/cpl/main/main.c +++ b/dll/cpl/main/main.c @@ -87,6 +87,8 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch(uMsg) { case CPL_INIT: @@ -96,26 +98,31 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; - - CPlInfo->lData = lParam1; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = lParam1; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - { - UINT uAppIndex = (UINT)lParam1; - Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; break; - } case CPL_STARTWPARMSW: - return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index 78bdc57078b..bde437eda15 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -745,6 +745,8 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch (uMsg) { case CPL_INIT: @@ -754,29 +756,31 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - UINT uAppIndex = (UINT)lParam1; - - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[uAppIndex].idIcon; - CPlInfo->idName = Applets[uAppIndex].idName; - CPlInfo->idInfo = Applets[uAppIndex].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - { - UINT uAppIndex = (UINT)lParam1; - Applets[uAppIndex].AppletProc(hwndCpl, - uMsg, - lParam1, - lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; break; - } case CPL_STARTWPARMSW: - return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index 4e5e1c17220..9fd813a35a7 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -155,7 +155,7 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -170,20 +170,26 @@ CPlApplet(HWND hwndCPl, } case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } break; - } case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; - } } return FALSE; diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index a93b02ceb1e..fbd7651a6f9 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -203,7 +203,7 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; + UINT i = (UINT)lParam1; UNREFERENCED_PARAMETER(hwndCPl); @@ -216,6 +216,7 @@ CPlApplet(HWND hwndCPl, return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -223,15 +224,23 @@ CPlApplet(HWND hwndCPl, CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; case CPL_STARTWPARMSW: - return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); - + if (i < NUM_APPLETS) + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } return FALSE; diff --git a/dll/cpl/timedate/timedate.c b/dll/cpl/timedate/timedate.c index 9e1baaa3eca..e3f03fdf7ca 100644 --- a/dll/cpl/timedate/timedate.c +++ b/dll/cpl/timedate/timedate.c @@ -131,7 +131,7 @@ CPlApplet(HWND hwndCpl, LPARAM lParam1, LPARAM lParam2) { - INT i = (INT)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -142,20 +142,26 @@ CPlApplet(HWND hwndCpl, return NUM_APPLETS; case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - } - break; + if (i < NUM_APPLETS) + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + else + { + return TRUE; + } + break; case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); - } - break; + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + else + return TRUE; + break; } return FALSE; } diff --git a/dll/cpl/usrmgr/usrmgr.c b/dll/cpl/usrmgr/usrmgr.c index 7aea9731796..6c00abd666e 100644 --- a/dll/cpl/usrmgr/usrmgr.c +++ b/dll/cpl/usrmgr/usrmgr.c @@ -90,7 +90,7 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + UINT i = (UINT)lParam1; switch (uMsg) { @@ -101,6 +101,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) return NUM_APPLETS; case CPL_INQUIRE: + if (i < NUM_APPLETS) { CPLINFO *CPlInfo = (CPLINFO*)lParam2; CPlInfo->lData = 0; @@ -108,10 +109,17 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; } + else + { + return TRUE; + } break; case CPL_DBLCLK: - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + if (i < NUM_APPLETS) + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + else + return TRUE; break; }

1 0

[reactos] 01/01: [MEDIA][INF] The name of rapps in Japanese is too long (#4707)
by Katayama Hirofumi MZ 16 Sep '22

16 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37ccb9e594e0979a01420… commit 37ccb9e594e0979a01420c411f5ce3c81e9a6aef Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 17 07:56:41 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 17 07:56:41 2022 +0900 [MEDIA][INF] The name of rapps in Japanese is too long (#4707) Renaming: 「アプリケーションマネージャ」→「アプリマネージャ」 --- media/inf/shortcuts.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index a12f7f481dc..2bceb76b599 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -934,8 +934,8 @@ CMD_TITLE=コマンドプロンプト CMD_DESC=コマンドプロンプトを開きます EXPLORER_TITLE=ReactOS Explorer EXPLORER_DESC=エクスプローラを起動します -RAPPS_TITLE=ReactOS アプリケーションマネージャ -RAPPS_TITLE_SHORT=アプリケーションマネージャ +RAPPS_TITLE=ReactOS アプリマネージャ +RAPPS_TITLE_SHORT=アプリマネージャ RAPPS_DESC=様々なアプリケーションのダウンロードとインストールを行います SERVMAN_TITLE=サービスマネージャ SERVMAN_DESC=サービスマネージャを起動します

1 0

[reactos] 01/01: [INPUT] Fix IsRebootNeeded condition
by Katayama Hirofumi MZ 16 Sep '22

16 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd46398b63a49293e9cb1… commit fd46398b63a49293e9cb1759c4b06c0fa5366d5f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 17 07:12:05 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 17 07:12:05 2022 +0900 [INPUT] Fix IsRebootNeeded condition If there is any IME HKL, reboot is needed. Follow-up to #4666 (596f04b). CORE-11700, CORE-18364 --- dll/cpl/input/settings_page.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c index a42de1399d6..86ff2162f66 100644 --- a/dll/cpl/input/settings_page.c +++ b/dll/cpl/input/settings_page.c @@ -360,12 +360,7 @@ static BOOL IsRebootNeeded(VOID) { if (IS_IME_HKL(pNode->hkl)) /* IME? */ { - if (pNode->wFlags & (INPUT_LIST_NODE_FLAG_ADDED | - INPUT_LIST_NODE_FLAG_EDITED | - INPUT_LIST_NODE_FLAG_DEFAULT)) - { - return TRUE; - } + return TRUE; } }

1 0

[reactos] 01/01: [USER32] Avoid szImeFileName buffer overrun
by Katayama Hirofumi MZ 16 Sep '22

16 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75116d6b8755a337138fb… commit 75116d6b8755a337138fba6facf86c6511b5b1db Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 16 18:04:55 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 16 18:04:55 2022 +0900 [USER32] Avoid szImeFileName buffer overrun CORE-11700 --- win32ss/user/user32/windows/input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 39ad3ab951f..57cb1e18b7a 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -800,6 +800,7 @@ IntLoadKeyboardLayout( else { WCHAR szPath[MAX_PATH]; + szImeFileName[_countof(szImeFileName) - 1] = UNICODE_NULL; GetSystemLibraryPath(szPath, _countof(szPath), szImeFileName); /* We don't allow the invalid "IME File" values for security reason */

1 0

[reactos] 01/01: [USER32] Don't allow invalid 'IME File' values
by Katayama Hirofumi MZ 16 Sep '22

16 Sep '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4575eccd77c37eb1c313… commit b4575eccd77c37eb1c3132660c288e91ac378ed9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 16 17:59:48 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 16 18:01:19 2022 +0900 [USER32] Don't allow invalid 'IME File' values Improve security. CORE-11700 --- win32ss/user/user32/windows/input.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index a9aac9e82a3..39ad3ab951f 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -801,7 +801,11 @@ IntLoadKeyboardLayout( { WCHAR szPath[MAX_PATH]; GetSystemLibraryPath(szPath, _countof(szPath), szImeFileName); - if (GetFileAttributesW(szPath) == INVALID_FILE_ATTRIBUTES) /* Does not exist? */ + + /* We don't allow the invalid "IME File" values for security reason */ + if (dwType != REG_SZ || szImeFileName[0] == 0 || + wcsspn(szImeFileName, L":\\/") != wcslen(szImeFileName) || + GetFileAttributesW(szPath) == INVALID_FILE_ATTRIBUTES) /* Does not exist? */ { bIsIME = FALSE; wHigh = 0;

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