fetch & merge

.gitignore

@@ -18,3 +18,4 @@ dist/src-mvn.zip
 dist/out-of-date.jar
 perf*.txt
 native/libffi/doc/libffi.info
+junit-*

CHANGES.md

@@ -7,7 +7,7 @@ NOTE: JNI native support is typically incompatible between minor versions, and a
 
 Features
 --------
-* [#241](https://github.com/twall/jna/issues/241) - Add support function SHAppBarMessage from ShellApi
+* [#241](https://github.com/twall/jna/issues/241) - Add support function SHAppBarMessage from ShellApi - [@bsorrentinoJ](https://github.com/bsorrentinoJ).
 * Added ASL licensing to facilitate distribution - [@twall](https://github.com/twall).
 * [#109](https://github.com/twall/jna/issues/109): Set default Java compatibility level to 1.6 - [@twall](https://github.com/twall).
 * [#209](https://github.com/twall/jna/issues/209): Improved default performance saving last error results - [@twall](https://github.com/twall).
@@ -20,6 +20,8 @@ Features
 * [#225](https://github.com/twall/jna/pull/225): Added `platform.win32.Kernel32.GetLogicalProcessorInformation` and `platform.win32.Kernel32Util.getLogicalProcessorInformation` - [@trejkaz](https://github.com/trejkaz).
 * [#236](https://github.com/twall/jna/issues/236): Auto-strip profiler native method prefix specified by `jna.profiler.prefix`, which defaults to $$YJP$$ - [@twall](https://github.com/twall).
 * Added `jna.debug_load` property to diagnose library loading issues - [@twall](https://github.com/twall).
+* Throw explicit `IllegalArgumentException` when `Structure.ByReference` is used where it shouldn't be (can result in multiply freed memory or other unexpected behavior) - [@twall](https://github.com/twall).
+* [#243](https://github.com/twall/jna/issues/243): Automatically accommodate long library paths on Windows which would otherwise fail - [@twall](https://github.com/twall).
 
 Bug Fixes
 ---------

LICENSE.ASL

@@ -0,0 +1,12 @@
+This copy of JNA is licensed under the
+Apache (Software) License, version 2.0 ("the License").
+See the License for details about distribution rights, and the
+specific rights regarding derivate works.
+
+You may obtain a copy of the License at:
+
+http://www.apache.org/licenses/
+
+A copy is also included in the downloadable source code package
+containing JNA, in file "ASL2.0", under the same directory
+as this file.

LICENSE.LGPL

@@ -0,0 +1,13 @@
+This copy of JNA is licensed under the
+Lesser General Public License (LGPL), version 2.1 ("the License").
+See the License for details about distribution rights, and the
+specific rights regarding derivate works.
+
+You may obtain a copy of the License at:
+
+http://www.gnu.org/licenses/licenses.html
+
+A copy is also included in the downloadable source code package
+containing JNA, in file "LGPL2.1", under the same directory
+as this file.
+

build.xml

@@ -114,12 +114,12 @@
   <property name="maven-javadoc-jar" value="${dist}/${artifactId}-${jna.version}-javadoc.jar" />
   <property name="maven-sources-jar" value="${dist}/${artifactId}-${jna.version}-sources.jar" />
 
-  <property name="platform-jar" value="${dist}/platform.jar"/>
+  <property name="platform-jar" value="${dist}/jna-platform.jar"/>
   <property name="platform-javadoc-jar" value="${dist}/platform-${jna.version}-javadoc.jar" />
   <property name="platform-sources-jar" value="${dist}/platform-${jna.version}-sources.jar" />
 
   <property name="pom" value="pom-jna.xml" />
-  <property name="pom-platform" value="pom-platform.xml" />
+  <property name="pom-platform" value="pom-jna-platform.xml" />
 
   <!-- defined maven snapshots and staging repository id and url -->
   <property name="maven-snapshots-repository-id" value="snapshots.java.net" />
@@ -225,12 +225,17 @@
     <condition property="os.prefix" value="sunos-${jre.arch}">
       <os name="SunOS"/>
     </condition>
-    <condition property="os.prefix" value="bsd-${jre.arch}">
-      <or>
-	<os name="FreeBSD"/>
+    <condition property="os.prefix" value="freebsd-${jre.arch}">
+      <os name="FreeBSD"/>
+    </condition>
+    <condition property="os.prefix" value="openbsd-${jre.arch}">
 	<os name="OpenBSD"/>
-	<os name="NetBSD"/>
-      </or>
+    </condition>
+    <condition property="os.prefix" value="netbsd-${jre.arch}">
+      <os name="NetBSD"/>
+    </condition>
+    <condition property="os.prefix" value="kfreebsd-${jre.arch}">
+      <os name="GNU/kFreeBSD"/>
     </condition>
     <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${jre.arch}), edit build.xml and native/Makefile to add it."/>
     <!-- Keep all natives separate -->
@@ -390,10 +395,14 @@ processor=arm;osname=linux,
 com/sun/jna/linux-ia64/libjnidispatch.so;
 processor=ia64;osname=linux,
 
-com/sun/jna/bsd-x86/libjnidispatch.so;
-processor=x86;osname=openbsd;osname=freebsd;osname=netbsd,
-com/sun/jna/bsd-x86-64/libjnidispatch.so;
-processor=x86-64;osname=openbsd;osname=freebsd;osname=netbsd,
+com/sun/jna/freebsd-x86/libjnidispatch.so;
+processor=x86;osname=freebsd,
+com/sun/jna/freebsd-x86-64/libjnidispatch.so;
+processor=x86-64;osname=freebsd,
+com/sun/jna/openbsd-x86/libjnidispatch.so;
+processor=x86;osname=openbsd,
+com/sun/jna/openbsd-x86-64/libjnidispatch.so;
+processor=x86-64;osname=openbsd,
 
 com/sun/jna/darwin/libjnidispatch.jnilib;
 osname=macosx;processor=x86;processor=x86-64;processor=ppc
@@ -444,12 +453,18 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
       <zipfileset src="${lib.native}/sunos-sparcv9.jar"
                   includes="*jnidispatch*"
                   prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${lib.native}/bsd-x86.jar"
+      <zipfileset src="${lib.native}/freebsd-x86.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/freebsd-x86"/>
+      <zipfileset src="${lib.native}/freebsd-x86-64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/freebsd-x86-64"/>
+      <zipfileset src="${lib.native}/openbsd-x86.jar"
                   includes="*jnidispatch*"
-                  prefix="com/sun/jna/bsd-x86"/>
-      <zipfileset src="${lib.native}/bsd-x86-64.jar"
+                  prefix="com/sun/jna/openbsd-x86"/>
+      <zipfileset src="${lib.native}/openbsd-x86-64.jar"
                   includes="*jnidispatch*"
-                  prefix="com/sun/jna/bsd-x86-64"/>
+                  prefix="com/sun/jna/openbsd-x86-64"/>
       <zipfileset src="${lib.native}/win32-x86-64.jar"
                   includes="*jnidispatch*"
                   prefix="com/sun/jna/win32-x86-64"/>
@@ -543,8 +558,10 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ia64.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ppc.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ppc64.jar" overwrite="true"/>
-    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/bsd-x86.jar" overwrite="true"/>
-    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/bsd-x86-64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-x86.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-x86-64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-x86.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-x86-64.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-x86.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-x86-64.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-sparc.jar" overwrite="true"/>
@@ -967,7 +984,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
           description="Build distribution files">
     <copy todir="${dist}">
       <fileset dir="${build}" includes="${jar},${minjar}"/>
-      <fileset dir="${contrib}/platform/dist" includes="platform.jar"/>
+      <fileset dir="${contrib}/platform/dist" includes="jna-platform.jar"/>
       <fileset dir="${lib.native}">
         <include name="*.jar"/>
         <exclude name="out-of-date.jar"/>

contrib/platform/nbproject/project.properties

@@ -14,17 +14,14 @@ debug.test.classpath=\
     ${run.test.classpath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/platform.jar
+dist.jar=${dist.dir}/jna-platform.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 file.reference.jna.jar=../../build/jna.jar
-file.reference.jna-d64.jar=../../build-d64/jna.jar
 file.reference.jna-test.jar=../../build/jna-test.jar
-file.reference.jna-test-d64.jar=../../build-d64/jna-test.jar
 libs.junit.classpath=../../lib/junit.jar
 jar.compress=false
 javac.classpath=\
-    ${file.reference.jna.jar}:\
-    ${file.reference.jna-d64.jar}
+    ${file.reference.jna.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -33,7 +30,6 @@ javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${file.reference.jna-test.jar}:\
-    ${file.reference.jna-test-d64.jar}:\
     ${build.classes.dir}:\
     ${libs.junit.classpath}
 javadoc.additionalparam=