Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/06: [WIN32SS] Implement panning driver
by Hervé Poussineau 14 May '22

14 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e0f2fc01c8fd44432ccd… commit 4e0f2fc01c8fd44432ccd3553ad3f9ec6e4e7bef Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 22:23:32 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Implement panning driver This can be configured in registry with DefaultSettings.XPanning and DefaultSettings.YPanning, which describe the real screen resolution. DefaultSettings.XResolution and DefaultSettings.YResolution describe the resolution of the virtual screen. --- win32ss/CMakeLists.txt | 1 + win32ss/gdi/eng/pandisp.c | 501 ++++++++++++++++++++++++++++++++++++++++++++++ win32ss/gdi/eng/pdevobj.c | 22 +- 3 files changed, 523 insertions(+), 1 deletion(-) diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index 0a7dd1492de..16026d6275e 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -78,6 +78,7 @@ list(APPEND SOURCE gdi/eng/engmisc.c gdi/eng/mouse.c gdi/eng/multidisp.c + gdi/eng/pandisp.c gdi/eng/paint.c gdi/eng/pathobj.c gdi/eng/pdevobj.c diff --git a/win32ss/gdi/eng/pandisp.c b/win32ss/gdi/eng/pandisp.c new file mode 100644 index 00000000000..9f1a4f8c916 --- /dev/null +++ b/win32ss/gdi/eng/pandisp.c @@ -0,0 +1,501 @@ +/* + * PROJECT: ReactOS Win32k subsystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Pan-Display driver + * COPYRIGHT: Copyright 2022 Hervé Poussineau <hpoussin(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +#define TAG_PAN 'DnaP' +#define GETPFN(name) ((PFN_Drv##name)(pandev->apfn[INDEX_Drv##name])) + +static DHPDEV gPan; /* FIXME: remove once PanSynchronize() is called periodically */ + +typedef struct _PANDEV +{ + ULONG iBitmapFormat; + HDEV hdev; + SIZEL szlDesktop; /* Size of the whole desktop */ + RECTL rclViewport; /* Viewport area */ + HSURF hsurf; /* Global surface */ + HSURF hsurfShadow; /* Our shadow surface, used for drawing */ + SURFOBJ *psoShadow; + + /* Underlying PDEVOBJ */ + ULONG flUnderlyingGraphicsCaps; + SIZEL szlScreen; + DHPDEV dhpdevScreen; + BOOL enabledScreen; /* underlying surface enabled */ + SURFOBJ *surfObjScreen; + PFN apfn[INDEX_LAST]; /* Functions of underlying PDEVOBJ */ +} PANDEV, *PPANDEV; + +BOOL +APIENTRY +PanSynchronize( + _In_ DHPDEV dhpdev, + _In_ PRECTL prcl) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + RECTL rclDest; + POINTL ptlSrc; + + /* FIXME: for now, copy the whole shadow buffer. We might try to optimize that */ + + ptlSrc.x = pandev->rclViewport.left; + ptlSrc.y = pandev->rclViewport.top; + + rclDest.top = rclDest.left = 0; + rclDest.bottom = pandev->szlScreen.cy; + rclDest.right = pandev->szlScreen.cx; + + return EngCopyBits(pandev->surfObjScreen, pandev->psoShadow, NULL, NULL, &rclDest, &ptlSrc); +} + +DHPDEV +APIENTRY +PanEnablePDEV( + _In_ PDEVMODEW pdm, + _In_ LPWSTR pwszLogAddress, + _In_ ULONG cPat, + _In_reads_opt_(cPat) HSURF *phsurfPatterns, + _In_ ULONG cjCaps, + _Out_writes_bytes_(cjCaps) PULONG pdevcaps, + _In_ ULONG cjDevInfo, + _Out_writes_bytes_(cjDevInfo) PDEVINFO pdi, + _In_ HDEV hdev, + _In_ LPWSTR pwszDeviceName, + _In_ HANDLE hDriver) +{ + PPANDEV pandev; + PPDEVOBJ ppdev = (PPDEVOBJ)hdev; + DEVMODEW underlyingDevmode; + PGDIINFO pGdiInfo = (PGDIINFO)pdevcaps; + + DPRINT("PanEnablePDEV(ppdev %p %dx%dx%d -> %dx%dx%d %d Hz)\n", + ppdev, + pdm->dmPelsWidth, pdm->dmPelsHeight, pdm->dmBitsPerPel, + pdm->dmPanningWidth, pdm->dmPanningHeight, pdm->dmBitsPerPel, pdm->dmDisplayFrequency); + + ASSERT(pdm->dmPanningWidth <= pdm->dmPelsWidth && pdm->dmPanningHeight <= pdm->dmPelsHeight); + + /* Allocate PANDEV */ + pandev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PANDEV), TAG_PAN); + if (!pandev) + { + DPRINT1("Failed to allocate memory\n"); + return NULL; + } + + /* Copy device pointers to our structure (do not copy ppdev->apfn, + * as it contains our local pointers!) */ + RtlCopyMemory(pandev->apfn, ppdev->pldev->apfn, sizeof(pandev->apfn)); + + /* Enable underlying PDEV */ + underlyingDevmode = *pdm; + underlyingDevmode.dmPelsWidth = pdm->dmPanningWidth; + underlyingDevmode.dmPelsHeight = pdm->dmPanningHeight; + pandev->dhpdevScreen = GETPFN(EnablePDEV)(&underlyingDevmode, + pwszLogAddress, + cPat, + phsurfPatterns, + cjCaps, + pdevcaps, + cjDevInfo, + pdi, + hdev, + pwszDeviceName, + hDriver); + if (!pandev->dhpdevScreen) + { + DPRINT1("Failed to enable underlying PDEV\n"); + EngFreeMem(pandev); + return NULL; + } + + pandev->iBitmapFormat = pdi->iDitherFormat; + pandev->szlDesktop.cx = pdm->dmPelsWidth; + pandev->szlDesktop.cy = pdm->dmPelsHeight; + pandev->szlScreen.cx = pdm->dmPanningWidth; + pandev->szlScreen.cy = pdm->dmPanningHeight; + pandev->flUnderlyingGraphicsCaps = pdi->flGraphicsCaps; + + /* Upgrade some capabilities */ + pGdiInfo->ulHorzRes = pdm->dmPelsWidth; + pGdiInfo->ulVertRes = pdm->dmPelsHeight; + pdi->flGraphicsCaps |= GCAPS_PANNING; + pdi->flGraphicsCaps2 = GCAPS2_SYNCFLUSH | GCAPS2_SYNCTIMER; + + gPan = (DHPDEV)pandev; + return (DHPDEV)pandev; +} + +VOID +APIENTRY +PanCompletePDEV( + _In_ DHPDEV dhpdev, + _In_ HDEV hdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + + DPRINT("PanCompletePDEV(%p %p)\n", dhpdev, hdev); + + pandev->hdev = hdev; + GETPFN(CompletePDEV)(pandev->dhpdevScreen, hdev); +} + +VOID +APIENTRY +PanDisablePDEV( + _In_ DHPDEV dhpdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + + DPRINT("PanDisablePDEV(%p)\n", dhpdev); + + GETPFN(DisablePDEV)(pandev->dhpdevScreen); + EngFreeMem(pandev); +} + +VOID +APIENTRY +PanDisableSurface( + _In_ DHPDEV dhpdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + + DPRINT("PanDisableSurface(%p)\n", dhpdev); + + /* Note that we must handle a not fully initialized pandev, as this + * function is also called from PanEnableSurface in case of error. */ + + if (pandev->psoShadow) + { + EngUnlockSurface(pandev->psoShadow); + pandev->psoShadow = NULL; + } + if (pandev->hsurfShadow) + { + EngDeleteSurface(pandev->hsurfShadow); + pandev->hsurfShadow = NULL; + } + if (pandev->hsurf) + { + EngDeleteSurface(pandev->hsurf); + pandev->hsurf = NULL; + } + if (pandev->surfObjScreen) + { + EngUnlockSurface(pandev->surfObjScreen); + pandev->surfObjScreen = NULL; + } + if (pandev->enabledScreen) + { + GETPFN(DisableSurface)(pandev->dhpdevScreen); + pandev->enabledScreen = FALSE; + } +} + +HSURF +APIENTRY +PanEnableSurface( + _In_ DHPDEV dhpdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + HSURF surfScreen; + + /* Move viewport to center of screen */ + pandev->rclViewport.left = (pandev->szlDesktop.cx - pandev->szlScreen.cx) / 2; + pandev->rclViewport.top = (pandev->szlDesktop.cy - pandev->szlScreen.cy) / 2; + pandev->rclViewport.right = pandev->rclViewport.left + pandev->szlScreen.cx; + pandev->rclViewport.bottom = pandev->rclViewport.top + pandev->szlScreen.cy; + + /* Enable underlying device */ + surfScreen = GETPFN(EnableSurface)(pandev->dhpdevScreen); + if (!surfScreen) + { + DPRINT1("Failed to enable underlying surface\n"); + goto failure; + } + pandev->enabledScreen = TRUE; + + pandev->surfObjScreen = EngLockSurface(surfScreen); + if (!pandev->surfObjScreen) + { + DPRINT1("Failed to lock underlying surface\n"); + goto failure; + } + + /* Create device surface */ + pandev->hsurf = EngCreateDeviceSurface(NULL, pandev->szlDesktop, pandev->iBitmapFormat); + if (!pandev->hsurf) + { + DPRINT1("EngCreateDeviceSurface() failed\n"); + goto failure; + } + + if (!EngAssociateSurface(pandev->hsurf, pandev->hdev, HOOK_ALPHABLEND | + HOOK_BITBLT | + HOOK_COPYBITS | + HOOK_GRADIENTFILL | + HOOK_STROKEPATH | + HOOK_SYNCHRONIZE | + HOOK_TEXTOUT)) + { + DPRINT1("EngAssociateSurface() failed\n"); + goto failure; + } + + /* Create shadow surface */ + pandev->hsurfShadow = (HSURF)EngCreateBitmap(pandev->szlDesktop, pandev->szlDesktop.cx, pandev->iBitmapFormat, BMF_TOPDOWN, NULL); + if (!pandev->hsurfShadow) + { + DPRINT1("EngCreateBitmap() failed\n"); + goto failure; + } + + pandev->psoShadow = EngLockSurface(pandev->hsurfShadow); + if (!pandev->psoShadow) + { + DPRINT1("EngLockSurface() failed\n"); + goto failure; + } + + return pandev->hsurf; + +failure: + PanDisableSurface(dhpdev); + return NULL; +} + +BOOL +APIENTRY +PanBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PRECTL prclTrg, + _In_opt_ PPOINTL pptlSrc, + _In_opt_ PPOINTL pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _In_opt_ PPOINTL pptlBrush, + _In_ ROP4 rop4) +{ + PPANDEV pandev; + BOOL res; + + if (psoTrg->iType == STYPE_DEVICE) + { + pandev = (PPANDEV)psoTrg->dhpdev; + psoTrg = pandev->psoShadow; + } + if (psoSrc && psoSrc->iType == STYPE_DEVICE) + { + pandev = (PPANDEV)psoSrc->dhpdev; + psoSrc = pandev->psoShadow; + } + + res = EngBitBlt(psoTrg, psoSrc, psoMask, pco, pxlo, prclTrg, pptlSrc, pptlMask, pbo, pptlBrush, rop4); + + /* FIXME: PanSynchronize must be called periodically, as we have the GCAPS2_SYNCTIMER flag. + * That's not the case, so call PanSynchronize() manually */ + if (res) + PanSynchronize(gPan, NULL); + + return res; +} + +BOOL +APIENTRY +PanCopyBits( + _Inout_ SURFOBJ *psoDest, + _In_opt_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PRECTL prclDest, + _In_opt_ PPOINTL pptlSrc) +{ + /* Easy. Just call the more general function PanBitBlt */ + return PanBitBlt(psoDest, psoSrc, NULL, pco, pxlo, prclDest, pptlSrc, NULL, NULL, NULL, ROP4_SRCCOPY); +} + +BOOL +APIENTRY +PanStrokePath( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pbo, + _In_ PPOINTL pptlBrushOrg, + _In_ PLINEATTRS plineattrs, + _In_ MIX mix) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return FALSE; +} + +BOOL +APIENTRY +PanTextOut( + _Inout_ SURFOBJ *pso, + _In_ STROBJ *pstro, + _In_ FONTOBJ *pfo, + _In_ CLIPOBJ *pco, + _In_opt_ PRECTL prclExtra, + _In_opt_ PRECTL prclOpaque, + _In_ BRUSHOBJ *pboFore, + _In_ BRUSHOBJ *pboOpaque, + _In_ PPOINTL pptlOrg, + _In_ MIX mix) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return FALSE; +} + +VOID +APIENTRY +PanMovePointer( + _Inout_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_ PRECTL prcl) +{ + PPANDEV pandev = (PPANDEV)pso->dhpdev; + PFN_DrvMovePointer pfnMovePointer; + BOOL bChanged = FALSE; + + DPRINT("PanMovePointer(%d, %d)\n", x, y); + + /* FIXME: MouseSafetyOnDrawStart/MouseSafetyOnDrawEnd like to call us to hide/show the cursor, + * without real reason (see 5b0f6dcceeae3cf21f2535e2c523c0bf2749ea6b). Ignore those calls */ + if (x < 0 || y >= 0) return; + + /* We don't set DrvSetPointerShape, so we must not be called + * with x < 0 (hide cursor) or y >= 0 (we have GCAPS_PANNING) */ + ASSERT(x >= 0 && y < 0); + + /* Call underlying MovePointer function */ + if (pandev->flUnderlyingGraphicsCaps & GCAPS_PANNING) + { + pfnMovePointer = GETPFN(MovePointer); + if (pfnMovePointer) + pfnMovePointer(pandev->surfObjScreen, x, y, prcl); + } + + y += pso->sizlBitmap.cy; + + if (x < pandev->rclViewport.left) + { + pandev->rclViewport.left = x; + pandev->rclViewport.right = x + pandev->szlScreen.cx; + bChanged = TRUE; + } + else if (x >= pandev->rclViewport.right) + { + pandev->rclViewport.right = x + 1; + pandev->rclViewport.left = x - pandev->szlScreen.cx; + bChanged = TRUE; + } + if (y < pandev->rclViewport.top) + { + pandev->rclViewport.top = y; + pandev->rclViewport.bottom = y + pandev->szlScreen.cy; + bChanged = TRUE; + } + else if (y >= pandev->rclViewport.bottom) + { + pandev->rclViewport.bottom = y + 1; + pandev->rclViewport.top = y - pandev->szlScreen.cy; + bChanged = TRUE; + } + + if (bChanged) + PanSynchronize(pso->dhpdev, NULL); +} + +BOOL +APIENTRY +PanAlphaBlend( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PRECTL prclDest, + _In_ PRECTL prclSrc, + _In_ BLENDOBJ *pBlendObj) +{ + PPANDEV pandev = (PPANDEV)psoDest->dhpdev; + BOOL res; + + res = EngAlphaBlend(pandev->psoShadow, psoSrc, pco, pxlo, prclDest, prclSrc, pBlendObj); + + /* FIXME: PanSynchronize must be called periodically, as we have the GCAPS2_SYNCTIMER flag. + * That's not the case, so call PanSynchronize() manually */ + if (res) + PanSynchronize(gPan, NULL); + + return res; +} + +BOOL +APIENTRY +PanGradientFill( + _Inout_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PTRIVERTEX pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ PRECTL prclExtents, + _In_ PPOINTL pptlDitherOrg, + _In_ ULONG ulMode) +{ + PPANDEV pandev = (PPANDEV)pso->dhpdev; + BOOL res; + + res = EngGradientFill(pandev->psoShadow, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, pptlDitherOrg, ulMode); + + /* FIXME: PanSynchronize must be called periodically, as we have the GCAPS2_SYNCTIMER flag. + * That's not the case, so call PanSynchronize() manually */ + if (res) + PanSynchronize(gPan, NULL); + + return res; +} + +DRVFN gPanDispDrvFn[] = +{ + /* required */ + { INDEX_DrvEnablePDEV, (PFN) PanEnablePDEV }, + { INDEX_DrvCompletePDEV, (PFN) PanCompletePDEV }, + { INDEX_DrvDisablePDEV, (PFN) PanDisablePDEV }, + { INDEX_DrvEnableSurface, (PFN) PanEnableSurface }, + { INDEX_DrvDisableSurface, (PFN) PanDisableSurface }, + + /* required for device-managed surfaces */ + { INDEX_DrvCopyBits, (PFN) PanCopyBits }, + { INDEX_DrvStrokePath, (PFN) PanStrokePath }, + { INDEX_DrvTextOut, (PFN) PanTextOut }, + + /* optional, but required for panning functionality */ + { INDEX_DrvSynchronize, (PFN) PanSynchronize }, + { INDEX_DrvMovePointer, (PFN) PanMovePointer }, + + /* optional */ + { INDEX_DrvBitBlt, (PFN) PanBitBlt }, + { INDEX_DrvAlphaBlend, (PFN) PanAlphaBlend }, + { INDEX_DrvGradientFill, (PFN) PanGradientFill }, +}; + +ULONG gPanDispDrvCount = RTL_NUMBER_OF(gPanDispDrvFn); diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index c16fd43bf4b..293dae4b967 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -21,6 +21,9 @@ MultiEnableDriver( _In_ ULONG cj, _Inout_bytecount_(cj) PDRVENABLEDATA pded); +extern DRVFN gPanDispDrvFn[]; +extern ULONG gPanDispDrvCount; + CODE_SEG("INIT") NTSTATUS NTAPI @@ -503,7 +506,24 @@ PDEVOBJ_Create( ppdev->dwAccelerationLevel = dwAccelerationLevel; /* Copy the function table */ - ppdev->pfn = ppdev->pldev->pfn; + if (pdm->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) + { + ULONG i; + + /* Initialize missing fields */ + if (!(pdm->dmFields & DM_PANNINGWIDTH)) + pdm->dmPanningWidth = pdm->dmPelsWidth; + if (!(pdm->dmFields & DM_PANNINGHEIGHT)) + pdm->dmPanningHeight = pdm->dmPelsHeight; + + /* Replace vtable by panning vtable */ + for (i = 0; i < gPanDispDrvCount; i++) + ppdev->apfn[gPanDispDrvFn[i].iFunc] = gPanDispDrvFn[i].pfn; + } + else + { + ppdev->pfn = ppdev->pldev->pfn; + } /* Call the driver to enable the PDEV */ if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL))

