Fix a GDI bitmap resource leak of window icons

Internal WM workaround for Java AWT bug

1 files changed, 7 insertions, 7 deletions

diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c
index 85a932f75..862d5ba98 100644
--- a/xorg-server/hw/xwin/winwin32rootless.c
+++ b/xorg-server/hw/xwin/winwin32rootless.c
@@ -365,8 +365,8 @@ void
 winMWExtWMDestroyFrame (RootlessFrameID wid)

 {

   win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;

-  HICON			hiconClass;

-  HICON			hiconSmClass;

+  HICON			hicon;

+  HICON			hiconSm;

   HMODULE		hInstance;

   int			iReturn;

   char			pszClass[CLASS_NAME_LENGTH];

@@ -397,8 +397,8 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
 

   /* Store the info we need to destroy after this window is gone */

   hInstance = (HINSTANCE) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HMODULE);

-  hiconClass = (HICON) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HICON);

-  hiconSmClass = (HICON) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HICONSM);

+  hicon = (HICON) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HICON);

+  hiconSm = (HICON) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HICONSM);

   iReturn = GetClassName (pRLWinPriv->hWnd, pszClass, CLASS_NAME_LENGTH);

 

   pRLWinPriv->fClose = TRUE;

@@ -418,11 +418,11 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
 #if CYGMULTIWINDOW_DEBUG

       winDebug ("winMWExtWMDestroyFramew - %d Deleting Icon: ", iReturn);

 #endif

-      

-      winDestroyIcon(hiconClass);

-      winDestroyIcon(hiconSmClass);

     }

 

+    winDestroyIcon(hiconClass);

+    winDestroyIcon(hiconSmClass);

+

 #if CYGMULTIWINDOW_DEBUG

   winDebug ("winMWExtWMDestroyFrame - done\n");

 #endif