Rebase against 002af352fac43d170aad216bf15098b27555539a.

This commit is contained in:
Sebastian Lackner
2016-08-30 20:44:42 +02:00
parent 39c7e02819
commit 8ca9f08b92
3 changed files with 5 additions and 92 deletions

View File

@@ -1,4 +1,4 @@
From b8426b424f9ed456f29189459f27ab51b1a9bd7c Mon Sep 17 00:00:00 2001
From bfbda74851ae4de3b0b185862af566005b477930 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@gmail.com>
Date: Tue, 23 Sep 2014 23:22:17 +0800
Subject: winex11.drv: Update a candidate window's position with over-the-spot
@@ -120,7 +120,7 @@ index 68aa699..cba4aa9 100644
void (CDECL *pThreadDetach)(void);
} USER_DRIVER;
diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec
index 7cdce52..167ecb2 100644
index ceb0f56..5552bdb 100644
--- a/dlls/winex11.drv/winex11.drv.spec
+++ b/dlls/winex11.drv/winex11.drv.spec
@@ -53,6 +53,7 @@
@@ -128,9 +128,9 @@ index 7cdce52..167ecb2 100644
@ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) X11DRV_WindowPosChanged
@ cdecl SystemParametersInfo(long long ptr long) X11DRV_SystemParametersInfo
+@ cdecl UpdateCandidatePos(long ptr) X11DRV_UpdateCandidatePos
@ cdecl ThreadDetach() X11DRV_ThreadDetach
# WinTab32
@ cdecl AttachEventQueueToTablet(long) X11DRV_AttachEventQueueToTablet
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index e51169d..069115d 100644
--- a/dlls/winex11.drv/xim.c