Ros-diffs October 2020

ros-diffs@reactos.org

22 participants
156 discussions

[reactos] 03/04: [BROWSEUI] Show virtual folders in the log for SHOpenFolderWindow

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3f2ba0522b24473dce2f… commit b3f2ba0522b24473dce2fc2e488ff64fd7e3f520 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 13 15:02:43 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 4 19:34:20 2020 +0200 [BROWSEUI] Show virtual folders in the log for SHOpenFolderWindow --- dll/win32/browseui/desktopipc.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 02d60cb488d..4ea4837f8d3 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -550,10 +550,16 @@ extern "C" HRESULT WINAPI SHOpenFolderWindow(PIE_THREAD_PARAM_BLOCK parameters) HANDLE threadHandle; DWORD threadID; - WCHAR debugStr[MAX_PATH + 1]; - SHGetPathFromIDListW(parameters->directoryPIDL, debugStr); - - TRACE("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); + // Only try to convert the pidl when it is going to be printed + if (TRACE_ON(browseui)) + { + WCHAR debugStr[MAX_PATH + 2] = { 0 }; + if (!ILGetDisplayName(parameters->directoryPIDL, debugStr)) + { + debugStr[0] = UNICODE_NULL; + } + TRACE("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); + } PIE_THREAD_PARAM_BLOCK paramsCopy = SHCloneIETHREADPARAM(parameters);

3 years, 11 months

[reactos] 02/04: [BROWSEUI] Update the current directory before creating a view This way, when the view asks for a directory _during creation_ it does not get either an old, or an invalid directory CORE-17270

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca087b6a189f9c665e31f… commit ca087b6a189f9c665e31fa29130e84e21035a536 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 13 14:30:04 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 4 19:34:20 2020 +0200 [BROWSEUI] Update the current directory before creating a view This way, when the view asks for a directory _during creation_ it does not get either an old, or an invalid directory CORE-17270 --- dll/win32/browseui/shellbrowser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 8ef99aae6f0..c559c2ed5fb 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -974,6 +974,10 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, ZeroMemory(&shellViewWindowBounds, sizeof(shellViewWindowBounds)); ::MapWindowPoints(0, m_hWnd, reinterpret_cast<POINT *>(&shellViewWindowBounds), 2); + // update current pidl + ILFree(fCurrentDirectoryPIDL); + fCurrentDirectoryPIDL = ILClone(absolutePIDL); + // create view window hResult = newShellView->CreateViewWindow(saveCurrentShellView, folderSettings, this, &shellViewWindowBounds, &newShellViewWindow); @@ -988,10 +992,6 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, return hResult; } - // update current pidl - ILFree(fCurrentDirectoryPIDL); - fCurrentDirectoryPIDL = ILClone(absolutePIDL); - // update view window if (saveCurrentShellView != NULL) saveCurrentShellView->DestroyViewWindow();

3 years, 11 months

[reactos] 01/04: [BROWSEUI] Remove refactoring leftovers

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b17d8d9005a5f788f6eb… commit 7b17d8d9005a5f788f6eb3718ebbd91c67633234 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 13 14:29:17 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 4 19:34:20 2020 +0200 [BROWSEUI] Remove refactoring leftovers --- dll/win32/browseui/shellbrowser.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index dc83e60db98..8ef99aae6f0 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -913,7 +913,6 @@ long IEGetNameAndFlags(LPITEMIDLIST pidl, SHGDNF uFlags, LPWSTR pszBuf, UINT cch HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, LPCITEMIDLIST absolutePIDL, FOLDERSETTINGS *folderSettings, long flags) { - CComPtr<IObjectWithSite> objectWithSite; CComPtr<IShellFolder> saveCurrentShellFolder; CComPtr<IShellView> saveCurrentShellView; CComPtr<IShellView> newShellView; @@ -989,9 +988,6 @@ HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, return hResult; } - if (objectWithSite.p != NULL) - hResult = objectWithSite->SetSite(NULL); - // update current pidl ILFree(fCurrentDirectoryPIDL); fCurrentDirectoryPIDL = ILClone(absolutePIDL);

