Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/04: [NTOS:MM] Fix-up call site of traced PFNs when serving a page fault
by Jérôme Gardou 24 Jun '21

24 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c5ce8d11cbcce37a5ade… commit 1c5ce8d11cbcce37a5ade6e3b4ab836546d52c2e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 24 17:01:38 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 18:48:31 2021 +0200 [NTOS:MM] Fix-up call site of traced PFNs when serving a page fault --- ntoskrnl/mm/ARM3/pagfault.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 4656828a3b0..8d1ce33c399 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -1286,6 +1286,14 @@ MiResolveProtoPteFault(IN BOOLEAN StoreInstruction, (ULONG)TempPte.u.Soft.Protection, Process, OldIrql); +#if MI_TRACE_PFNS + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerProtoPte->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerProtoPte->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); +#endif + ASSERT(NT_SUCCESS(Status)); } @@ -1637,6 +1645,14 @@ MiDispatchFault(IN ULONG FaultCode, ASSERT(KeAreAllApcsDisabled() == TRUE); if (NT_SUCCESS(Status)) { +#if MI_TRACE_PFNS + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); +#endif + // // Make sure we're returning in a sane state and pass the status down // @@ -2191,6 +2207,11 @@ UserFault: #if MI_TRACE_PFNS UserPdeFault = FALSE; + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); #endif /* We should come back with APCs enabled, and with a valid PDE */ ASSERT(KeAreAllApcsDisabled() == TRUE); @@ -2286,6 +2307,14 @@ UserFault: CurrentProcess, MM_NOIRQL); +#if MI_TRACE_PFNS + /* Update debug info */ + if (TrapInformation) + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = (PVOID)((PKTRAP_FRAME)TrapInformation)->Eip; + else + MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber)->CallSite = _ReturnAddress(); +#endif + /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); return STATUS_PAGE_FAULT_DEMAND_ZERO;

1 0

[reactos] 01/04: [NTOS:MM] Save caller address when tracing PFNs
by Jérôme Gardou 24 Jun '21

