diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
| commit | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (patch) | |
| tree | eec421a528cb2f0fdaff43d4cf82fc0af89c0392 /xorg-server/mi | |
| parent | 2553bdd7c359cd87525d367761c86932cec5adff (diff) | |
| download | vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.gz vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.bz2 vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.zip | |
vcxsrv compiles now. Still run-time errors.
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/mipointer.c | 4 | ||||
| -rw-r--r-- | xorg-server/mi/misprite.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c index e37316e71..85cc70de0 100644 --- a/xorg-server/mi/mipointer.c +++ b/xorg-server/mi/mipointer.c @@ -285,10 +285,10 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) static void miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) { + SetupScreen(pScreen); if (!pDev->isMaster && pDev->u.master) return; - SetupScreen(pScreen); (*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen); xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey)); dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL); @@ -302,9 +302,9 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { miPointerPtr pPointer; BOOL changedScreen = FALSE; + SetupScreen (pScreen); pPointer = MIPOINTER(pDev); - SetupScreen (pScreen); if (pPointer->pScreen != pScreen) { diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c index 692e6c97a..0b83abdb4 100644 --- a/xorg-server/mi/misprite.c +++ b/xorg-server/mi/misprite.c @@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { miSpriteScreenPtr pScreenPriv; + miCursorInfoPtr pPointer; pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); - miCursorInfoPtr pPointer; if (!pDev->isMaster && !pDev->u.master) { |