Ros-diffs

ros-diffs@reactos.org

19 participants
81101 discussions

[reactos] 01/01: [WIN32SS][ENG][NTDDRAW] Manage DirectDraw instances when switching display mode (#4519)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e034377b51a11e6894ba3… commit e034377b51a11e6894ba3b558b1990342cac681c Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jun 21 18:00:24 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 21 18:00:24 2023 +0200 [WIN32SS][ENG][NTDDRAW] Manage DirectDraw instances when switching display mode (#4519) CORE-17932 [ENG] Implement DirectDraw management in switch display mode functions (e.g. resolution change, color depth, display frequency etc.): - Switch DirectDraw instances between the two PDEVs (the current one and the new one allocated by ourselves) by calling dxg!DxDdDynamicModeChange function. - Suspend them before and resume after the display mode switch, by calling dxg!DxDdsuspendDirectDraw and dxg!DxDdResumeDirectDraw appropriately. We currently don't have these functions implemented, but MS DXG has, so it allows to properly manage DirectDraw PDEVs using this driver, similarly to Windows. My analysis confirms that these functions are always called in XP/2k3 on display mode switch, even when there is no any DirectX app running at the moment. Analyzing their prototypes show that my guesses are correct. - Initialize hDev and dhpdev members for EDD_DIRECTDRAW_GLOBAL for newly created surfaces, switch them during mode change and re-initialize after it also. They are commonly used by DirectDraw stack. In addition, enable DirectDraw for old and new PDEVs, by calling dxg!DxDdEnableDirectDraw function. [NTDDRAW] Additionally, fix usage of DirectDraw lock count in the PDEVOBJ structure. - Enable cDirectDrawDisableLocks member for storing its value, instead of DxDd_nCount, which is marked as ROS-specific. - Use it in win32k!DxEngGet/SetHdevData for getting/setting DirectDraw count appropriately. My analysis also shows that in Windows, the PDEVOBJ::cDirectDrawDisableLocks method calls DxEngGetHdevData with type 8, which corresponds to our DxDd_nCount. So there are no doubts that this member is used there. - Rename DxEngGetHdevData_dd_count alias of type 8 to DxEngGetHdevData_dd_locks, to match more accurately an actual member name. Update the enumeration and fix all code parts appropriately. All these changes allow to properly change display mode during executing DirectDraw applications, when they try to switch in full-screen mode. At least a bugcheck that happened before my changes, does no longer appear. There are still some games that don't run correctly, as if there is no 3D acceleration (which actually exists). This requires further investigations. --- sdk/include/reactos/drivers/directx/dxeng.h | 2 +- sdk/include/reactos/drivers/directx/dxg.h | 2 +- win32ss/gdi/eng/pdevobj.c | 85 +++++++++++++++++++++++++++-- win32ss/gdi/eng/pdevobj.h | 3 +- win32ss/reactx/dxg/ddraw.c | 2 +- win32ss/reactx/ntddraw/dxeng.c | 11 ++-- win32ss/reactx/ntddraw/intddraw.h | 5 ++ 7 files changed, 94 insertions(+), 16 deletions(-) diff --git a/sdk/include/reactos/drivers/directx/dxeng.h b/sdk/include/reactos/drivers/directx/dxeng.h index 8a349ce6507..fa2f248e7cf 100644 --- a/sdk/include/reactos/drivers/directx/dxeng.h +++ b/sdk/include/reactos/drivers/directx/dxeng.h @@ -57,7 +57,7 @@ typedef enum _DXEGSHDEVDATA DxEGShDevData_DrvFuncs, DxEGShDevData_dhpdev, DxEGShDevData_eddg, - DxEGShDevData_dd_nCount, + DxEGShDevData_dd_locks, DxEGShDevData_dd_flags, DxEGShDevData_disable, DxEGShDevData_metadev, diff --git a/sdk/include/reactos/drivers/directx/dxg.h b/sdk/include/reactos/drivers/directx/dxg.h index 33a815a2a61..470597ad1de 100644 --- a/sdk/include/reactos/drivers/directx/dxg.h +++ b/sdk/include/reactos/drivers/directx/dxg.h @@ -197,7 +197,7 @@ typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, //typedef x (NTAPI *PGD_DxDdHeapVidMemAllocAligned)( //typedef x (NTAPI *PGD_DxDdHeapVidMemFree)( typedef BOOLEAN (NTAPI *PGD_DXDDENABLEDIRECTDRAW)(PVOID, BOOLEAN); -//typedef x (NTAPI *PGD_DxDdDisableDirectDraw)( +typedef VOID (NTAPI *PGD_DXDDDISABLEDIRECTDRAW)(PVOID, BOOLEAN); //typedef x (NTAPI *PGD_DxDdSuspendDirectDraw)( //typedef x (NTAPI *PGD_DxDdResumeDirectDraw)( //typedef x (NTAPI *PGD_DxDdDynamicModeChange)( diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index c8af5c7e9c3..ed6fc630e76 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Support for physical devices * FILE: win32ss/gdi/eng/pdevobj.c - * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROGRAMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ #include <win32k.h> @@ -336,6 +337,55 @@ PDEVOBJ_pSurface( return ppdev->pSurface; } +BOOL +PDEVOBJ_bEnableDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; + BOOL Success; + + /* Enable DirectDraw */ + TRACE("DxDdEnableDirectDraw(ppdev %p)\n", ppdev); + Success = pfnDdEnableDirectDraw((HDEV)ppdev, TRUE); + TRACE("DxDdEnableDirectDraw(ppdev %p) => %d\n", ppdev, Success); + + return Success; +} + +VOID +PDEVOBJ_vResumeDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDRESUMEDIRECTDRAW pfnDdResumeDirectDraw = (PGD_DXDDRESUMEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdResumeDirectDraw].pfn; + + /* Resume DirectDraw after mode change */ + TRACE("DxDdResumeDirectDraw(ppdev %p)\n", ppdev); + pfnDdResumeDirectDraw((HDEV)ppdev, 0); +} + +VOID +PDEVOBJ_vSuspendDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDSUSPENDDIRECTDRAW pfnDdSuspendDirectDraw = (PGD_DXDDSUSPENDDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdSuspendDirectDraw].pfn; + + /* Suspend DirectDraw for mode change */ + TRACE("DxDdSuspendDirectDraw(ppdev %p)\n", ppdev); + pfnDdSuspendDirectDraw((HDEV)ppdev, 0); +} + +VOID +PDEVOBJ_vSwitchDirectDraw( + _Inout_ PPDEVOBJ ppdev, + _Inout_ PPDEVOBJ ppdev2) +{ + PGD_DXDDDYNAMICMODECHANGE pfnDdDynamicModeChange = (PGD_DXDDDYNAMICMODECHANGE)gpDxFuncs[DXG_INDEX_DxDdDynamicModeChange].pfn; + + /* Switch DirectDraw instances between the PDEVs */ + TRACE("DxDdDynamicModeChange(ppdev %p, ppdev2 %p)\n", ppdev, ppdev2); + pfnDdDynamicModeChange((HDEV)ppdev, (HDEV)ppdev2, 0); +} + VOID PDEVOBJ_vEnableDisplay( _Inout_ PPDEVOBJ ppdev) @@ -365,6 +415,8 @@ PDEVOBJ_bDisableDisplay( if (ppdev->flFlags & PDEV_DISABLED) return TRUE; + PDEVOBJ_vSuspendDirectDraw(ppdev); + TRACE("DrvAssertMode(dhpdev %p, FALSE)\n", ppdev->dhpdev); assertVal = ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE); TRACE("DrvAssertMode(dhpdev %p, FALSE) => %d\n", ppdev->dhpdev, assertVal); @@ -548,6 +600,15 @@ PDEVOBJ_Create( return NULL; } + /* Enable DirectDraw */ + if (!PDEVOBJ_bEnableDirectDraw(ppdev)) + { + ERR("Failed to enable DirectDraw\n"); + PDEVOBJ_vRelease(ppdev); + EngUnloadImage(pldev); + return NULL; + } + /* Remove some acceleration capabilities from driver */ PDEVOBJ_vFilterDriverHooks(ppdev); @@ -631,6 +692,9 @@ PDEVOBJ_bDynamicModeChange( ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); + /* Switch DirectDraw mode */ + PDEVOBJ_vSwitchDirectDraw(ppdev, ppdev2); + return TRUE; } @@ -660,6 +724,8 @@ PDEVOBJ_bSwitchMode( if (!PDEVOBJ_bDisableDisplay(ppdev)) { DPRINT1("PDEVOBJ_bDisableDisplay() failed\n"); + /* Resume DirectDraw in case of failure */ + PDEVOBJ_vResumeDirectDraw(ppdev); goto leave; } @@ -680,11 +746,11 @@ PDEVOBJ_bSwitchMode( goto leave2; } - /* 4. Get DirectDraw information */ - /* 5. Enable DirectDraw Not traced */ - /* 6. Copy old PDEV state to new PDEV instance */ + /* 4. Temporarily suspend DirectDraw for mode change */ + PDEVOBJ_vSuspendDirectDraw(ppdev); + PDEVOBJ_vSuspendDirectDraw(ppdevTmp); - /* 7. Switch the PDEVs */ + /* 5. Switch the PDEVs */ if (!PDEVOBJ_bDynamicModeChange(ppdev, ppdevTmp)) { DPRINT1("PDEVOBJ_bDynamicModeChange() failed\n"); @@ -692,10 +758,17 @@ PDEVOBJ_bSwitchMode( goto leave2; } - /* 8. Disable DirectDraw */ + /* 6. Resume DirectDraw */ + PDEVOBJ_vResumeDirectDraw(ppdev); + PDEVOBJ_vResumeDirectDraw(ppdevTmp); + /* Release temp PDEV */ PDEVOBJ_vRelease(ppdevTmp); + /* Re-initialize DirectDraw data */ + ppdev->pEDDgpl->hDev = (HDEV)ppdev; + ppdev->pEDDgpl->dhpdev = ppdev->dhpdev; + /* Update primary display capabilities */ if (ppdev == gpmdev->ppdevGlobal) { diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index b9d439d3dda..a58eb1aa2ab 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -101,7 +101,7 @@ typedef struct _PDEVOBJ // RFONT * prfntInactive; // ULONG cInactive; // BYTE ajbo[0x5C]; -// ULONG cDirectDrawDisableLocks; + ULONG cDirectDrawDisableLocks; // PVOID TypeOneInfo; PVOID pvGammaRamp; /* Gamma ramp pointer. */ PVOID RemoteTypeOne; @@ -140,7 +140,6 @@ typedef struct _PDEVOBJ }; /* ros specific */ - ULONG DxDd_nCount; GDIPOINTER Pointer; /* Stuff to keep track of software cursors; win32k gdi part */ UINT SafetyRemoveLevel; /* at what level was the cursor removed? diff --git a/win32ss/reactx/dxg/ddraw.c b/win32ss/reactx/dxg/ddraw.c index 1a639a39ef1..12ed339367d 100644 --- a/win32ss/reactx/dxg/ddraw.c +++ b/win32ss/reactx/dxg/ddraw.c @@ -563,7 +563,7 @@ DxDdReenableDirectDrawObject( gpEngFuncs.DxEngGetDCState(hDC, 2) != 1 && !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_OpenRefs)) && !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_disable)) && - !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_nCount)) && + !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_locks)) && gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_DitherFmt) >= BMF_8BPP) { // reset acceleration and suspend flags diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index a096bf5f350..bcd0db67e26 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -324,9 +324,9 @@ DxEngGetHdevData(HDEV hDev, DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); retVal = (DWORD_PTR) PDev->pEDDgpl; break; - case DxEGShDevData_dd_nCount: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_nCount\n"); - retVal = (DWORD_PTR) PDev->DxDd_nCount; + case DxEGShDevData_dd_locks: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_locks\n"); + retVal = (DWORD_PTR) PDev->cDirectDrawDisableLocks; break; case DxEGShDevData_dd_flags: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); @@ -413,9 +413,10 @@ DxEngSetHdevData(HDEV hDev, DPRINT1("ReactX Calling : DxEngSetHdevData DXEGSHDEVDATA : %ld\n", Type); - if ( Type == DxEGShDevData_dd_nCount ) + if (Type == DxEGShDevData_dd_locks) { - ((PPDEVOBJ)hDev)->DxDd_nCount = Data; + DPRINT1("Assigning value %d\n", Data); + ((PPDEVOBJ)hDev)->cDirectDrawDisableLocks = Data; retVal = TRUE; // Set } return retVal; diff --git a/win32ss/reactx/ntddraw/intddraw.h b/win32ss/reactx/ntddraw/intddraw.h index c1ab8c945b0..5dcf1d28774 100644 --- a/win32ss/reactx/ntddraw/intddraw.h +++ b/win32ss/reactx/ntddraw/intddraw.h @@ -108,6 +108,11 @@ typedef VOID (APIENTRY *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); typedef PDD_SURFACE_LOCAL (APIENTRY *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef BOOL (APIENTRY *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); +/* Other internal functions */ +typedef VOID (APIENTRY *PGD_DXDDDYNAMICMODECHANGE)(HDEV, HDEV, ULONG_PTR); +typedef VOID (APIENTRY *PGD_DXDDRESUMEDIRECTDRAW)(HDEV, ULONG_PTR); +typedef VOID (APIENTRY *PGD_DXDDSUSPENDDIRECTDRAW)(HDEV, ULONG_PTR); + /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL);

1 year, 7 months

[reactos] 02/02: [MINIHAL] Remove sysinfo.c from compilation.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa613b9da95348b8ef38… commit 3fa613b9da95348b8ef38f5799f659e6acfc63ce Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 19:17:41 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 22:40:58 2023 +0200 [MINIHAL] Remove sysinfo.c from compilation. --- hal/halx86/minihal/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 58e640180d8..de7f4de04ed 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND MINI_HAL_SOURCE ../generic/misc.c ../generic/nmi.c ../generic/spinlock.c - ../generic/sysinfo.c ../generic/timer.c ../generic/usage.c ../pic/pic.c

1 year, 7 months

[reactos] 01/02: [HALX86] Tabs to 4-space indentation in generic/sysinfo.c + Fix typo "ALMI" -> "AMLI"

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6a78d580b9676ca8c245… commit d6a78d580b9676ca8c24500e8668d179a0434815 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 19:02:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 22:40:57 2023 +0200 [HALX86] Tabs to 4-space indentation in generic/sysinfo.c + Fix typo "ALMI" -> "AMLI" --- hal/halx86/generic/sysinfo.c | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/hal/halx86/generic/sysinfo.c b/hal/halx86/generic/sysinfo.c index ba880f380c3..209fc8e1fc9 100644 --- a/hal/halx86/generic/sysinfo.c +++ b/hal/halx86/generic/sysinfo.c @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -HAL_AMLI_BAD_IO_ADDRESS_LIST HalALMIBadIOAddressList[] = +HAL_AMLI_BAD_IO_ADDRESS_LIST HalAMLIBadIOAddressList[] = { { 0x0000, 0x10, 1, NULL }, // DMA controller { 0x0020, 0x02, 0, NULL }, // Programmable Interrupt Controller (8259A) @@ -58,59 +58,59 @@ HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, OUT PULONG ReturnedLength) { #define REPORT_THIS_CASE(X) case X: DPRINT1("Unhandled case: %s\n", #X); break - switch (InformationClass) - { - REPORT_THIS_CASE(HalInstalledBusInformation); - REPORT_THIS_CASE(HalProfileSourceInformation); - REPORT_THIS_CASE(HalInformationClassUnused1); - REPORT_THIS_CASE(HalPowerInformation); - REPORT_THIS_CASE(HalProcessorSpeedInformation); - REPORT_THIS_CASE(HalCallbackInformation); - REPORT_THIS_CASE(HalMapRegisterInformation); - REPORT_THIS_CASE(HalMcaLogInformation); - case HalFrameBufferCachingInformation: - { + switch (InformationClass) + { + REPORT_THIS_CASE(HalInstalledBusInformation); + REPORT_THIS_CASE(HalProfileSourceInformation); + REPORT_THIS_CASE(HalInformationClassUnused1); + REPORT_THIS_CASE(HalPowerInformation); + REPORT_THIS_CASE(HalProcessorSpeedInformation); + REPORT_THIS_CASE(HalCallbackInformation); + REPORT_THIS_CASE(HalMapRegisterInformation); + REPORT_THIS_CASE(HalMcaLogInformation); + case HalFrameBufferCachingInformation: + { /* FIXME: TODO */ return STATUS_NOT_IMPLEMENTED; - } - REPORT_THIS_CASE(HalDisplayBiosInformation); - REPORT_THIS_CASE(HalProcessorFeatureInformation); - REPORT_THIS_CASE(HalNumaTopologyInterface); - REPORT_THIS_CASE(HalErrorInformation); - REPORT_THIS_CASE(HalCmcLogInformation); - REPORT_THIS_CASE(HalCpeLogInformation); - REPORT_THIS_CASE(HalQueryMcaInterface); - case HalQueryAMLIIllegalIOPortAddresses: - { - ULONG Size = sizeof(HalALMIBadIOAddressList); - NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; + } + REPORT_THIS_CASE(HalDisplayBiosInformation); + REPORT_THIS_CASE(HalProcessorFeatureInformation); + REPORT_THIS_CASE(HalNumaTopologyInterface); + REPORT_THIS_CASE(HalErrorInformation); + REPORT_THIS_CASE(HalCmcLogInformation); + REPORT_THIS_CASE(HalCpeLogInformation); + REPORT_THIS_CASE(HalQueryMcaInterface); + case HalQueryAMLIIllegalIOPortAddresses: + { + ULONG Size = sizeof(HalAMLIBadIOAddressList); + NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; - if (BufferSize >= Size) - { - RtlCopyMemory(Buffer, HalALMIBadIOAddressList, Size); - Status = STATUS_SUCCESS; - } + if (BufferSize >= Size) + { + RtlCopyMemory(Buffer, HalAMLIBadIOAddressList, Size); + Status = STATUS_SUCCESS; + } - *ReturnedLength = Size; - KeFlushWriteBuffer(); - return Status; - } + *ReturnedLength = Size; + KeFlushWriteBuffer(); + return Status; + } - REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); - REPORT_THIS_CASE(HalPartitionIpiInterface); - REPORT_THIS_CASE(HalPlatformInformation); - REPORT_THIS_CASE(HalQueryProfileSourceList); - REPORT_THIS_CASE(HalInitLogInformation); - REPORT_THIS_CASE(HalFrequencyInformation); - REPORT_THIS_CASE(HalProcessorBrandString); - REPORT_THIS_CASE(HalHypervisorInformation); - REPORT_THIS_CASE(HalPlatformTimerInformation); - REPORT_THIS_CASE(HalAcpiAuditInformation); - } + REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); + REPORT_THIS_CASE(HalPartitionIpiInterface); + REPORT_THIS_CASE(HalPlatformInformation); + REPORT_THIS_CASE(HalQueryProfileSourceList); + REPORT_THIS_CASE(HalInitLogInformation); + REPORT_THIS_CASE(HalFrequencyInformation); + REPORT_THIS_CASE(HalProcessorBrandString); + REPORT_THIS_CASE(HalHypervisorInformation); + REPORT_THIS_CASE(HalPlatformTimerInformation); + REPORT_THIS_CASE(HalAcpiAuditInformation); + } #undef REPORT_THIS_CASE - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS

1 year, 7 months

[reactos] 01/01: [MINIHAL] Remove unneeded files from compilation.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d03fc32e7d456a5ddcf5f… commit d03fc32e7d456a5ddcf5f1ac7c01e9f4898842e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 14:29:44 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 18:39:01 2023 +0200 [MINIHAL] Remove unneeded files from compilation. --- hal/halx86/generic/bios.c | 6 ------ hal/halx86/generic/display.c | 2 -- hal/halx86/minihal/CMakeLists.txt | 5 ----- 3 files changed, 13 deletions(-) diff --git a/hal/halx86/generic/bios.c b/hal/halx86/generic/bios.c index be5e082d1fc..9c5c4907158 100644 --- a/hal/halx86/generic/bios.c +++ b/hal/halx86/generic/bios.c @@ -202,7 +202,6 @@ HalpDispatchV86Opcode(IN PKTRAP_FRAME TrapFrame) /* V86 TRAP HANDLERS **********************************************************/ -#ifndef _MINIHAL_ DECLSPEC_NORETURN VOID FASTCALL @@ -285,7 +284,6 @@ HalpBiosCall(VOID) /* Exit to V86 mode */ HalpExitToV86((PKTRAP_FRAME)&V86TrapFrame); } -#endif /* FUNCTIONS ******************************************************************/ @@ -443,7 +441,6 @@ HalpRestoreIopm(VOID) while (i--) HalpSavedIoMap[HalpSavedIoMapData[i][0]] = HalpSavedIoMapData[i][1]; } -#ifndef _MINIHAL_ VOID NTAPI HalpMapRealModeMemory(VOID) @@ -531,7 +528,6 @@ HalpSwitchToRealModeTrapHandlers(VOID) // KeRegisterInterruptHandler(6, HalpTrap06); } -#endif VOID NTAPI @@ -641,7 +637,6 @@ HalpUnmapRealModeMemory(VOID) HalpFlushTLB(); } -#ifndef _MINIHAL_ BOOLEAN NTAPI HalpBiosDisplayReset(VOID) @@ -716,6 +711,5 @@ HalpBiosDisplayReset(VOID) return TRUE; #endif } -#endif /* EOF */ diff --git a/hal/halx86/generic/display.c b/hal/halx86/generic/display.c index dc5f821240e..449ddc2986d 100644 --- a/hal/halx86/generic/display.c +++ b/hal/halx86/generic/display.c @@ -31,10 +31,8 @@ VOID NTAPI HalDisplayString(IN PCH String) { -#ifndef _MINIHAL_ /* Call the Inbv driver */ InbvDisplayString(String); -#endif } /* diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 32d510f2a8b..58e640180d8 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -6,9 +6,7 @@ list(APPEND MINI_HAL_SOURCE ../legacy/bus/isabus.c ../legacy/bus/pcibus.c ../legacy/bussupp.c - ../generic/bios.c ../generic/dma.c - ../generic/display.c ../generic/drive.c ../generic/misc.c ../generic/nmi.c @@ -25,7 +23,6 @@ if(SARCH STREQUAL "xbox") list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/cmos.c - ../generic/profil.c ../xbox/clock.c ../xbox/reboot.c) elseif(SARCH STREQUAL "pc98") @@ -33,14 +30,12 @@ elseif(SARCH STREQUAL "pc98") ../pc98/beep.c ../pc98/clock.c ../pc98/cmos.c - ../pc98/profil.c ../pc98/reboot.c) else() list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/clock.c ../generic/cmos.c - ../generic/profil.c ../generic/reboot.c) endif()

1 year, 7 months

[reactos] 01/01: [BROWSEUI] Add locked toolbar state persistence (#5350)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f203ad5cf4f650b77e5ae… commit f203ad5cf4f650b77e5ae32ed977d3606c32bb2a Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Tue Jun 20 03:16:23 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 20 11:16:23 2023 +0200 [BROWSEUI] Add locked toolbar state persistence (#5350) Store the state of the explorer toolbar, locked or unlocked, in the proper registry location and set the proper toolbar state when initialized. CORE-9094 - Set `HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Toolbar\Locked` to 1 when the explorer toolbar is locked, 0 when the toolbar is unlocked. - Query `HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Toolbar\Locked` when the toolbar is initialized to set the correct locked state. - Set the default state of the toolbar to locked if the registry key does not exist, matching the behavior of Windows Server 2003. --- dll/win32/browseui/internettoolbar.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 8c71f4d1a3f..8d51ad6bcfe 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -607,8 +607,12 @@ HRESULT STDMETHODCALLTYPE CMenuCallback::CallbackSM(LPSMDATA psmd, UINT uMsg, WP CInternetToolbar::CInternetToolbar() { + fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", + L"Locked", + FALSE, + TRUE); + fMainReBar = NULL; - fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; fMenuCallback = new CComObject<CMenuCallback>(); @@ -718,7 +722,15 @@ HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) if (locked != fLocked) { + DWORD dwLocked = locked ? 1 : 0; + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", + L"Locked", + REG_DWORD, + &dwLocked, + sizeof(dwLocked), + SHREGSET_FORCE_HKCU); fLocked = locked; + rebarBandInfo.cbSize = sizeof(rebarBandInfo); rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0);

1 year, 7 months

[reactos] 04/04: [STORPORT] MaximumNumberOfLogicalUnits should be initialized to SCSI_MAXIMUM_LOGICAL_UNITS

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=157491e29741da7cc5314… commit 157491e29741da7cc5314ab22148a1a169741221 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:42:41 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:53 2023 +0200 [STORPORT] MaximumNumberOfLogicalUnits should be initialized to SCSI_MAXIMUM_LOGICAL_UNITS See https://www.osronline.com/article.cfm%5Earticle=538.htm --- drivers/storage/port/storport/miniport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index 54071f98345..16fefe95864 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -65,7 +65,7 @@ InitializeConfiguration( PortConfig->SpecificLuExtensionSize = InitData->SpecificLuExtensionSize; PortConfig->SrbExtensionSize = InitData->SrbExtensionSize; - PortConfig->MaximumNumberOfLogicalUnits = 1; + PortConfig->MaximumNumberOfLogicalUnits = SCSI_MAXIMUM_LOGICAL_UNITS; PortConfig->WmiDataProvider = TRUE; PortConfig->NumberOfAccessRanges = InitData->NumberOfAccessRanges;

1 year, 7 months

[reactos] 03/04: [FREELDR][SCSIPORT][STORPORT] Use existing defines for some hardcoded max values.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bc71f9086e9176669f38… commit 3bc71f9086e9176669f38f939fbe99fd0f1bef05 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:08:33 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:51 2023 +0200 [FREELDR][SCSIPORT][STORPORT] Use existing defines for some hardcoded max values. See https://www.osronline.com/article.cfm%5Earticle=538.htm [SCSIPORT] Remove 'MaxBus' variable, deprecated since commit fc3d38d1c (r26220). --- boot/freeldr/freeldr/disk/scsiport.c | 6 ++++-- drivers/storage/port/scsiport/scsiport.c | 22 ++++++++++++---------- drivers/storage/port/storport/miniport.c | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 97d85034a5c..63d81c3dab8 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -455,8 +455,10 @@ SpiCreatePortConfig( ConfigInfo->AtdiskSecondaryClaimed = FALSE; // FIXME /* Initiator bus id is not set */ - for (Bus = 0; Bus < 8; Bus++) + for (Bus = 0; Bus < RTL_NUMBER_OF(ConfigInfo->InitiatorBusId); Bus++) + { ConfigInfo->InitiatorBusId[Bus] = (CCHAR)SP_UNINITIALIZED_VALUE; + } } ConfigInfo->NumberOfPhysicalBreaks = 17; @@ -644,7 +646,7 @@ ScsiPortGetPhysicalAddress( else { /* Nothing */ - PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE); + PhysicalAddress.QuadPart = (LONGLONG)SP_UNINITIALIZED_VALUE; } *Length = BufferLength; diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index 9b7f7f9d6df..655c4680676 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -569,7 +569,7 @@ ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, else { /* Nothing */ - PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE); + PhysicalAddress.QuadPart = (LONGLONG)SP_UNINITIALIZED_VALUE; } *Length = (ULONG)BufferLength; @@ -852,7 +852,6 @@ ScsiPortInitialize( BOOLEAN FirstConfigCall = TRUE; ULONG Result; NTSTATUS Status; - ULONG MaxBus; PCI_SLOT_NUMBER SlotNumber; PDEVICE_OBJECT PortDeviceObject; @@ -861,7 +860,7 @@ ScsiPortInitialize( PCM_RESOURCE_LIST ResourceList; - DPRINT ("ScsiPortInitialize() called!\n"); + DPRINT("ScsiPortInitialize() called!\n"); /* Check params for validity */ if ((HwInitializationData->HwInitialize == NULL) || @@ -945,8 +944,8 @@ ScsiPortInitialize( DeviceExtensionSize = sizeof(SCSI_PORT_DEVICE_EXTENSION) + HwInitializationData->DeviceExtensionSize; - MaxBus = (HwInitializationData->AdapterInterfaceType == PCIBus) ? 8 : 1; - DPRINT("MaxBus: %lu\n", MaxBus); + DPRINT("AdapterInterfaceType: %lu\n", + HwInitializationData->AdapterInterfaceType); while (TRUE) { @@ -1080,7 +1079,8 @@ CreatePortConfig: if ((HwInitializationData->AdapterInterfaceType == PCIBus) && (HwInitializationData->VendorIdLength > 0) && (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && (HwInitializationData->DeviceId != NULL)) + (HwInitializationData->DeviceIdLength > 0) && + (HwInitializationData->DeviceId != NULL)) { PortConfig->BusInterruptLevel = 0; @@ -1360,7 +1360,7 @@ CreatePortConfig: if (!Again) ConfigInfo.BusNumber++; - DPRINT("Bus: %lu MaxBus: %lu\n", ConfigInfo.BusNumber, MaxBus); + DPRINT(" Bus: %lu\n", ConfigInfo.BusNumber); DeviceFound = TRUE; } @@ -2402,7 +2402,7 @@ SpiCreatePortConfig(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ConfigInfo->DmaPort2 = SP_UNINITIALIZED_VALUE; ConfigInfo->MaximumTransferLength = SP_UNINITIALIZED_VALUE; ConfigInfo->NumberOfAccessRanges = HwInitData->NumberOfAccessRanges; - ConfigInfo->MaximumNumberOfTargets = 8; + ConfigInfo->MaximumNumberOfTargets = SCSI_MAXIMUM_TARGETS; // NOTE: Using legacy value. /* Store parameters */ ConfigInfo->NeedPhysicalAddresses = HwInitData->NeedPhysicalAddresses; @@ -2418,8 +2418,10 @@ SpiCreatePortConfig(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ConfigInfo->AtdiskSecondaryClaimed = DdkConfigInformation->AtDiskSecondaryAddressClaimed; /* Initiator bus id is not set */ - for (Bus = 0; Bus < 8; Bus++) + for (Bus = 0; Bus < RTL_NUMBER_OF(ConfigInfo->InitiatorBusId); Bus++) + { ConfigInfo->InitiatorBusId[Bus] = (CCHAR)SP_UNINITIALIZED_VALUE; + } } ConfigInfo->NumberOfPhysicalBreaks = 17; @@ -2690,7 +2692,7 @@ SpiParseDeviceInfo(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, /* Check / reset if needed */ if (ConfigInfo->InitiatorBusId[0] > ConfigInfo->MaximumNumberOfTargets - 1) - ConfigInfo->InitiatorBusId[0] = (CCHAR)-1; + ConfigInfo->InitiatorBusId[0] = (CCHAR)SP_UNINITIALIZED_VALUE; DPRINT("InitiatorTargetId = %d\n", ConfigInfo->InitiatorBusId[0]); } diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index 48fd9890b2f..54071f98345 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -41,9 +41,9 @@ InitializeConfiguration( PortConfig->SlotNumber = SlotNumber; PortConfig->AdapterInterfaceType = InitData->AdapterInterfaceType; - PortConfig->MaximumTransferLength = -1; //SP_UNINITIALIZED_VALUE; - PortConfig->DmaChannel = -1; //SP_UNINITIALIZED_VALUE; - PortConfig->DmaPort = -1; //SP_UNINITIALIZED_VALUE; + PortConfig->MaximumTransferLength = SP_UNINITIALIZED_VALUE; + PortConfig->DmaChannel = SP_UNINITIALIZED_VALUE; + PortConfig->DmaPort = SP_UNINITIALIZED_VALUE; PortConfig->InterruptMode = LevelSensitive; @@ -61,7 +61,7 @@ InitializeConfiguration( PortConfig->ReceiveEvent = InitData->ReceiveEvent; PortConfig->RealModeInitialized = FALSE; PortConfig->BufferAccessScsiPortControlled = TRUE; - PortConfig->MaximumNumberOfTargets = 128; + PortConfig->MaximumNumberOfTargets = SCSI_MAXIMUM_TARGETS_PER_BUS; PortConfig->SpecificLuExtensionSize = InitData->SpecificLuExtensionSize; PortConfig->SrbExtensionSize = InitData->SrbExtensionSize; @@ -82,8 +82,10 @@ InitializeConfiguration( PortConfig->NumberOfAccessRanges * sizeof(ACCESS_RANGE)); } - for (i = 0; i < 7; i++) - PortConfig->InitiatorBusId[i] = 0xff; + for (i = 0; i < RTL_NUMBER_OF(PortConfig->InitiatorBusId); i++) + { + PortConfig->InitiatorBusId[i] = (CCHAR)SP_UNINITIALIZED_VALUE; + } return STATUS_SUCCESS; }

1 year, 7 months

[reactos] 02/04: [DDK] storport.h: Add some missing definitions that are in common with srb.h

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fbd5eda85b64c2efcdad… commit 0fbd5eda85b64c2efcdad7e748d9f58d511c81b7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:39:43 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:49 2023 +0200 [DDK] storport.h: Add some missing definitions that are in common with srb.h --- sdk/include/ddk/storport.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/sdk/include/ddk/storport.h b/sdk/include/ddk/storport.h index 901d761cc88..1fb04882dbe 100644 --- a/sdk/include/ddk/storport.h +++ b/sdk/include/ddk/storport.h @@ -20,6 +20,14 @@ * */ +#ifdef _NTSCSI_ + #error STORPORT.H must be included instead of SCSI.H +#endif + +#ifdef _NTSRB_ + #error STORPORT.H must be included instead of SRB.H +#endif + #ifndef _NTSTORPORT_ #define _NTSTORPORT_ @@ -27,6 +35,40 @@ extern "C" { #endif +// +// Common definitions with SRB.H +// + +/* NOTE: the current SCSI_MAXIMUM_TARGETS_PER_BUS is applicable + * only on scsiport miniports. For storport miniports, the max + * target supported is 255. */ +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define SCSI_MAXIMUM_BUSES_PER_ADAPTER 255 +#endif +#define SCSI_MAXIMUM_TARGETS_PER_BUS 128 +#define SCSI_MAXIMUM_LUNS_PER_TARGET 255 +#define SCSI_MINIMUM_PHYSICAL_BREAKS 16 +#define SCSI_MAXIMUM_PHYSICAL_BREAKS 255 + +/* These constants are for backward compatibility. + * They used to be the maximum supported. */ +#define SCSI_MAXIMUM_BUSES 8 +#define SCSI_MAXIMUM_TARGETS 8 +#define SCSI_MAXIMUM_LOGICAL_UNITS 8 + +/* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */ +#define SCSI_DMA64_MINIPORT_SUPPORTED 0x01 +#define SCSI_DMA64_SYSTEM_SUPPORTED 0x80 +#if (NTDDI_VERSION > NTDDI_WS03SP1) +#define SCSI_DMA64_MINIPORT_FULL64BIT_SUPPORTED 0x02 +#endif + +#define SP_UNINITIALIZED_VALUE ((ULONG) ~0) +#define SP_UNTAGGED ((UCHAR) ~0) + +// End of common definitions with SRB.H + + #if defined(_STORPORT_) #define STORPORT_API #else @@ -293,6 +335,7 @@ extern "C" { #define SP_RETURN_ERROR 2 #define SP_RETURN_BAD_CONFIG 3 +/* SCSI_REQUEST_BLOCK.Function constants */ #define SRB_FUNCTION_EXECUTE_SCSI 0x00 #define SRB_FUNCTION_CLAIM_DEVICE 0x01 #define SRB_FUNCTION_IO_CONTROL 0x02 @@ -320,6 +363,7 @@ extern "C" { #define SRB_FUNCTION_PNP 0x25 #define SRB_FUNCTION_DUMP_POINTERS 0x26 +/* SCSI_REQUEST_BLOCK.SrbStatus constants */ #define SRB_STATUS_PENDING 0x00 #define SRB_STATUS_SUCCESS 0x01 #define SRB_STATUS_ABORTED 0x02 @@ -353,6 +397,7 @@ extern "C" { #define SRB_STATUS_AUTOSENSE_VALID 0x80 #define SRB_STATUS(Status) (Status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN)) +/* SCSI_REQUEST_BLOCK.SrbFlags constants */ #define SRB_FLAGS_QUEUE_ACTION_ENABLE 0x00000002 #define SRB_FLAGS_DISABLE_DISCONNECT 0x00000004 #define SRB_FLAGS_DISABLE_SYNCH_TRANSFER 0x00000008

1 year, 7 months

[reactos] 01/04: [DDK] srb.h: Introduce Win8+ SCSI_MAXIMUM_BUSES_PER_ADAPTER and comment about the old SCSI_MAXIMUM_* variables.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b12069d67070ca59a3c5f… commit b12069d67070ca59a3c5fc24f62da7d7c3cd3099 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:11:23 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:44 2023 +0200 [DDK] srb.h: Introduce Win8+ SCSI_MAXIMUM_BUSES_PER_ADAPTER and comment about the old SCSI_MAXIMUM_* variables. --- sdk/include/ddk/srb.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sdk/include/ddk/srb.h b/sdk/include/ddk/srb.h index 297be69d073..78c9fde397a 100644 --- a/sdk/include/ddk/srb.h +++ b/sdk/include/ddk/srb.h @@ -27,13 +27,22 @@ extern "C" { #endif -#define SCSI_MAXIMUM_LOGICAL_UNITS 8 +/* NOTE: the current SCSI_MAXIMUM_TARGETS_PER_BUS is applicable + * only on scsiport miniports. For storport miniports, the max + * target supported is 255. */ +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define SCSI_MAXIMUM_BUSES_PER_ADAPTER 255 +#endif #define SCSI_MAXIMUM_TARGETS_PER_BUS 128 #define SCSI_MAXIMUM_LUNS_PER_TARGET 255 -#define SCSI_MAXIMUM_BUSES 8 #define SCSI_MINIMUM_PHYSICAL_BREAKS 16 #define SCSI_MAXIMUM_PHYSICAL_BREAKS 255 + +/* These constants are for backward compatibility. + * They used to be the maximum supported. */ +#define SCSI_MAXIMUM_BUSES 8 #define SCSI_MAXIMUM_TARGETS 8 +#define SCSI_MAXIMUM_LOGICAL_UNITS 8 /* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */ #define SCSI_DMA64_MINIPORT_SUPPORTED 0x01

1 year, 7 months

[reactos] 04/04: [HALX86] Implement HalpcGetCmosData and HalpcSetCmosData.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e1510eb9c384dcf6b820… commit 7e1510eb9c384dcf6b82054dfc1165d1e34727a5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 19 17:51:31 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:09:03 2023 +0200 [HALX86] Implement HalpcGetCmosData and HalpcSetCmosData. --- hal/halx86/generic/cmos.c | 9 +++--- hal/halx86/include/bus.h | 38 +++++++++++-------------- hal/halx86/legacy/bus/cmosbus.c | 63 +++++++++++++++++++++++++---------------- 3 files changed, 60 insertions(+), 50 deletions(-) diff --git a/hal/halx86/generic/cmos.c b/hal/halx86/generic/cmos.c index 75a09b1bfe2..45ad8840956 100644 --- a/hal/halx86/generic/cmos.c +++ b/hal/halx86/generic/cmos.c @@ -101,10 +101,11 @@ HalpGetCmosData( ULONG NTAPI -HalpSetCmosData(IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) +HalpSetCmosData( + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length) { PUCHAR Ptr = (PUCHAR)Buffer; ULONG Address = SlotNumber; diff --git a/hal/halx86/include/bus.h b/hal/halx86/include/bus.h index 3e8fa82e13e..af61f0fa67c 100644 --- a/hal/halx86/include/bus.h +++ b/hal/halx86/include/bus.h @@ -427,17 +427,15 @@ HalpGetCmosData( _In_ ULONG BusNumber, _In_ ULONG SlotNumber, _Out_writes_bytes_(Length) PVOID Buffer, - _In_ ULONG Length -); + _In_ ULONG Length); ULONG NTAPI HalpSetCmosData( - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length -); + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length); CODE_SEG("INIT") VOID @@ -584,24 +582,22 @@ HalpNoBusData( ULONG NTAPI HalpcGetCmosData( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length -); + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); ULONG NTAPI HalpcSetCmosData( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length -); + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); BOOLEAN NTAPI diff --git a/hal/halx86/legacy/bus/cmosbus.c b/hal/halx86/legacy/bus/cmosbus.c index 88e7981ac51..cc633e8c96f 100644 --- a/hal/halx86/legacy/bus/cmosbus.c +++ b/hal/halx86/legacy/bus/cmosbus.c @@ -1,45 +1,58 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/legacy/bus/cmosbus.c - * PURPOSE: - * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + * PROJECT: ReactOS HAL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CMOS bus data handlers + * COPYRIGHT: Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ /* INCLUDES *******************************************************************/ #include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ /* PRIVATE FUNCTIONS **********************************************************/ ULONG NTAPI -HalpcGetCmosData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) +HalpcGetCmosData( + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) { - UNIMPLEMENTED_DBGBREAK("CMOS GetData\n"); - return 0; + UNREFERENCED_PARAMETER(RootHandler); + + /* CMOS reads do not support offsets */ + if (Offset != 0) + return 0; + + return HalpGetCmosData(BusHandler->BusNumber, + SlotNumber, + Buffer, + Length); } ULONG NTAPI -HalpcSetCmosData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) +HalpcSetCmosData( + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) { - UNIMPLEMENTED_DBGBREAK("CMOS SetData\n"); - return 0; + UNREFERENCED_PARAMETER(RootHandler); + + /* CMOS writes do not support offsets */ + if (Offset != 0) + return 0; + + return HalpSetCmosData(BusHandler->BusNumber, + SlotNumber, + Buffer, + Length); } /* EOF */

1 year, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs