Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

[reactos] 01/01: [SHELL32] CMenuToolbarBase: Use COLOR_MENUTEXT color for the text color in normal menu items. CORE-13855

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6719230378fd49e61059… commit a6719230378fd49e610593c2b7e45ac331017c86 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Jan 5 11:53:35 2018 +0200 [SHELL32] CMenuToolbarBase: Use COLOR_MENUTEXT color for the text color in normal menu items. CORE-13855 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 40dd12fc9a..909c5fb21f 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -206,6 +206,9 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } else { + // Set the text color, will be used by the internal drawing code + cdraw->clrText = GetSysColor(COLOR_MENUTEXT); + // Remove HOT and CHECKED flags (will restore HOT if necessary) cdraw->nmcd.uItemState &= ~CDIS_HOT;

6 years, 11 months

[reactos] 01/01: [COMCTL32] tab: Use DrawThemeText when drawing text with themes. CORE-13855

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695147eaacf99d47e771b… commit 695147eaacf99d47e771b063cd896b5379488ca8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 4 23:25:37 2018 +0200 [COMCTL32] tab: Use DrawThemeText when drawing text with themes. CORE-13855 --- dll/win32/comctl32/tab.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dll/win32/comctl32/tab.c b/dll/win32/comctl32/tab.c index 0a191c04c7..c5e3a8672f 100644 --- a/dll/win32/comctl32/tab.c +++ b/dll/win32/comctl32/tab.c @@ -1534,6 +1534,9 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect HPEN holdPen; INT oldBkMode; HFONT hOldFont; +#ifdef __REACTOS__ +HTHEME theme = GetWindowTheme (infoPtr->hwnd); +#endif /* if (drawRect == NULL) */ { @@ -1904,6 +1907,29 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n", debugstr_w(item->pszText), center_offset_h, center_offset_v, wine_dbgstr_rect(drawRect), (rcText.right-rcText.left)); +#ifdef __REACTOS__ + if (theme && item->pszText) + { + int partIndex = iItem == infoPtr->iSelected ? TABP_TABITEM : TABP_TOPTABITEM; + int stateId = TIS_NORMAL; + + if (iItem == infoPtr->iSelected) + stateId = TIS_SELECTED; + else if (iItem == infoPtr->iHotTracked) + stateId = TIS_HOT; + else if (iItem == infoPtr->uFocus) + stateId = TIS_FOCUSED; + + DrawThemeText(theme, + hdc, + partIndex, + stateId, + item->pszText, + lstrlenW(item->pszText), + DT_LEFT | DT_SINGLELINE, 0, drawRect); + } + else +#endif if (item->pszText) { DrawTextW

6 years, 11 months

[reactos] 01/01: [USETUP] When overwriting a file, if open fails, it might be because the file is readonly. In such situation, try to drop the readonly attribute before overwritting the file.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82f44a2107d7eb79f1e3a… commit 82f44a2107d7eb79f1e3a4af196e2e007a166e57 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jan 4 21:47:59 2018 +0100 [USETUP] When overwriting a file, if open fails, it might be because the file is readonly. In such situation, try to drop the readonly attribute before overwritting the file. This fixes setup not being able to overwrite FAT bootcode when reusing a FAT partition already installed without reformatting. CORE-14158 --- base/setup/usetup/filesup.c | 68 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index bed30c418d..65a372a337 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -348,8 +348,72 @@ SetupCopyFile( 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); - goto unmapsrcsec; + /* Open may have failed because the file to overwrite + * is in readonly mode + */ + if (Status == STATUS_ACCESS_DENIED) + { + FILE_BASIC_INFORMATION FileBasicInfo; + + /* Reattempt to open it */ + Status = NtCreateFile(&FileHandleDest, + GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OPEN, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + /* Fail for real if we cannot open it that way + * XXX: actually, we should try to refine access rights + * to only have write_attributes, should be enough + */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); + goto unmapsrcsec; + } + + /* Zero our basic info, just to set attributes */ + RtlZeroMemory(&FileBasicInfo, sizeof(FileBasicInfo)); + /* Reset attributes to normal, no read-only */ + FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + /* We basically don't care about whether it succeed: + * if it didn't, later open will fail + */ + NtSetInformationFile(FileHandleDest, &IoStatusBlock, &FileBasicInfo, + sizeof(FileBasicInfo), FileBasicInformation); + + /* Close file */ + NtClose(FileHandleDest); + + /* And re-attempt overwrite */ + Status = NtCreateFile(&FileHandleDest, + GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + } + + /* We failed */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); + goto unmapsrcsec; + } } RegionSize = (ULONG)PAGE_ROUND_UP(FileStandard.EndOfFile.u.LowPart);

6 years, 11 months

[reactos] 01/01: [NTOS:EX] Don't dereference ExpCritSecOutOfMemoryEvent when it was never referenced.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f555c102b79f675c57118… commit f555c102b79f675c571187c84a54b76b5bd9e652 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 22 10:57:40 2017 +0200 [NTOS:EX] Don't dereference ExpCritSecOutOfMemoryEvent when it was never referenced. --- ntoskrnl/ex/keyedevt.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ex/keyedevt.c b/ntoskrnl/ex/keyedevt.c index 6bb2769e34..110b2c3ee7 100644 --- a/ntoskrnl/ex/keyedevt.c +++ b/ntoskrnl/ex/keyedevt.c @@ -457,8 +457,11 @@ NtWaitForKeyedEvent( /* Do the wait */ Status = ExpWaitForKeyedEvent(KeyedEvent, Key, Alertable, Timeout); - /* Dereference the keyed event */ - ObDereferenceObject(KeyedEvent); + if (Handle != NULL) + { + /* Dereference the keyed event */ + ObDereferenceObject(KeyedEvent); + } /* Return the status */ return Status; @@ -523,8 +526,11 @@ NtReleaseKeyedEvent( /* Do the wait */ Status = ExpReleaseKeyedEvent(KeyedEvent, Key, Alertable, Timeout); - /* Dereference the keyed event */ - ObDereferenceObject(KeyedEvent); + if (Handle != NULL) + { + /* Dereference the keyed event */ + ObDereferenceObject(KeyedEvent); + } /* Return the status */ return Status;

6 years, 11 months

[reactos] 01/01: [PSDK] Change #if to #ifdef, to be more consistent with the majority of our codebase.

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c32993c67249513b17673… commit c32993c67249513b17673d44e4c6bcfb7b70e9b1 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Thu Jan 4 19:15:06 2018 +0100 [PSDK] Change #if to #ifdef, to be more consistent with the majority of our codebase. --- sdk/include/psdk/ipexport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/ipexport.h b/sdk/include/psdk/ipexport.h index 906bbb0edf..608952eec8 100644 --- a/sdk/include/psdk/ipexport.h +++ b/sdk/include/psdk/ipexport.h @@ -66,7 +66,7 @@ typedef struct ip_option_information IP_OPTION_INFORMATION, *PIP_OPTION_INFORMAT typedef struct icmp_echo_reply ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY; -#if _WIN64 +#ifdef _WIN64 struct icmp_echo_reply32 { IPAddr Address;

6 years, 11 months

[reactos] 01/01: [PSDK] Add ICMP_ECHO_REPLY32 needed by 64-bit code. Fixes x64 build of tracert.

by David Quintana

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8b93430d47557c6a0781… commit c8b93430d47557c6a0781ed3fe6bf4af909adef6 Author: David Quintana <gigaherz(a)gmail.com> AuthorDate: Thu Jan 4 18:21:16 2018 +0100 [PSDK] Add ICMP_ECHO_REPLY32 needed by 64-bit code. Fixes x64 build of tracert. --- sdk/include/psdk/ipexport.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sdk/include/psdk/ipexport.h b/sdk/include/psdk/ipexport.h index 01a1185c20..906bbb0edf 100644 --- a/sdk/include/psdk/ipexport.h +++ b/sdk/include/psdk/ipexport.h @@ -66,6 +66,21 @@ typedef struct ip_option_information IP_OPTION_INFORMATION, *PIP_OPTION_INFORMAT typedef struct icmp_echo_reply ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY; +#if _WIN64 +struct icmp_echo_reply32 +{ + IPAddr Address; + ULONG Status; + ULONG RoundTripTime; + unsigned short DataSize; + unsigned short Reserved; + void* POINTER_32 Data; + struct ip_option_information Options; +}; + +typedef struct icmp_echo_reply32 ICMP_ECHO_REPLY32, *PICMP_ECHO_REPLY32; +#endif + #define IP_STATUS_BASE 11000

6 years, 11 months

[reactos] 01/01: [COMCTL32] toolbar: Draw checked and not hot buttons as checked, not hot. CORE-13592 Should be sent to wine.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=522601d0503b19d09e0ec… commit 522601d0503b19d09e0ecce9bf2c474370d419e2 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 4 14:30:47 2018 +0200 [COMCTL32] toolbar: Draw checked and not hot buttons as checked, not hot. CORE-13592 Should be sent to wine. --- dll/win32/comctl32/toolbar.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index e0a73e7f12..8f78b2c792 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -1130,7 +1130,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, else if (tbcd.nmcd.uItemState & CDIS_SELECTED) stateId = TS_PRESSED; else if (tbcd.nmcd.uItemState & CDIS_CHECKED) +#ifdef __REACTOS__ + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; +#else stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT; +#endif else if ((tbcd.nmcd.uItemState & CDIS_HOT) || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) stateId = TS_HOT; @@ -1156,7 +1160,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, else if (btnPtr->bDropDownPressed || (tbcd.nmcd.uItemState & CDIS_SELECTED)) stateId = TS_PRESSED; else if (tbcd.nmcd.uItemState & CDIS_CHECKED) +#ifdef __REACTOS__ + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; +#else stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT; +#endif else if (tbcd.nmcd.uItemState & CDIS_HOT) stateId = TS_HOT;

6 years, 11 months

[reactos] 01/01: [NTOS:KDBG] Fix DPRINT format specifier in KdPortInitializeEx. CORE-14174

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8bd06be981d4d4c5d278… commit a8bd06be981d4d4c5d2789e3f48e647c2172692d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 4 19:00:36 2018 +0900 [NTOS:KDBG] Fix DPRINT format specifier in KdPortInitializeEx. CORE-14174 --- ntoskrnl/kd/i386/kdbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/kd/i386/kdbg.c b/ntoskrnl/kd/i386/kdbg.c index 11c9efeede..b87ce56e9f 100644 --- a/ntoskrnl/kd/i386/kdbg.c +++ b/ntoskrnl/kd/i386/kdbg.c @@ -111,7 +111,7 @@ KdPortInitializeEx( /* Print message to blue screen */ sprintf(buffer, - "\r\nKernel Debugger: Serial port found: COM%ld (Port 0x%lx) BaudRate %ld\r\n\r\n", + "\r\nKernel Debugger: Serial port found: COM%ld (Port 0x%p) BaudRate %ld\r\n\r\n", ComPortNumber, PortInformation->Address, PortInformation->BaudRate);

6 years, 11 months

[reactos] 04/04: [NTOS:MM] Use MiResolveDemandZeroFault instead of MiDispatchFault

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d17812f9331d8df208b6a… commit d17812f9331d8df208b6abd4e9f8628cffc60cc3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 27 15:20:52 2017 +0100 [NTOS:MM] Use MiResolveDemandZeroFault instead of MiDispatchFault --- ntoskrnl/mm/ARM3/pagfault.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 69d70cc80b..3176a6b0d1 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2121,18 +2121,12 @@ UserFault: return Status; } - /* Write a demand-zero PDE */ - MI_WRITE_INVALID_PDE(PointerPde, DemandZeroPde); - - /* Dispatch the fault */ - Status = MiDispatchFault(TRUE, - PointerPte, + /* Resolve a demand zero fault */ + MiResolveDemandZeroFault(PointerPte, PointerPde, - NULL, - FALSE, - PsGetCurrentProcess(), - TrapInformation, - NULL); + MM_READWRITE, + CurrentProcess, + MM_NOIRQL); #if MI_TRACE_PFNS UserPdeFault = FALSE; #endif

6 years, 11 months

[reactos] 03/04: [NTOS:MM] Implement resolving PXE/PPE page table demand zero faults

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4765fe3666e32cbf2536… commit d4765fe3666e32cbf25363520e010421bd2ef307 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 27 17:18:00 2017 +0100 [NTOS:MM] Implement resolving PXE/PPE page table demand zero faults --- ntoskrnl/mm/ARM3/pagfault.c | 67 ++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index f37fa458d2..69d70cc80b 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2025,43 +2025,67 @@ UserFault: /* Lock the working set */ MiLockProcessWorkingSet(CurrentProcess, CurrentThread); + ProtectionCode = MM_INVALID_PROTECTION; + #if (_MI_PAGING_LEVELS == 4) -// Note to Timo: You should call MiCheckVirtualAddress and also check if it's zero pte -// also this is missing the page count increment /* Check if the PXE is valid */ if (PointerPxe->u.Hard.Valid == 0) { /* Right now, we only handle scenarios where the PXE is totally empty */ ASSERT(PointerPxe->u.Long == 0); -#if 0 + + /* This is only possible for user mode addresses! */ + ASSERT(PointerPte <= MiHighestUserPte); + + /* Check if we have a VAD */ + MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); + if (ProtectionCode == MM_NOACCESS) + { + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_ACCESS_VIOLATION; + } + /* Resolve a demand zero fault */ - Status = MiResolveDemandZeroFault(PointerPpe, - PointerPxe, - MM_READWRITE, - CurrentProcess, - MM_NOIRQL); -#endif + MiResolveDemandZeroFault(PointerPpe, + PointerPxe, + MM_READWRITE, + CurrentProcess, + MM_NOIRQL); + /* We should come back with a valid PXE */ ASSERT(PointerPxe->u.Hard.Valid == 1); } #endif #if (_MI_PAGING_LEVELS >= 3) -// Note to Timo: You should call MiCheckVirtualAddress and also check if it's zero pte -// also this is missing the page count increment /* Check if the PPE is valid */ if (PointerPpe->u.Hard.Valid == 0) { /* Right now, we only handle scenarios where the PPE is totally empty */ ASSERT(PointerPpe->u.Long == 0); -#if 0 + + /* This is only possible for user mode addresses! */ + ASSERT(PointerPte <= MiHighestUserPte); + + /* Check if we have a VAD, unless we did this already */ + if (ProtectionCode == MM_INVALID_PROTECTION) + { + MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); + } + + if (ProtectionCode == MM_NOACCESS) + { + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_ACCESS_VIOLATION; + } + /* Resolve a demand zero fault */ - Status = MiResolveDemandZeroFault(PointerPde, - PointerPpe, - MM_READWRITE, - CurrentProcess, - MM_NOIRQL); -#endif + MiResolveDemandZeroFault(PointerPde, + PointerPpe, + MM_READWRITE, + CurrentProcess, + MM_NOIRQL); + /* We should come back with a valid PPE */ ASSERT(PointerPpe->u.Hard.Valid == 1); } @@ -2077,7 +2101,12 @@ UserFault: #if MI_TRACE_PFNS UserPdeFault = TRUE; #endif - MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); + /* Check if we have a VAD, unless we did this already */ + if (ProtectionCode == MM_INVALID_PROTECTION) + { + MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); + } + if (ProtectionCode == MM_NOACCESS) { #if (_MI_PAGING_LEVELS == 2)

6 years, 11 months

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 January 2018