Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 14:08:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS] Copy function table earlier, and use it in all PDEVOBJ operations

Browse source
This commit is contained in:
Hervé Poussineau 2022-05-08 21:51:10 +02:00 committed by hpoussin
parent 884356a06e
commit 185f2dac85
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
win32ss/gdi/eng/pdevobj.c
View file

@ -176,7 +176,7 @@ PDEVOBJ_bEnablePDEV(
ULONG i; ULONG i;
/* Get the DrvEnablePDEV function */ /* Get the DrvEnablePDEV function */
pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV; pfnEnablePDEV = ppdev->pfn.EnablePDEV;
/* Call the drivers DrvEnablePDEV function */ /* Call the drivers DrvEnablePDEV function */
TRACE("DrvEnablePDEV(pdevmode %p (%dx%dx%d %d Hz) hdev %p (%S))\n", TRACE("DrvEnablePDEV(pdevmode %p (%dx%dx%d %d Hz) hdev %p (%S))\n",
@ -243,7 +243,7 @@ PDEVOBJ_vCompletePDEV(
{ {
/* Call the drivers DrvCompletePDEV function */ /* Call the drivers DrvCompletePDEV function */
TRACE("DrvCompletePDEV(dhpdev %p hdev %p)\n", ppdev->dhpdev, ppdev); 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 static
@ -314,7 +314,7 @@ PDEVOBJ_pSurface(
{ {
/* Call the drivers DrvEnableSurface */ /* Call the drivers DrvEnableSurface */
TRACE("DrvEnableSurface(dhpdev %p)\n", ppdev->dhpdev); 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); TRACE("DrvEnableSurface(dhpdev %p) => hsurf %p\n", ppdev->dhpdev, hsurf);
if (hsurf== NULL) if (hsurf== NULL)
{ {
@ -502,6 +502,9 @@ PDEVOBJ_Create(
ppdev->pldev = pldev; ppdev->pldev = pldev;
ppdev->dwAccelerationLevel = dwAccelerationLevel; ppdev->dwAccelerationLevel = dwAccelerationLevel;
/* Copy the function table */
ppdev->pfn = ppdev->pldev->pfn;
/* Call the driver to enable the PDEV */ /* Call the driver to enable the PDEV */
if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL)) if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL))
{ {
@ -511,9 +514,6 @@ PDEVOBJ_Create(
return NULL; return NULL;
} }
/* Copy the function table */
ppdev->pfn = ppdev->pldev->pfn;
/* Tell the driver that the PDEV is ready */ /* Tell the driver that the PDEV is ready */
PDEVOBJ_vCompletePDEV(ppdev); PDEVOBJ_vCompletePDEV(ppdev);