Ros-diffs April 2023

ros-diffs@reactos.org

17 participants
89 discussions

[reactos] 01/01: [NTOS:OB] Properly calculate the return length in ObQueryTypeInfo

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00c69bcd15e44ee961f4d… commit 00c69bcd15e44ee961f4dfa7503cc0012c4beadd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Apr 15 12:55:32 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Apr 21 12:45:31 2023 +0200 [NTOS:OB] Properly calculate the return length in ObQueryTypeInfo On a x86 system aligning the return length pointer to a 4-byte boundary works best since pointers in general are 4-byte aligned for x86 systems. However, what happens on a AMD64 system is that we still align this pointer to 4-byte, ObjectTypeInfo is a 8-byte pointer and we might write into the return length past the 4-byte boundary. If one were to allocate a pool of memory with that length and query all the object types info and free the said pool of memory thereafter, the system will crash with BAD_POOL_HEADER because ObQueryTypeInfo overwrote the return length past the 4-byte boundary length therefore leading up with corrupted memory blocks in the pool header. This symptom of BAD_POOL_HEADER happens exactly the same in Windows Server 2003 x64 Edition. Newer versions of Windows like 10 aren't affected. But, Windows has another bug where they are using MaximumLength for the calculation of the needed length to be returned to caller. MaximumLength does not guarantee you that it includes the NULL-terminator in the length and that potentially leads to a buffer overrun. Also annotate the ObQueryTypeInfo function with SAL2. https://processhacker.sourceforge.io/doc/object_8c_source.html (read the comment in KphObjectTypeInformation). --- ntoskrnl/ob/oblife.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index a6161a4bbf7..f0ae6aafee3 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -944,22 +944,36 @@ ObpQueryNameInfoSize( NTSTATUS NTAPI -ObQueryTypeInfo(IN POBJECT_TYPE ObjectType, - OUT POBJECT_TYPE_INFORMATION ObjectTypeInfo, - IN ULONG Length, - OUT PULONG ReturnLength) +ObQueryTypeInfo( + _In_ POBJECT_TYPE ObjectType, + _Out_writes_bytes_(Length) POBJECT_TYPE_INFORMATION ObjectTypeInfo, + _In_ ULONG Length, + _Out_ PULONG ReturnLength) { NTSTATUS Status = STATUS_SUCCESS; PWSTR InfoBuffer; + /* The string of the object type name has to be NULL-terminated */ + ASSERT(ObjectType->Name.MaximumLength >= ObjectType->Name.Length + sizeof(UNICODE_NULL)); + /* Enter SEH */ _SEH2_TRY { - /* Set return length aligned to 4-byte boundary */ + /* + * Set return length aligned to 4-byte or 8-byte boundary. Windows has a bug + * where the returned length pointer is always aligned to a 4-byte boundary. + * If one were to allocate a pool of memory in kernel mode to retrieve all + * the object types info with this return length, Windows will bugcheck with + * BAD_POOL_HEADER in 64-bit upon you free the said allocated memory. + * + * More than that, Windows uses MaximumLength for the calculation of the returned + * length and MaximumLength does not always guarantee the name type is NULL-terminated + * leading the ObQueryTypeInfo function to overrun the buffer. + */ *ReturnLength += sizeof(*ObjectTypeInfo) + - ALIGN_UP(ObjectType->Name.MaximumLength, ULONG); + ALIGN_UP(ObjectType->Name.Length + sizeof(UNICODE_NULL), ULONG_PTR); - /* Check if thats too much though. */ + /* Check if that is too much */ if (Length < *ReturnLength) { _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH);

1 year, 6 months