1 0

[reactos] 04/06: [WIN32SS] mouse: call panning driver when moving pointer
by Hervé Poussineau 14 May '22

14 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d2c8ce3366a8d1fafae… commit 83d2c8ce3366a8d1fafae52ee804a70c66e8a6b9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 14 15:41:44 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] mouse: call panning driver when moving pointer Yes, if a driver supports both hardware pointers and panning, it will be called twice on each move. --- win32ss/gdi/eng/mouse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/gdi/eng/mouse.c b/win32ss/gdi/eng/mouse.c index 21f67f7fdcc..c8de250aa1f 100644 --- a/win32ss/gdi/eng/mouse.c +++ b/win32ss/gdi/eng/mouse.c @@ -820,6 +820,11 @@ GreMovePointer( pdc->ppdev->pfnMovePointer(pso, x, y, prcl); else if (pdc->ppdev->flFlags & PDEV_SOFTWARE_POINTER) EngMovePointer(pso, x, y, prcl); + + /* If panning device, and we're not hiding the cursor, notify cursor's current position. + * (driver may already have been called if it also supports hardware pointers) */ + if (pdc->ppdev->devinfo.flGraphicsCaps & GCAPS_PANNING && y >= 0) + pdc->ppdev->pfnMovePointer(pso, x, y - pso->sizlBitmap.cy, NULL); } /* Release PDEV lock */

