From df090671df4b44083b09084ccecc6ef30fd9b166 Mon Sep 17 00:00:00 2001 From: schlaepfer Date: Fri, 15 Dec 2006 15:50:08 +0000 Subject: [PATCH] - bux fixed in usb_control_msg (the values read were not written to the original array) git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@230 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c --- LibusbJava/LibusbJava.cpp | 2 -- LibusbJava/resource.rc | 2 +- LibusbJava/version.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/LibusbJava/LibusbJava.cpp b/LibusbJava/LibusbJava.cpp index ffb6b73..566cad0 100644 --- a/LibusbJava/LibusbJava.cpp +++ b/LibusbJava/LibusbJava.cpp @@ -588,8 +588,6 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1control_1msg { jbyte *bytes = env->GetByteArrayElements(jbytes, NULL); int retVal = usb_control_msg((usb_dev_handle *) dev_handle, requesttype, request, value, index, (char *) bytes, size, timeout); - if (bytes) { return retVal; } - jbytes = env->NewByteArray(size); env->SetByteArrayRegion(jbytes, 0, size, bytes); return retVal; } diff --git a/LibusbJava/resource.rc b/LibusbJava/resource.rc index 521eace..3e100cc 100644 --- a/LibusbJava/resource.rc +++ b/LibusbJava/resource.rc @@ -2,6 +2,6 @@ #define RC_FILE_SUB_TYPE VFT2_UNKNOWN #define RC_PRODUCT_STR "Java LibUsb-Win32 wrapper - DLL" #define RC_FILE_NAME_STR "LibusbJava.dll" -#define RC_VERSION_STR "0.1.0.0" +#define RC_VERSION_STR "0.1.0.1" #include "common.rc" diff --git a/LibusbJava/version.properties b/LibusbJava/version.properties index 50acdfe..2fe2049 100644 --- a/LibusbJava/version.properties +++ b/LibusbJava/version.properties @@ -2,4 +2,4 @@ version.major=0 version.minor=1 version.micro=0 -version.nano=0 \ No newline at end of file +version.nano=1 \ No newline at end of file