winex11: Remove unnecessary cleanups on process exit.
This commit is contained in:
parent
cd8c1b28ad
commit
f9a383323f
|
@ -3303,13 +3303,3 @@ void X11DRV_SelectionClear( HWND hWnd, XEvent *xev )
|
||||||
X11DRV_CLIPBOARD_ReleaseSelection( event->display, event->selection,
|
X11DRV_CLIPBOARD_ReleaseSelection( event->display, event->selection,
|
||||||
event->window, hWnd, event->time );
|
event->window, hWnd, event->time );
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* X11DRV_Clipboard_Cleanup
|
|
||||||
*/
|
|
||||||
void X11DRV_Clipboard_Cleanup(void)
|
|
||||||
{
|
|
||||||
selectionAcquired = S_NOSELECTION;
|
|
||||||
|
|
||||||
X11DRV_EmptyClipboard(FALSE);
|
|
||||||
}
|
|
||||||
|
|
|
@ -153,11 +153,6 @@ static void IME_RegisterClasses(void)
|
||||||
WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed");
|
WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed");
|
||||||
}
|
}
|
||||||
|
|
||||||
void IME_UnregisterClasses(void)
|
|
||||||
{
|
|
||||||
UnregisterClassW(UI_CLASS_NAME, x11drv_module);
|
|
||||||
}
|
|
||||||
|
|
||||||
static HIMCC ImeCreateBlankCompStr(void)
|
static HIMCC ImeCreateBlankCompStr(void)
|
||||||
{
|
{
|
||||||
HIMCC rc;
|
HIMCC rc;
|
||||||
|
|
|
@ -100,16 +100,6 @@ static void device_init(void)
|
||||||
vert_size = MulDiv( screen_height, 254, log_pixels_y * 10 );
|
vert_size = MulDiv( screen_height, 254, log_pixels_y * 10 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**********************************************************************
|
|
||||||
* X11DRV_GDI_Finalize
|
|
||||||
*/
|
|
||||||
void X11DRV_GDI_Finalize(void)
|
|
||||||
{
|
|
||||||
X11DRV_PALETTE_Cleanup();
|
|
||||||
/* don't bother to close the display, it often triggers X bugs */
|
|
||||||
/* XCloseDisplay( gdi_display ); */
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable )
|
static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable )
|
||||||
{
|
{
|
||||||
|
|
|
@ -248,22 +248,6 @@ int X11DRV_PALETTE_Init(void)
|
||||||
return palette_size;
|
return palette_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* X11DRV_PALETTE_Cleanup
|
|
||||||
*
|
|
||||||
* Free external colors we grabbed in the FillDefaultPalette()
|
|
||||||
*/
|
|
||||||
void X11DRV_PALETTE_Cleanup(void)
|
|
||||||
{
|
|
||||||
if( COLOR_gapFilled )
|
|
||||||
{
|
|
||||||
XFreeColors(gdi_display, X11DRV_PALETTE_PaletteXColormap,
|
|
||||||
(unsigned long*)(X11DRV_PALETTE_PaletteToXPixel + COLOR_gapStart),
|
|
||||||
COLOR_gapFilled, 0);
|
|
||||||
}
|
|
||||||
DeleteCriticalSection(&palette_cs);
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* X11DRV_PALETTE_ComputeChannelShift
|
* X11DRV_PALETTE_ComputeChannelShift
|
||||||
*
|
*
|
||||||
|
|
|
@ -221,13 +221,11 @@ extern int client_side_with_render DECLSPEC_HIDDEN;
|
||||||
extern int client_side_antialias_with_core DECLSPEC_HIDDEN;
|
extern int client_side_antialias_with_core DECLSPEC_HIDDEN;
|
||||||
extern int client_side_antialias_with_render DECLSPEC_HIDDEN;
|
extern int client_side_antialias_with_render DECLSPEC_HIDDEN;
|
||||||
extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN;
|
extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN;
|
||||||
extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN;
|
|
||||||
|
|
||||||
extern const struct gdi_dc_funcs *get_glx_driver(void) DECLSPEC_HIDDEN;
|
extern const struct gdi_dc_funcs *get_glx_driver(void) DECLSPEC_HIDDEN;
|
||||||
extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN;
|
extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* IME support */
|
/* IME support */
|
||||||
extern void IME_UnregisterClasses(void) DECLSPEC_HIDDEN;
|
|
||||||
extern void IME_SetOpenStatus(BOOL fOpen) DECLSPEC_HIDDEN;
|
extern void IME_SetOpenStatus(BOOL fOpen) DECLSPEC_HIDDEN;
|
||||||
extern void IME_SetCompositionStatus(BOOL fOpen) DECLSPEC_HIDDEN;
|
extern void IME_SetCompositionStatus(BOOL fOpen) DECLSPEC_HIDDEN;
|
||||||
extern INT IME_GetCursorPos(void) DECLSPEC_HIDDEN;
|
extern INT IME_GetCursorPos(void) DECLSPEC_HIDDEN;
|
||||||
|
@ -247,8 +245,6 @@ extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECL
|
||||||
* X11 GDI driver
|
* X11 GDI driver
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern void X11DRV_GDI_Finalize(void) DECLSPEC_HIDDEN;
|
|
||||||
|
|
||||||
extern Display *gdi_display DECLSPEC_HIDDEN; /* display to use for all GDI functions */
|
extern Display *gdi_display DECLSPEC_HIDDEN; /* display to use for all GDI functions */
|
||||||
|
|
||||||
/* X11 GDI palette driver */
|
/* X11 GDI palette driver */
|
||||||
|
@ -269,7 +265,6 @@ extern ColorShifts X11DRV_PALETTE_default_shifts DECLSPEC_HIDDEN;
|
||||||
extern int X11DRV_PALETTE_mapEGAPixel[16] DECLSPEC_HIDDEN;
|
extern int X11DRV_PALETTE_mapEGAPixel[16] DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
extern int X11DRV_PALETTE_Init(void) DECLSPEC_HIDDEN;
|
extern int X11DRV_PALETTE_Init(void) DECLSPEC_HIDDEN;
|
||||||
extern void X11DRV_PALETTE_Cleanup(void) DECLSPEC_HIDDEN;
|
|
||||||
extern BOOL X11DRV_IsSolidColor(COLORREF color) DECLSPEC_HIDDEN;
|
extern BOOL X11DRV_IsSolidColor(COLORREF color) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) DECLSPEC_HIDDEN;
|
extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) DECLSPEC_HIDDEN;
|
||||||
|
@ -618,7 +613,6 @@ extern XContext winContext DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN;
|
extern void X11DRV_InitClipboard(void) DECLSPEC_HIDDEN;
|
||||||
extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN;
|
extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) DECLSPEC_HIDDEN;
|
||||||
extern void X11DRV_Clipboard_Cleanup(void) DECLSPEC_HIDDEN;
|
|
||||||
extern void X11DRV_ResetSelectionOwner(void) DECLSPEC_HIDDEN;
|
extern void X11DRV_ResetSelectionOwner(void) DECLSPEC_HIDDEN;
|
||||||
extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN;
|
extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN;
|
||||||
extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;
|
extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN;
|
||||||
|
@ -661,7 +655,6 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name,
|
||||||
int reserve_depths) DECLSPEC_HIDDEN;
|
int reserve_depths) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
|
void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
|
||||||
void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN;
|
|
||||||
void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN;
|
void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* XIM support */
|
/* XIM support */
|
||||||
|
|
|
@ -611,25 +611,6 @@ static void thread_detach(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* X11DRV process termination routine
|
|
||||||
*/
|
|
||||||
static void process_detach(void)
|
|
||||||
{
|
|
||||||
X11DRV_Clipboard_Cleanup();
|
|
||||||
/* cleanup XVidMode */
|
|
||||||
X11DRV_XF86VM_Cleanup();
|
|
||||||
X11DRV_XRender_Finalize();
|
|
||||||
|
|
||||||
/* cleanup GDI */
|
|
||||||
X11DRV_GDI_Finalize();
|
|
||||||
|
|
||||||
IME_UnregisterClasses();
|
|
||||||
DeleteCriticalSection( &X11DRV_CritSection );
|
|
||||||
TlsFree( thread_data_tls_index );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* store the display fd into the message queue */
|
/* store the display fd into the message queue */
|
||||||
static void set_queue_display_fd( Display *display )
|
static void set_queue_display_fd( Display *display )
|
||||||
{
|
{
|
||||||
|
@ -713,9 +694,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||||
case DLL_THREAD_DETACH:
|
case DLL_THREAD_DETACH:
|
||||||
thread_detach();
|
thread_detach();
|
||||||
break;
|
break;
|
||||||
case DLL_PROCESS_DETACH:
|
|
||||||
process_detach();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1039,20 +1039,6 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* X11DRV_XRender_Finalize
|
|
||||||
*/
|
|
||||||
void X11DRV_XRender_Finalize(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
EnterCriticalSection(&xrender_cs);
|
|
||||||
for(i = mru; i >= 0; i = glyphsetCache[i].next)
|
|
||||||
FreeEntry(i);
|
|
||||||
LeaveCriticalSection(&xrender_cs);
|
|
||||||
DeleteCriticalSection(&xrender_cs);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* xrenderdrv_SelectFont
|
* xrenderdrv_SelectFont
|
||||||
*/
|
*/
|
||||||
|
@ -2515,8 +2501,4 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void X11DRV_XRender_Finalize(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* SONAME_LIBXRENDER */
|
#endif /* SONAME_LIBXRENDER */
|
||||||
|
|
|
@ -248,11 +248,6 @@ sym_not_found:
|
||||||
usexvidmode = 0;
|
usexvidmode = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void X11DRV_XF86VM_Cleanup(void)
|
|
||||||
{
|
|
||||||
if (real_xf86vm_modes) XFree(real_xf86vm_modes);
|
|
||||||
}
|
|
||||||
|
|
||||||
/***** GAMMA CONTROL *****/
|
/***** GAMMA CONTROL *****/
|
||||||
/* (only available in XF86VidMode 2.x) */
|
/* (only available in XF86VidMode 2.x) */
|
||||||
|
|
||||||
|
@ -391,10 +386,6 @@ void X11DRV_XF86VM_Init(void)
|
||||||
TRACE("XVidMode support not compiled in.\n");
|
TRACE("XVidMode support not compiled in.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void X11DRV_XF86VM_Cleanup(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* SONAME_LIBXXF86VM */
|
#endif /* SONAME_LIBXXF86VM */
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
Loading…
Reference in New Issue