mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3371 from realjiangms/fix_x11_shadow_race

Browse Source 
Server/shadow: Protect X operations on shared subystem X11 display with X11 display lock
This commit is contained in:
Bernhard Miklautz 2016-05-30 19:25:20 +02:00
commit 9daf129c63
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/shadow/X11/x11_shadow.c
View File

@ -238,6 +238,8 @@ void x11_shadow_input_keyboard_event(x11ShadowSubsystem* subsystem, rdpShadowCli
if (keycode != 0)
{
XLockDisplay(subsystem->display);
XTestGrabControl(subsystem->display, True);
if (flags & KBD_FLAGS_DOWN)
@ -248,6 +250,8 @@ void x11_shadow_input_keyboard_event(x11ShadowSubsystem* subsystem, rdpShadowCli
XTestGrabControl(subsystem->display, False);
XFlush(subsystem->display);
XUnlockDisplay(subsystem->display);
}
#endif
}
@ -272,6 +276,8 @@ void x11_shadow_input_mouse_event(x11ShadowSubsystem* subsystem, rdpShadowClient
x += surface->x;
y += surface->y;
XLockDisplay(subsystem->display);
XTestGrabControl(subsystem->display, True);
if (flags & PTR_FLAGS_WHEEL)
@ -308,6 +314,8 @@ void x11_shadow_input_mouse_event(x11ShadowSubsystem* subsystem, rdpShadowClient
XTestGrabControl(subsystem->display, False);
XFlush(subsystem->display);
XUnlockDisplay(subsystem->display);
#endif
}
@ -326,6 +334,8 @@ void x11_shadow_input_extended_mouse_event(x11ShadowSubsystem* subsystem, rdpSha
x += surface->x;
y += surface->y;
XLockDisplay(subsystem->display);
XTestGrabControl(subsystem->display, True);
XTestFakeMotionEvent(subsystem->display, 0, x, y, CurrentTime);
@ -344,6 +354,8 @@ void x11_shadow_input_extended_mouse_event(x11ShadowSubsystem* subsystem, rdpSha
XTestGrabControl(subsystem->display, False);
XFlush(subsystem->display);
XUnlockDisplay(subsystem->display);
#endif
}
@ -447,7 +459,9 @@ int x11_shadow_query_cursor(x11ShadowSubsystem* subsystem, BOOL getImage)
UINT32* pDstPixel;
XFixesCursorImage* ci;
XLockDisplay(subsystem->display);
ci = XFixesGetCursorImage(subsystem->display);
XUnlockDisplay(subsystem->display);
if (!ci)
return -1;
@ -490,12 +504,17 @@ int x11_shadow_query_cursor(x11ShadowSubsystem* subsystem, BOOL getImage)
int root_x, root_y;
Window root, child;
XLockDisplay(subsystem->display);
if (!XQueryPointer(subsystem->display, subsystem->root_window,
&root, &child, &root_x, &root_y, &win_x, &win_y, &mask))
{
XUnlockDisplay(subsystem->display);
return -1;
}
XUnlockDisplay(subsystem->display);
x = root_x;
y = root_y;
}
@ -551,8 +570,10 @@ void x11_shadow_validate_region(x11ShadowSubsystem* subsystem, int x, int y, int
region.height = height;
#ifdef WITH_XFIXES
XLockDisplay(subsystem->display);
XFixesSetRegion(subsystem->display, subsystem->xdamage_region, &region, 1);
XDamageSubtract(subsystem->display, subsystem->xdamage, subsystem->xdamage_region, None);
XUnlockDisplay(subsystem->display);
#endif
}
@ -675,7 +696,10 @@ BOOL x11_shadow_check_resize(x11ShadowSubsystem* subsystem)
{
MONITOR_DEF* virtualScreen;
XWindowAttributes attr;
XLockDisplay(subsystem->display);
XGetWindowAttributes(subsystem->display, subsystem->root_window, &attr);
XUnlockDisplay(subsystem->display);
if (attr.width != subsystem->width || attr.height != subsystem->height)
{
@ -832,7 +856,7 @@ int x11_shadow_screen_grab(x11ShadowSubsystem* subsystem)
XDestroyImage(image);
return 1;
fail_capture:
XSetErrorHandler(NULL);
XSync(subsystem->display, False);
@ -938,11 +962,15 @@ void* x11_shadow_subsystem_thread(x11ShadowSubsystem* subsystem)
if (WaitForSingleObject(subsystem->event, 0) == WAIT_OBJECT_0)
{
XLockDisplay(subsystem->display);
if (XEventsQueued(subsystem->display, QueuedAlready))
{
XNextEvent(subsystem->display, &xevent);
x11_shadow_handle_xevent(subsystem, &xevent);
}
XUnlockDisplay(subsystem->display);
}
if ((status == WAIT_TIMEOUT) || (GetTickCount64() > frameTime))
@ -990,7 +1018,7 @@ int x11_shadow_subsystem_base_init(x11ShadowSubsystem* subsystem)
return 1;
}
int x11_shadow_xfixes_init(x11ShadowSubsystem* subsystem)
static int x11_shadow_xfixes_init(x11ShadowSubsystem* subsystem)
{
#ifdef WITH_XFIXES
int xfixes_event;
@ -1014,7 +1042,7 @@ int x11_shadow_xfixes_init(x11ShadowSubsystem* subsystem)
#endif
}
int x11_shadow_xinerama_init(x11ShadowSubsystem* subsystem)
static int x11_shadow_xinerama_init(x11ShadowSubsystem* subsystem)
{
#ifdef WITH_XINERAMA
int major, minor;
@ -1038,7 +1066,7 @@ int x11_shadow_xinerama_init(x11ShadowSubsystem* subsystem)
#endif
}
int x11_shadow_xdamage_init(x11ShadowSubsystem* subsystem)
static int x11_shadow_xdamage_init(x11ShadowSubsystem* subsystem)
{
#ifdef WITH_XDAMAGE
int major, minor;
@ -1076,7 +1104,7 @@ int x11_shadow_xdamage_init(x11ShadowSubsystem* subsystem)
#endif
}
int x11_shadow_xshm_init(x11ShadowSubsystem* subsystem)
static int x11_shadow_xshm_init(x11ShadowSubsystem* subsystem)
{
Bool pixmaps;
int major, minor;