src/joystick/win32/SDL_dxjoystick.c
branchgsoc2008_force_feedback
changeset 2576 034440120c38
parent 2198 fe19afb86473
child 2577 72b17d80b426
     1.1 --- a/src/joystick/win32/SDL_dxjoystick.c	Thu Jul 31 17:11:36 2008 +0000
     1.2 +++ b/src/joystick/win32/SDL_dxjoystick.c	Thu Jul 31 17:15:36 2008 +0000
     1.3 @@ -178,7 +178,7 @@
     1.4  static BOOL CALLBACK
     1.5  EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
     1.6  {
     1.7 -    memcpy(&SYS_Joystick[SYS_NumJoysticks], pdidInstance,
     1.8 +    SDL_memcpy(&SYS_Joystick[SYS_NumJoysticks], pdidInstance,
     1.9             sizeof(DIDEVICEINSTANCE));
    1.10      SYS_NumJoysticks++;
    1.11  
    1.12 @@ -208,7 +208,7 @@
    1.13      LPDIRECTINPUTDEVICE device;
    1.14      DIPROPDWORD dipdw;
    1.15  
    1.16 -    ZeroMemory(&dipdw, sizeof(DIPROPDWORD));
    1.17 +    SDL_memset(&dipdw, 0, sizeof(DIPROPDWORD));
    1.18      dipdw.diph.dwSize = sizeof(DIPROPDWORD);
    1.19      dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
    1.20  
    1.21 @@ -220,7 +220,7 @@
    1.22          SDL_OutOfMemory();
    1.23          return (-1);
    1.24      }
    1.25 -    ZeroMemory(joystick->hwdata, sizeof(struct joystick_hwdata));
    1.26 +    SDL_memset(joystick->hwdata, 0, sizeof(struct joystick_hwdata));
    1.27      joystick->hwdata->buffered = 1;
    1.28      joystick->hwdata->Capabilities.dwSize = sizeof(DIDEVCAPS);
    1.29