3 years, 11 months

[reactos] 01/01: [WDMAUD.DRV] Revert "Workaround multiple issues with AC97 driver from rapps"

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bb36e92c522bf94b7d39… commit 5bb36e92c522bf94b7d399183008ca7d5f9a5356 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Oct 3 16:39:13 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Oct 3 16:39:13 2020 +0200 [WDMAUD.DRV] Revert "Workaround multiple issues with AC97 driver from rapps" This reverts commit 0.4.15-dev-791-g 6d7ebc20481a587bd19e8a8049317113071b0817 It was a workaround just. To bypass sysaudio. It had a very positive effect on our playback performance, but using the different codepaths did also lead to regressions, that I have no idea how to address, therefore I think it's my personal responsibility to revert it. I guess it's better to improve on the code-paths that we intend to use finally, instead of fixing what will be dead paths in the future. The revert will fix: - CORE-17277 crash of dsound:duplex on "GCCLin_x86 on Test VBox" - CORE-17278 crash of dsound:capture on "GCCLin_x86 on Test VBox" - CORE-17285 Realtek HD Audio does no longer work in ReactOS But ofc now we will suffer again from very severe things that the hack could workaround: - CORE-13202 Unhandled exception from wdmaud.drv when recording sound in Scratch 1.4 leads to app-crash - CORE-13488 A deadlock in "DiabloII" character selection screen and "The Lion King II" - CORE-8726/CORE-9986/CORE-16564 AC97 driver from rapps will need reboot-orgies again, does not longer work in the same session that we installed the driver - CORE-9981 "DosBox + Commander Keen6" totally garbled sound output instead of music "ScummVM 2.0 with Monkey Island 2" totally garbled sound output instead of music - the test execution times of "GCCLin_x86 on Test VBox" will almost double --- dll/win32/wdmaud.drv/wdmaud.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dll/win32/wdmaud.drv/wdmaud.c b/dll/win32/wdmaud.drv/wdmaud.c index 45308b3aff2..dfd8ea0361e 100644 --- a/dll/win32/wdmaud.drv/wdmaud.c +++ b/dll/win32/wdmaud.drv/wdmaud.c @@ -18,7 +18,6 @@ #include <debug.h> #include <mmebuddy_debug.h> -#define USE_MMIXER_LIB #ifndef USE_MMIXER_LIB #define FUNC_NAME(x) x##ByLegacy #else

3 years, 11 months

[reactos] 01/01: [COMCTL32] Button.c Fix CORE-17260

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c947eb4d176603e0ff292… commit c947eb4d176603e0ff29217c079d8f5e1c2119e1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Oct 3 15:38:02 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Oct 3 15:38:02 2020 +0200 [COMCTL32] Button.c Fix CORE-17260 Press'n'Hold of a button, then leaving the button rect should redraw the button in unpressed state Thanks to JIRA user 'I_kill_Bugs' for perfecting my initial experiments to fix that. It regressed by 0.4.9-dev-719-g b3fb8555bf9abcc04eeac31c7153d33e2f027fc0 No need to sync anything with Wine, their code is correct on Wine head. The bug was in ros specific diff. --- dll/win32/comctl32/button.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index db207499e67..095515c2775 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -854,7 +854,6 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L mouse_event.dwHoverTime = 1; TrackMouseEvent(&mouse_event); } - break; #else if (!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags & (TME_HOVER | TME_LEAVE))) @@ -864,6 +863,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L mouse_event.dwHoverTime = 1; TrackMouseEvent(&mouse_event); } +#endif if ((wParam & MK_LBUTTON) && GetCapture() == hWnd) { @@ -871,7 +871,6 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L SendMessageW( hWnd, BM_SETSTATE, PtInRect(&rect, pt), 0 ); } break; -#endif } #ifndef __REACTOS__

3 years, 11 months

