From db7b3a9cf5d7a41273713691bf9a872657e506cd Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Sat, 1 Mar 2003 21:39:31 +0000 Subject: [PATCH] fix: no longer fatal to not acquire input --- src/native/win32/org_lwjgl_input_Keyboard.cpp | 6 ++++-- src/native/win32/org_lwjgl_input_Mouse.cpp | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/native/win32/org_lwjgl_input_Keyboard.cpp b/src/native/win32/org_lwjgl_input_Keyboard.cpp index bfe448df..199affd2 100644 --- a/src/native/win32/org_lwjgl_input_Keyboard.cpp +++ b/src/native/win32/org_lwjgl_input_Keyboard.cpp @@ -117,8 +117,10 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate lpdiKeyboard->SetProperty(DIPROP_BUFFERSIZE, &dipropdw.diph); HRESULT ret = lpdiKeyboard->Acquire(); - if (ret != DI_OK && ret != S_FALSE) { - printf("Failed to acquire keyboard\n"); + if(FAILED(ret)) { +#if _DEBUG + printf("Failed to acquire keyboard\n"); +#endif } return JNI_TRUE; diff --git a/src/native/win32/org_lwjgl_input_Mouse.cpp b/src/native/win32/org_lwjgl_input_Mouse.cpp index 9d0b9ddf..fa0139d1 100644 --- a/src/native/win32/org_lwjgl_input_Mouse.cpp +++ b/src/native/win32/org_lwjgl_input_Mouse.cpp @@ -136,10 +136,8 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Mouse_nCreate(JNIEnv *env, jclas hr = mDIDevice->Acquire(); if(FAILED(hr)) { #if _DEBUG - printf("Acquire failed\n"); + printf("Failed to acquire mouse\n"); #endif - ShutdownMouse(); - return JNI_FALSE; } return mCreate_success; @@ -160,6 +158,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy(JNIEnv *env, jclass c * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass clazz) { + mDIDevice->Acquire(); UpdateMouseFields(); }