24 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=146337cc50e29e3f11e55… commit 146337cc50e29e3f11e55ede4885f5967e86d3f3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 24 16:35:00 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 18:48:31 2021 +0200 [NTOS:MM] Save caller address when tracing PFNs --- ntoskrnl/include/internal/mm.h | 3 ++- ntoskrnl/mm/ARM3/pfnlist.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 81c3954d8ae..0b75e613687 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -275,7 +275,7 @@ void MI_SET_PROCESS_USTR(PUNICODE_STRING ustr) { PWSTR pos, strEnd; - int i; + ULONG i; if (!ustr->Buffer || ustr->Length == 0) { @@ -407,6 +407,7 @@ typedef struct _MMPFN MI_PFN_USAGES PfnUsage; CHAR ProcessName[16]; #define MI_SET_PFN_PROCESS_NAME(pfn, x) memcpy(pfn->ProcessName, x, min(sizeof(x), sizeof(pfn->ProcessName))) + PVOID CallSite; #endif // HACK until WS lists are supported diff --git a/ntoskrnl/mm/ARM3/pfnlist.c b/ntoskrnl/mm/ARM3/pfnlist.c index 726143870f4..bbf4275a9df 100644 --- a/ntoskrnl/mm/ARM3/pfnlist.c +++ b/ntoskrnl/mm/ARM3/pfnlist.c @@ -254,6 +254,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry) ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); Entry->PfnUsage = MI_PFN_CURRENT_USAGE; memcpy(Entry->ProcessName, MI_PFN_CURRENT_PROCESS_NAME, 16); + Entry->CallSite = _ReturnAddress(); MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; MI_SET_PROCESS2("Not Set"); #endif @@ -462,6 +463,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex, ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); Pfn1->PfnUsage = MI_PFN_CURRENT_USAGE; memcpy(Pfn1->ProcessName, MI_PFN_CURRENT_PROCESS_NAME, 16); + Pfn1->CallSite = _ReturnAddress(); MI_PFN_CURRENT_USAGE = MI_USAGE_NOT_SET; MI_SET_PROCESS2("Not Set"); #endif @@ -710,6 +712,7 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex) #if MI_TRACE_PFNS Pfn1->PfnUsage = MI_USAGE_FREE_PAGE; RtlZeroMemory(Pfn1->ProcessName, 16); + Pfn1->CallSite = NULL; #endif } @@ -940,6 +943,7 @@ MiInsertPageInList(IN PMMPFNLIST ListHead, ASSERT(MI_PFN_CURRENT_USAGE == MI_USAGE_NOT_SET); Pfn1->PfnUsage = MI_USAGE_FREE_PAGE; RtlZeroMemory(Pfn1->ProcessName, 16); + Pfn1->CallSite = NULL; #endif } else if (ListName == ModifiedPageList)

1 0

[reactos] 02/02: [CMD] Do not use an intermediate buffer when reading lines from batch files
by Jérôme Gardou 24 Jun '21

24 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aae161d06184383e3ed06… commit aae161d06184383e3ed06a85918c02ef47f77526 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Jun 23 16:26:50 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 15:03:36 2021 +0200 [CMD] Do not use an intermediate buffer when reading lines from batch files This is easier on the heap and improves cmd:batch winetest nicely --- base/shell/cmd/batch.c | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 8fc6bf8466e..f20028af23f 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -75,7 +75,6 @@ BOOL bEcho = TRUE; /* The echo flag */ /* Buffer for reading Batch file lines */ TCHAR textline[BATCH_BUFFSIZE]; - /* * Returns a pointer to the n'th parameter of the current batch file. * If no such parameter exists returns pointer to empty string. @@ -527,47 +526,31 @@ VOID AddBatchRedirection(REDIRECTION **RedirList) */ BOOL BatchGetString(LPTSTR lpBuffer, INT nBufferLength) { - LPSTR lpString; INT len = 0; -#ifdef _UNICODE - lpString = cmd_alloc(nBufferLength); - if (!lpString) - { - WARN("Cannot allocate memory for lpString\n"); - error_out_of_memory(); - return FALSE; - } -#else - lpString = lpBuffer; -#endif + /* read all chars from memory until a '\n' is encountered */ if (bc->mem) { - for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) - { - lpString[len] = bc->mem[bc->mempos++]; - if (lpString[len] == '\n' ) + for (; ((bc->mempos + len) < bc->memsize && len < (nBufferLength-1)); len++) + { +#ifndef _UNICODE + lpBuffer[len] = bc->mem[bc->mempos + len]; +#endif + if (bc->mem[bc->mempos + len] == '\n') { len++; break; } } - } - - if (!len) - { #ifdef _UNICODE - cmd_free(lpString); + nBufferLength = MultiByteToWideChar(OutputCodePage, 0, &bc->mem[bc->mempos], len, lpBuffer, nBufferLength); + lpBuffer[nBufferLength] = L'\0'; + lpBuffer[len] = '\0'; #endif - return FALSE; + bc->mempos += len; } - lpString[len++] = '\0'; -#ifdef _UNICODE - MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); - cmd_free(lpString); -#endif - return TRUE; + return len != 0; } /*

1 0

[reactos] 01/02: [CMD] Improve performance a bit
by Jérôme Gardou 24 Jun '21

24 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ca83e516cbb5ab3fd809… commit 5ca83e516cbb5ab3fd809e044c0de4c018bd20c3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jun 22 12:44:56 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Jun 24 15:03:36 2021 +0200 [CMD] Improve performance a bit Do not use custom alloc/free functions by default. Do not free resources at process exit. - You're doing it brick by brick while the OS & CRT do that with a bulldozer better than you do. --- base/shell/cmd/CMakeLists.txt | 2 -- base/shell/cmd/cmd.c | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt index 471ecd0dfe1..b1cf669c03a 100644 --- a/base/shell/cmd/CMakeLists.txt +++ b/base/shell/cmd/CMakeLists.txt @@ -1,6 +1,4 @@ -add_definitions(-D_DEBUG_MEM) - include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 99070ff24f9..0f16229172f 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -2333,6 +2333,17 @@ static VOID Cleanup(VOID) ParseCommandLine(_T("\\cmdexit.bat")); } + /* Remove ctrl break handler */ + RemoveBreakHandler(); + + /* Restore the default console mode */ + SetConsoleMode(ConStreamGetOSHandle(StdIn), + ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + SetConsoleMode(ConStreamGetOSHandle(StdOut), + ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + + +#ifdef _DEBUG_MEM #ifdef FEATURE_DIRECTORY_STACK /* Destroy directory stack */ DestroyDirectoryStack(); @@ -2344,15 +2355,7 @@ static VOID Cleanup(VOID) /* Free GetEnvVar's buffer */ GetEnvVar(NULL); - - /* Remove ctrl break handler */ - RemoveBreakHandler(); - - /* Restore the default console mode */ - SetConsoleMode(ConStreamGetOSHandle(StdIn), - ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); - SetConsoleMode(ConStreamGetOSHandle(StdOut), - ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); +#endif /* _DEBUG_MEM */ DeleteCriticalSection(&ChildProcessRunningLock); }

1 0

[reactos] 01/01: [WIN32K] CreateDIBPalette addendum to #3758 CORE-17626
by Joachim Henze 23 Jun '21

23 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4130f0b1c5f869614c718… commit 4130f0b1c5f869614c71818bb7c30447d894afc8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jun 23 21:37:53 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jun 23 21:37:53 2021 +0200 [WIN32K] CreateDIBPalette addendum to #3758 CORE-17626 Fix compilation on older GCC4.7.2 toolchain to not warn about universal zero initializer. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 https://stackoverflow.com/questions/13746033/how-to-repair-warning-missing-… --- win32ss/gdi/ntgdi/dibobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index acd8da28d23..c99cabe33c9 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -127,7 +127,7 @@ CreateDIBPalette( { /* The colors are an array of RGBQUAD values */ RGBQUAD *prgb = (RGBQUAD*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); - RGBQUAD colors[256] = {0}; + RGBQUAD colors[256] = {{0}}; // FIXME: do we need to handle PALETTEINDEX / PALETTERGB macro?

1 0

[reactos] 01/01: [WIN32K] CreateDIBPalette SEH Simplification #3758 CORE-17626
by Joachim Henze 23 Jun '21

23 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c596fd3ef6933c9eec95a… commit c596fd3ef6933c9eec95a47c807d01d3776bbcc0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jun 23 19:59:42 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jun 23 19:59:42 2021 +0200 [WIN32K] CreateDIBPalette SEH Simplification #3758 CORE-17626 Enter an SEH2_TRY one time and do all testing within it instead of entering the SEH_TRY multiple times. The commit is an addendum to 0.4.15-dev-2734-g 514147776a7e70636911033ab6c89779b2c8ee1e Thanks to patches author Doug-Lyons This is 1:1 the final approved content of #3758, but I committed by hand and closed the PR to avoid squash+rebase. --- win32ss/gdi/ntgdi/dibobj.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 1ae6e8affa9..acd8da28d23 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -45,8 +45,6 @@ CreateDIBPalette( { PPALETTE ppal; ULONG i, cBitsPixel, cColors; - RGBQUAD rgb; - NTSTATUS Status; if (pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) { @@ -129,34 +127,29 @@ CreateDIBPalette( { /* The colors are an array of RGBQUAD values */ RGBQUAD *prgb = (RGBQUAD*)((PCHAR)pbmi + pbmi->bmiHeader.biSize); + RGBQUAD colors[256] = {0}; // FIXME: do we need to handle PALETTEINDEX / PALETTERGB macro? - /* Loop all color indices in the DIB */ - for (i = 0; i < cColors; i++) + /* Use SEH to verify we can READ prgb[] succesfully */ + _SEH2_TRY { - /* User SEH to verify READ success */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - rgb = prgb[i]; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - /* On Read Failure, put zero in Palette */ - PALETTE_vSetRGBColorForIndex(ppal, i, 0); - } - _SEH2_END + RtlCopyMemory(colors, prgb, cColors * sizeof(colors[0])); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do Nothing */ + } + _SEH2_END; - if(NT_SUCCESS(Status)) - { - /* Get the color value and translate it to a COLORREF */ - COLORREF crColor = RGB(rgb.rgbRed, rgb.rgbGreen, rgb.rgbBlue); + for (i = 0; i < cColors; ++i) + { + /* Get the color value and translate it to a COLORREF */ + COLORREF crColor = RGB(colors[i].rgbRed, colors[i].rgbGreen, colors[i].rgbBlue); + + /* Set the RGB value in the palette */ + PALETTE_vSetRGBColorForIndex(ppal, i, crColor); - /* Set the RGB value in the palette */ - PALETTE_vSetRGBColorForIndex(ppal, i, crColor); - } } } else

1 0

[reactos] 01/01: [NTOS:MM] Fix one occurrence of MiDeletePte instead of MiDeletePde
by Jérôme Gardou 22 Jun '21

22 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8ce0cc4340224bf93f4f… commit c8ce0cc4340224bf93f4f34050deaf504d598bc3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Jun 22 12:04:25 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Jun 22 12:05:20 2021 +0200 [NTOS:MM] Fix one occurrence of MiDeletePte instead of MiDeletePde --- ntoskrnl/mm/i386/page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index 7210d769df8..cf2e012389b 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -365,7 +365,7 @@ MmDeletePageFileMapping( { /* We can let it go */ KIRQL OldIrql = MiAcquirePfnLock(); - MiDeletePte(MiAddressToPte(PointerPte), PointerPte, Process, NULL); + MiDeletePde(MiPteToPde(PointerPte), Process); MiReleasePfnLock(OldIrql); }

1 0

[reactos] 02/02: [NTOS:CC] CcRosFlushVacb(): Fix Iosb annotation
by Serge Gautherie 22 Jun '21

22 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2e454b4396e075e38587… commit c2e454b4396e075e38587d7b77eddd6bcfdc37e6 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jun 22 10:33:45 2021 +0200 [NTOS:CC] CcRosFlushVacb(): Fix Iosb annotation Addendum to 2ba1926. --- ntoskrnl/cc/view.c | 2 +- ntoskrnl/include/internal/cc.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index c59c103a46b..97d675c2b04 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -158,7 +158,7 @@ CcRosTraceCacheMap ( NTSTATUS CcRosFlushVacb ( _In_ PROS_VACB Vacb, - _In_ PIO_STATUS_BLOCK Iosb) + _Out_opt_ PIO_STATUS_BLOCK Iosb) { NTSTATUS Status; BOOLEAN HaveLock = FALSE; diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 1986e888f9e..a56118a8558 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -310,7 +310,10 @@ CcMdlWriteComplete2( ); NTSTATUS -CcRosFlushVacb(PROS_VACB Vacb, PIO_STATUS_BLOCK Iosb); +CcRosFlushVacb( + _In_ PROS_VACB Vacb, + _Out_opt_ PIO_STATUS_BLOCK Iosb +); NTSTATUS CcRosGetVacb(

1 0

[reactos] 01/02: [NTOS:MM] MmFlushSegment(): Fix Iosb annotation
by Serge Gautherie 22 Jun '21

22 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eab2bb4b20cdca6558b53… commit eab2bb4b20cdca6558b5333afc956813e7db32fd Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jun 22 10:33:45 2021 +0200 [NTOS:MM] MmFlushSegment(): Fix Iosb annotation Addendum to 90c6a65. --- ntoskrnl/include/internal/mm.h | 2 +- ntoskrnl/mm/section.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index a3a382cbcfc..81c3954d8ae 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1434,7 +1434,7 @@ MmFlushSegment( _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer, _In_opt_ PLARGE_INTEGER Offset, _In_ ULONG Length, - _In_opt_ PIO_STATUS_BLOCK Iosb); + _Out_opt_ PIO_STATUS_BLOCK Iosb); NTSTATUS NTAPI diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index c6b618cdbf8..b6a6ca67b4c 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4663,7 +4663,7 @@ MmFlushSegment( _In_ PSECTION_OBJECT_POINTERS SectionObjectPointer, _In_opt_ PLARGE_INTEGER Offset, _In_ ULONG Length, - _In_opt_ PIO_STATUS_BLOCK Iosb) + _Out_opt_ PIO_STATUS_BLOCK Iosb) { LARGE_INTEGER FlushStart, FlushEnd; NTSTATUS Status;

1 0

[reactos] 01/01: [XBOX][FREELDR] Initialize PCI-AGP bridge BAR values
by Stanislav Motylkov 21 Jun '21

21 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d441f7d65f57c0f5b6da… commit 6d441f7d65f57c0f5b6da59ae851640a6e787875 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 25 20:32:42 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jun 22 02:42:04 2021 +0300 [XBOX][FREELDR] Initialize PCI-AGP bridge BAR values This fixes problem with Xbox GPU not being detected as a children device. CORE-17600 CORE-16216 --- boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c index eb7ce22c232..14f700e7751 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c @@ -86,6 +86,31 @@ XboxInitializePCI(VOID) PciData |= 0x00020200; WRITE_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT, PciData); } + + /* Select AGP to PCI bridge */ + PciCfg1.u.bits.DeviceNumber = 30; + /* Select register VendorID & DeviceID */ + PciCfg1.u.bits.RegisterNumber = 0x00; + + WRITE_PORT_ULONG(PCI_TYPE1_ADDRESS_PORT, PciCfg1.u.AsULONG); + PciData = READ_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT); + + if (PciData == 0x01B710DE) + { + /* Zero out uninitialized AGP Host bridge BARs */ + + /* Select register BAR0 */ + PciCfg1.u.bits.RegisterNumber = 0x10; + WRITE_PORT_ULONG(PCI_TYPE1_ADDRESS_PORT, PciCfg1.u.AsULONG); + /* Zero it out */ + WRITE_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT, 0); + + /* Select register BAR1 */ + PciCfg1.u.bits.RegisterNumber = 0x14; + WRITE_PORT_ULONG(PCI_TYPE1_ADDRESS_PORT, PciCfg1.u.AsULONG); + /* Zero it out */ + WRITE_PORT_ULONG((PULONG)PCI_TYPE1_DATA_PORT, 0); + } } VOID

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