[ros-diffs] [greatlrd] 14347:

Modified: branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c
  _____

Modified: branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c
--- branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c
2005-03-27 12:03:59 UTC (rev 14346)
+++ branches/ros-branch-0_2_6/reactos/lib/dinput/mouse.c
2005-03-27 12:47:43 UTC (rev 14347)
@@ -871,6 +871,7 @@

static POINT point;
 int calc;
 int count_button;
+int add = 0;
 #endif

@@ -880,7 +881,6 @@

if (flags != DIGDD_PEEK) 
 {
-getmousesvalue(iface);
 b[0] = ((GetKeyState(VK_LBUTTON) & 0x80) ? 0xFF : 0x00);	
 b[1] = ((GetKeyState(VK_RBUTTON) & 0x80) ? 0xFF : 0x00);	
 b[2] = ((GetKeyState(VK_MBUTTON) & 0x80) ? 0xFF : 0x00);	
@@ -899,14 +899,13 @@

if (This->acquired == 0) {
    WARN(" application tries to get data from an unacquired device
!\n");
-	//return DIERR_NOTACQUIRED;
+	return DIERR_NOTACQUIRED;

// windows does not get any data if 
    // we do not call manual to mouse Acquire
    // this is only need if some apps calling on getdevice data
direcly
    // in windows GetdeviceData does always update first the data
    // then return it.
-	 SysMouseAImpl_Acquire(iface);
    }

@@ -915,6 +914,7 @@

#ifdef __REACTOS__

+
   if (*entries == 0) return DIERR_INVALIDPARAM;

if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) {
@@ -924,48 +924,58 @@
    if (This->data_queue==NULL) {
        WARN("No buffer have been set up !\n");	  
        return DIERR_NOTINITIALIZED;
-	}   
-	    
-  FIXME("This is broken in Tribes ??, need right implant of the
buffer!!!!!!!!\n"); 
+	}

+/* this code are not need it but if we want 100% compatible
+  with ms we should keep it. but the mouse will be choppy 
+  in Unreal 2004 Demo
+
   if (GetTickCount()-time <50) {
      *entries=0;
      return DI_OK;
       }
-
   time = GetTickCount();
-  
-  
+*/  
+	if (GetTickCount()-time <50)
+	   {
+	    add=0;
+	   }
+	else 
+	{
+	 add=1;
+	 time = GetTickCount();
+	}

for (count=0;count<*entries;count++) {
      
-	 if (save_point.x != point.x) {
-         dod[count_ent].dwOfs =   DIMOFS_X;         
+	 
+	  if (save_point.x != point.x) {
+             dod[count_ent].dwOfs =   DIMOFS_X;

-		 dod[count_ent].dwData =  point.x - save_point.x;
-         dod[count_ent].dwTimeStamp =  time +1; 
-         dod[count_ent].dwSequence = last_event++;  
-		 count_ent++;
-         save_point.x = point.x;
-         }
+		     dod[count_ent].dwData =  point.x - save_point.x;
+             dod[count_ent].dwTimeStamp =  GetTickCount();
+             dod[count_ent].dwSequence = last_event+=add;  
+		     count_ent++;
+             save_point.x = point.x;
+		     }

-     else if (save_point.y != point.y) {
-        dod[count_ent].dwOfs =   DIMOFS_Y;		
-		dod[count_ent].dwData =  point.y - save_point.y;	
+	   else  if (save_point.y != point.y) {
+              dod[count_ent].dwOfs =   DIMOFS_Y;		
+		      dod[count_ent].dwData =  point.y - save_point.y;

-        dod[count_ent].dwTimeStamp =  time +1;
-        dod[count_ent].dwSequence = last_event++;
-		count_ent++;
-		save_point.y = point.y;
-	    }
-          
+              dod[count_ent].dwTimeStamp =  GetTickCount();
+              dod[count_ent].dwSequence =  last_event+=add;  
+		      count_ent++;
+		      save_point.y = point.y;				
+	          }	      
+
     else if (save_b[0] != b[0]) {		 
    	dod[count_ent].dwOfs =   DIMOFS_BUTTON0;
    		
         dod[count_ent].dwData =   b[0];
-        dod[count_ent].dwTimeStamp =  time +1;
-        dod[count_ent].dwSequence = last_event++;
+        dod[count_ent].dwTimeStamp =  GetTickCount();
+        dod[count_ent].dwSequence =  last_event+=add;  
    	count_ent++;
    	save_b[0] = b[0];
        }
@@ -974,8 +984,8 @@
    	dod[count_ent].dwOfs =   DIMOFS_BUTTON1;
    		
         dod[count_ent].dwData =   b[1];
-        dod[count_ent].dwTimeStamp =  time +1;
-        dod[count_ent].dwSequence = last_event++;
+        dod[count_ent].dwTimeStamp =  GetTickCount();
+        dod[count_ent].dwSequence =  last_event+=add;  
    	count_ent++;
    	save_b[1] = b[1];
        }
@@ -984,8 +994,8 @@
    	dod[count_ent].dwOfs =   DIMOFS_BUTTON2;
    		
         dod[count_ent].dwData =   b[2];
-        dod[count_ent].dwTimeStamp =  time +1;
-        dod[count_ent].dwSequence = last_event++;
+        dod[count_ent].dwTimeStamp =  GetTickCount();
+        dod[count_ent].dwSequence =  last_event+=add;  
    	count_ent++;
    	save_b[2] = b[2];
        }
@@ -994,26 +1004,17 @@
    	dod[count_ent].dwOfs =   DIMOFS_BUTTON3;
    		
         dod[count_ent].dwData =   b[3];
-        dod[count_ent].dwTimeStamp =  time +1;
-        dod[count_ent].dwSequence = last_event++;
+        dod[count_ent].dwTimeStamp =  GetTickCount();
+        dod[count_ent].dwSequence =  last_event+=add;  
    	count_ent++;
    	save_b[3] = b[3];
        }
-
-     else if (save_b[4] != b[4]) {		 
-		dod[count_ent].dwOfs =   DIMOFS_BUTTON4;
-			
-        dod[count_ent].dwData =   b[4];
-        dod[count_ent].dwTimeStamp =  time +1;
-        dod[count_ent].dwSequence = last_event++;
-		count_ent++;
-		save_b[4] = b[4];
-	    }

}  // end for

+SetCursorPos(point.x, point.y);
 *entries = count_ent;
 #endif