[reactos] 01/01: [SCSIPORT] Flush and Free Map Registers (#5190)

by Atharva Kulkarni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6eee9f9daf8aa3260e868… commit 6eee9f9daf8aa3260e868291c5e32f1b8eee0d70 Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Fri Apr 21 16:14:31 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 21 12:44:31 2023 +0200 [SCSIPORT] Flush and Free Map Registers (#5190) - Flush Map registers once the DMA completes - Free Map registers once the DMA completes - Add support for SGL allocated from NonPagedPool Test: Force Allocations of SGL from Non Paged Pool and ensure OS boots and functions properly Test Logs: SpiAdapterControlFORCING ALLOCATION FROM SGPOOL SpiAdapterControlFORCING ALLOCATION FROM SGPOOL SpiAdapterControlFORCING ALLOCATION FROM SGPOOL SpiAdapterControlFORCING ALLOCATION FROM SGPOOL SpiAdapterControlFORCING ALLOCATION FROM SGPOOL SpiAdapterControlFORCING ALLOCATION FROM SGPOOL DHCPCSVC: Adapter Name: [{7cd69ac0-dabb-410a-b927-cb3961d174da}] (dynamic) SpiAdapterControlFORCING ALLOCATION FROM SGPOOL WARNING: HalCalculateScatterGatherListSize at hal\halx86\generic\dma.c:1168 is UNIMPLEMENTED! SpiAdapterControlFORCING ALLOCATION FROM SGPOOL SpiAdapterControlFORCING ALLOCATION FROM SGPOO --- drivers/storage/port/scsiport/scsi.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/storage/port/scsiport/scsi.c b/drivers/storage/port/scsiport/scsi.c index 056e2bb8328..42efbeca821 100644 --- a/drivers/storage/port/scsiport/scsi.c +++ b/drivers/storage/port/scsiport/scsi.c @@ -653,7 +653,6 @@ SpiProcessCompletedRequest( PSCSI_PORT_LUN_EXTENSION LunExtension; LONG Result; PIRP Irp; - //ULONG SequenceNumber; Srb = SrbInfo->Srb; Irp = Srb->OriginalRequest; @@ -681,10 +680,25 @@ SpiProcessCompletedRequest( } /* Flush adapter if needed */ - if (SrbInfo->BaseOfMapRegister) + if (SrbInfo->BaseOfMapRegister && SrbInfo->ScatterGather) { - /* TODO: Implement */ - ASSERT(FALSE); + ULONG transferLen = 0; + BOOLEAN isWrite = !!(Srb->SrbFlags & SRB_FLAGS_DATA_OUT); + ULONG i; + + for (i = 0; + i < SrbInfo->NumberOfMapRegisters && transferLen < Srb->DataTransferLength; + i++) + { + transferLen += SrbInfo->ScatterGather[i].Length; + } + + IoFlushAdapterBuffers(DeviceExtension->AdapterObject, + Irp->MdlAddress, + SrbInfo->BaseOfMapRegister, + Srb->DataBuffer, + transferLen, + isWrite); } /* Clear the request */ @@ -718,8 +732,16 @@ SpiProcessCompletedRequest( /* Scatter/gather */ if (Srb->SrbFlags & SRB_FLAGS_SGLIST_FROM_POOL) { - /* TODO: Implement */ - ASSERT(FALSE); + ExFreePoolWithTag(SrbInfo->ScatterGather, TAG_SCSIPORT); + SrbInfo->ScatterGather = NULL; + } + + /* Free Map Registers */ + if (SrbInfo->NumberOfMapRegisters) + { + IoFreeMapRegisters(DeviceExtension->AdapterObject, + SrbInfo->BaseOfMapRegister, + SrbInfo->NumberOfMapRegisters); } /* Acquire spinlock (we're freeing SrbExtension) */

1 year, 6 months

[reactos] 01/01: [NTOS:MM] MmCanFileBeTruncated: Check whether second (optional) parameter was passed (#5248)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6eb8fe4f82782cce064ea… commit 6eb8fe4f82782cce064ea3dd51dfe6dec9a57b81 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Wed Apr 19 23:12:11 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 19 23:12:11 2023 +0200 [NTOS:MM] MmCanFileBeTruncated: Check whether second (optional) parameter was passed (#5248) Second parameter is optional, so mark it as such and check whether it was passed. Fixes a sporadic 0x24 bugcheck caused by access violation when running ReactOS on NTFS volume with WinXP ntfs.sys. --- ntoskrnl/mm/section.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 9323a6da196..49c0e0e8f4f 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4209,9 +4209,11 @@ MmMapViewOfSection(IN PVOID SectionObject, /* * @unimplemented */ -BOOLEAN NTAPI -MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, - IN PLARGE_INTEGER NewFileSize) +BOOLEAN +NTAPI +MmCanFileBeTruncated( + _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer, + _In_opt_ PLARGE_INTEGER NewFileSize) { BOOLEAN Ret; PMM_SECTION_SEGMENT Segment; @@ -4237,7 +4239,7 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, /* If the cache is the only one holding a reference to the segment, then it's fine to resize */ Ret = TRUE; } - else + else if (NewFileSize != NULL) { /* We can't shrink, but we can extend */ Ret = NewFileSize->QuadPart >= Segment->RawLength.QuadPart; @@ -4248,6 +4250,12 @@ MmCanFileBeTruncated (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, } #endif } + else + { + DPRINT1("ERROR: File can't be truncated because it has references held to its data section\n"); + Ret = FALSE; + } + MmUnlockSectionSegment(Segment); MmDereferenceSegment(Segment);

1 year, 6 months

[reactos] 01/01: [I8042PRT] Add Dell Latitude D410 to the hack list (#5246)

by Vincent Franchomme

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=058726a2c123451208de4… commit 058726a2c123451208de4358689115a171cea7b9 Author: Vincent Franchomme <franchomme.vincent(a)gmail.com> AuthorDate: Tue Apr 18 10:03:16 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Apr 18 10:03:16 2023 +0200 [I8042PRT] Add Dell Latitude D410 to the hack list (#5246) --- drivers/input/i8042prt/hwhacks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/i8042prt/hwhacks.c b/drivers/input/i8042prt/hwhacks.c index 4478c78cb19..2bc84448c30 100644 --- a/drivers/input/i8042prt/hwhacks.c +++ b/drivers/input/i8042prt/hwhacks.c @@ -41,6 +41,7 @@ const HARDWARE_TABLE i8042HardwareTable[] = { {{SYS_VENDOR, "Microsoft Corporation"}, {SYS_PRODUCT, "Virtual Machine"}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Inspiron 6000 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D410 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D430 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531 "}}, FL_INITHACK },

1 year, 6 months

[reactos] 02/02: [GITHUB] Add Labeler rule for ATL

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e35c7503562353bfbf0b… commit 6e35c7503562353bfbf0b9391bd9f8d26401518c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 17 13:38:00 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 17 18:12:27 2023 +0200 [GITHUB] Add Labeler rule for ATL --- .github/labeler.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 37a6a4061bd..8028448ed45 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,4 +1,8 @@ # Labelling by the files touched + +ATL: + - sdk/lib/atl/** + drivers: - drivers/** - sdk/lib/drivers/**

1 year, 6 months

[reactos] 01/02: [GITHUB] Add Labeler rule for shell stuff

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09afeeccf5ee413a42e6b… commit 09afeeccf5ee413a42e6b1af501e70ea7459122a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 17 13:37:45 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 17 18:12:26 2023 +0200 [GITHUB] Add Labeler rule for shell stuff --- .github/labeler.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 1ab7f371fc7..37a6a4061bd 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -14,5 +14,12 @@ freeldr: ROSTESTS: - modules/rostests/** +shell: + - base/shell/explorer/** + - base/shell/rshell/** + - dll/shellext/** + - dll/win32/browseui/** + - dll/win32/shell32/** + Win32SS: - win32ss/**

1 year, 6 months

[reactos] 01/01: [ATL] Add CString::AppendFormat

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c8580a1e06fd6bf0f142… commit 9c8580a1e06fd6bf0f142dd1f32fcc2b6909f57a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 12 22:21:41 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 17 18:09:34 2023 +0200 [ATL] Add CString::AppendFormat --- modules/rostests/apitests/atl/CString.inl | 37 +++++++++++++++++++------------ sdk/lib/atl/cstringt.h | 27 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/modules/rostests/apitests/atl/CString.inl b/modules/rostests/apitests/atl/CString.inl index 865804dc3a1..834079a2506 100644 --- a/modules/rostests/apitests/atl/CString.inl +++ b/modules/rostests/apitests/atl/CString.inl @@ -17,75 +17,75 @@ TEST_NAMEX(operators_init) CStringX first(_X("First ")); ok(first.IsEmpty() != true, "Expected first to not be empty\n"); ok(first.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", first.GetLength()); - ok_int(first.GetAllocLength(), 6); + //ok_int(first.GetAllocLength(), 6); CStringX second(_X("Second")); ok(second.IsEmpty() != true, "Expected second to not be empty\n"); ok(second.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", second.GetLength()); - ok_int(second.GetAllocLength(), 6); + //ok_int(second.GetAllocLength(), 6); test = first; ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 6); + //ok_int(test.GetAllocLength(), 6); test.Empty(); ok(test.IsEmpty() == true, "Expected test to be empty\n"); ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 0); + //ok_int(test.GetAllocLength(), 0); test = _X("First "); ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 6); + //ok_int(test.GetAllocLength(), 6); test += second; ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 12, "Expected GetLength() to be 12, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 12); + //ok_int(test.GetAllocLength(), 12); test = first + second; ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 12, "Expected GetLength() to be 12, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 12); + //ok_int(test.GetAllocLength(), 12); test = first + second + _X("."); ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 13, "Expected GetLength() to be 13, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 13); + //ok_int(test.GetAllocLength(), 13); CStringX test2(test); ok(test2.IsEmpty() != true, "Expected test2 to not be empty\n"); ok(test2.GetLength() == 13, "Expected GetLength() to be 13, was: %i\n", test2.GetLength()); - ok_int(test2.GetAllocLength(), 13); + //ok_int(test2.GetAllocLength(), 13); // Clear it again test.Empty(); ok(test.IsEmpty() == true, "Expected test to be empty\n"); ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 0); + //ok_int(test.GetAllocLength(), 0); // Assign string test = "First "; ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 6); + //ok_int(test.GetAllocLength(), 6); CStringA testA = test; ok(testA.IsEmpty() != true, "Expected testA to not be empty\n"); ok(testA.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", testA.GetLength()); - ok_int(testA.GetAllocLength(), 6); + //ok_int(testA.GetAllocLength(), 6); CStringW testW = test; ok(testW.IsEmpty() != true, "Expected testW to not be empty\n"); ok(testW.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", testW.GetLength()); - ok_int(testW.GetAllocLength(), 6); + //ok_int(testW.GetAllocLength(), 6); // Assign wstring test = L"First "; ok(test.IsEmpty() != true, "Expected test to not be empty\n"); ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); - ok_int(test.GetAllocLength(), 6); + //ok_int(test.GetAllocLength(), 6); } @@ -185,6 +185,12 @@ void WriteString(const XCHAR* pstrFormat, ...) va_end(args); ok(str == _X("10e 1351l"), "Expected str to be '10e 1351l', was: %s\n", dbgstrx(str)); + + + va_start(args, pstrFormat); + str.AppendFormatV(pstrFormat, args); + va_end(args); + ok(str == _X("10e 1351l10e 1351l"), "Expected str to be '10e 1351l10e 1351l', was: %s\n", dbgstrx(str)); } TEST_NAMEX(format) @@ -198,6 +204,9 @@ TEST_NAMEX(format) ok(str == _X("int: 000035"), "Expected str to be 'int: 000035', was: %s\n", dbgstrx(str)); WriteString(_X("%de %dl"), 10, 1351); + + str.AppendFormat(_X(",FP: %.2f"), 12345.12345); + ok(str == _X("int: 000035,FP: 12345.12"), "Expected str to be 'int: 000035,FP: 12345.12', was: %s\n", dbgstrx(str)); } diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index f0dccbebeed..748cbcba993 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -749,6 +749,23 @@ public: return CStringT(CThisSimpleString::GetString() + nLength - nCount, nCount); } + void __cdecl AppendFormat(UINT nFormatID, ...) + { + va_list args; + va_start(args, nFormatID); + CStringT formatString; + if (formatString.LoadString(nFormatID)) + AppendFormatV(formatString, args); + va_end(args); + } + + void __cdecl AppendFormat(PCXSTR pszFormat, ...) + { + va_list args; + va_start(args, pszFormat); + AppendFormatV(pszFormat, args); + va_end(args); + } void __cdecl Format(UINT nFormatID, ...) { @@ -768,6 +785,16 @@ public: va_end(args); } + void AppendFormatV(PCXSTR pszFormat, va_list args) + { + int nLength = StringTraits::FormatV(NULL, pszFormat, args); + int nCurrent = CThisSimpleString::GetLength(); + + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength + nCurrent); + StringTraits::FormatV(pszBuffer + nCurrent, pszFormat, args); + CThisSimpleString::ReleaseBufferSetLength(nLength + nCurrent); + } + void FormatV(PCXSTR pszFormat, va_list args) { int nLength = StringTraits::FormatV(NULL, pszFormat, args);

1 year, 6 months

[reactos] 11/11: [USER32_APITEST] Comment out a test for GetMessageTime that randomly fails on Windows

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28a305e26a13b7fe3a7f9… commit 28a305e26a13b7fe3a7f9970fb2ba5b9f657eed3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 3 18:26:49 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [USER32_APITEST] Comment out a test for GetMessageTime that randomly fails on Windows --- modules/rostests/apitests/user32/GetMessageTime.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/user32/GetMessageTime.c b/modules/rostests/apitests/user32/GetMessageTime.c index de41755a37f..e958f35bb46 100644 --- a/modules/rostests/apitests/user32/GetMessageTime.c +++ b/modules/rostests/apitests/user32/GetMessageTime.c @@ -67,8 +67,9 @@ WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_MOUSEMOVE: trace("WM_MOUSEMOVE\n"); ok_int(s_nCount, 5); - ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL, - "GetMessageTime() is wrong, compared to previous one\n"); + // This test randomly fails on Windows 2003 + //ok(GetMessageTime() - s_nMsgTime < TIMER_INTERVAL, + // "GetMessageTime() is wrong, compared to previous one\n"); ok(GetTickCount() - (DWORD)GetMessageTime() < TIMER_INTERVAL / 2, "GetMessageTime() is wrong, compared to GetTickCount()\n"); s_bReach_WM_MOUSEMOVE = TRUE;

1 year, 6 months

[reactos] 10/11: [JSCRIPT_WINETEST] Disable a test that fails on Windows 2003

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2920363476b6084531b0… commit b2920363476b6084531b072197f338ef7645f27c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 3 18:18:14 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [JSCRIPT_WINETEST] Disable a test that fails on Windows 2003 --- modules/rostests/winetests/jscript/run.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/winetests/jscript/run.c b/modules/rostests/winetests/jscript/run.c index e3f272d46ca..324bf4d23e8 100644 --- a/modules/rostests/winetests/jscript/run.c +++ b/modules/rostests/winetests/jscript/run.c @@ -1032,7 +1032,9 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); +#ifndef __REACTOS__ // Fails on Windows 2003 ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); +#endif return S_OK;

1 year, 6 months

[reactos] 09/11: [NTDLL_APITEST] Fix a test for NtMapViewOfSection

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81d58bcf06d48943968c3… commit 81d58bcf06d48943968c3934150bea863ae375f0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 3 15:33:16 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [NTDLL_APITEST] Fix a test for NtMapViewOfSection --- modules/rostests/apitests/ntdll/NtMapViewOfSection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index 4a6e187a08b..9c1b85d88e5 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -1553,7 +1553,7 @@ static struct _RAW_SIZE_IMAGE_FILE 4, /* MajorSubsystemVersion */ 0, /* MinorSubsystemVersion */ 0, /* Win32VersionValue */ - 0x5000, /* SizeOfImage */ + 0x6000, /* SizeOfImage */ 0x400, /* SizeOfHeaders */ 0x0, /* CheckSum */ IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ @@ -1818,8 +1818,8 @@ Test_RawSize(ULONG TestNumber) ok_hex(ImageFile->zdata_header.SizeOfRawData, RawSizeImageFile.zdata_header.SizeOfRawData); ok_hex(ImageFile->zdata_header.PointerToRawData, 0); - /* PointerToRawData = 0 resets SizeOfRawData to 0, CORE-18797 */ - ok_hex(ImageFile->bss_header.SizeOfRawData, 0); + /* .bss section is unmodified */ + ok_hex(ImageFile->bss_header.SizeOfRawData, 0x600); ok_hex(ImageFile->bss_header.PointerToRawData, 0); #define TEST_BYTE(n, v) \

1 year, 6 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2023