1 0

[reactos] 03/06: [WIN32SS] mouse: use pointer flags in PDEVOBJ
by Hervé Poussineau 14 May '22

14 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57c07ba117dca721676df… commit 57c07ba117dca721676dfa3876b26e3fd63c4106 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 14 15:37:29 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] mouse: use pointer flags in PDEVOBJ When changing pointer cursor: - use PDEV_HARDWARE_POINTER flag if using hardware pointer - use PDEV_SOFTWARE_POINTER flag if using software pointer - keep pfnMovePointer as an accelerator to driver function (if available) and never change it - fix bug (2 pointers) when switching between hardware and software pointer When moving pointer: - check PDEV_HARDWARE_POINTER flag to know if we need to call the driver - check PDEV_SOFTWARE_POINTER flag to know if we need to call EngMovePointer --- win32ss/gdi/eng/mouse.c | 50 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/eng/mouse.c b/win32ss/gdi/eng/mouse.c index 677a0e68eee..21f67f7fdcc 100644 --- a/win32ss/gdi/eng/mouse.c +++ b/win32ss/gdi/eng/mouse.c @@ -618,6 +618,8 @@ IntEngSetPointerShape( ULONG ulResult = SPS_DECLINE; PFN_DrvSetPointerShape pfnSetPointerShape; PPDEVOBJ ppdev = GDIDEV(pso); + BOOL bHardwarePointer = FALSE; + BOOL bSoftwarePointer = TRUE; pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; @@ -638,15 +640,15 @@ IntEngSetPointerShape( y, prcl, fl); - } - /* Check if the driver accepted it */ - if (ulResult == SPS_ACCEPT_NOEXCLUDE) - { - /* Set MovePointer to the driver function */ - ppdev->pfnMovePointer = GDIDEVFUNCS(pso).MovePointer; + /* Check if the driver accepted it */ + if (ulResult == SPS_ACCEPT_NOEXCLUDE) + bHardwarePointer = TRUE; + + bSoftwarePointer = !bHardwarePointer; } - else + + if (bSoftwarePointer) { /* Set software pointer */ ulResult = EngSetPointerShape(pso, @@ -659,10 +661,31 @@ IntEngSetPointerShape( y, prcl, fl); - /* Set MovePointer to the eng function */ - ppdev->pfnMovePointer = EngMovePointer; } + if (!bSoftwarePointer && ppdev->flFlags & PDEV_SOFTWARE_POINTER) + { + /* Disable software pointer */ + EngMovePointer(pso, -1, -1, NULL); + } + + if (!bHardwarePointer && ppdev->flFlags & PDEV_HARDWARE_POINTER) + { + /* Disable hardware pointer */ + ppdev->pfnMovePointer(pso, -1, -1, NULL); + } + + /* Update flags */ + if (bSoftwarePointer) + ppdev->flFlags |= PDEV_SOFTWARE_POINTER; + else + ppdev->flFlags &= ~PDEV_SOFTWARE_POINTER; + + if (bHardwarePointer) + ppdev->flFlags |= PDEV_HARDWARE_POINTER; + else + ppdev->flFlags &= ~PDEV_HARDWARE_POINTER; + return ulResult; } @@ -787,11 +810,16 @@ GreMovePointer( /* Check if we need to move it */ if(pdc->ppdev->SafetyRemoveLevel == 0) { + SURFOBJ* pso = &pdc->ppdev->pSurface->SurfObj; + /* Store the cursor exclude position in the PDEV */ prcl = &pdc->ppdev->Pointer.Exclude; - /* Call Eng/Drv function */ - pdc->ppdev->pfnMovePointer(&pdc->ppdev->pSurface->SurfObj, x, y, prcl); + /* Send new position of the hot spot of the pointer (will likely redraw cursor) */ + if (pdc->ppdev->flFlags & PDEV_HARDWARE_POINTER) + pdc->ppdev->pfnMovePointer(pso, x, y, prcl); + else if (pdc->ppdev->flFlags & PDEV_SOFTWARE_POINTER) + EngMovePointer(pso, x, y, prcl); } /* Release PDEV lock */

1 0

[reactos] 02/06: [WIN32SS] Handle panning in LDEVOBJ_bProbeAndCaptureDevmode
by Hervé Poussineau 14 May '22

14 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37c2bb3985c5724e9c3d0… commit 37c2bb3985c5724e9c3d00472f6f3419d65266d1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 21:56:00 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Handle panning in LDEVOBJ_bProbeAndCaptureDevmode - search a graphic mode corresponding to real screen resolution (not virtual panning one) - when capturing the selected mode, copy from input the virtual panning resolution - when searching the best mode, also try without panning --- win32ss/gdi/eng/ldevobj.c | 53 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index cb6a8bbbe32..43c0e0fdf94 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -688,6 +688,14 @@ LDEVOBJ_bGetClosestMode( if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) return TRUE; + /* Remove panning (if specified) */ + if (RequestedMode->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) + { + RequestedMode->dmFields &= ~(DM_PANNINGWIDTH | DM_PANNINGHEIGHT); + if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) + return TRUE; + } + /* Fall back to first mode */ WARN("Fall back to first available mode\n"); *pSelectedMode = pGraphicsDevice->pDevModeList[0].pdm; @@ -718,21 +726,36 @@ LDEVOBJ_bProbeAndCaptureDevmode( else { /* Search if requested mode exists */ + DWORD dmPelsWidth = RequestedMode->dmPelsWidth; + DWORD dmPelsHeight = RequestedMode->dmPelsHeight; + DWORD dmFields = RequestedMode->dmFields; + + if (dmFields & DM_PANNINGWIDTH) + { + dmFields |= DM_PELSWIDTH; + dmPelsWidth = RequestedMode->dmPanningWidth; + } + if (dmFields & DM_PANNINGHEIGHT) + { + dmFields |= DM_PELSHEIGHT; + dmPelsHeight = RequestedMode->dmPanningHeight; + } + for (i = 0; i < pGraphicsDevice->cDevModes; i++) { pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; /* Compare asked DEVMODE fields * Only compare those that are valid in both DEVMODE structs */ - dwFields = pdmCurrent->dmFields & RequestedMode->dmFields; + dwFields = pdmCurrent->dmFields & dmFields; /* For now, we only need those */ if ((dwFields & DM_BITSPERPEL) && (pdmCurrent->dmBitsPerPel != RequestedMode->dmBitsPerPel)) continue; if ((dwFields & DM_PELSWIDTH) && - (pdmCurrent->dmPelsWidth != RequestedMode->dmPelsWidth)) continue; + (pdmCurrent->dmPelsWidth != dmPelsWidth)) continue; if ((dwFields & DM_PELSHEIGHT) && - (pdmCurrent->dmPelsHeight != RequestedMode->dmPelsHeight)) continue; + (pdmCurrent->dmPelsHeight != dmPelsHeight)) continue; if ((dwFields & DM_DISPLAYFREQUENCY) && (pdmCurrent->dmDisplayFrequency != RequestedMode->dmDisplayFrequency)) continue; @@ -743,10 +766,10 @@ LDEVOBJ_bProbeAndCaptureDevmode( if (!pdmSelected) { WARN("Requested mode not found (%dx%dx%d %d Hz)\n", - RequestedMode->dmFields & DM_PELSWIDTH ? RequestedMode->dmPelsWidth : 0, - RequestedMode->dmFields & DM_PELSHEIGHT ? RequestedMode->dmPelsHeight : 0, - RequestedMode->dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, - RequestedMode->dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); + dmFields & DM_PELSWIDTH ? dmPelsWidth : 0, + dmFields & DM_PELSHEIGHT ? dmPelsHeight : 0, + dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, + dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); return FALSE; } } @@ -762,6 +785,22 @@ LDEVOBJ_bProbeAndCaptureDevmode( (PVOID)((ULONG_PTR)pdmSelected + pdmSelected->dmSize), pdmSelected->dmDriverExtra); + if (!bSearchClosestMode) + { + if (RequestedMode->dmFields & DM_PANNINGWIDTH) + { + pdm->dmFields |= DM_PANNINGWIDTH; + pdm->dmPanningWidth = pdm->dmPelsWidth; + pdm->dmPelsWidth = RequestedMode->dmPelsWidth; + } + if (RequestedMode->dmFields & DM_PANNINGHEIGHT) + { + pdm->dmFields |= DM_PANNINGHEIGHT; + pdm->dmPanningHeight = pdm->dmPelsHeight; + pdm->dmPelsHeight = RequestedMode->dmPelsHeight; + } + } + *pSelectedMode = pdm; return TRUE; }

