Ros-dev April 2015

ros-dev@reactos.org

15 participants
15 discussions

Re: [ros-dev] [ros-diffs] [akhaldi] 67242: [THEMEUI] Add this module for .msstyle file type association. By Lee Schroeder. CORE-5984

by Timo Kreuzer

Just as a reminder: we can put registry stuff, that is related to a special module, into a separate file together with the module itself now. This one looks a bit like it should go into the the themeui folder. Am 18.04.2015 um 11:52 schrieb akhaldi(a)svn.reactos.org: > Modified: trunk/reactos/boot/bootdata/hivecls.inf > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… > ============================================================================== > --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) > +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Apr 18 09:52:23 2015 > @@ -265,6 +265,18 @@ > HKCR,"sysfile","NoOpen",0x00000000,"" > HKCR,"sysfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-171" > HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" > + > +; MS Styles (Themes) > +HKCR,".msstyles","",0x00000000,"msstylesfile" > +HKCR,"msstylesfile","",0x00000000,"Visual Style File" > +HKCR,"msstylesfile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > +HKCR,"msstylesfile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenMSTheme file:""%1""" > + > +; Theme File > +HKCR,".theme","",0x00000000,"themefile" > +HKCR,"themefile","",0x00000000,"Theme File" > +HKCR,"themefile\DefaultIcon","","0x00020000","%SystemRoot%\system32\themeui.dll,-1" > +HKCR,"themefile\shell\open\command","",0x00000000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %SystemRoot%\system32\desk.cpl desk,@Appearance /Action:OpenTheme /file:""%1""" > > ; URL shortcuts (e.g. used in favorites folder of IExplorer) > HKCR,".url","",0x00000000,"InternetShortcut" > >

9 years, 8 months

Re: [ros-dev] [ros-diffs] [cwittich] 67177: [SNDREC32] do not delete objects which are still selected into a DC

by Timo Kreuzer

Just for the record: it's perfectly fine and safe to do that. They will be kept alive as long as they are selected and will be deleted, once a different object is selected or the DC is deleted. Am 12.04.2015 um 18:29 schrieb cwittich(a)svn.reactos.org: > Author: cwittich > Date: Sun Apr 12 16:29:36 2015 > New Revision: 67177 > > URL: http://svn.reactos.org/svn/reactos?rev=67177&view=rev > Log: > [SNDREC32] > do not delete objects which are still selected into a DC > > Modified: > trunk/reactos/base/applications/sndrec32/sndrec32.cpp > > Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… > ============================================================================== > --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) > +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Sun Apr 12 16:29:36 2015 > @@ -352,6 +352,7 @@ > PAINTSTRUCT ps; > HDC hdc; > HPEN pen; > + HPEN oldpen; > > unsigned int max_h = (cli.bottom / 2); > unsigned int samples; > @@ -366,7 +367,7 @@ > /* Initialize hdc objects */ > hdc = BeginPaint(hWnd, &ps); > pen = (HPEN)CreatePen(PS_SOLID, 1, WAVEBAR_COLOR); > - SelectObject(hdc, (HBRUSH)pen); > + oldpen = (HPEN) SelectObject(hdc, (HBRUSH)pen); > if (AUD_OUT->current_status() == snd::WAVEOUT_PLAYING) > { > samples = AUD_OUT->tot_samples_buf(); > @@ -412,6 +413,7 @@ > LineTo(hdc, WAVEBAR_CX, cli.bottom / 2); > } > > + SelectObject(hdc, oldpen); > DeleteObject( pen ); > EndPaint( hWnd, &ps ); > break; > @@ -437,6 +439,7 @@ > PAINTSTRUCT ps; > HDC hdc; > HFONT font; > + HFONT oldfont; > long long slid_samp = 0; > > /* Checking for global pointers to buffer and io audio devices */ > @@ -774,7 +777,7 @@ > case WM_PAINT: > hdc = BeginPaint(hWnd, &ps); > font = CreateFontIndirect(&s_info.lfMenuFont); > - SelectObject(hdc, font); > + oldfont = (HFONT) SelectObject(hdc, font); > SetBkMode(hdc, TRANSPARENT); > > if (AUD_IN->current_status() == snd::WAVEIN_RECORDING) > @@ -877,6 +880,7 @@ > _tcslen(str_tmp), > 0); > > + SelectObject(hdc, oldfont); > DeleteObject(font); > EndPaint(hWnd, &ps); > break; > > >

9 years, 8 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 67140: [RTL] Improve RtlImageNtHeaderEx: - Fix signed/unsigned mismatch when comparing NT header offset - Simplify overflow checks - Add missing overflow-into-systemspace check CR-77 / C...

by Alex Ionescu

The Windows implementation of the API is different in user vs kernel-mode. We should probably try to remain compatible. Best regards, Alex Ionescu On Fri, Apr 10, 2015 at 12:21 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Fri Apr 10 19:21:22 2015 > New Revision: 67140 > > URL: http://svn.reactos.org/svn/reactos?rev=67140&view=rev > Log: > [RTL] > Improve RtlImageNtHeaderEx: > - Fix signed/unsigned mismatch when comparing NT header offset > - Simplify overflow checks > - Add missing overflow-into-systemspace check > CR-77 / CORE-8091 #resolve > > Modified: > trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > trunk/reactos/dll/ntdll/rtl/libsupp.c > trunk/reactos/include/ndk/amd64/mmtypes.h > trunk/reactos/include/ndk/i386/mmtypes.h > trunk/reactos/lib/rtl/image.c > trunk/reactos/lib/rtl/rtlp.h > trunk/reactos/ntoskrnl/include/internal/amd64/mm.h > trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > > Modified: trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/r… > > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/lib/rtl/libsupp.c > [iso-8859-1] Fri Apr 10 19:21:22 2015 > @@ -19,6 +19,8 @@ > */ > > #include <freeldr.h> > + > +PVOID MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS; > > #if DBG > VOID FASTCALL > > Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… > > ============================================================================== > --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -16,6 +16,7 @@ > > SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; > PTEB LdrpTopLevelDllBeingLoadedTeb = NULL; > +PVOID MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS; > > /* FUNCTIONS > ***************************************************************/ > > > Modified: trunk/reactos/include/ndk/amd64/mmtypes.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… > > ============================================================================== > --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -36,6 +36,11 @@ > #define MM_ALLOCATION_GRANULARITY 0x10000 > #define MM_ALLOCATION_GRANULARITY_SHIFT 16L > #define MM_PAGE_FRAME_NUMBER_SIZE 52 > + > +// > +// User space range limit > +// > +#define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL > > // > // Address of the shared user page > > Modified: trunk/reactos/include/ndk/i386/mmtypes.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… > > ============================================================================== > --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -35,6 +35,11 @@ > #define MM_ALLOCATION_GRANULARITY 0x10000 > #define MM_ALLOCATION_GRANULARITY_SHIFT 16L > #define MM_PAGE_FRAME_NUMBER_SIZE 20 > + > +// > +// User space range limit > +// > +#define MI_HIGHEST_USER_ADDRESS (PVOID)0x7FFEFFFF > > // > // Address of the shared user page > > Modified: trunk/reactos/lib/rtl/image.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=67140&… > > ============================================================================== > --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Fri Apr 10 19:21:22 > 2015 > @@ -137,32 +137,42 @@ > */ > NTSTATUS > NTAPI > -RtlImageNtHeaderEx(IN ULONG Flags, > - IN PVOID Base, > - IN ULONG64 Size, > - OUT PIMAGE_NT_HEADERS *OutHeaders) > +RtlImageNtHeaderEx( > + _In_ ULONG Flags, > + _In_ PVOID Base, > + _In_ ULONG64 Size, > + _Out_ PIMAGE_NT_HEADERS *OutHeaders) > { > PIMAGE_NT_HEADERS NtHeaders; > PIMAGE_DOS_HEADER DosHeader; > BOOLEAN WantsRangeCheck; > + ULONG NtHeaderOffset; > > /* You must want NT Headers, no? */ > - if (!OutHeaders) return STATUS_INVALID_PARAMETER; > + if (OutHeaders == NULL) > + { > + DPRINT1("OutHeaders is NULL\n"); > + return STATUS_INVALID_PARAMETER; > + } > > /* Assume failure */ > *OutHeaders = NULL; > > /* Validate Flags */ > - if (Flags &~ RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) > - { > - DPRINT1("Invalid flag combination... check for new API flags?\n"); > + if (Flags & ~RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK) > + { > + DPRINT1("Invalid flags: 0x%lx\n", Flags); > return STATUS_INVALID_PARAMETER; > } > > /* Validate base */ > - if (!(Base) || (Base == (PVOID)-1)) return STATUS_INVALID_PARAMETER; > - > - /* Check if the caller wants validation */ > + if ((Base == NULL) || (Base == (PVOID)-1)) > + { > + DPRINT1("Invalid base address: %p\n", Base); > + return STATUS_INVALID_PARAMETER; > + } > + > + /* Check if the caller wants range checks */ > WantsRangeCheck = !(Flags & > RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK); > if (WantsRangeCheck) > { > @@ -179,56 +189,56 @@ > if (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) > { > /* Not a valid COFF */ > - DPRINT1("Not an MZ file\n"); > + DPRINT1("Invalid image DOS signature!\n"); > + return STATUS_INVALID_IMAGE_FORMAT; > + } > + > + /* Get the offset to the NT headers (and copy from LONG to ULONG) */ > + NtHeaderOffset = DosHeader->e_lfanew; > + > + /* The offset must not be larger than 256MB, as a hard-coded check. > + In Windows this check is only done in user mode, not in kernel > mode, > + but it shouldn't harm to have it anyway. Note that without this > check, > + other overflow checks would become necessary! */ > + if (NtHeaderOffset >= (256 * 1024 * 1024)) > + { > + /* Fail */ > + DPRINT1("NT headers offset is larger than 256MB!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > > /* Check if the caller wants validation */ > if (WantsRangeCheck) > { > - /* The offset should fit in the passsed-in size */ > - if (DosHeader->e_lfanew >= Size) > + /* Make sure the file header fits into the size */ > + if ((NtHeaderOffset + > + RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS, FileHeader)) >= > Size) > { > /* Fail */ > - DPRINT1("e_lfanew is larger than PE file\n"); > + DPRINT1("NT headers beyond image size!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > - > - /* It shouldn't be past 4GB either */ > - if (DosHeader->e_lfanew >= > - (MAXULONG - sizeof(IMAGE_DOS_SIGNATURE) - > sizeof(IMAGE_FILE_HEADER))) > - { > - /* Fail */ > - DPRINT1("e_lfanew is larger than 4GB\n"); > + } > + > + /* Now get a pointer to the NT Headers */ > + NtHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)Base + NtHeaderOffset); > + > + /* Check if the mapping is in user space */ > + if (Base <= MmHighestUserAddress) > + { > + /* Make sure we don't overflow into kernel space */ > + if ((PVOID)(NtHeaders + 1) > MmHighestUserAddress) > + { > + DPRINT1("Image overflows from user space into kernel > space!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > - > - /* And the whole file shouldn't overflow past 4GB */ > - if ((DosHeader->e_lfanew + > - sizeof(IMAGE_DOS_SIGNATURE) - sizeof(IMAGE_FILE_HEADER)) >= > Size) > - { > - /* Fail */ > - DPRINT1("PE is larger than 4GB\n"); > - return STATUS_INVALID_IMAGE_FORMAT; > - } > - } > - > - /* The offset also can't be larger than 256MB, as a hard-coded check > */ > - if (DosHeader->e_lfanew >= (256 * 1024 * 1024)) > - { > - /* Fail */ > - DPRINT1("PE offset is larger than 256MB\n"); > - return STATUS_INVALID_IMAGE_FORMAT; > - } > - > - /* Now it's safe to get the NT Headers */ > - NtHeaders = (PIMAGE_NT_HEADERS)((ULONG_PTR)Base + > DosHeader->e_lfanew); > + } > > /* Verify the PE Signature */ > if (NtHeaders->Signature != IMAGE_NT_SIGNATURE) > { > /* Fail */ > - DPRINT1("PE signature missing\n"); > + DPRINT1("Invalid image NT signature!\n"); > return STATUS_INVALID_IMAGE_FORMAT; > } > > @@ -245,6 +255,10 @@ > RtlImageNtHeader(IN PVOID Base) > { > PIMAGE_NT_HEADERS NtHeader; > + > + ULONG c = 1; > + ULONG s = FIELD_OFFSET(IMAGE_OPTIONAL_HEADER32, DataDirectory[c]); > + (void)s; > > /* Call the new API */ > RtlImageNtHeaderEx(RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK, > > Modified: trunk/reactos/lib/rtl/rtlp.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=67140&r… > > ============================================================================== > --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Fri Apr 10 19:21:22 > 2015 > @@ -34,6 +34,8 @@ > > #define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) > > +extern PVOID MmHighestUserAddress; > + > NTSTATUS > NTAPI > RtlpSafeCopyMemory( > > Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] > (original) > +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri > Apr 10 19:21:22 2015 > @@ -5,7 +5,6 @@ > > /* Memory layout base addresses */ > #define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL > -#define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL > #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL > #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL > #define MI_REAL_SYSTEM_RANGE_START 0xFFFF800000000000ULL > > Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… > > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Apr 10 > 19:21:22 2015 > @@ -29,7 +29,6 @@ > > #define MI_SYSTEM_VIEW_SIZE (32 * _1MB) > > -#define MI_HIGHEST_USER_ADDRESS (PVOID)0x7FFEFFFF > #define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 > #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 > #define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 > > >

9 years, 8 months

Re: [ros-dev] [ros-diffs] [spetreolle] 67053: [FREELDR] In a quest to better registry, don't break VSSolution builds. freeldr_pe is not in the same directory and copy doesn't care if you ask to concatenate C:\tomatoes, it a...

by Timo Kreuzer

The comment "# Retrieve the full path to the generated file of the 'freeldr_pe' target" Doesn't explain why it is done. It rather looks like someone is doing something pointless and documenting in a comment that he's doing the pointless. ${CMAKE_CURRENT_BINARY_DIR} should be the "full path to the generated file". So it seems completely pointless to add extra magic to get that file path. Your commit message implies that this change fixes VSSolution builds, but it also doesn't explain it. In fact I don't even understand that sentence. If you don't add a proper comment to that thing, why it is needed, I promise I will have forgotten about this in a year and remove it again. :) Thanks, Timo Am 04.04.2015 um 22:33 schrieb spetreolle(a)svn.reactos.org: > Author: spetreolle > Date: Sat Apr 4 20:33:18 2015 > New Revision: 67053 > > URL: http://svn.reactos.org/svn/reactos?rev=67053&view=rev > Log: > [FREELDR] > In a quest to better registry, > don't break VSSolution builds. > freeldr_pe is not in the same directory and copy doesn't care if you ask to concatenate C:\tomatoes, it already has the first file. > > Modified: > trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > > Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Apr 4 20:33:18 2015 > @@ -226,10 +226,13 @@ > add_dependencies(freeldr_pe asm) > add_dependencies(freeldr_pe_dbg asm) > > +# Retrieve the full path to the generated file of the 'freeldr_pe' target > +get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) > + > concatenate_files( > ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys > ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin > - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll) > + ${_freeldr_pe_output_file}) > > add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) > > @@ -240,7 +243,8 @@ > concatenate_files( > ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys > ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin > - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll) > + ${_freeldr_pe_output_file}) > > add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) > add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) > + > > >

9 years, 8 months

old.reactos.org reaching end-of-life

by Pierre Schweitzer

Dear all, On the 3rd of April 2015, the old.reactos.org website will be taken offline after several years of good services. If you have anything to do on it (like gathering data or whatever) please make sure you do before that date. With my best regards, -- Pierre Schweitzer <pierre(a)reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

9 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev April 2015