XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwin: drop wrapping on ScreenRec->CloseScreen()

Browse Source 
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
committed by Enrico Weigelt
parent a0c67bd720
commit 01768051cf
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/win.h
View File

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

1
hw/xwin/winscrinit.c
View File

@@ -430,7 +430,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
}
/* Wrap either fb's or shadow's CloseScreen with our CloseScreen */
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
/* 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;
/* Call the wrapped CloseScreen procedure */
WIN_UNWRAP(CloseScreen);
if (pScreen->CloseScreen)
fReturn = (*pScreen->CloseScreen) (pScreen);
fReturn = fbCloseScreen(pScreen);
winFreeFBShadowDDNL(pScreen);

5
hw/xwin/winshadgdi.c
View File

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