1 0

[reactos] 01/06: [WIN32SS] Copy function table earlier, and use it in all PDEVOBJ operations
by Hervé Poussineau 14 May '22

14 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=185f2dac855b55d328fd5… commit 185f2dac855b55d328fd547ef4faaa0f3df7a42b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 21:51:10 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Copy function table earlier, and use it in all PDEVOBJ operations --- win32ss/gdi/eng/pdevobj.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 65469cfce76..c16fd43bf4b 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -176,7 +176,7 @@ PDEVOBJ_bEnablePDEV( ULONG i; /* Get the DrvEnablePDEV function */ - pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV; + pfnEnablePDEV = ppdev->pfn.EnablePDEV; /* Call the drivers DrvEnablePDEV function */ TRACE("DrvEnablePDEV(pdevmode %p (%dx%dx%d %d Hz) hdev %p (%S))\n", @@ -243,7 +243,7 @@ PDEVOBJ_vCompletePDEV( { /* Call the drivers DrvCompletePDEV function */ TRACE("DrvCompletePDEV(dhpdev %p hdev %p)\n", ppdev->dhpdev, ppdev); - ppdev->pldev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); + ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); } static @@ -314,7 +314,7 @@ PDEVOBJ_pSurface( { /* Call the drivers DrvEnableSurface */ TRACE("DrvEnableSurface(dhpdev %p)\n", ppdev->dhpdev); - hsurf = ppdev->pldev->pfn.EnableSurface(ppdev->dhpdev); + hsurf = ppdev->pfn.EnableSurface(ppdev->dhpdev); TRACE("DrvEnableSurface(dhpdev %p) => hsurf %p\n", ppdev->dhpdev, hsurf); if (hsurf== NULL) { @@ -502,6 +502,9 @@ PDEVOBJ_Create( ppdev->pldev = pldev; ppdev->dwAccelerationLevel = dwAccelerationLevel; + /* Copy the function table */ + ppdev->pfn = ppdev->pldev->pfn; + /* Call the driver to enable the PDEV */ if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL)) { @@ -511,9 +514,6 @@ PDEVOBJ_Create( return NULL; } - /* Copy the function table */ - ppdev->pfn = ppdev->pldev->pfn; - /* Tell the driver that the PDEV is ready */ PDEVOBJ_vCompletePDEV(ppdev);

1 0

[reactos] 01/01: [NTOS:MM] Charge and free quotas for VAD allocations
by Tuur Martens 14 May '22

14 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=884356a06e1589271595e… commit 884356a06e1589271595e198e0a32c35d29d6059 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Thu May 12 08:11:52 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 14 15:09:50 2022 +0200 [NTOS:MM] Charge and free quotas for VAD allocations Charge quotas for VAD allocations and free the quotas again when the VADs are freed. CORE-18028 --- ntoskrnl/mm/ARM3/mdlsup.c | 5 +++++ ntoskrnl/mm/ARM3/procsup.c | 27 +++++++++++++++++++++++++-- ntoskrnl/mm/ARM3/section.c | 9 +++++++++ ntoskrnl/mm/ARM3/virtual.c | 26 ++++++++++++++++++++++---- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 9332ec3153e..0d74949cd16 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -158,6 +158,10 @@ MiMapLockedPagesInUserSpace( MiInsertVad((PMMVAD)Vad, &Process->VadRoot); + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + goto Error; + /* Check if this is uncached */ if (CacheAttribute != MiCached) { @@ -319,6 +323,7 @@ MiUnmapLockedPagesInUserSpace( /* Remove it from the process VAD tree */ ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); /* MiRemoveNode should have removed us if we were the hint */ ASSERT(Process->VadRoot.NodeHint != Vad); diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index dd04b68fb83..2ddd91c5ca2 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -97,6 +97,13 @@ MiCreatePebOrTeb(IN PEPROCESS Process, return STATUS_NO_MEMORY; } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + /* Success */ return STATUS_SUCCESS; } @@ -154,6 +161,9 @@ MmDeleteTeb(IN PEPROCESS Process, /* Remove the VAD */ ExFreePool(Vad); + + /* Return the quota the VAD used */ + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } /* Release the address space lock */ @@ -842,7 +852,8 @@ MmCreateTeb(IN PEPROCESS Process, #ifdef _M_AMD64 static NTSTATUS -MiInsertSharedUserPageVad(VOID) +MiInsertSharedUserPageVad( + _In_ PEPROCESS Process) { PMMVAD_LONG Vad; ULONG_PTR BaseAddress; @@ -890,6 +901,15 @@ MiInsertSharedUserPageVad(VOID) return Status; } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of quota.\n"); + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + + /* Success */ return STATUS_SUCCESS; } @@ -1012,7 +1032,7 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, #ifdef _M_AMD64 /* On x64 we need a VAD for the shared user page */ - Status = MiInsertSharedUserPageVad(); + Status = MiInsertSharedUserPageVad(Process); if (!NT_SUCCESS(Status)) { DPRINT1("MiCreateSharedUserPageVad() failed: 0x%lx\n", Status); @@ -1300,6 +1320,9 @@ MmCleanProcessAddressSpace(IN PEPROCESS Process) /* Free the VAD memory */ ExFreePool(Vad); + + /* Return the quota the VAD used */ + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } /* Lock the working set */ diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 4a65209d38b..40d942f7703 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -915,6 +915,7 @@ MiUnmapViewOfSection(IN PEPROCESS Process, /* Remove the VAD */ ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); /* Remove the PTEs for this view, which also releases the working set lock */ MiRemoveMappedView(Process, Vad); @@ -1489,6 +1490,13 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, StartAddress = 0; } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + /* Insert the VAD */ Status = MiInsertVadEx((PMMVAD)Vad, &StartAddress, @@ -1498,6 +1506,7 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, AllocationType); if (!NT_SUCCESS(Status)) { + PsReturnProcessNonPagedPoolQuota(PsGetCurrentProcess(), sizeof(MMVAD_LONG)); return Status; } diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index f178edbb909..c5c5a5283b0 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -4790,6 +4790,15 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, goto FailPathNoLock; } + // Charge quotas for the VAD + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Quota exceeded.\n"); + ExFreePoolWithTag(Vad, 'SdaV'); + goto FailPathNoLock; + } + // // Detach and dereference the target process if // it was different from the current process @@ -5416,6 +5425,7 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } else { @@ -5448,6 +5458,7 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } else { @@ -5522,6 +5533,17 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, goto FailPath; } + // Charge quota for the new VAD + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of process quota whilst creating new VAD!\n"); + ExFreePoolWithTag(NewVad, 'SdaV'); + Status = STATUS_QUOTA_EXCEEDED; + goto FailPath; + } + // // This new VAD describes the second chunk, so we keep the end // address of the original and adjust the start to point past @@ -5534,10 +5556,6 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, NewVad->u.VadFlags.CommitCharge = 0; ASSERT(NewVad->EndingVpn >= NewVad->StartingVpn); - // - // TODO: charge quota for the new VAD - // - // // Get the commit charge for the released region //

1 0

[reactos] 01/01: [BUSLOGIC] Fix reference link to VMware driver source page
by Stanislav Motylkov 13 May '22

13 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ee633f7d7e34b513b7f4… commit 5ee633f7d7e34b513b7f4ee27e07c8e9a2ee0fca Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri May 13 17:24:02 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri May 13 17:24:02 2022 +0300 [BUSLOGIC] Fix reference link to VMware driver source page - Clarify driver version in 3rd Party Files. - Fix some minor formatting problems. - Also add missing OBJ_KERNEL_HANDLE to match Zw*() uses. (#4499) CORE-10207 CORE-18180 Co-authored-by: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> --- drivers/storage/port/buslogic/BT958.mof | 26 +++++++++++++------------- drivers/storage/port/buslogic/BusLogic958.rc | 6 +++--- drivers/storage/port/buslogic/Log.c | 4 ++-- drivers/storage/port/buslogic/README.ReactOS | 4 +++- media/doc/3rd Party Files.txt | 4 ++-- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/drivers/storage/port/buslogic/BT958.mof b/drivers/storage/port/buslogic/BT958.mof index 3566f0e23dc..878e09e9bcb 100644 --- a/drivers/storage/port/buslogic/BT958.mof +++ b/drivers/storage/port/buslogic/BT958.mof @@ -12,19 +12,19 @@ class BT958ExtendedSetupInfoGuid [read,key] String InstanceName; [read] boolean Active; - [read, WmiDataId(1), WmiVersion(1)] uint8 BusType; - [read, WmiDataId(2), WmiVersion(1)] uint8 BIOS_Address; - [read, WmiDataId(3), WmiVersion(1)] uint16 ScatterGatherLimit; - [read, WmiDataId(4), WmiVersion(1)] uint8 MailboxCount; - [read, WmiDataId(5), WmiVersion(1)] uint32 BaseMailboxAddress; - [read, WmiDataId(6), WmiVersion(1)] boolean FastOnEISA; - [read, WmiDataId(7), WmiVersion(1)] boolean LevelSensitiveInterrupt; - [read, WmiDataId(8), WmiVersion(1), max(3)] uint8 FirmwareRevision[]; - [read, WmiDataId(9), WmiVersion(1)] boolean HostWideSCSI; - [read, WmiDataId(10), WmiVersion(1)] boolean HostDifferentialSCSI; - [read, WmiDataId(11), WmiVersion(1)] boolean HostSupportsSCAM; - [read, WmiDataId(12), WmiVersion(1)] boolean HostUltraSCSI; - [read, WmiDataId(13), WmiVersion(1)] boolean HostSmartTermination; + [read, WmiDataId(1), WmiVersion(1)] uint8 BusType; + [read, WmiDataId(2), WmiVersion(1)] uint8 BIOS_Address; + [read, WmiDataId(3), WmiVersion(1)] uint16 ScatterGatherLimit; + [read, WmiDataId(4), WmiVersion(1)] uint8 MailboxCount; + [read, WmiDataId(5), WmiVersion(1)] uint32 BaseMailboxAddress; + [read, WmiDataId(6), WmiVersion(1)] boolean FastOnEISA; + [read, WmiDataId(7), WmiVersion(1)] boolean LevelSensitiveInterrupt; + [read, WmiDataId(8), WmiVersion(1), max(3)] uint8 FirmwareRevision[]; + [read, WmiDataId(9), WmiVersion(1)] boolean HostWideSCSI; + [read, WmiDataId(10), WmiVersion(1)] boolean HostDifferentialSCSI; + [read, WmiDataId(11), WmiVersion(1)] boolean HostSupportsSCAM; + [read, WmiDataId(12), WmiVersion(1)] boolean HostUltraSCSI; + [read, WmiDataId(13), WmiVersion(1)] boolean HostSmartTermination; }; diff --git a/drivers/storage/port/buslogic/BusLogic958.rc b/drivers/storage/port/buslogic/BusLogic958.rc index 777aace2945..02a1fdddc67 100644 --- a/drivers/storage/port/buslogic/BusLogic958.rc +++ b/drivers/storage/port/buslogic/BusLogic958.rc @@ -81,18 +81,18 @@ MOFRESOURCE MOFDATA "BT958.bmf" // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/drivers/storage/port/buslogic/Log.c b/drivers/storage/port/buslogic/Log.c index 47f138f948c..944ee5574e4 100644 --- a/drivers/storage/port/buslogic/Log.c +++ b/drivers/storage/port/buslogic/Log.c @@ -25,7 +25,7 @@ BOOLEAN LogMessage(PCHAR szFormat, ...) fileName.Length = 0; fileName.MaximumLength = sizeof(DEFAULT_LOG_FILE_NAME) + sizeof(UNICODE_NULL); fileName.Buffer = ExAllocatePool(PagedPool, - fileName.MaximumLength); + fileName.MaximumLength); if (!fileName.Buffer) { return FALSE; @@ -37,7 +37,7 @@ BOOLEAN LogMessage(PCHAR szFormat, ...) InitializeObjectAttributes (&objectAttributes, (PUNICODE_STRING)&fileName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL ); diff --git a/drivers/storage/port/buslogic/README.ReactOS b/drivers/storage/port/buslogic/README.ReactOS index 1af58010501..952cc69174e 100644 --- a/drivers/storage/port/buslogic/README.ReactOS +++ b/drivers/storage/port/buslogic/README.ReactOS @@ -1,5 +1,7 @@ This code was published by VMware on their website at -http://www.vmware.com/download/open_sources.html. The intro there says: +https://customerconnect.vmware.com/downloads/details?productId=23&downloadGroup=SERVER-SCSI-OS + +The intro there says: This open source software is licensed under the terms of various open source license agreements included with the materials relating to the open source diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 772f9dcd072..f9c9e611729 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -147,9 +147,9 @@ URL: http://alter.org.ua/soft/win/uni_ata/ Title: Miniport driver for the Buslogic BT 958 SCSI Controller Path: drivers/storage/port/buslogic -Used Version: ??? +Used Version: v1.2.0.2 (2005-08-17) License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) -URL: http://www.vmware.com/download/open_sources.html +URL: https://customerconnect.vmware.com/downloads/details?productId=23&downloadG… Title: AC97 Sample Driver Path: drivers/wdm/audio/drivers/ac97

1 0

[reactos] 01/01: [KBDJA] Fix key names (#4507)
by Katayama Hirofumi MZ 12 May '22

12 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fec06b8e50051dce11ba… commit 6fec06b8e50051dce11ba9857fc782849c13adbc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 12 20:39:56 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 12 20:39:56 2022 +0900 [KBDJA] Fix key names (#4507) They will be used at user32!GetKeyNameText function. CORE-11700 --- dll/keyboard/kbdja/kbdja.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c index 4566a1cf2bf..ac081050918 100644 --- a/dll/keyboard/kbdja/kbdja.c +++ b/dll/keyboard/kbdja/kbdja.c @@ -279,12 +279,13 @@ ROSDATA VSC_LPWSTR key_names[] = { { 0x0f, L"Tab" }, { 0x1c, L"Enter" }, { 0x1d, L"Ctrl" }, + { 0x29, L"\u534A\u89D2/\u5168\u89D2" }, /* Hankaku/Zenkaku */ { 0x2a, L"Shift" }, { 0x36, L"Right Shift" }, { 0x37, L"Num *" }, { 0x38, L"Alt" }, { 0x39, L"Space" }, - { 0x3a, L"CAPLOK Lock" }, + { 0x3a, L"Caps Lock" }, { 0x3b, L"F1" }, { 0x3c, L"F2" }, { 0x3d, L"F3" }, @@ -313,6 +314,9 @@ ROSDATA VSC_LPWSTR key_names[] = { { 0x54, L"Sys Req" }, { 0x57, L"F11" }, { 0x58, L"F12" }, + { 0x70, L"\u3072\u3089\u304C\u306A" }, /* Hiragana */ + { 0x79, L"\u5909\u63DB" }, /* Henkan (Convert) */ + { 0x7b, L"\u7121\u5909\u63DB" }, /* Mu-Henkan (Non-Convert) */ { 0x7c, L"F13" }, { 0x7d, L"F14" }, { 0x7e, L"F15" }, @@ -325,12 +329,14 @@ ROSDATA VSC_LPWSTR key_names[] = { { 0x85, L"F22" }, { 0x86, L"F23" }, { 0x87, L"F24" }, + { 0xf1, L"ImeOff" }, + { 0xf2, L"ImeOn" }, { 0, NULL }, }; ROSDATA VSC_LPWSTR extended_key_names[] = { { 0x1c, L"Num Enter" }, - { 0x1d, L"Right Ctrl" }, + { 0x1d, L"Right Control" }, { 0x35, L"Num /" }, { 0x37, L"Prnt Scrn" }, { 0x38, L"Right Alt" }, @@ -339,8 +345,8 @@ ROSDATA VSC_LPWSTR extended_key_names[] = { { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, - { 0x4c, L"Center" }, + { 0x4a, L"-" }, + { 0x4b, L"Left" }, { 0x4d, L"Right" }, { 0x4f, L"End" }, { 0x50, L"Down" }, @@ -348,9 +354,9 @@ ROSDATA VSC_LPWSTR extended_key_names[] = { { 0x52, L"Insert" }, { 0x53, L"Delete" }, { 0x54, L"<ReactOS>" }, - { 0x55, L"Help" }, - { 0x56, L"Left Windows" }, - { 0x5b, L"Right Windows" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, { 0, NULL }, };

1 0

[reactos] 01/01: [KDBJA] Delete duplicate key entries (#4508)
by Katayama Hirofumi MZ 12 May '22

12 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c4b8e474fc90dbab4c1f… commit 5c4b8e474fc90dbab4c1f17e7437522b8b5f4b7f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 12 17:55:59 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 12 17:55:59 2022 +0900 [KDBJA] Delete duplicate key entries (#4508) Delete the duplicated key data. CORE-11700 --- dll/keyboard/kbdja/kbdja.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c index c72eccc803f..4566a1cf2bf 100644 --- a/dll/keyboard/kbdja/kbdja.c +++ b/dll/keyboard/kbdja/kbdja.c @@ -212,13 +212,6 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { { VK_OEM_3, 0, { '@','`'} }, { VK_OEM_PLUS, 0, { ';','+'} }, { VK_OEM_1, 0, { ':','*'} }, - - /* Specials */ - /* Ctrl-_ generates US */ - { VK_OEM_PLUS ,0, {';', '+'} }, - { VK_OEM_1 ,0, {';', ':'} }, - { VK_OEM_7 ,0, {'\'','\"'} }, - { VK_OEM_3 ,0, {'`', '~'} }, { VK_OEM_COMMA ,0, {',', '<'} }, { VK_OEM_PERIOD ,0, {'.', '>'} }, { VK_OEM_2 ,0, {'/', '?'} },

1 0

[reactos] 01/01: [KBDJA] Delete temporary hacks (#4506)
by Katayama Hirofumi MZ 12 May '22

12 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2038087d9e705613dc98d… commit 2038087d9e705613dc98d709ef1585679d6619a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 12 14:05:16 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 12 14:05:16 2022 +0900 [KBDJA] Delete temporary hacks (#4506) Improve readability of Japanese keyboard. - SC_13 (0xDE) --> VK_OEM_7 - SC_27 (0xC0) --> VK_OEM_3 - SC_40 (0xBB) --> VK_OEM_PLUS - SC_41 (0xBA) --> VK_OEM_1 CORE-11700 --- dll/keyboard/kbdja/kbdja.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c index 110333a820a..c72eccc803f 100644 --- a/dll/keyboard/kbdja/kbdja.c +++ b/dll/keyboard/kbdja/kbdja.c @@ -29,12 +29,6 @@ #define KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ #define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ -/* temporary */ -#define SC_13 0xde -#define SC_27 0xc0 -#define SC_40 0xbb -#define SC_41 0xba - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -42,19 +36,19 @@ ROSDATA USHORT scancode_to_vk[] = { VK_EMPTY, VK_ESCAPE, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', - VK_OEM_MINUS, SC_13, VK_BACK, + VK_OEM_MINUS, VK_OEM_7, VK_BACK, /* - 0f - */ /* First Letters Row */ VK_TAB, 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', - SC_27, VK_OEM_4, VK_RETURN, + VK_OEM_3, VK_OEM_4, VK_RETURN, /* - 1d - */ /* Second Letters Row */ VK_LCONTROL, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', - 'L', SC_40, SC_41, VK_PROCESSKEY, + 'L', VK_OEM_PLUS, VK_OEM_1, VK_PROCESSKEY, VK_LSHIFT, VK_OEM_6, /* - 2c - */ /* Third letters row */ @@ -214,10 +208,10 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { { '0', 0, {'0', 0 } }, /*Japanese Keys*/ - { SC_13, 0, { '^','~'} }, - { SC_27, 0, { '@','`'} }, - { SC_40, 0, { ';','+'} }, - { SC_41, 0, { ':','*'} }, + { VK_OEM_7, 0, { '^','~'} }, + { VK_OEM_3, 0, { '@','`'} }, + { VK_OEM_PLUS, 0, { ';','+'} }, + { VK_OEM_1, 0, { ':','*'} }, /* Specials */ /* Ctrl-_ generates US */

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