shadowfacts/jinput-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/jinput-arm64.git synced 2025-12-06 08:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: Fix more mingw compile warnings

Browse source
This commit is contained in:
elias 2006-07-17 11:32:38 +00:00
parent 0a481c9adb
commit 13a7aaef3c
2 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/windows/src/native/dx8/net_java_games_input_IDirectInput.c
View file

@ -22,7 +22,7 @@ typedef struct {
JNIEXPORT jlong JNICALL Java_net_java_games_input_IDirectInput_createIDirectInput(JNIEnv *env, jclass unused) { JNIEXPORT jlong JNICALL Java_net_java_games_input_IDirectInput_createIDirectInput(JNIEnv *env, jclass unused) {
LPDIRECTINPUT8 lpDirectInput; LPDIRECTINPUT8 lpDirectInput;
HRESULT res = DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, HRESULT res = DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION,
&IID_IDirectInput8,(VOID **)&lpDirectInput, NULL); &IID_IDirectInput8, (void *)&lpDirectInput, NULL);
if (FAILED(res)) { if (FAILED(res)) {
throwIOException(env, "Failed to create IDirectInput8 (%d)\n", res); throwIOException(env, "Failed to create IDirectInput8 (%d)\n", res);
return 0; return 0;

32
plugins/windows/src/native/dx8/net_java_games_input_IDirectInputDevice.c
View file

@ -32,34 +32,6 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_IDirectInputDevice_nSetBufferSi
return res; return res;
} }
static const GUID *mapGUIDId(const jint guid_id) {
switch (guid_id) {
case net_java_games_input_IDirectInputDevice_GUID_XAxis:
return &GUID_XAxis;
case net_java_games_input_IDirectInputDevice_GUID_YAxis:
return &GUID_YAxis;
case net_java_games_input_IDirectInputDevice_GUID_ZAxis:
return &GUID_ZAxis;
case net_java_games_input_IDirectInputDevice_GUID_RxAxis:
return &GUID_RxAxis;
case net_java_games_input_IDirectInputDevice_GUID_RyAxis:
return &GUID_RyAxis;
case net_java_games_input_IDirectInputDevice_GUID_RzAxis:
return &GUID_RzAxis;
case net_java_games_input_IDirectInputDevice_GUID_Slider:
return &GUID_Slider;
case net_java_games_input_IDirectInputDevice_GUID_Button:
return &GUID_Button;
case net_java_games_input_IDirectInputDevice_GUID_Key:
return &GUID_Key;
case net_java_games_input_IDirectInputDevice_GUID_POV:
return &GUID_POV;
case net_java_games_input_IDirectInputDevice_GUID_Unknown:
default:
return NULL;
}
}
static jint mapGUIDType(const GUID *guid) { static jint mapGUIDType(const GUID *guid) {
if (IsEqualGUID(guid, &GUID_XAxis)) { if (IsEqualGUID(guid, &GUID_XAxis)) {
return net_java_games_input_IDirectInputDevice_GUID_XAxis; return net_java_games_input_IDirectInputDevice_GUID_XAxis;
@ -113,9 +85,6 @@ static BOOL CALLBACK enumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef) {
enum_context_t *enum_context = (enum_context_t *)pvRef; enum_context_t *enum_context = (enum_context_t *)pvRef;
jmethodID add_method; jmethodID add_method;
jstring name; jstring name;
DWORD instance;
DWORD type;
jint guid_type;
jbyteArray guid; jbyteArray guid;
JNIEnv *env = enum_context->env; JNIEnv *env = enum_context->env;
jobject device_obj = enum_context->device_obj; jobject device_obj = enum_context->device_obj;
@ -228,7 +197,6 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_IDirectInputDevice_nSetDataForm
jmethodID getInstance_method; jmethodID getInstance_method;
jobject object; jobject object;
jint type; jint type;
jint guid_id;
jint object_flags; jint object_flags;
jint instance; jint instance;
jobject guid_array; jobject guid_array;