[reactos] 04/04: [NTOS:MM] Fail on SizeOfRawData overflow. CORE-17284

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e57a59a60acc4f654adea… commit e57a59a60acc4f654adea86968c53b49f26a3885 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 27 17:48:33 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 3 13:20:25 2020 +0200 [NTOS:MM] Fail on SizeOfRawData overflow. CORE-17284 Fixes the corresponding tests in ntdll_apitest:NtMapViewOfSection. Also add a TODO for the remaining test failures. --- ntoskrnl/mm/section.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 2bbbee15e8b..ce63e796a3d 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -723,12 +723,16 @@ l_ReadHeaderFromFile: // if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment)) // DIE(("PointerToRawData[%u] is not aligned\n", i)); + if(!Intsafe_CanAddULong32(pishSectionHeaders[i].PointerToRawData, pishSectionHeaders[i].SizeOfRawData)) + DIE(("SizeOfRawData[%u] too large\n", i)); + /* conversion */ pssSegments[i].Image.FileOffset = pishSectionHeaders[i].PointerToRawData; pssSegments[i].RawLength.QuadPart = pishSectionHeaders[i].SizeOfRawData; } else { + /* FIXME: Should reset PointerToRawData to 0 in the image mapping */ ASSERT(pssSegments[i].Image.FileOffset == 0); ASSERT(pssSegments[i].RawLength.QuadPart == 0); }

3 years, 11 months

[reactos] 03/04: [NTOS:MM] VirtualSize overrides SizeOfRawData when mapping PE files. CORE-17284

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b957af4b6b41b05e78990… commit b957af4b6b41b05e789908577002c26fe498d25e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 27 16:43:19 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 3 13:13:35 2020 +0200 [NTOS:MM] VirtualSize overrides SizeOfRawData when mapping PE files. CORE-17284 This fixes the related failures in ntdll_apitest:NtMapViewOfSection as well as loading of OrgPlayer's DragDrop.ocx. --- ntoskrnl/mm/section.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 9e7958a2aac..2bbbee15e8b 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -754,7 +754,7 @@ l_ReadHeaderFromFile: pssSegments[i].Protection = SectionCharacteristicsToProtect[nCharacteristics >> 28]; pssSegments[i].WriteCopy = !(nCharacteristics & IMAGE_SCN_MEM_SHARED); - if(pishSectionHeaders[i].Misc.VirtualSize == 0 || pishSectionHeaders[i].Misc.VirtualSize < pishSectionHeaders[i].SizeOfRawData) + if(pishSectionHeaders[i].Misc.VirtualSize == 0) pssSegments[i].Length.QuadPart = pishSectionHeaders[i].SizeOfRawData; else pssSegments[i].Length.QuadPart = pishSectionHeaders[i].Misc.VirtualSize;

3 years, 11 months

