frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwin: drop wrapping on ScreenRec->CloseScreen() 

Instead of complicated wrapping, just call fbCloseScreen() directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-27 10:54:14 +02:00
parent b5555c768c
commit c002b468a5
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/win.h
View File

@ -429,8 +429,6 @@ typedef struct _winPrivScreenRec {
int iConnectedClients; int iConnectedClients;
CloseScreenProcPtr CloseScreen;
DWORD dwRedMask; DWORD dwRedMask;
DWORD dwGreenMask; DWORD dwGreenMask;
DWORD dwBlueMask; DWORD dwBlueMask;

1
hw/xwin/winscrinit.c
View File

@ -424,7 +424,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
} }
/* Wrap either fb's or shadow's CloseScreen with our CloseScreen */ /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = pScreenPriv->pwinCloseScreen; pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
/* Create a mutex for modules in separate threads to wait for */ /* Create a mutex for modules in separate threads to wait for */

4
hw/xwin/winshadddnl.c
View File

@ -663,9 +663,7 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen)
pScreenPriv->fActive = FALSE; pScreenPriv->fActive = FALSE;
/* Call the wrapped CloseScreen procedure */ /* Call the wrapped CloseScreen procedure */
WIN_UNWRAP(CloseScreen); fReturn = fbCloseScreen(pScreen);
if (pScreen->CloseScreen)
fReturn = (*pScreen->CloseScreen) (pScreen);
winFreeFBShadowDDNL(pScreen); winFreeFBShadowDDNL(pScreen);

5
hw/xwin/winshadgdi.c
View File

@ -583,10 +583,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
pScreenPriv->fClosed = TRUE; pScreenPriv->fClosed = TRUE;
pScreenPriv->fActive = FALSE; pScreenPriv->fActive = FALSE;
/* Call the wrapped CloseScreen procedure */ fReturn = fbCloseScreen(pScreen);
WIN_UNWRAP(CloseScreen);
if (pScreen->CloseScreen)
fReturn = (*pScreen->CloseScreen) (pScreen);
/* Delete the window property */ /* Delete the window property */
RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP); RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);