Changeset 2462 for trunk/src

Timestamp:

Jan 17, 2000, 6:18:38 PM (26 years ago)

Author:

sandervl

Message:

bugfixes

Location:

trunk/src/dinput

Files:

• dinput.cpp (modified) (4 diffs)
• oslibinput.cpp (modified) (2 diffs)

trunk/src/dinput/dinput.cpp

@@ -1 @@
-/* $Id: dinput.cpp,v 1.2 1999-11-08 13:50:41 sandervl Exp $ */
+/* $Id: dinput.cpp,v 1.3 2000-01-17 17:18:38 sandervl Exp $ */
 /*              DirectInput
  *
@@ -545 +545 @@
         n = 0;
   
-        for (int i=0;i<256 && (n<*entries);i++)
+        for (int i=0;i<256 && (n<xentries);i++)
         {
               if (This->keystate[i] == (win32keys[i]&0x80))
@@ -553 +553 @@
                 dod[n].dwOfs            = i; /* scancode */
                 dod[n].dwData           = win32keys[i]&0x80;
-                dod[i].dwTimeStamp      = time(NULL);
-                dod[i].dwSequence       = evsequence++;
+                dod[n].dwTimeStamp      = time(NULL);
+                dod[n].dwSequence       = evsequence++;
                 n++;
               }
@@ -562 +562 @@
         }
   
-        *entries = n;
+        if(entries) *entries = n;
         ret = DI_OK;
 }

trunk/src/dinput/oslibinput.cpp

@@ -1 @@
-/* $Id: oslibinput.cpp,v 1.3 1999-12-21 23:19:14 hugh Exp $ */
+/* $Id: oslibinput.cpp,v 1.4 2000-01-17 17:18:38 sandervl Exp $ */
 
 #define INCL_WIN
@@ -32 +32 @@
   if(rc == TRUE && len==256)
   {
-      KeyTranslatePMToWinBuf((BYTE *)&PMKeyState, (BYTE *)&ptr, len);
-  for(int i=0;i<256;i++) {
-    winkeybuf[i] &= 0x80; //only high bit
-  }
-      return TRUE;
+        KeyTranslatePMToWinBuf((BYTE *)&PMKeyState[0], (BYTE *)ptr, len);
+        for(int i=0;i<256;i++) {
+                winkeybuf[i] &= 0x80; //only high bit
+        }
+        return TRUE;
   }
   return FALSE;