Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 06/18: [WIN32SS] Preparation to load internal drivers (ie entry point in win32k)
by Hervé Poussineau 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75f4be53dfb168981ff25… commit 75f4be53dfb168981ff25a090aac8396d8b4fa23 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 11:02:27 2022 +0100 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Fri Apr 15 23:09:16 2022 +0200 [WIN32SS] Preparation to load internal drivers (ie entry point in win32k) - Change LDEVOBJ_bEnableDriver to directly take the entry point (pGdiDriverInfo not required anymore) - Add LDEVOBJ_pLoadInternal to load and start an internal driver --- win32ss/gdi/eng/ldevobj.c | 53 +++++++++++++++++++++++++++++++++++++++++------ win32ss/gdi/eng/ldevobj.h | 5 +++++ 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index db46a0dfbb6..6321c8ad88d 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -194,18 +194,16 @@ LDEVOBJ_vUnloadImage( static BOOL LDEVOBJ_bEnableDriver( - _Inout_ PLDEVOBJ pldev) + _Inout_ PLDEVOBJ pldev, + _In_ PFN_DrvEnableDriver pfnEnableDriver) { - PFN_DrvEnableDriver pfnEnableDriver; DRVENABLEDATA ded; ULONG i; - /* Make sure we have a driver info */ - ASSERT(pldev && pldev->pGdiDriverInfo != NULL); + ASSERT(pldev); /* Call the drivers DrvEnableDriver function */ RtlZeroMemory(&ded, sizeof(ded)); - pfnEnableDriver = pldev->pGdiDriverInfo->EntryPoint; if (!pfnEnableDriver(GDI_ENGINE_VERSION, sizeof(ded), &ded)) { ERR("DrvEnableDriver failed\n"); @@ -325,6 +323,49 @@ LDEVOBJ_pvFindImageProcAddress( return pvProcAdress; } +PLDEVOBJ +LDEVOBJ_pLoadInternal( + _In_ PFN_DrvEnableDriver pfnEnableDriver, + _In_ ULONG ldevtype) +{ + PLDEVOBJ pldev; + + TRACE("LDEVOBJ_pLoadInternal(%lu)\n", ldevtype); + + /* Lock loader */ + EngAcquireSemaphore(ghsemLDEVList); + + /* Allocate a new LDEVOBJ */ + pldev = LDEVOBJ_AllocLDEV(ldevtype); + if (!pldev) + { + ERR("Could not allocate LDEV\n"); + goto leave; + } + + /* Load the driver */ + if (!LDEVOBJ_bEnableDriver(pldev, pfnEnableDriver)) + { + ERR("LDEVOBJ_bEnableDriver failed\n"); + LDEVOBJ_vFreeLDEV(pldev); + pldev = NULL; + goto leave; + } + + /* Insert the LDEV into the global list */ + InsertHeadList(&gleLdevListHead, &pldev->leLink); + + /* Increase ref count */ + pldev->cRefs++; + +leave: + /* Unlock loader */ + EngReleaseSemaphore(ghsemLDEVList); + + TRACE("LDEVOBJ_pLoadInternal returning %p\n", pldev); + return pldev; +} + PLDEVOBJ NTAPI LDEVOBJ_pLoadDriver( @@ -423,7 +464,7 @@ LDEVOBJ_pLoadDriver( if (ldevtype != LDEV_IMAGE) { /* Load the driver */ - if (!LDEVOBJ_bEnableDriver(pldev)) + if (!LDEVOBJ_bEnableDriver(pldev, pldev->pGdiDriverInfo->EntryPoint)) { ERR("LDEVOBJ_bEnableDriver failed\n"); diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h index f1fc624950d..c603847cecc 100644 --- a/win32ss/gdi/eng/ldevobj.h +++ b/win32ss/gdi/eng/ldevobj.h @@ -46,6 +46,11 @@ LDEVOBJ_ulGetDriverModes( _In_ HANDLE hDriver, _Out_ PDEVMODEW *ppdm); +PLDEVOBJ +LDEVOBJ_pLoadInternal( + _In_ PFN_DrvEnableDriver pfnEnableDriver, + _In_ ULONG ldevtype); + PLDEVOBJ APIENTRY LDEVOBJ_pLoadDriver(

1 0

[reactos] 05/18: [WIN32SS] Remove useless prototype (function never existed)
by Hervé Poussineau 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=333f3382f63cb87f66a81… commit 333f3382f63cb87f66a818733fdf7cfb60c40302 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 10:47:11 2022 +0100 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Fri Apr 15 23:09:16 2022 +0200 [WIN32SS] Remove useless prototype (function never existed) --- win32ss/gdi/eng/ldevobj.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h index 7b2fc2065ee..f1fc624950d 100644 --- a/win32ss/gdi/eng/ldevobj.h +++ b/win32ss/gdi/eng/ldevobj.h @@ -64,11 +64,6 @@ LDEVOBJ_bProbeAndCaptureDevmode( _Out_ PDEVMODEW *pSelectedMode, _In_ BOOL bSearchClosestMode); -PLDEVOBJ -NTAPI -EngGetLDEV( - PDEVMODEW pdm); - CODE_SEG("INIT") NTSTATUS APIENTRY

1 0

[reactos] 04/18: [WIN32SS] Rewrite PDEVOBJ_pdmMatchDevMode to LDEVOBJ_bProbeAndCaptureDevmode
by Hervé Poussineau 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cb1dd8ab20c8b29ed497… commit 3cb1dd8ab20c8b29ed497518b5abb8656ac8354e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 10:44:53 2022 +0100 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Fri Apr 15 23:09:16 2022 +0200 [WIN32SS] Rewrite PDEVOBJ_pdmMatchDevMode to LDEVOBJ_bProbeAndCaptureDevmode - make it return a new allocated PDEVMODEW instead of a pointer into existing PGRAPHICS_DEVICE (usefull when available display modes can dynamically change: VirtualBox, RDP, ...) - update all callers --- win32ss/gdi/eng/device.c | 27 +++++----------- win32ss/gdi/eng/ldevobj.c | 71 +++++++++++++++++++++++++++++++++++++++++++ win32ss/gdi/eng/ldevobj.h | 8 +++++ win32ss/gdi/eng/pdevobj.c | 68 ++++++++++------------------------------- win32ss/gdi/eng/pdevobj.h | 6 ---- win32ss/user/ntuser/display.c | 17 ++++++++--- 6 files changed, 114 insertions(+), 83 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 8ad49ed5fd1..4f2284fa1e6 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -130,25 +130,18 @@ EngpPopulateDeviceModeList( _In_ PDEVMODEW pdmDefault) { PDEVMODEINFO pdminfo; - PDEVMODEW pdm; + PDEVMODEW pdm, pdmSelected; ULONG i; - BOOLEAN bModeMatch = FALSE; ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); ASSERT(pGraphicsDevice->pDevModeList == NULL); - if (!LDEVOBJ_bBuildDevmodeList(pGraphicsDevice)) + if (!LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, pdmDefault, &pdmSelected, TRUE)) { - ERR("LDEVOBJ_bBuildDevmodeList() failed\n"); + ERR("LDEVOBJ_bProbeAndCaptureDevmode() failed\n"); return FALSE; } - TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n", - pdmDefault->dmPelsWidth, - pdmDefault->dmPelsHeight, - pdmDefault->dmBitsPerPel, - pdmDefault->dmDisplayFrequency); - /* Loop through all DEVMODEINFOs */ for (pdminfo = pGraphicsDevice->pdevmodeInfo, i = 0; pdminfo; @@ -159,20 +152,14 @@ EngpPopulateDeviceModeList( { pdm = pGraphicsDevice->pDevModeList[i].pdm; - /* Compare with the default entry */ - if (!bModeMatch && - pdm->dmBitsPerPel == pdmDefault->dmBitsPerPel && - pdm->dmPelsWidth == pdmDefault->dmPelsWidth && - pdm->dmPelsHeight == pdmDefault->dmPelsHeight) + /* Compare with the selected entry */ + if (pdm->dmSize == pdmSelected->dmSize && + RtlCompareMemory(pdm, pdmSelected, pdm->dmSize) == pdm->dmSize) { pGraphicsDevice->iDefaultMode = i; pGraphicsDevice->iCurrentMode = i; TRACE("Found default entry: %lu '%ls'\n", i, pdm->dmDeviceName); - if (pdm->dmDisplayFrequency == pdmDefault->dmDisplayFrequency) - { - /* Uh oh, even the display frequency matches. */ - bModeMatch = TRUE; - } + break; } } } diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index e2079da8178..db46a0dfbb6 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -558,6 +558,77 @@ LDEVOBJ_bBuildDevmodeList( return TRUE; } +BOOL +LDEVOBJ_bProbeAndCaptureDevmode( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW RequestedMode, + _Out_ PDEVMODEW *pSelectedMode, + _In_ BOOL bSearchClosestMode) +{ + PDEVMODEW pdmCurrent, pdm, pdmSelected = NULL; + ULONG i; + DWORD dwFields; + + if (!LDEVOBJ_bBuildDevmodeList(pGraphicsDevice)) + return FALSE; + + /* Search if requested mode exists */ + 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; + + /* For now, we only need those */ + if ((dwFields & DM_BITSPERPEL) && + (pdmCurrent->dmBitsPerPel != RequestedMode->dmBitsPerPel)) continue; + if ((dwFields & DM_PELSWIDTH) && + (pdmCurrent->dmPelsWidth != RequestedMode->dmPelsWidth)) continue; + if ((dwFields & DM_PELSHEIGHT) && + (pdmCurrent->dmPelsHeight != RequestedMode->dmPelsHeight)) continue; + if ((dwFields & DM_DISPLAYFREQUENCY) && + (pdmCurrent->dmDisplayFrequency != RequestedMode->dmDisplayFrequency)) continue; + + pdmSelected = pdmCurrent; + break; + } + + 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); + if (!bSearchClosestMode || pGraphicsDevice->cDevModes == 0) + return FALSE; + + /* FIXME: need to search the closest mode instead of taking the first one */ + pdmSelected = pGraphicsDevice->pDevModeList[0].pdm; + WARN("Replacing it by %dx%dx%d %d Hz\n", + pdmSelected->dmFields & DM_PELSWIDTH ? pdmSelected->dmPelsWidth : 0, + pdmSelected->dmFields & DM_PELSHEIGHT ? pdmSelected->dmPelsHeight : 0, + pdmSelected->dmFields & DM_BITSPERPEL ? pdmSelected->dmBitsPerPel : 0, + pdmSelected->dmFields & DM_DISPLAYFREQUENCY ? pdmSelected->dmDisplayFrequency : 0); + } + + /* Allocate memory for output */ + pdm = ExAllocatePoolZero(PagedPool, pdmSelected->dmSize + pdmSelected->dmDriverExtra, GDITAG_DEVMODE); + if (!pdm) + return FALSE; + + /* Copy selected mode */ + RtlCopyMemory(pdm, pdmSelected, pdmSelected->dmSize); + RtlCopyMemory((PVOID)((ULONG_PTR)pdm + pdm->dmSize), + (PVOID)((ULONG_PTR)pdmSelected + pdmSelected->dmSize), + pdmSelected->dmDriverExtra); + + *pSelectedMode = pdm; + return TRUE; +} + /** Exported functions ********************************************************/ HANDLE diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h index cac2ec8f5e0..7b2fc2065ee 100644 --- a/win32ss/gdi/eng/ldevobj.h +++ b/win32ss/gdi/eng/ldevobj.h @@ -56,6 +56,14 @@ BOOL LDEVOBJ_bBuildDevmodeList( _Inout_ PGRAPHICS_DEVICE pGraphicsDevice); +/* This function selects the best available mode corresponding to requested mode */ +BOOL +LDEVOBJ_bProbeAndCaptureDevmode( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW RequestedMode, + _Out_ PDEVMODEW *pSelectedMode, + _In_ BOOL bSearchClosestMode); + PLDEVOBJ NTAPI EngGetLDEV( diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index e764dea384c..77b9a9fafc3 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -83,6 +83,8 @@ PDEVOBJ_vDeletePDEV( PPDEVOBJ ppdev) { EngDeleteSemaphore(ppdev->hsemDevLock); + if (ppdev->pdmwDev) + ExFreePoolWithTag(ppdev->pdmwDev, GDITAG_DEVMODE); if (ppdev->pEDDgpl) ExFreePoolWithTag(ppdev->pEDDgpl, GDITAG_PDEV); ExFreePoolWithTag(ppdev, GDITAG_PDEV); @@ -266,18 +268,13 @@ PDEVOBJ_vRefreshModeList( { PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEINFO pdminfo, pdmiNext; - DEVMODEW dmDefault; - DEVMODEW dmCurrent; + PDEVMODEW newDevMode; /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); pGraphicsDevice = ppdev->pGraphicsDevice; - /* Remember our default mode */ - dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; - dmCurrent = *ppdev->pdmwDev; - /* Clear out the modes */ for (pdminfo = pGraphicsDevice->pdevmodeInfo; pdminfo; @@ -290,57 +287,17 @@ PDEVOBJ_vRefreshModeList( ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); pGraphicsDevice->pDevModeList = NULL; - /* Now re-populate the list */ - if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault)) + /* Search an available display mode */ + if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, ppdev->pdmwDev, &newDevMode, TRUE)) { - DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); + ExFreePoolWithTag(ppdev->pdmwDev, GDITAG_DEVMODE); + ppdev->pdmwDev = newDevMode; } - ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, &dmCurrent); - /* Unlock PDEV */ EngReleaseSemaphore(ppdev->hsemDevLock); } -PDEVMODEW -NTAPI -PDEVOBJ_pdmMatchDevMode( - PPDEVOBJ ppdev, - PDEVMODEW pdm) -{ - PGRAPHICS_DEVICE pGraphicsDevice; - PDEVMODEW pdmCurrent; - ULONG i; - DWORD dwFields; - - pGraphicsDevice = ppdev->pGraphicsDevice; - - 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 & pdm->dmFields; - - /* For now, we only need those */ - if ((dwFields & DM_BITSPERPEL) && - (pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel)) continue; - if ((dwFields & DM_PELSWIDTH) && - (pdmCurrent->dmPelsWidth != pdm->dmPelsWidth)) continue; - if ((dwFields & DM_PELSHEIGHT) && - (pdmCurrent->dmPelsHeight != pdm->dmPelsHeight)) continue; - if ((dwFields & DM_DISPLAYFREQUENCY) && - (pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency)) continue; - - /* Match! Return the DEVMODE */ - return pdmCurrent; - } - - /* Nothing found */ - return NULL; -} - static PPDEVOBJ EngpCreatePDEV( @@ -349,6 +306,7 @@ EngpCreatePDEV( { PGRAPHICS_DEVICE pGraphicsDevice; PPDEVOBJ ppdev; + PDEVMODEW newDevMode; DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm); @@ -410,7 +368,13 @@ EngpCreatePDEV( ppdev->hSpooler = ppdev->pGraphicsDevice->DeviceObject; // Should we change the ative mode of pGraphicsDevice ? - ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm); + if (!LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, pdm, &newDevMode, TRUE)) + { + DPRINT1("LDEVOBJ_bProbeAndCaptureDevmode() failed\n"); + PDEVOBJ_vRelease(ppdev); + return NULL; + } + ppdev->pdmwDev = newDevMode; /* FIXME! */ ppdev->flFlags = PDEV_DISPLAY; @@ -525,7 +489,7 @@ PDEVOBJ_bSwitchMode( DPRINT1("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); // Lookup the GraphicsDevice + select DEVMODE - // pdm = PDEVOBJ_pdmMatchDevMode(ppdev, pdm); + // pdm = LDEVOBJ_bProbeAndCaptureDevmode(ppdev, pdm); /* 1. Temporarily disable the current PDEV and reset video to its default mode */ if (!ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE)) diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index 4d22c270aa7..af4973b60f6 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -213,10 +213,4 @@ PDEVOBJ_bSwitchMode( PPDEVOBJ ppdev, PDEVMODEW pdm); -PDEVMODEW -NTAPI -PDEVOBJ_pdmMatchDevMode( - PPDEVOBJ ppdev, - PDEVMODEW pdm); - #endif /* !__WIN32K_PDEVOBJ_H */ diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index df00c0e3974..81ed1bdb402 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -657,6 +657,7 @@ UserChangeDisplaySettings( PPDEVOBJ ppdev; WORD OrigBC; //PDESKTOP pdesk; + PDEVMODEW newDevMode = NULL; /* If no DEVMODE is given, use registry settings */ if (!pdm) @@ -707,8 +708,7 @@ UserChangeDisplaySettings( dm.dmDisplayFrequency = ppdev->pdmwDev->dmDisplayFrequency; /* Look for the requested DEVMODE */ - pdm = PDEVOBJ_pdmMatchDevMode(ppdev, &dm); - if (!pdm) + if (!LDEVOBJ_bProbeAndCaptureDevmode(ppdev->pGraphicsDevice, &dm, &newDevMode, FALSE)) { ERR("Could not find a matching DEVMODE\n"); lResult = DISP_CHANGE_BADMODE; @@ -729,7 +729,7 @@ UserChangeDisplaySettings( if (NT_SUCCESS(Status)) { /* Store the settings */ - RegWriteDisplaySettings(hkey, pdm); + RegWriteDisplaySettings(hkey, newDevMode); /* Close the registry key */ ZwClose(hkey); @@ -742,7 +742,9 @@ UserChangeDisplaySettings( } /* Check if DEVMODE matches the current mode */ - if (pdm == ppdev->pdmwDev && !(flags & CDS_RESET)) + if (newDevMode->dmSize == ppdev->pdmwDev->dmSize && + RtlCompareMemory(newDevMode, ppdev->pdmwDev, newDevMode->dmSize) == newDevMode->dmSize && + !(flags & CDS_RESET)) { ERR("DEVMODE matches, nothing to do\n"); goto leave; @@ -759,7 +761,7 @@ UserChangeDisplaySettings( pvOldCursor = UserSetCursor(NULL, TRUE); /* Do the mode switch */ - ulResult = PDEVOBJ_bSwitchMode(ppdev, pdm); + ulResult = PDEVOBJ_bSwitchMode(ppdev, newDevMode); /* Restore mouse pointer, no hooks called */ pvOldCursor = UserSetCursor(pvOldCursor, TRUE); @@ -781,6 +783,8 @@ UserChangeDisplaySettings( { /* Setting mode succeeded */ lResult = DISP_CHANGE_SUCCESSFUL; + ExFreePoolWithTag(ppdev->pdmwDev, GDITAG_DEVMODE); + ppdev->pdmwDev = newDevMode; UserUpdateFullscreen(flags); @@ -847,6 +851,9 @@ UserChangeDisplaySettings( } leave: + if (newDevMode && newDevMode != ppdev->pdmwDev) + ExFreePoolWithTag(newDevMode, GDITAG_DEVMODE); + /* Release the PDEV */ PDEVOBJ_vRelease(ppdev);

1 0

[reactos] 03/18: [WIN32SS] Extract devmode list query to new function LDEVOBJ_bBuildDevmodeList
by Hervé Poussineau 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21ddeb76d91c851d95b6a… commit 21ddeb76d91c851d95b6ab563517f5ee071b9848 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 10:33:10 2022 +0100 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Fri Apr 15 23:09:16 2022 +0200 [WIN32SS] Extract devmode list query to new function LDEVOBJ_bBuildDevmodeList LDEVOBJ_bBuildDevmodeList() only queries the available display modes, without choosing the one to use on the graphic device, and without immediately creating a PDEV. Replace first part of EngpPopulateDeviceModeList() function by a call to this new function LDEVOBJ_bBuildDevmodeList(). Keep second part of EngpPopulateDeviceModeList() function, which chooses the default display mode. --- win32ss/gdi/eng/device.c | 92 +++------------------------------------ win32ss/gdi/eng/ldevobj.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ win32ss/gdi/eng/ldevobj.h | 4 ++ 3 files changed, 118 insertions(+), 85 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 27edfe2a56e..8ad49ed5fd1 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -129,81 +129,17 @@ EngpPopulateDeviceModeList( _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, _In_ PDEVMODEW pdmDefault) { - PWSTR pwsz; PDEVMODEINFO pdminfo; - PDEVMODEW pdm, pdmEnd; - ULONG i, cModes = 0; + PDEVMODEW pdm; + ULONG i; BOOLEAN bModeMatch = FALSE; - ULONG cbSize, cbFull; ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); ASSERT(pGraphicsDevice->pDevModeList == NULL); - pwsz = pGraphicsDevice->pDiplayDrivers; - - /* Loop through the driver names - * This is a REG_MULTI_SZ string */ - for (; *pwsz; pwsz += wcslen(pwsz) + 1) - { - /* Get the mode list from the driver */ - TRACE("Trying driver: %ls\n", pwsz); - cbSize = LDEVOBJ_ulGetDriverModes(pwsz, pGraphicsDevice->DeviceObject, &pdm); - if (!cbSize) - { - WARN("Driver %ls returned no valid mode\n", pwsz); - continue; - } - - /* Add space for the header */ - cbFull = cbSize + FIELD_OFFSET(DEVMODEINFO, adevmode); - - /* Allocate a buffer for the DEVMODE array */ - pdminfo = ExAllocatePoolWithTag(PagedPool, cbFull, GDITAG_DEVMODE); - if (!pdminfo) - { - ERR("Could not allocate devmodeinfo\n"); - continue; - } - - pdminfo->pldev = LDEVOBJ_pLoadDriver(pwsz, LDEV_DEVICE_DISPLAY); - pdminfo->cbdevmode = cbSize; - RtlCopyMemory(pdminfo->adevmode, pdm, cbSize); - - /* Attach the mode info to the device */ - pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo; - pGraphicsDevice->pdevmodeInfo = pdminfo; - - /* Loop all DEVMODEs */ - pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); - for (pdm = pdminfo->adevmode; - (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); - pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) - { - /* Count this DEVMODE */ - cModes++; - - /* Some drivers like the VBox driver don't fill the dmDeviceName - with the name of the display driver. So fix that here. */ - RtlStringCbCopyW(pdm->dmDeviceName, sizeof(pdm->dmDeviceName), pwsz); - } - - // FIXME: release the driver again until it's used? - } - - if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) + if (!LDEVOBJ_bBuildDevmodeList(pGraphicsDevice)) { - ERR("No devmodes\n"); - return FALSE; - } - - /* Allocate an index buffer */ - pGraphicsDevice->cDevModes = cModes; - pGraphicsDevice->pDevModeList = ExAllocatePoolWithTag(PagedPool, - cModes * sizeof(DEVMODEENTRY), - GDITAG_GDEVICE); - if (!pGraphicsDevice->pDevModeList) - { - ERR("No devmode list\n"); + ERR("LDEVOBJ_bBuildDevmodeList() failed\n"); return FALSE; } @@ -218,20 +154,11 @@ EngpPopulateDeviceModeList( pdminfo; pdminfo = pdminfo->pdmiNext) { - /* Calculate End of the DEVMODEs */ - pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); - /* Loop through the DEVMODEs */ - for (pdm = pdminfo->adevmode; - (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); - pdm = (PDEVMODEW)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) + for (i = 0; i < pGraphicsDevice->cDevModes; i++) { - TRACE(" %S has mode %lux%lux%lu(%lu Hz)\n", - pdm->dmDeviceName, - pdm->dmPelsWidth, - pdm->dmPelsHeight, - pdm->dmBitsPerPel, - pdm->dmDisplayFrequency); + pdm = pGraphicsDevice->pDevModeList[i].pdm; + /* Compare with the default entry */ if (!bModeMatch && pdm->dmBitsPerPel == pdmDefault->dmBitsPerPel && @@ -247,11 +174,6 @@ EngpPopulateDeviceModeList( bModeMatch = TRUE; } } - - /* Initialize the entry */ - pGraphicsDevice->pDevModeList[i].dwFlags = 0; - pGraphicsDevice->pDevModeList[i].pdm = pdm; - i++; } } return TRUE; diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index b1cdc7b1247..e2079da8178 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -450,6 +450,113 @@ leave: return pldev; } +BOOL +LDEVOBJ_bBuildDevmodeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice) +{ + PWSTR pwsz; + PDEVMODEINFO pdminfo; + PDEVMODEW pdm, pdmEnd; + ULONG i, cModes = 0; + ULONG cbSize, cbFull; + + if (pGraphicsDevice->pdevmodeInfo) + return TRUE; + ASSERT(pGraphicsDevice->pDevModeList == NULL); + + pwsz = pGraphicsDevice->pDiplayDrivers; + + /* Loop through the driver names + * This is a REG_MULTI_SZ string */ + for (; *pwsz; pwsz += wcslen(pwsz) + 1) + { + /* Get the mode list from the driver */ + TRACE("Trying driver: %ls\n", pwsz); + cbSize = LDEVOBJ_ulGetDriverModes(pwsz, pGraphicsDevice->DeviceObject, &pdm); + if (!cbSize) + { + WARN("Driver %ls returned no valid mode\n", pwsz); + continue; + } + + /* Add space for the header */ + cbFull = cbSize + FIELD_OFFSET(DEVMODEINFO, adevmode); + + /* Allocate a buffer for the DEVMODE array */ + pdminfo = ExAllocatePoolWithTag(PagedPool, cbFull, GDITAG_DEVMODE); + if (!pdminfo) + { + ERR("Could not allocate devmodeinfo\n"); + continue; + } + + pdminfo->cbdevmode = cbSize; + RtlCopyMemory(pdminfo->adevmode, pdm, cbSize); + + /* Attach the mode info to the device */ + pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo; + pGraphicsDevice->pdevmodeInfo = pdminfo; + + /* Loop all DEVMODEs */ + pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); + for (pdm = pdminfo->adevmode; + (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); + pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) + { + /* Count this DEVMODE */ + cModes++; + + /* Some drivers like the VBox driver don't fill the dmDeviceName + with the name of the display driver. So fix that here. */ + RtlStringCbCopyW(pdm->dmDeviceName, sizeof(pdm->dmDeviceName), pwsz); + } + } + + if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) + { + ERR("No devmodes\n"); + return FALSE; + } + + /* Allocate an index buffer */ + pGraphicsDevice->cDevModes = cModes; + pGraphicsDevice->pDevModeList = ExAllocatePoolWithTag(PagedPool, + cModes * sizeof(DEVMODEENTRY), + GDITAG_GDEVICE); + if (!pGraphicsDevice->pDevModeList) + { + ERR("No devmode list\n"); + return FALSE; + } + + /* Loop through all DEVMODEINFOs */ + for (pdminfo = pGraphicsDevice->pdevmodeInfo, i = 0; + pdminfo; + pdminfo = pdminfo->pdmiNext) + { + /* Calculate End of the DEVMODEs */ + pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); + + /* Loop through the DEVMODEs */ + for (pdm = pdminfo->adevmode; + (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); + pdm = (PDEVMODEW)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) + { + TRACE(" %S has mode %lux%lux%lu(%lu Hz)\n", + pdm->dmDeviceName, + pdm->dmPelsWidth, + pdm->dmPelsHeight, + pdm->dmBitsPerPel, + pdm->dmDisplayFrequency); + + /* Initialize the entry */ + pGraphicsDevice->pDevModeList[i].dwFlags = 0; + pGraphicsDevice->pDevModeList[i].pdm = pdm; + i++; + } + } + return TRUE; +} /** Exported functions ********************************************************/ diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h index 351328fe61e..cac2ec8f5e0 100644 --- a/win32ss/gdi/eng/ldevobj.h +++ b/win32ss/gdi/eng/ldevobj.h @@ -52,6 +52,10 @@ LDEVOBJ_pLoadDriver( _In_z_ LPWSTR pwszDriverName, _In_ ULONG ldevtype); +BOOL +LDEVOBJ_bBuildDevmodeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice); + PLDEVOBJ NTAPI EngGetLDEV(

1 0

[reactos] 02/18: [WIN32SS] Implement LDEVOBJ_ulGetDriverModes
by Hervé Poussineau 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d93362f5aa002fe40366… commit 7d93362f5aa002fe4036691976e1f092334f4857 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 09:54:53 2022 +0100 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Fri Apr 15 23:09:16 2022 +0200 [WIN32SS] Implement LDEVOBJ_ulGetDriverModes - implement LDEVOBJ_ulGetDriverModes (which get modes from a not yet loaded driver), and use it in EngpPopulateDeviceModeList - remove now useless LDEVOBJ_pdmiGetModes (replaced by LDEVOBJ_ulGetDriverModes) --- win32ss/gdi/eng/device.c | 23 ++++++---- win32ss/gdi/eng/ldevobj.c | 106 +++++++++++++++++++++++----------------------- win32ss/gdi/eng/ldevobj.h | 16 ++++--- 3 files changed, 80 insertions(+), 65 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index f651c213b09..27edfe2a56e 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -130,11 +130,11 @@ EngpPopulateDeviceModeList( _In_ PDEVMODEW pdmDefault) { PWSTR pwsz; - PLDEVOBJ pldev; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; ULONG i, cModes = 0; BOOLEAN bModeMatch = FALSE; + ULONG cbSize, cbFull; ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); ASSERT(pGraphicsDevice->pDevModeList == NULL); @@ -145,23 +145,30 @@ EngpPopulateDeviceModeList( * This is a REG_MULTI_SZ string */ for (; *pwsz; pwsz += wcslen(pwsz) + 1) { - /* Try to load the display driver */ + /* Get the mode list from the driver */ TRACE("Trying driver: %ls\n", pwsz); - pldev = LDEVOBJ_pLoadDriver(pwsz, LDEV_DEVICE_DISPLAY); - if (!pldev) + cbSize = LDEVOBJ_ulGetDriverModes(pwsz, pGraphicsDevice->DeviceObject, &pdm); + if (!cbSize) { - ERR("Could not load driver: '%ls'\n", pwsz); + WARN("Driver %ls returned no valid mode\n", pwsz); continue; } - /* Get the mode list from the driver */ - pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject); + /* Add space for the header */ + cbFull = cbSize + FIELD_OFFSET(DEVMODEINFO, adevmode); + + /* Allocate a buffer for the DEVMODE array */ + pdminfo = ExAllocatePoolWithTag(PagedPool, cbFull, GDITAG_DEVMODE); if (!pdminfo) { - ERR("Could not get mode list for '%ls'\n", pwsz); + ERR("Could not allocate devmodeinfo\n"); continue; } + pdminfo->pldev = LDEVOBJ_pLoadDriver(pwsz, LDEV_DEVICE_DISPLAY); + pdminfo->cbdevmode = cbSize; + RtlCopyMemory(pdminfo->adevmode, pdm, cbSize); + /* Attach the mode info to the device */ pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo; pGraphicsDevice->pdevmodeInfo = pdminfo; diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 7afbf1584fa..b1cdc7b1247 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -111,58 +111,6 @@ LDEVOBJ_vFreeLDEV( ExFreePoolWithTag(pldev, GDITAG_LDEV); } -PDEVMODEINFO -NTAPI -LDEVOBJ_pdmiGetModes( - _In_ PLDEVOBJ pldev, - _In_ HANDLE hDriver) -{ - ULONG cbSize, cbFull; - PDEVMODEINFO pdminfo; - - TRACE("LDEVOBJ_pdmiGetModes(%p, %p)\n", pldev, hDriver); - - /* Mirror drivers may omit this function */ - if (!pldev->pfn.GetModes) - { - return NULL; - } - - /* Call the driver to get the required size */ - cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); - if (!cbSize) - { - ERR("DrvGetModes returned 0\n"); - return NULL; - } - - /* Add space for the header */ - cbFull = cbSize + FIELD_OFFSET(DEVMODEINFO, adevmode); - - /* Allocate a buffer for the DEVMODE array */ - pdminfo = ExAllocatePoolWithTag(PagedPool, cbFull, GDITAG_DEVMODE); - if (!pdminfo) - { - ERR("Could not allocate devmodeinfo\n"); - return NULL; - } - - pdminfo->pldev = pldev; - pdminfo->cbdevmode = cbSize; - - /* Call the driver again to fill the buffer */ - cbSize = pldev->pfn.GetModes(hDriver, cbSize, pdminfo->adevmode); - if (!cbSize) - { - /* Could not get modes */ - ERR("returned size %lu(%lu)\n", cbSize, pdminfo->cbdevmode); - ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); - pdminfo = NULL; - } - - return pdminfo; -} - static BOOL LDEVOBJ_bLoadImage( @@ -277,6 +225,60 @@ LDEVOBJ_bEnableDriver( return TRUE; } +ULONG +LDEVOBJ_ulGetDriverModes( + _In_ LPWSTR pwszDriverName, + _In_ HANDLE hDriver, + _Out_ PDEVMODEW *ppdm) +{ + PLDEVOBJ pldev = NULL; + ULONG cbSize = 0; + PDEVMODEW pdm = NULL; + + TRACE("LDEVOBJ_ulGetDriverModes('%ls', %p)\n", pwszDriverName, hDriver); + + pldev = LDEVOBJ_pLoadDriver(pwszDriverName, LDEV_DEVICE_DISPLAY); + if (!pldev) + goto cleanup; + + /* Mirror drivers may omit this function */ + if (!pldev->pfn.GetModes) + goto cleanup; + + /* Call the driver to get the required size */ + cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); + if (!cbSize) + { + ERR("DrvGetModes returned 0\n"); + goto cleanup; + } + + /* Allocate a buffer for the DEVMODE array */ + pdm = ExAllocatePoolWithTag(PagedPool, cbSize, GDITAG_DEVMODE); + if (!pdm) + { + ERR("Could not allocate devmodeinfo\n"); + goto cleanup; + } + + /* Call the driver again to fill the buffer */ + cbSize = pldev->pfn.GetModes(hDriver, cbSize, pdm); + if (!cbSize) + { + /* Could not get modes */ + ERR("DrvrGetModes returned 0 on second call\n"); + ExFreePoolWithTag(pdm, GDITAG_DEVMODE); + pdm = NULL; + } + +cleanup: + if (pldev) + LDEVOBJ_vUnloadImage(pldev); + + *ppdm = pdm; + return cbSize; +} + static PVOID LDEVOBJ_pvFindImageProcAddress( diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h index c7b803a9a4c..351328fe61e 100644 --- a/win32ss/gdi/eng/ldevobj.h +++ b/win32ss/gdi/eng/ldevobj.h @@ -34,11 +34,17 @@ NTSTATUS NTAPI InitLDEVImpl(VOID); -PDEVMODEINFO -NTAPI -LDEVOBJ_pdmiGetModes( - _In_ PLDEVOBJ pldev, - _In_ HANDLE hDriver); +/* Get all available device modes from a driver + * - pwszDriverName: name of the driver + * - hDriver: handle of the driver + * - ppdm: allocated memory containing driver modes or NULL on error + * Return value: number of bytes allocated for *ppdm buffer or 0 on error + */ +ULONG +LDEVOBJ_ulGetDriverModes( + _In_ LPWSTR pwszDriverName, + _In_ HANDLE hDriver, + _Out_ PDEVMODEW *ppdm); PLDEVOBJ APIENTRY

1 0

[reactos] 01/18: [WIN32SS] Rename EngLoadDriverEx to LDEVOBJ_pLoadDriver
by Hervé Poussineau 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b234cce25191693e4a2d… commit 3b234cce25191693e4a2d9903080ac6f46fceaac Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 9 09:42:23 2022 +0100 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Fri Apr 15 23:09:16 2022 +0200 [WIN32SS] Rename EngLoadDriverEx to LDEVOBJ_pLoadDriver --- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/ldevobj.c | 8 ++++---- win32ss/gdi/eng/ldevobj.h | 2 +- win32ss/gdi/eng/pdevobj.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 2777143bf9f..f651c213b09 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -147,7 +147,7 @@ EngpPopulateDeviceModeList( { /* Try to load the display driver */ TRACE("Trying driver: %ls\n", pwsz); - pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY); + pldev = LDEVOBJ_pLoadDriver(pwsz, LDEV_DEVICE_DISPLAY); if (!pldev) { ERR("Could not load driver: '%ls'\n", pwsz); diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 852c6822d25..7afbf1584fa 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -325,7 +325,7 @@ LDEVOBJ_pvFindImageProcAddress( PLDEVOBJ NTAPI -EngLoadImageEx( +LDEVOBJ_pLoadDriver( _In_z_ LPWSTR pwszDriverName, _In_ ULONG ldevtype) { @@ -336,7 +336,7 @@ EngLoadImageEx( SIZE_T cwcLength; LPWSTR pwsz; - TRACE("EngLoadImageEx(%ls, %lu)\n", pwszDriverName, ldevtype); + TRACE("LDEVOBJ_pLoadDriver(%ls, %lu)\n", pwszDriverName, ldevtype); ASSERT(pwszDriverName); /* Initialize buffer for the the driver name */ @@ -444,7 +444,7 @@ leave: /* Unlock loader */ EngReleaseSemaphore(ghsemLDEVList); - TRACE("EngLoadImageEx returning %p\n", pldev); + TRACE("LDEVOBJ_pLoadDriver returning %p\n", pldev); return pldev; } @@ -456,7 +456,7 @@ APIENTRY EngLoadImage( _In_ LPWSTR pwszDriverName) { - return (HANDLE)EngLoadImageEx(pwszDriverName, LDEV_IMAGE); + return (HANDLE)LDEVOBJ_pLoadDriver(pwszDriverName, LDEV_IMAGE); } diff --git a/win32ss/gdi/eng/ldevobj.h b/win32ss/gdi/eng/ldevobj.h index cd15f3cc823..c7b803a9a4c 100644 --- a/win32ss/gdi/eng/ldevobj.h +++ b/win32ss/gdi/eng/ldevobj.h @@ -42,7 +42,7 @@ LDEVOBJ_pdmiGetModes( PLDEVOBJ APIENTRY -EngLoadImageEx( +LDEVOBJ_pLoadDriver( _In_z_ LPWSTR pwszDriverName, _In_ ULONG ldevtype); diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index a9f959b4b23..e764dea384c 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -386,7 +386,7 @@ EngpCreatePDEV( } /* Try to get a diplay driver */ - ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY); + ppdev->pldev = LDEVOBJ_pLoadDriver(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY); if (!ppdev->pldev) { DPRINT1("Could not load display driver '%ls', '%ls'\n",

1 0

[reactos] 01/01: [NTUSER][IMM32_APITEST] Associate HIMC to WND (#4451)
by Katayama Hirofumi MZ 15 Apr '22

15 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3820744a18cc4ea1b2a44… commit 3820744a18cc4ea1b2a44d6c07f03c154f7e2796 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 15 13:16:50 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 15 13:16:50 2022 +0900 [NTUSER][IMM32_APITEST] Associate HIMC to WND (#4451) - Set the default input context to WND at IntCreateWindow function. - Add more tests to the himc testcase of imm32_apitest. CORE-11700 --- modules/rostests/apitests/imm32/himc.c | 43 +++++++++++++++++++++++++++++++++- win32ss/user/ntuser/window.c | 4 ++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/imm32/himc.c b/modules/rostests/apitests/imm32/himc.c index 050bd324e10..d2e7104ba24 100644 --- a/modules/rostests/apitests/imm32/himc.c +++ b/modules/rostests/apitests/imm32/himc.c @@ -7,7 +7,7 @@ #include "precomp.h" -START_TEST(himc) +static void Test1(void) { DWORD style; HWND hwndEdit, hwndStatic; @@ -152,3 +152,44 @@ START_TEST(himc) DestroyWindow(hwndEdit); DestroyWindow(hwndStatic); } + +static void Test2(void) +{ + static const LPCSTR apszClasses[] = + { + "BUTTON", + "COMBOBOX", + "EDIT", + "LISTBOX", + "SCROLLBAR", + "STATIC" + }; + size_t i; + HIMC hIMC; + HWND hwnd; + + for (i = 0; i < _countof(apszClasses); ++i) + { + LPCSTR pszClass = apszClasses[i]; + hwnd = CreateWindowA(pszClass, NULL, WS_VISIBLE, 0, 0, 0, 0, NULL, NULL, + GetModuleHandle(NULL), NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + hIMC = ImmGetContext(hwnd); + + if (lstrcmpiA(pszClass, "BUTTON") == 0) + ok(hIMC == NULL, "hIMC was %p\n", hIMC); + else + ok(hIMC != NULL, "hIMC was NULL\n"); + + ImmReleaseContext(hwnd, hIMC); + + DestroyWindow(hwnd); + } +} + +START_TEST(himc) +{ + Test1(); + Test2(); +} diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 3cf1fd22a99..025e80e578f 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1866,6 +1866,10 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, pWnd->ExStyle = Cs->dwExStyle; pWnd->cbwndExtra = pWnd->pcls->cbwndExtra; pWnd->pActCtx = acbiBuffer; + + if (pti->spDefaultImc && Class->atomClassName != gpsi->atomSysClass[ICLS_BUTTON]) + pWnd->hImc = UserHMGetHandle(pti->spDefaultImc); + pWnd->InternalPos.MaxPos.x = pWnd->InternalPos.MaxPos.y = -1; pWnd->InternalPos.IconPos.x = pWnd->InternalPos.IconPos.y = -1;

1 0

[reactos] 01/01: [IMM32] Improve ImmLockClientImc (#4450)
by Katayama Hirofumi MZ 14 Apr '22

14 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f848343bffa662c6c4fc8… commit f848343bffa662c6c4fc81b0198256d1d1edcbbc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 14 14:10:19 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 14 14:10:19 2022 +0900 [IMM32] Improve ImmLockClientImc (#4450) CORE-11700 --- dll/win32/imm32/imm.c | 35 +++++++++++++++++------------------ dll/win32/imm32/utils.c | 1 + 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 4a440d9fb41..5d199630229 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -907,38 +907,37 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) TRACE("(%p)\n", hImc); - if (hImc == NULL) + if (!hImc) return NULL; pIMC = ValidateHandleNoErr(hImc, TYPE_INPUTCONTEXT); - if (pIMC == NULL || !Imm32CheckImcProcess(pIMC)) + if (!pIMC || !Imm32CheckImcProcess(pIMC)) return NULL; pClientImc = (PCLIENTIMC)pIMC->dwClientImcData; - if (!pClientImc) + if (pClientImc) { - pClientImc = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); - if (!pClientImc) + if (pClientImc->dwFlags & CLIENTIMC_DESTROY) return NULL; + goto Finish; + } - RtlInitializeCriticalSection(&pClientImc->cs); - - pClientImc->dwCompatFlags = (DWORD)NtUserGetThreadState(THREADSTATE_IMECOMPATFLAGS); + pClientImc = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); + if (!pClientImc) + return NULL; - if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc)) - { - ImmLocalFree(pClientImc); - return NULL; - } + RtlInitializeCriticalSection(&pClientImc->cs); + pClientImc->dwCompatFlags = (DWORD)NtUserGetThreadState(THREADSTATE_IMECOMPATFLAGS); - pClientImc->dwFlags |= CLIENTIMC_UNKNOWN2; - } - else + if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc)) { - if (pClientImc->dwFlags & CLIENTIMC_DESTROY) - return NULL; + ImmLocalFree(pClientImc); + return NULL; } + pClientImc->dwFlags |= CLIENTIMC_UNKNOWN2; + +Finish: InterlockedIncrement(&pClientImc->cLockObj); return pClientImc; } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 26f6715f4fc..b3618536782 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -213,6 +213,7 @@ PWND FASTCALL ValidateHwndNoErr(HWND hwnd) return ValidateHandleNoErr(hwnd, TYPE_WINDOW); } +// Win: TestInputContextProcess BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) { HIMC hIMC;

1 0

[reactos] 01/01: [IMM32] Add Win: comments more (#4449)
by Katayama Hirofumi MZ 14 Apr '22

14 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5f637f93f919667550eb… commit e5f637f93f919667550eb43b66ff4189012e12fc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 14 11:23:16 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 14 11:23:16 2022 +0900 [IMM32] Add Win: comments more (#4449) CORE-11700 --- dll/win32/imm32/ime.c | 1 + dll/win32/imm32/precomp.h | 1 + dll/win32/imm32/utils.c | 3 +++ 3 files changed, 5 insertions(+) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 5b7720363aa..e9c80d195b5 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -355,6 +355,7 @@ Quit: return ret; } +// Win: ImmGetImeMenuItemsInterProcess DWORD APIENTRY Imm32GetImeMenuItemWCrossProcess(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu, LPVOID lpImeMenu, DWORD dwSize) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index f80fe47781c..82af0034e9b 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -102,6 +102,7 @@ static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) return (dwImeThreadId != dwThreadId); } +// Win: TestWindowProcess static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) { return (NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) != diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 810bd0acd58..26f6715f4fc 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -50,6 +50,7 @@ BOOL APIENTRY Imm32IsSystemJapaneseOrKorean(VOID) return (wPrimary == LANG_JAPANESE || wPrimary == LANG_KOREAN); } +// Win: IsAnsiIMC BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) { BOOL ret; @@ -166,6 +167,7 @@ static PVOID FASTCALL DesktopPtrToUser(PVOID ptr) return (PVOID)NtUserCallOneParam((DWORD_PTR)ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING); } +// Win: HMValidateHandle LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) { UINT index; @@ -223,6 +225,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) return dwProcessID == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; } +// Win: ImmLocalAlloc LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes) { if (!ghImmHeap)

1 0

[reactos] 01/01: [CMAKE] msvc.cmake: Enable C4090 warning as error
by Serge Gautherie 11 Apr '22

11 Apr '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c5fc49f828a0dff16cbe… commit 0c5fc49f828a0dff16cbe127d54d5e1ad22c40c9 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Apr 11 21:07:19 2022 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Apr 12 02:08:45 2022 +0300 [CMAKE] msvc.cmake: Enable C4090 warning as error C4090: different 'modifier' qualifiers Follow-up to 42d2d5e (0.4.14-dev-847) and 41bc57d (0.4.15-dev-2952), which silenced affected modules. CORE-7538 --- sdk/cmake/msvc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 9f6d4544003..af021129b22 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -114,7 +114,7 @@ else() # - C4022: pointer type mismatch for parameter # - C4028: formal parameter different from declaration # - C4047: different level of indirection -# - TODO: C4090: different 'modifier' qualifiers (for C programs only; +# - C4090: different 'modifier' qualifiers (for C programs only; # for C++ programs, the compiler error C2440 is issued) # - C4098: void function returning a value # - C4113: parameter lists differ @@ -130,7 +130,7 @@ else() # - C4700: uninitialized variable usage # - C4715: 'function': not all control paths return a value # - C4716: function must return a value -add_compile_options(/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716) +add_compile_options(/we4013 /we4020 /we4022 /we4028 /we4047 /we4090 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716) # - C4101: unreferenced local variable # - C4189: local variable initialized but not referenced

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