Removed MSG_WineStartTicks (does not work for multiple address spaces

include/message.h

@@ -11,8 +11,6 @@
 
 struct tagMSG;
 
-extern DWORD MSG_WineStartTicks;  /* Ticks at Wine startup */
-
 /* message.c */
 extern BOOL MSG_InternalGetMessage( int type, struct tagMSG *msg, HWND hwnd,
                                     HWND hwndOwner, WPARAM code,

misc/main.c

@@ -646,8 +646,6 @@ void MAIN_WineInit(void)
 
     setlocale(LC_CTYPE,"");
     gettimeofday( &tv, NULL);
-    MSG_WineStartTicks = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-    
     atexit(called_at_exit);
 }
 
@@ -700,5 +698,5 @@ DWORD WINAPI GetTickCount(void)
 {
     struct timeval t;
     gettimeofday( &t, NULL );
-    return ((t.tv_sec * 1000) + (t.tv_usec / 1000)) - MSG_WineStartTicks;
+    return (t.tv_sec * 1000) + (t.tv_usec / 1000);
 }

windows/message.c

@@ -43,8 +43,6 @@ typedef enum { SYSQ_MSG_ABANDON, SYSQ_MSG_SKIP,
 
 extern HQUEUE16 hCursorQueue;			 /* queue.c */
 
-DWORD MSG_WineStartTicks; /* Ticks at Wine startup */
-
 static UINT doubleClickSpeed = 452;
 
 /***********************************************************************

windows/x11drv/event.c

@@ -697,14 +697,12 @@ static void EVENT_MotionNotify( HWND hWnd, XMotionEvent *event )
     MOUSE_SendEvent( MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, 
 		     xOffset + event->x, yOffset + event->y,
 		     X11DRV_EVENT_XStateToKeyState( event->state ), 
-		     event->time - MSG_WineStartTicks,
-		     hWnd);
+		     event->time, hWnd);
   } else {
     MOUSE_SendEvent( MOUSEEVENTF_MOVE,
                      event->x_root, event->y_root,
                      X11DRV_EVENT_XStateToKeyState( event->state ), 
-                     event->time - MSG_WineStartTicks,
-                     hWnd);
+                     event->time, hWnd);
   }
 }
 
@@ -758,8 +756,7 @@ static void EVENT_ButtonPress( HWND hWnd, XButtonEvent *event )
   MOUSE_SendEvent( statusCodes[buttonNum], 
 		   xOffset + event->x, yOffset + event->y,
 		   MAKEWPARAM(keystate,wData),
-		   event->time - MSG_WineStartTicks,
-		   hWnd);
+		   event->time, hWnd);
 }
 
 
@@ -806,9 +803,7 @@ static void EVENT_ButtonRelease( HWND hWnd, XButtonEvent *event )
 
   MOUSE_SendEvent( statusCodes[buttonNum], 
 		   xOffset + event->x, yOffset + event->y,
-		   keystate, 
-		   event->time - MSG_WineStartTicks,
-		   hWnd);
+		   keystate, event->time, hWnd);
 }
 
 
@@ -1927,8 +1922,7 @@ static void EVENT_DGAMotionEvent( XDGAMotionEvent *event )
   MOUSE_SendEvent( MOUSEEVENTF_MOVE, 
 		   event->dx, event->dy,
 		   X11DRV_EVENT_XStateToKeyState( event->state ), 
-		   event->time - MSG_WineStartTicks,
-		   DGAhwnd );
+		   event->time, DGAhwnd );
 }
 
 static void EVENT_DGAButtonPressEvent( XDGAButtonEvent *event )
@@ -1956,11 +1950,7 @@ static void EVENT_DGAButtonPressEvent( XDGAButtonEvent *event )
       break;
   }
   
-  MOUSE_SendEvent( statusCodes[buttonNum], 
-		   0, 0, 
-		   keystate, 
-		   event->time - MSG_WineStartTicks,
-		   DGAhwnd );
+  MOUSE_SendEvent( statusCodes[buttonNum], 0, 0, keystate, event->time, DGAhwnd );
 }
 
 static void EVENT_DGAButtonReleaseEvent( XDGAButtonEvent *event )
@@ -1988,11 +1978,7 @@ static void EVENT_DGAButtonReleaseEvent( XDGAButtonEvent *event )
       break;
   }
   
-  MOUSE_SendEvent( statusCodes[buttonNum], 
-		   0, 0, 
-		   keystate, 
-		   event->time - MSG_WineStartTicks,
-		   DGAhwnd );
+  MOUSE_SendEvent( statusCodes[buttonNum], 0, 0, keystate, event->time, DGAhwnd );
 }
 
 #endif

windows/x11drv/keyboard.c

@@ -596,7 +596,7 @@ void X11DRV_KEYBOARD_HandleEvent( WND *pWnd, XKeyEvent *event )
 
     INT event_x = (pWnd? pWnd->rectWindow.left : 0) + event->x;
     INT event_y = (pWnd? pWnd->rectWindow.top  : 0) + event->y;
-    DWORD event_time = event->time - MSG_WineStartTicks;
+    DWORD event_time = event->time;
 
     /* this allows support for dead keys */
     if ((event->keycode >> 8) == 0x10)