[reactos] 02/04: [NTDLL_APITEST] Add test for an image file where SizeOfRawData > VirtualSize. CORE-17284

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b1fb8d6fd1e3034e4fa0… commit 9b1fb8d6fd1e3034e4fa0fb1e3e87b6bdae6d795 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 27 16:42:29 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 3 13:13:35 2020 +0200 [NTDLL_APITEST] Add test for an image file where SizeOfRawData > VirtualSize. CORE-17284 --- .../rostests/apitests/ntdll/NtMapViewOfSection.c | 395 ++++++++++++++++++++- 1 file changed, 381 insertions(+), 14 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index 2df52007c41..a191126df20 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -766,7 +766,7 @@ Test_ImageSection(void) ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) { - skip("Failed to open file\n"); + skip("Failed to open file %s\n", wine_dbgstr_wn(FileName.Buffer, FileName.Length / sizeof(WCHAR))); return; } @@ -1165,7 +1165,7 @@ Test_BasedSection(void) #define BYTES512(x) BYTES256(x), BYTES256(x) #define BYTES1024(x) BYTES512(x), BYTES512(x) -static struct _MY_IMAGE_FILE +static struct _SECTION_CONTENTS_IMAGE_FILE { IMAGE_DOS_HEADER doshdr; WORD stub[32]; @@ -1179,7 +1179,7 @@ static struct _MY_IMAGE_FILE BYTE rossym_data[0x400]; BYTE rsrc_data[0x400]; BYTE clc_data[0x1000]; -} ImageFile = +} SectionContentsImageFile = { /* IMAGE_DOS_HEADER */ { @@ -1358,10 +1358,10 @@ static struct _MY_IMAGE_FILE }, }; -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, text_data) == 0x400); -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rossym_data) == 0x800); -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, rsrc_data) == 0xc00); -C_ASSERT(FIELD_OFFSET(struct _MY_IMAGE_FILE, clc_data) == 0x1000); +C_ASSERT(FIELD_OFFSET(struct _SECTION_CONTENTS_IMAGE_FILE, text_data) == 0x400); +C_ASSERT(FIELD_OFFSET(struct _SECTION_CONTENTS_IMAGE_FILE, rossym_data) == 0x800); +C_ASSERT(FIELD_OFFSET(struct _SECTION_CONTENTS_IMAGE_FILE, rsrc_data) == 0xc00); +C_ASSERT(FIELD_OFFSET(struct _SECTION_CONTENTS_IMAGE_FILE, clc_data) == 0x1000); static void @@ -1398,21 +1398,21 @@ Test_SectionContents(BOOL Relocate) if (Relocate) { ok((ULONG_PTR)GetModuleHandle(NULL) <= 0x80000000, "Module at %p\n", GetModuleHandle(NULL)); - ImageFile.nthdrs.OptionalHeader.ImageBase = (ULONG)(ULONG_PTR)GetModuleHandle(NULL); + SectionContentsImageFile.nthdrs.OptionalHeader.ImageBase = (ULONG)(ULONG_PTR)GetModuleHandle(NULL); } else { - ImageFile.nthdrs.OptionalHeader.ImageBase = 0xe400000; + SectionContentsImageFile.nthdrs.OptionalHeader.ImageBase = 0xe400000; } Success = WriteFile(Handle, - &ImageFile, - sizeof(ImageFile), + &SectionContentsImageFile, + sizeof(SectionContentsImageFile), &Written, NULL); ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); - ok(Written == sizeof(ImageFile), "WriteFile wrote %lu bytes\n", Written); - + ok(Written == sizeof(SectionContentsImageFile), "WriteFile wrote %lu bytes\n", Written); + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, NULL, @@ -1473,6 +1473,370 @@ Test_SectionContents(BOOL Relocate) TEST_WRITE(0x8000); TEST_BYTE(0x8000, 0x11); TEST_BYTE(0x8400, 0x33); +#undef TEST_BYTE +#undef TEST_WRITE +#undef TEST_NOWRITE + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + ok_ntstatus(Status, STATUS_SUCCESS); + } + Status = NtClose(SectionHandle); + ok_ntstatus(Status, STATUS_SUCCESS); + } + + CloseHandle(Handle); + DeleteFileW(FileName); +} + +static struct _RAW_SIZE_IMAGE_FILE +{ + IMAGE_DOS_HEADER doshdr; + WORD stub[32]; + IMAGE_NT_HEADERS32 nthdrs; + IMAGE_SECTION_HEADER text_header; + IMAGE_SECTION_HEADER data_header; + IMAGE_SECTION_HEADER zdata_header; + IMAGE_SECTION_HEADER rsrc_header; + BYTE pad[488]; + BYTE text_data[0x1200]; + BYTE data_data[0x1200]; + BYTE rsrc_data[0x400]; +} RawSizeImageFile = +{ + /* IMAGE_DOS_HEADER */ + { + IMAGE_DOS_SIGNATURE, 144, 3, 0, 4, 0, 0xFFFF, 0, 0xB8, 0, 0, 0, 0x40, + 0, { 0 }, 0, 0, { 0 }, 0x80 + }, + /* binary to print "This program cannot be run in DOS mode." */ + { + 0x1F0E, 0x0EBA, 0xB400, 0xCD09, 0xB821, 0x4C01, 0x21CD, 0x6854, 0x7369, + 0x7020, 0x6F72, 0x7267, 0x6D61, 0x6320, 0x6E61, 0x6F6E, 0x2074, 0x6562, + 0x7220, 0x6E75, 0x6920, 0x206E, 0x4F44, 0x2053, 0x6F6D, 0x6564, 0x0D2E, + 0x0A0D, 0x0024, 0x0000, 0x0000, 0x0000 + }, + /* IMAGE_NT_HEADERS32 */ + { + IMAGE_NT_SIGNATURE, /* Signature */ + /* IMAGE_FILE_HEADER */ + { + IMAGE_FILE_MACHINE_I386, /* Machine */ + 4, /* NumberOfSections */ + 0x47EFDF09, /* TimeDateStamp */ + 0, /* PointerToSymbolTable */ + 0, /* NumberOfSymbols */ + 0xE0, /* SizeOfOptionalHeader */ + IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_LOCAL_SYMS_STRIPPED | + IMAGE_FILE_LINE_NUMS_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE | + IMAGE_FILE_DLL, /* Characteristics */ + }, + /* IMAGE_OPTIONAL_HEADER32 */ + { + IMAGE_NT_OPTIONAL_HDR32_MAGIC, /* Magic */ + 8, /* MajorLinkerVersion */ + 0, /* MinorLinkerVersion */ + 0x400, /* SizeOfCode */ + 0x000, /* SizeOfInitializedData */ + 0, /* SizeOfUninitializedData */ + 0x1000, /* AddressOfEntryPoint */ + 0x1000, /* BaseOfCode */ + 0x0000, /* BaseOfData */ + 0x400000, /* ImageBase */ + 0x1000, /* SectionAlignment */ + 0x200, /* FileAlignment */ + 4, /* MajorOperatingSystemVersion */ + 0, /* MinorOperatingSystemVersion */ + 0, /* MajorImageVersion */ + 0, /* MinorImageVersion */ + 4, /* MajorSubsystemVersion */ + 0, /* MinorSubsystemVersion */ + 0, /* Win32VersionValue */ + 0x5000, /* SizeOfImage */ + 0x400, /* SizeOfHeaders */ + 0x0, /* CheckSum */ + IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | + IMAGE_DLLCHARACTERISTICS_NO_SEH | + IMAGE_DLLCHARACTERISTICS_NX_COMPAT, /* DllCharacteristics */ + 0x100000, /* SizeOfStackReserve */ + 0x1000, /* SizeOfStackCommit */ + 0x100000, /* SizeOfHeapReserve */ + 0x1000, /* SizeOfHeapCommit */ + 0, /* LoaderFlags */ + 0x10, /* NumberOfRvaAndSizes */ + /* IMAGE_DATA_DIRECTORY */ + { + { 0 }, /* Export Table */ + { 0 }, /* Import Table */ + { 0 }, /* Resource Table */ + { 0 }, /* Exception Table */ + { 0 }, /* Certificate Table */ + { 0 }, /* Base Relocation Table */ + { 0 }, /* Debug */ + { 0 }, /* Copyright */ + { 0 }, /* Global Ptr */ + { 0 }, /* TLS Table */ + { 0 }, /* Load Config Table */ + { 0 }, /* Bound Import */ + { 0 }, /* IAT */ + { 0 }, /* Delay Import Descriptor */ + { 0 }, /* CLI Header */ + { 0 } /* Reserved */ + } + } + }, + /* IMAGE_SECTION_HEADER */ + { + /* SizeOfRawData larger than VirtualSize */ + ".text", /* Name */ + { 0x1000 }, /* Misc.VirtualSize */ + 0x1000, /* VirtualAddress */ + 0x1200, /* SizeOfRawData */ + 0x400, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE | + IMAGE_SCN_CNT_CODE, /* Characteristics */ + }, + /* IMAGE_SECTION_HEADER */ + { + /* SizeOfRawData larger than VirtualSize */ + ".data", /* Name */ + { 0x100 }, /* Misc.VirtualSize */ + 0x2000, /* VirtualAddress */ + 0x1200, /* SizeOfRawData */ + 0x1600, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ | + IMAGE_SCN_CNT_INITIALIZED_DATA, /* Characteristics */ + }, + /* IMAGE_SECTION_HEADER */ + { + /* SizeOfRawData = 0 */ + ".zdata", /* Name */ + { 0x100 }, /* Misc.VirtualSize */ + 0x3000, /* VirtualAddress */ + 0, /* SizeOfRawData */ + 0x2800, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_READ | + IMAGE_SCN_CNT_UNINITIALIZED_DATA, /* Characteristics */ + }, + /* IMAGE_SECTION_HEADER */ + { + /* VirtualSize larger than SizeOfRawData */ + ".rsrc", /* Name */ + { 0x300 }, /* Misc.VirtualSize */ + 0x4000, /* VirtualAddress */ + 0x200, /* SizeOfRawData */ + 0x2800, /* PointerToRawData */ + 0, /* PointerToRelocations */ + 0, /* PointerToLinenumbers */ + 0, /* NumberOfRelocations */ + 0, /* NumberOfLinenumbers */ + IMAGE_SCN_MEM_READ | + IMAGE_SCN_CNT_INITIALIZED_DATA, /* Characteristics */ + }, + /* fill */ + { 0 }, + /* text */ + { + 0xc3, 0, 0, 0, 0, 0, 0, 0, + BYTES8(1), + BYTES16(2), + BYTES32(3), + BYTES64(4), + BYTES128(5), + BYTES256(6), + BYTES512(7), + BYTES1024(8), + BYTES1024(9), + BYTES1024(0xa), + BYTES512(0xb), + }, + /* data */ + { + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, + BYTES8(0xaa), + BYTES16(0xbb), + BYTES32(0xcc), + BYTES64(0xdd), + BYTES128(0xee), + BYTES256(0xff), + BYTES512(0xee), + BYTES1024(0xdd), + BYTES1024(0xcc), + BYTES1024(0xbb), + BYTES512(0xaa), + }, + /* rsrc */ + { + BYTES256(0xff), + BYTES128(0xee), + BYTES64(0xdd), + BYTES32(0xcc), + BYTES16(0xbb), + BYTES8(0xaa), + 0xef, 0xcd, 0xab, 0x89, 0x67, 0x45, 0x23, 0x01, + }, +}; + +C_ASSERT(FIELD_OFFSET(struct _RAW_SIZE_IMAGE_FILE, text_data) == 0x400); +C_ASSERT(FIELD_OFFSET(struct _RAW_SIZE_IMAGE_FILE, data_data) == 0x1600); +C_ASSERT(FIELD_OFFSET(struct _RAW_SIZE_IMAGE_FILE, rsrc_data) == 0x2800); + +// CORE-17284 +static +void +Test_RawSize(ULONG TestNumber) +{ + NTSTATUS Status; + WCHAR TempPath[MAX_PATH]; + WCHAR FileName[MAX_PATH]; + HANDLE Handle; + HANDLE SectionHandle; + LARGE_INTEGER SectionOffset; + PVOID BaseAddress; + SIZE_T ViewSize; + ULONG Written; + ULONG Length; + BOOL Success; + + Length = GetTempPathW(MAX_PATH, TempPath); + ok(Length != 0, "GetTempPathW failed with %lu\n", GetLastError()); + Length = GetTempFileNameW(TempPath, L"nta", 0, FileName); + ok(Length != 0, "GetTempFileNameW failed with %lu\n", GetLastError()); + Handle = CreateFileW(FileName, + FILE_ALL_ACCESS, + 0, + NULL, + CREATE_ALWAYS, + 0, + NULL); + if (Handle == INVALID_HANDLE_VALUE) + { + skip("Failed to create temp file %ls, error %lu\n", FileName, GetLastError()); + return; + } + RawSizeImageFile.nthdrs.OptionalHeader.ImageBase = 0xe400000; + if (TestNumber == 1) + { + /* Just for fun, show that these flags don't matter. */ + RawSizeImageFile.text_header.Characteristics &= ~(IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_UNINITIALIZED_DATA); + RawSizeImageFile.data_header.Characteristics &= ~(IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_UNINITIALIZED_DATA); + RawSizeImageFile.zdata_header.Characteristics &= ~(IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_UNINITIALIZED_DATA); + RawSizeImageFile.rsrc_header.Characteristics &= ~(IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_UNINITIALIZED_DATA); + } + else if (TestNumber == 2) + { + /* SizeOfRawData is too large and will overflow. + * This should cause failure to load the file */ + RawSizeImageFile.rsrc_header.SizeOfRawData = (ULONG)-0x200; + } + + Success = WriteFile(Handle, + &RawSizeImageFile, + sizeof(RawSizeImageFile), + &Written, + NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(Written == sizeof(RawSizeImageFile), "WriteFile wrote %lu bytes\n", Written); + + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + NULL, + PAGE_EXECUTE_READWRITE, + SEC_IMAGE, + Handle); + if (TestNumber == 2) + { + /* overflow in SizeOfRawData */ + ok_ntstatus(Status, STATUS_INVALID_IMAGE_FORMAT); + } + else + { + ok_ntstatus(Status, STATUS_SUCCESS); + } + + if (NT_SUCCESS(Status)) + { + /* Map the section with */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 0; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + PUCHAR Bytes = BaseAddress; + struct _RAW_SIZE_IMAGE_FILE *ImageFile = BaseAddress; + + /* .text section header is unmodified */ + ok_hex(ImageFile->text_header.Misc.VirtualSize, RawSizeImageFile.text_header.Misc.VirtualSize); + ok_hex(ImageFile->text_header.VirtualAddress, RawSizeImageFile.text_header.VirtualAddress); + ok_hex(ImageFile->text_header.SizeOfRawData, RawSizeImageFile.text_header.SizeOfRawData); + ok_hex(ImageFile->text_header.PointerToRawData, RawSizeImageFile.text_header.PointerToRawData); + + /* SizeOfRawData = 0 resets PointerToRawData to 0 */ + ok_hex(ImageFile->zdata_header.Misc.VirtualSize, RawSizeImageFile.zdata_header.Misc.VirtualSize); + ok_hex(ImageFile->zdata_header.VirtualAddress, RawSizeImageFile.zdata_header.VirtualAddress); + ok_hex(ImageFile->zdata_header.SizeOfRawData, RawSizeImageFile.zdata_header.SizeOfRawData); + ok_hex(ImageFile->zdata_header.PointerToRawData, 0); + +#define TEST_BYTE(n, v) \ + StartSeh() \ + ok(Bytes[n] == v, "[%lu] Bytes[%u] = 0x%x, expected 0x%x\n", \ + TestNumber, n, Bytes[n], v); \ + EndSeh(STATUS_SUCCESS); + /* .text section data matches file up to 0x1000 */ + TEST_BYTE(0x1000, 0xc3); + TEST_BYTE(0x1001, 0x00); + TEST_BYTE(0x1008, 0x01); + TEST_BYTE(0x1010, 0x02); + TEST_BYTE(0x1fff, 0x0a); + + /* .data section data matches file up to 0x1000 */ + TEST_BYTE(0x2000, 0x01); + TEST_BYTE(0x2001, 0x23); + TEST_BYTE(0x20ff, 0xee); + TEST_BYTE(0x2100, 0xff); + TEST_BYTE(0x2fff, 0xbb); + + /* .zdata section data is all zeroes */ + TEST_BYTE(0x3000, 0x00); + TEST_BYTE(0x3001, 0x00); + TEST_BYTE(0x3800, 0x00); + TEST_BYTE(0x3fff, 0x00); + + /* .rsrc section data matches file up to VirtualSize 0x200 */ + TEST_BYTE(0x4000, 0xff); + TEST_BYTE(0x4100, 0xee); + TEST_BYTE(0x4180, 0xdd); + TEST_BYTE(0x41c0, 0xcc); + TEST_BYTE(0x41e0, 0xbb); + TEST_BYTE(0x41f0, 0xaa); + TEST_BYTE(0x41fe, 0x23); + TEST_BYTE(0x41ff, 0x01); + TEST_BYTE(0x4200, 0x00); + TEST_BYTE(0x4fff, 0x00); +#undef TEST_BYTE Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); ok_ntstatus(Status, STATUS_SUCCESS); } @@ -1510,7 +1874,7 @@ Test_EmptyFile(VOID) skip("Failed to create temp file %ls, error %lu\n", FileName, GetLastError()); return; } - + Status = NtCreateSection(&SectionHandle, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, 0, 0, PAGE_READONLY, SEC_COMMIT, Handle); @@ -1633,6 +1997,9 @@ START_TEST(NtMapViewOfSection) Test_BasedSection(); Test_SectionContents(FALSE); Test_SectionContents(TRUE); + Test_RawSize(0); + Test_RawSize(1); + Test_RawSize(2); Test_EmptyFile(); Test_Truncate(); }

3 years, 11 months

[reactos] 01/04: [NTDLL:LDR] Fail if section creation fails in LdrpCreateDllSection. CORE-17284

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c404d838a7a681f825c4… commit 1c404d838a7a681f825c42d6bf9f317008173239 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 27 16:41:34 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 3 13:10:09 2020 +0200 [NTDLL:LDR] Fail if section creation fails in LdrpCreateDllSection. CORE-17284 Otherwise we'd call ZwQuerySection on an invalid handle and get: (ntoskrnl/mm/section.c:4320) Failed to reference section: 0xc0000008 Also correctly check DllCharacteristics: If the argument is missing, the file is _not_ a system file, i.e. we should check for restrictions. --- dll/ntdll/ldr/ldrutils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 7f04bb46055..5b1ec30e525 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -641,10 +641,12 @@ LdrpCreateDllSection(IN PUNICODE_STRING FullName, /* Increment the error count */ if (LdrpInLdrInit) LdrpFatalHardErrorCount++; + + goto Exit; } /* Check for Safer restrictions */ - if (DllCharacteristics && + if (!DllCharacteristics || !(*DllCharacteristics & IMAGE_FILE_SYSTEM)) { /* Make sure it's executable */ @@ -683,6 +685,7 @@ LdrpCreateDllSection(IN PUNICODE_STRING FullName, } } +Exit: /* Close the file handle, we don't need it */ NtClose(FileHandle);

