ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(MSVC) Buildfix

This commit is contained in:
twinaphex 2017-12-06 04:33:54 +01:00
parent 0c9fce98a2
commit de9b0127f8
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
input/drivers_joypad/dinput_joypad.c
View File

@ -34,6 +34,7 @@
#include "../input_driver.h" #include "../input_driver.h"
#include "../input_keymaps.h" #include "../input_keymaps.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#include "dinput_joypad.h"
struct dinput_joypad struct dinput_joypad
{ {
@ -63,7 +64,7 @@ extern bool g_xinput_block_pads;
extern int g_xinput_pad_indexes[MAX_USERS]; extern int g_xinput_pad_indexes[MAX_USERS];
extern LPDIRECTINPUT8 g_dinput_ctx; extern LPDIRECTINPUT8 g_dinput_ctx;
bool dinput_joypad_get_vidpid_from_xinput_index(int index, int *vid, int *pid, int *dinput_index) bool dinput_joypad_get_vidpid_from_xinput_index(int32_t index, int32_t *vid, int32_t *pid, int32_t *dinput_index)
{ {
int i; int i;

4
input/drivers_joypad/dinput_joypad.h
View File

@ -18,11 +18,13 @@
#ifndef __DINPUT_JOYPAD_H #ifndef __DINPUT_JOYPAD_H
#define __DINPUT_JOYPAD_H #define __DINPUT_JOYPAD_H
#include <stdint.h>
#include <boolean.h>
#include <retro_common_api.h> #include <retro_common_api.h>
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
bool dinput_joypad_get_vidpid_from_xinput_index(int index, int *vid, int *pid, int *dinput_index); bool dinput_joypad_get_vidpid_from_xinput_index(int32_t index, int32_t *vid, int32_t *pid, int32_t *dinput_index);
RETRO_END_DECLS RETRO_END_DECLS

9
input/drivers_joypad/xinput_joypad.c
View File

@ -278,11 +278,12 @@ static bool xinput_joypad_init(void *data)
if (pad_index_to_xuser_index(j) > -1) if (pad_index_to_xuser_index(j) > -1)
{ {
int vid = 0; int32_t vid = 0;
int pid = 0; int32_t pid = 0;
#ifdef HAVE_DINPUT #ifdef HAVE_DINPUT
int dinput_index = 0; int32_t dinput_index = 0;
bool success = dinput_joypad_get_vidpid_from_xinput_index(pad_index_to_xuser_index(j), &vid, &pid, &dinput_index); bool success = dinput_joypad_get_vidpid_from_xinput_index((int32_t)pad_index_to_xuser_index(j), (int32_t*)&vid, (int32_t*)&pid,
(int32_t*)&dinput_index);
if (success) if (success)
RARCH_LOG("[XInput]: Found VID/PID (%04X/%04X) from DINPUT index %d for \"%s\", user #%u\n", RARCH_LOG("[XInput]: Found VID/PID (%04X/%04X) from DINPUT index %d for \"%s\", user #%u\n",