From 7ddfe4d310b0bfac2af3b91f497e9e8a460e9287 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 26 Sep 2024 20:42:47 +0200
Subject: [PATCH] (!1705) xwin: drop wrapping on ScreenRec->UnrealizeWindow()

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

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xwin/win.h                  | 1 -
 hw/xwin/winmultiwindowwindow.c | 4 +---
 hw/xwin/winscrinit.c           | 4 ----
 hw/xwin/winwindow.c            | 4 +---
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index d8bc22f519..5d508894e1 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -500,7 +500,6 @@ typedef struct _winPrivScreenRec {
     winCreateScreenResourcesProc pwinCreateScreenResources;
 
     /* Window Procedures for Rootless mode */
-    UnrealizeWindowProcPtr UnrealizeWindow;
     ValidateTreeProcPtr ValidateTree;
     PostValidateTreeProcPtr PostValidateTree;
     ClearToBackgroundProcPtr ClearToBackground;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 5a8659de71..4084579fdb 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -312,9 +312,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
     ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(UnrealizeWindow);
-    fResult = (*pScreen->UnrealizeWindow) (pWin);
-    WIN_WRAP(UnrealizeWindow, winUnmapWindowMultiWindow);
+    fbUnrealizeWindow(pWin);
 
     /* Flag that the window has been killed */
     pWinPriv->fXKilled = TRUE;
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index ac628674c8..856ffd5f8d 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -381,9 +381,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         pScreenPriv->a = NULL; \
     }
 
-        /* Save a pointer to each lower-level window procedure */
-        WRAP(UnrealizeWindow);
-
         /* Assign rootless window procedures to be top level procedures */
         pScreen->CreateWindow = winCreateWindowRootless;
         pScreen->DestroyWindow = winDestroyWindowRootless;
@@ -409,7 +406,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     }
 
         /* Save a pointer to each lower-level window procedure */
-        WRAP(UnrealizeWindow);
         WRAP(ReparentWindow);
         WRAP(RestackWindow);
         WRAP(ResizeWindow);
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 0d49244ea6..06b08b965f 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -163,9 +163,7 @@ winUnmapWindowRootless(WindowPtr pWin)
     winTrace("winUnmapWindowRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(UnrealizeWindow);
-    fResult = (*pScreen->UnrealizeWindow) (pWin);
-    WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);
+    fbUnrealizeWindow(pWin);
 
     if (pWinPriv->hRgn != NULL) {
         DeleteObject(pWinPriv->hRgn);