Moved graphics initialisation to the x11drv/ttydrv dll init code.
Merged event, keyboard and mouse drivers into USER driver.
diff --git a/dlls/mouse/mouse_main.c b/dlls/mouse/mouse_main.c
index ae0f0ed..ccfc08a 100644
--- a/dlls/mouse/mouse_main.c
+++ b/dlls/mouse/mouse_main.c
@@ -13,18 +13,17 @@
#include "module.h"
#include "mouse.h"
#include "monitor.h"
+#include "user.h"
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "win.h"
#include "wine/winbase16.h"
-DEFAULT_DEBUG_CHANNEL(event)
+DEFAULT_DEBUG_CHANNEL(event);
/**********************************************************************/
-MOUSE_DRIVER *MOUSE_Driver = NULL;
-
static LPMOUSE_EVENT_PROC DefMouseEventProc = NULL;
/***********************************************************************
@@ -57,10 +56,10 @@
/* Now initialize the mouse driver */
if (initDone == FALSE)
- {
- MOUSE_Driver->pInit();
+ {
+ USER_Driver->pInitMouse();
initDone = TRUE;
- }
+ }
}
static VOID WINAPI MOUSE_CallMouseEventProc( FARPROC16 proc,
@@ -127,11 +126,11 @@
wme.hWnd = hWnd;
wme.keyState = keyState;
- MOUSE_Driver->pEnableWarpPointer(FALSE);
+ USER_Driver->pEnableWarpPointer(FALSE);
/* To avoid deadlocks, we have to suspend all locks on windows structures
before the program control is passed to the mouse driver */
iWndsLocks = WIN_SuspendWndsLock();
DefMouseEventProc( mouseStatus, posX, posY, 0, (DWORD)&wme );
WIN_RestoreWndsLock(iWndsLocks);
- MOUSE_Driver->pEnableWarpPointer(TRUE);
+ USER_Driver->pEnableWarpPointer(TRUE);
}