3 years, 11 months

[reactos] 01/01: [TCPIP] Add NULL checks in DispTdiQueryInformation. CORE-12274

by Thomas Brogan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e1aeb12dfd8b44b4b57d… commit 2e1aeb12dfd8b44b4b57d377b59ef347dfe3386e Author: Thomas Brogan <brogan.tom.iii(a)gmail.com> AuthorDate: Tue Jul 28 00:08:00 2020 +0300 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Oct 3 13:05:12 2020 +0200 [TCPIP] Add NULL checks in DispTdiQueryInformation. CORE-12274 Add additional NULL checks to DispTdiQueryInformation, which return STATUS_INVALID_PARAMETER. Co-authored-by: Peter Hater <7element(a)mail.bg> --- drivers/network/tcpip/tcpip/dispatch.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/network/tcpip/tcpip/dispatch.c b/drivers/network/tcpip/tcpip/dispatch.c index bb3625c731c..da2a00ba5bd 100644 --- a/drivers/network/tcpip/tcpip/dispatch.c +++ b/drivers/network/tcpip/tcpip/dispatch.c @@ -711,6 +711,12 @@ NTSTATUS DispTdiQueryInformation( switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; + if (AddrFile == NULL) + { + TI_DbgPrint(MIN_TRACE, ("FIXME: No address file object.\n")); + ASSERT(AddrFile != NULL); + return STATUS_INVALID_PARAMETER; + } Address->TAAddressCount = 1; Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; @@ -725,6 +731,12 @@ NTSTATUS DispTdiQueryInformation( case TDI_CONNECTION_FILE: Endpoint = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + if (Endpoint == NULL || Endpoint->AddressFile == NULL) + { + TI_DbgPrint(MIN_TRACE, ("FIXME: No connection endpoint file object.\n")); + ASSERT(Endpoint != NULL && Endpoint->AddressFile != NULL); + return STATUS_INVALID_PARAMETER; + } Address->TAAddressCount = 1; Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP;

3 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 October 2020