fix Structure equals/hashcode

git-svn-id: https://svn.java.net/svn/jna~svn/trunk@964 2f8a963e-d2e4-e7d0-97bf-ccb7fcea9d80

.gitignore

@@ -1,21 +0,0 @@
-.libs
-.deps
-*.o
-*.lo
-.dirstamp
-*.la
-Makefile
-config.log
-config.status
-*~
-fficonfig.h
-include/ffi.h
-include/ffitarget.h
-libffi.pc
-libtool
-stamp-h1
-libffi*gz
-autom4te.cache
-libffi.xcodeproj/xcuserdata
-libffi.xcodeproj/project.xcworkspace
-ios/

.travis.yml

@@ -1,8 +0,0 @@
-language: c
-compiler:
-  - gcc
-  - clang
-
-before_script: sudo apt-get install dejagnu
-
-script: ./configure && make && make check

README

@@ -1,390 +0,0 @@
-Status
-======
-
-libffi-3.0.12 was released on February 11, 2013.  Check the libffi web
-page for updates: <URL:http://sourceware.org/libffi/>.
-
-
-What is libffi?
-===============
-
-Compilers for high level languages generate code that follow certain
-conventions. These conventions are necessary, in part, for separate
-compilation to work. One such convention is the "calling
-convention". The "calling convention" is essentially a set of
-assumptions made by the compiler about where function arguments will
-be found on entry to a function. A "calling convention" also specifies
-where the return value for a function is found.
-
-Some programs may not know at the time of compilation what arguments
-are to be passed to a function. For instance, an interpreter may be
-told at run-time about the number and types of arguments used to call
-a given function. Libffi can be used in such programs to provide a
-bridge from the interpreter program to compiled code.
-
-The libffi library provides a portable, high level programming
-interface to various calling conventions. This allows a programmer to
-call any function specified by a call interface description at run
-time.  
-
-FFI stands for Foreign Function Interface.  A foreign function
-interface is the popular name for the interface that allows code
-written in one language to call code written in another language. The
-libffi library really only provides the lowest, machine dependent
-layer of a fully featured foreign function interface. A layer must
-exist above libffi that handles type conversions for values passed
-between the two languages.
-
-
-Supported Platforms
-===================
-
-Libffi has been ported to many different platforms.
-For specific configuration details and testing status, please
-refer to the wiki page here:
-
- http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.12
-
-At the time of release, the following basic configurations have been
-tested:
-
-|-----------------+------------------+-------------------------|
-| Architecture    | Operating System | Compiler                |
-|-----------------+------------------+-------------------------|
-| AArch64         | Linux            | GCC                     |
-| Alpha           | Linux            | GCC                     |
-| Alpha           | Tru64            | GCC                     |
-| ARM             | Linux            | GCC                     |
-| ARM             | iOS              | GCC                     |
-| AVR32           | Linux            | GCC                     |
-| Blackfin        | uClinux          | GCC                     |
-| HPPA            | HPUX             | GCC                     |
-| IA-64           | Linux            | GCC                     |
-| M68K            | FreeMiNT         | GCC                     |
-| M68K            | Linux	     | GCC                     |
-| M68K            | RTEMS            | GCC                     |
-| MicroBlaze      | Linux            | GCC                     |
-| MIPS            | IRIX             | GCC                     |
-| MIPS            | Linux            | GCC                     |
-| MIPS            | RTEMS            | GCC                     |
-| MIPS64          | Linux            | GCC                     |
-| Moxie		  | Bare metal	     | GCC
-| PowerPC 32-bit  | AIX              | IBM XL C                |
-| PowerPC 64-bit  | AIX              | IBM XL C                |
-| PowerPC         | AMIGA            | GCC                     |
-| PowerPC         | Linux            | GCC                     |
-| PowerPC         | Mac OSX          | GCC                     |
-| PowerPC         | FreeBSD          | GCC                     |
-| PowerPC 64-bit  | FreeBSD          | GCC                     |
-| PowerPC 64-bit  | Linux            | GCC                     |
-| S390            | Linux            | GCC                     |
-| S390X           | Linux            | GCC                     |
-| SPARC           | Linux            | GCC                     |
-| SPARC           | Solaris          | GCC                     |
-| SPARC           | Solaris          | Oracle Solaris Studio C |
-| SPARC64         | Linux            | GCC                     |
-| SPARC64         | FreeBSD          | GCC                     |
-| SPARC64         | Solaris          | Oracle Solaris Studio C |
-| TILE-Gx/TILEPro | Linux            | GCC                     |
-| X86             | FreeBSD          | GCC                     |
-| X86             | GNU HURD         | GCC                     |
-| X86             | Interix          | GCC                     |
-| X86             | kFreeBSD         | GCC                     |
-| X86             | Linux            | GCC                     |
-| X86             | Mac OSX          | GCC                     |
-| X86             | OpenBSD          | GCC                     |
-| X86             | OS/2             | GCC                     |
-| X86             | Solaris          | GCC                     |
-| X86             | Solaris          | Oracle Solaris Studio C |
-| X86             | Windows/Cygwin   | GCC                     |
-| X86             | Windows/MingW    | GCC                     |
-| X86-64          | FreeBSD          | GCC                     |
-| X86-64          | Linux            | GCC                     |
-| X86-64          | Linux/x32        | GCC                     |
-| X86-64          | OpenBSD          | GCC                     |
-| X86-64          | Solaris          | Oracle Solaris Studio C |
-| X86-64          | Windows/MingW    | GCC                     |
-| Xtensa          | Linux            | GCC                     |
-|-----------------+------------------+-------------------------|
-
-Please send additional platform test results to
-libffi-discuss@sourceware.org and feel free to update the wiki page
-above.
-
-Installing libffi
-=================
-
-First you must configure the distribution for your particular
-system. Go to the directory you wish to build libffi in and run the
-"configure" program found in the root directory of the libffi source
-distribution.
-
-You may want to tell configure where to install the libffi library and
-header files. To do that, use the --prefix configure switch.  Libffi
-will install under /usr/local by default. 
-
-If you want to enable extra run-time debugging checks use the the
---enable-debug configure switch. This is useful when your program dies
-mysteriously while using libffi. 
-
-Another useful configure switch is --enable-purify-safety. Using this
-will add some extra code which will suppress certain warnings when you
-are using Purify with libffi. Only use this switch when using 
-Purify, as it will slow down the library.
-
-It's also possible to build libffi on Windows platforms with
-Microsoft's Visual C++ compiler.  In this case, use the msvcc.sh
-wrapper script during configuration like so:
-
-path/to/configure CC=path/to/msvcc.sh LD=link CPP=\"cl -nologo -EP\"
-
-For 64-bit Windows builds, use CC="path/to/msvcc.sh -m64".
-You may also need to specify --build appropriately. When building with MSVC
-under a MingW environment, you may need to remove the line in configure
-that sets 'fix_srcfile_path' to a 'cygpath' command. ('cygpath' is not
-present in MingW, and is not required when using MingW-style paths.)
-
-For iOS builds, the 'libffi.xcodeproj' Xcode project is available.
-
-Configure has many other options. Use "configure --help" to see them all.
-
-Once configure has finished, type "make". Note that you must be using
-GNU make.  You can ftp GNU make from ftp.gnu.org:/pub/gnu/make .
-
-To ensure that libffi is working as advertised, type "make check".
-This will require that you have DejaGNU installed.
-
-To install the library and header files, type "make install".
-
-
-History
-=======
-
-See the ChangeLog files for details.
-
-3.0.12 Feb-11-13
-        Add Moxie support.
-	Add AArch64 support.
-	Add Blackfin support.
-	Add TILE-Gx/TILEPro support.
-	Add MicroBlaze support.
-	Add Xtensa support.
-	Add support for PaX enabled kernels with MPROTECT.
-	Add support for native vendor compilers on
-	  Solaris and AIX.
-	Work around LLVM/GCC interoperability issue on x86_64.
-
-3.0.11 Apr-11-12
-        Lots of build fixes.
-	Add Amiga newer MacOS support.
-	Add support for variadic functions (ffi_prep_cif_var).
-	Add Linux/x32 support.
-	Add thiscall, fastcall and MSVC cdecl support on Windows.
-	Add Amiga and newer MacOS support.
-	Add m68k FreeMiNT support.
-	Integration with iOS' xcode build tools.
-	Fix Octeon and MC68881 support.
-	Fix code pessimizations.
-
-3.0.10 Aug-23-11
-        Add support for Apple's iOS.
-	Add support for ARM VFP ABI.
-        Add RTEMS support for MIPS and M68K.
-	Fix instruction cache clearing problems on
-	  ARM and SPARC.
-	Fix the N64 build on mips-sgi-irix6.5.
-	Enable builds with Microsoft's compiler.
-	Enable x86 builds with Oracle's Solaris compiler.
-	Fix support for calling code compiled with Oracle's Sparc
-	  Solaris compiler.
-	Testsuite fixes for Tru64 Unix.
-	Additional platform support.
-
-3.0.9 Dec-31-09
-        Add AVR32 and win64 ports.  Add ARM softfp support.
-	Many fixes for AIX, Solaris, HP-UX, *BSD.
-	Several PowerPC and x86-64 bug fixes.
-	Build DLL for windows.
-
-3.0.8 Dec-19-08
-        Add *BSD, BeOS, and PA-Linux support.
-
-3.0.7 Nov-11-08
-        Fix for ppc FreeBSD.
-	(thanks to Andreas Tobler)
-
-3.0.6 Jul-17-08
-        Fix for closures on sh.
-	Mark the sh/sh64 stack as non-executable.
-	(both thanks to Kaz Kojima)
-
-3.0.5 Apr-3-08
-        Fix libffi.pc file.
-	Fix #define ARM for IcedTea users.
-	Fix x86 closure bug.
-
-3.0.4 Feb-24-08
-        Fix x86 OpenBSD configury.
-
-3.0.3 Feb-22-08
-        Enable x86 OpenBSD thanks to Thomas Heller, and
-	x86-64 FreeBSD thanks to Björn König and Andreas Tobler.
-	Clean up test instruction in README.
-
-3.0.2 Feb-21-08
-        Improved x86 FreeBSD support.
-	Thanks to Björn König.
-
-3.0.1 Feb-15-08
-        Fix instruction cache flushing bug on MIPS.
-	Thanks to David Daney.
-
-3.0.0 Feb-15-08
-        Many changes, mostly thanks to the GCC project.
-	Cygnus Solutions is now Red Hat.
-
-  [10 years go by...]
-
-1.20 Oct-5-98
-	Raffaele Sena produces ARM port.
-
-1.19 Oct-5-98
-	Fixed x86 long double and long long return support.
-	m68k bug fixes from Andreas Schwab.
-	Patch for DU assembler compatibility for the Alpha from Richard
-	Henderson.
-
-1.18 Apr-17-98
-	Bug fixes and MIPS configuration changes.
-
-1.17 Feb-24-98
-	Bug fixes and m68k port from Andreas Schwab. PowerPC port from
-	Geoffrey Keating. Various bug x86, Sparc and MIPS bug fixes.
-
-1.16 Feb-11-98
-	Richard Henderson produces Alpha port.
-
-1.15 Dec-4-97
-	Fixed an n32 ABI bug. New libtool, auto* support.
-
-1.14 May-13-97
-	libtool is now used to generate shared and static libraries.
-	Fixed a minor portability problem reported by Russ McManus
-	<mcmanr@eq.gs.com>.
-
-1.13 Dec-2-96
-	Added --enable-purify-safety to keep Purify from complaining
-	about certain low level code.
-	Sparc fix for calling functions with < 6 args.
-	Linux x86 a.out fix.
-
-1.12 Nov-22-96
-	Added missing ffi_type_void, needed for supporting void return 
-	types. Fixed test case for non MIPS machines. Cygnus Support 
-	is now Cygnus Solutions. 
-
-1.11 Oct-30-96
-	Added notes about GNU make.
-
-1.10 Oct-29-96
-	Added configuration fix for non GNU compilers.
-
-1.09 Oct-29-96
-	Added --enable-debug configure switch. Clean-ups based on LCLint 
-	feedback. ffi_mips.h is always installed. Many configuration 
-	fixes. Fixed ffitest.c for sparc builds.
-
-1.08 Oct-15-96
-	Fixed n32 problem. Many clean-ups.
-
-1.07 Oct-14-96
-	Gordon Irlam rewrites v8.S again. Bug fixes.
-
-1.06 Oct-14-96
-	Gordon Irlam improved the sparc port. 
-
-1.05 Oct-14-96
-	Interface changes based on feedback.
-
-1.04 Oct-11-96
-	Sparc port complete (modulo struct passing bug).
-
-1.03 Oct-10-96
-	Passing struct args, and returning struct values works for
-	all architectures/calling conventions. Expanded tests.
-
-1.02 Oct-9-96
-	Added SGI n32 support. Fixed bugs in both o32 and Linux support.
-	Added "make test".
-
-1.01 Oct-8-96
-	Fixed float passing bug in mips version. Restructured some
-	of the code. Builds cleanly with SGI tools.
-
-1.00 Oct-7-96
-	First release. No public announcement.
-
-
-Authors & Credits
-=================
-
-libffi was originally written by Anthony Green <green@redhat.com>.
-
-The developers of the GNU Compiler Collection project have made
-innumerable valuable contributions.  See the ChangeLog file for
-details.
-
-Some of the ideas behind libffi were inspired by Gianni Mariani's free
-gencall library for Silicon Graphics machines.
-
-The closure mechanism was designed and implemented by Kresten Krab
-Thorup.
-
-Major processor architecture ports were contributed by the following
-developers:
-
-aarch64		Marcus Shawcroft, James Greenhalgh
-alpha		Richard Henderson
-arm		Raffaele Sena
-blackfin        Alexandre Keunecke I. de Mendonca
-cris		Simon Posnjak, Hans-Peter Nilsson
-frv		Anthony Green
-ia64		Hans Boehm
-m32r		Kazuhiro Inaoka
-m68k		Andreas Schwab
-microblaze	Nathan Rossi
-mips		Anthony Green, Casey Marshall
-mips64		David Daney
-moxie		Anthony Green
-pa		Randolph Chung, Dave Anglin, Andreas Tobler
-powerpc		Geoffrey Keating, Andreas Tobler, 
-			 David Edelsohn, John Hornkvist
-powerpc64	Jakub Jelinek
-s390		Gerhard Tonn, Ulrich Weigand
-sh		Kaz Kojima
-sh64		Kaz Kojima
-sparc		Anthony Green, Gordon Irlam
-tile-gx/tilepro Walter Lee
-x86		Anthony Green, Jon Beniston
-x86-64		Bo Thorsen
-xtensa		Chris Zankel
-
-Jesper Skov and Andrew Haley both did more than their fair share of
-stepping through the code and tracking down bugs.
-
-Thanks also to Tom Tromey for bug fixes, documentation and
-configuration help.
-
-Thanks to Jim Blandy, who provided some useful feedback on the libffi
-interface.
-
-Andreas Tobler has done a tremendous amount of work on the testsuite.
-
-Alex Oliva solved the executable page problem for SElinux.
-
-The list above is almost certainly incomplete and inaccurate.  I'm
-happy to make corrections or additions upon request.
-
-If you have a problem, or have found a bug, please send a note to the
-author at green@moxielogic.com, or the project mailing list at
-libffi-discuss@sourceware.org.

build-ios.sh

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-PLATFORM_IOS=/Developer/Platforms/iPhoneOS.platform/
-PLATFORM_IOS_SIM=/Developer/Platforms/iPhoneSimulator.platform/
-SDK_IOS_VERSION="4.2"
-MIN_IOS_VERSION="3.0"
-OUTPUT_DIR="universal-ios"
-
-build_target () {
-    local platform=$1
-    local sdk=$2
-    local arch=$3
-    local triple=$4
-    local builddir=$5
-
-    mkdir -p "${builddir}"
-    pushd "${builddir}"
-    export CC="${platform}"/Developer/usr/bin/gcc-4.2
-    export CFLAGS="-arch ${arch} -isysroot ${sdk} -miphoneos-version-min=${MIN_IOS_VERSION}"
-    ../configure --host=${triple} && make
-    popd
-}
-
-# Build all targets
-build_target "${PLATFORM_IOS}" "${PLATFORM_IOS}/Developer/SDKs/iPhoneOS${SDK_IOS_VERSION}.sdk/" armv6 arm-apple-darwin10 armv6-ios
-build_target "${PLATFORM_IOS}" "${PLATFORM_IOS}/Developer/SDKs/iPhoneOS${SDK_IOS_VERSION}.sdk/" armv7 arm-apple-darwin10 armv7-ios
-build_target "${PLATFORM_IOS_SIM}" "${PLATFORM_IOS_SIM}/Developer/SDKs/iPhoneSimulator${SDK_IOS_VERSION}.sdk/" i386 i386-apple-darwin10 i386-ios-sim
-
-# Create universal output directories
-mkdir -p "${OUTPUT_DIR}"
-mkdir -p "${OUTPUT_DIR}/include"
-mkdir -p "${OUTPUT_DIR}/include/armv6"
-mkdir -p "${OUTPUT_DIR}/include/armv7"
-mkdir -p "${OUTPUT_DIR}/include/i386"
-
-# Create the universal binary
-lipo -create armv6-ios/.libs/libffi.a armv7-ios/.libs/libffi.a i386-ios-sim/.libs/libffi.a -output "${OUTPUT_DIR}/libffi.a"
-
-# Copy in the headers
-copy_headers () {
-    local src=$1
-    local dest=$2
-
-    # Fix non-relative header reference
-    sed 's/<ffitarget.h>/"ffitarget.h"/' < "${src}/include/ffi.h" > "${dest}/ffi.h"
-    cp "${src}/include/ffitarget.h" "${dest}"
-}
-
-copy_headers armv6-ios "${OUTPUT_DIR}/include/armv6"
-copy_headers armv7-ios "${OUTPUT_DIR}/include/armv7"
-copy_headers i386-ios-sim "${OUTPUT_DIR}/include/i386"
-
-# Create top-level header
-(
-cat << EOF
-#ifdef __arm__
-  #include <arm/arch.h>
-  #ifdef _ARM_ARCH_6
-    #include "include/armv6/ffi.h"
-  #elif _ARM_ARCH_7
-    #include "include/armv7/ffi.h"
-  #endif
-#elif defined(__i386__)
-  #include "include/i386/ffi.h"
-#endif
-EOF
-) > "${OUTPUT_DIR}/ffi.h"

configure.ac

@@ -1,565 +0,0 @@
-dnl Process this with autoconf to create configure
-
-AC_PREREQ(2.68)
-
-AC_INIT([libffi], [3.0.12], [http://github.com/atgreen/libffi/issues])
-AC_CONFIG_HEADERS([fficonfig.h])
-
-AC_CANONICAL_SYSTEM
-target_alias=${target_alias-$host_alias}
-
-. ${srcdir}/configure.host
-
-AX_ENABLE_BUILDDIR
-
-AM_INIT_AUTOMAKE
-
-# The same as in boehm-gc and libstdc++. Have to borrow it from there.
-# We must force CC to /not/ be precious variables; otherwise
-# the wrong, non-multilib-adjusted value will be used in multilibs.
-# As a side effect, we have to subst CFLAGS ourselves.
-# Also save and restore CFLAGS, since AC_PROG_CC will come up with
-# defaults of its own if none are provided.
-
-m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
-m4_define([_AC_ARG_VAR_PRECIOUS],[])
-save_CFLAGS=$CFLAGS
-AC_PROG_CC
-CFLAGS=$save_CFLAGS
-m4_undefine([_AC_ARG_VAR_PRECIOUS])
-m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
-
-AC_SUBST(CFLAGS)
-
-AM_PROG_AS
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AC_CONFIG_MACRO_DIR([m4])
-
-# Test for 64-bit build.
-AC_CHECK_SIZEOF([size_t])
-
-AX_COMPILER_VENDOR
-AX_CC_MAXOPT
-# The AX_CFLAGS_WARN_ALL macro doesn't currently work for sunpro
-# compiler.
-if test "$ax_cv_c_compiler_vendor" != "sun"; then
-  AX_CFLAGS_WARN_ALL
-fi
-
-if test "x$GCC" = "xyes"; then
-  CFLAGS="$CFLAGS -fexceptions"
-  touch local.exp
-else
-  cat > local.exp <<EOF
-set CC_FOR_TARGET "$CC"
-EOF
-fi
-
-AM_MAINTAINER_MODE
-
-AC_CHECK_HEADERS(sys/mman.h)
-AC_CHECK_FUNCS(mmap)
-AC_FUNC_MMAP_BLACKLIST
-
-dnl The -no-testsuite modules omit the test subdir.
-AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
-
-TARGETDIR="unknown"
-case "$host" in
-  aarch64*-*-*)
-	TARGET=AARCH64; TARGETDIR=aarch64
-	;;
-
-  alpha*-*-*)
-	TARGET=ALPHA; TARGETDIR=alpha;
-	# Support 128-bit long double, changeable via command-line switch.
-	HAVE_LONG_DOUBLE='defined(__LONG_DOUBLE_128__)'
-	;;
-
-  arm*-*-*)
-	TARGET=ARM; TARGETDIR=arm
-	;;
-
-  amd64-*-freebsd* | amd64-*-openbsd*)
-	TARGET=X86_64; TARGETDIR=x86
-  	;;
-
-  amd64-*-freebsd*)
-	TARGET=X86_64; TARGETDIR=x86
-  	;;
-
-  amd64-*-freebsd*)
-	TARGET=X86_64; TARGETDIR=x86
-	;;
-
-  avr32*-*-*)
-	TARGET=AVR32; TARGETDIR=avr32
-	;;
-
-  bfin*)
-  	TARGET=BFIN; TARGETDIR=bfin
-  	;;
-
-  cris-*-*)
-	TARGET=LIBFFI_CRIS; TARGETDIR=cris
-	;;
-
-  frv-*-*)
-	TARGET=FRV; TARGETDIR=frv
-	;;
-
-  hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
-	TARGET=PA_LINUX; TARGETDIR=pa
-	;;
-  hppa*64-*-hpux*)
-	TARGET=PA64_HPUX; TARGETDIR=pa
-	;;
-  hppa*-*-hpux*)
-	TARGET=PA_HPUX; TARGETDIR=pa
-	;;
-
-  i?86-*-freebsd* | i?86-*-openbsd*)
-	TARGET=X86_FREEBSD; TARGETDIR=x86
-	;;
-  i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2* | i?86-*-interix*)
-	TARGET=X86_WIN32; TARGETDIR=x86
-	# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
-	# We must also check with_cross_host to decide if this is a native
-	# or cross-build and select where to install dlls appropriately.
-	if test -n "$with_cross_host" &&
-	   test x"$with_cross_host" != x"no"; then
-	  AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
-	else
-	  AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
-	fi
-	;;
-  i?86-*-darwin*)
-	TARGET=X86_DARWIN; TARGETDIR=x86
-	;;
-  i?86-*-solaris2.1[[0-9]]*)
-	TARGETDIR=x86
-	if test $ac_cv_sizeof_size_t = 4; then
-	  TARGET=X86; 
-	else
-	  TARGET=X86_64; 
-	fi	  
-	;;
-
-  x86_64-*-darwin*)
-	TARGET=X86_DARWIN; TARGETDIR=x86
-	;;
-
-  x86_64-*-cygwin* | x86_64-*-mingw*)
-	TARGET=X86_WIN64; TARGETDIR=x86
-	# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
-	# We must also check with_cross_host to decide if this is a native
-	# or cross-build and select where to install dlls appropriately.
-	if test -n "$with_cross_host" &&
-	   test x"$with_cross_host" != x"no"; then
-	  AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
-	else
-	  AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
-	fi
-	;;
-
-  i?86-*-* | x86_64-*-*)
-	TARGETDIR=x86
-	if test $ac_cv_sizeof_size_t = 4; then
-	  case "$host" in
-	    *-gnux32)
-	      TARGET=X86_64
-	      ;;
-	    *)
-	      TARGET=X86
-	      ;;
-          esac	
-	else
-	  TARGET=X86_64; 
-	fi	  
-	;;
-
-  ia64*-*-*)
-	TARGET=IA64; TARGETDIR=ia64
-	;;
-
-  m32r*-*-*)
-	TARGET=M32R; TARGETDIR=m32r
-	;;
-
-  m68k-*-*)
-	TARGET=M68K; TARGETDIR=m68k
-	;;
-
-  microblaze*-*-*)
-	TARGET=MICROBLAZE; TARGETDIR=microblaze
-	;;
-
-  moxie-*-*)
-	TARGET=MOXIE; TARGETDIR=moxie
-	;;
-
-  mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
-	TARGET=MIPS; TARGETDIR=mips
-	;;
-  mips*-*-linux* | mips*-*-openbsd*)
-	# Support 128-bit long double for NewABI.
-	HAVE_LONG_DOUBLE='defined(__mips64)'
-	TARGET=MIPS; TARGETDIR=mips
-	;;
-
-  powerpc*-*-linux* | powerpc-*-sysv*)
-	TARGET=POWERPC; TARGETDIR=powerpc
-	;;
-  powerpc-*-amigaos*)
-	TARGET=POWERPC; TARGETDIR=powerpc
-	;;
-  powerpc-*-beos*)
-	TARGET=POWERPC; TARGETDIR=powerpc
-	;;
-  powerpc-*-darwin* | powerpc64-*-darwin*)
-	TARGET=POWERPC_DARWIN; TARGETDIR=powerpc
-	;;
-  powerpc-*-aix* | rs6000-*-aix*)
-	TARGET=POWERPC_AIX; TARGETDIR=powerpc
-	;;
-  powerpc-*-freebsd* | powerpc-*-openbsd*)
-	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
-	;;
-  powerpc64-*-freebsd*)
-	TARGET=POWERPC; TARGETDIR=powerpc
-	;;
-  powerpc*-*-rtems*)
-	TARGET=POWERPC; TARGETDIR=powerpc
-	;;
-
-  s390-*-* | s390x-*-*)
-	TARGET=S390; TARGETDIR=s390
-	;;
-
-  sh-*-* | sh[[34]]*-*-*)
-	TARGET=SH; TARGETDIR=sh
-	;;
-  sh64-*-* | sh5*-*-*)
-	TARGET=SH64; TARGETDIR=sh64
-	;;
-
-  sparc*-*-*)
-	TARGET=SPARC; TARGETDIR=sparc
-	;;
-
-  tile*-*)
-        TARGET=TILE; TARGETDIR=tile
-        ;;
-
-  xtensa*-*)
-	TARGET=XTENSA; TARGETDIR=xtensa
-	;;
-
-esac
-
-AC_SUBST(AM_RUNTESTFLAGS)
-AC_SUBST(AM_LTLDFLAGS)
-
-if test $TARGETDIR = unknown; then
-  AC_MSG_ERROR(["libffi has not been ported to $host."])
-fi
-
-AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
-AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
-AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
-AM_CONDITIONAL(X86, test x$TARGET = xX86)
-AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
-AM_CONDITIONAL(X86_WIN32, test x$TARGET = xX86_WIN32)
-AM_CONDITIONAL(X86_WIN64, test x$TARGET = xX86_WIN64)
-AM_CONDITIONAL(X86_DARWIN, test x$TARGET = xX86_DARWIN)
-AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
-AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
-AM_CONDITIONAL(M32R, test x$TARGET = xM32R)
-AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
-AM_CONDITIONAL(MICROBLAZE, test x$TARGET = xMICROBLAZE)
-AM_CONDITIONAL(MOXIE, test x$TARGET = xMOXIE)
-AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
-AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
-AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
-AM_CONDITIONAL(POWERPC_FREEBSD, test x$TARGET = xPOWERPC_FREEBSD)
-AM_CONDITIONAL(AARCH64, test x$TARGET = xAARCH64)
-AM_CONDITIONAL(ARM, test x$TARGET = xARM)
-AM_CONDITIONAL(AVR32, test x$TARGET = xAVR32)
-AM_CONDITIONAL(LIBFFI_CRIS, test x$TARGET = xLIBFFI_CRIS)
-AM_CONDITIONAL(FRV, test x$TARGET = xFRV)
-AM_CONDITIONAL(S390, test x$TARGET = xS390)
-AM_CONDITIONAL(X86_64, test x$TARGET = xX86_64)
-AM_CONDITIONAL(SH, test x$TARGET = xSH)
-AM_CONDITIONAL(SH64, test x$TARGET = xSH64)
-AM_CONDITIONAL(PA_LINUX, test x$TARGET = xPA_LINUX)
-AM_CONDITIONAL(PA_HPUX, test x$TARGET = xPA_HPUX)
-AM_CONDITIONAL(PA64_HPUX, test x$TARGET = xPA64_HPUX)
-AM_CONDITIONAL(TILE, test x$TARGET = xTILE)
-AM_CONDITIONAL(XTENSA, test x$TARGET = xXTENSA)
-
-AC_HEADER_STDC
-AC_CHECK_FUNCS(memcpy)
-AC_FUNC_ALLOCA
-
-AC_CHECK_SIZEOF(double)
-AC_CHECK_SIZEOF(long double)
-
-# Also AC_SUBST this variable for ffi.h.
-if test -z "$HAVE_LONG_DOUBLE"; then
-  HAVE_LONG_DOUBLE=0
-  if test $ac_cv_sizeof_double != $ac_cv_sizeof_long_double; then
-    if test $ac_cv_sizeof_long_double != 0; then
-      HAVE_LONG_DOUBLE=1
-      AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the long double type and it is bigger than a double])
-    fi
-  fi
-fi
-AC_SUBST(HAVE_LONG_DOUBLE)
-
-AC_C_BIGENDIAN
-
-GCC_AS_CFI_PSEUDO_OP
-
-if test x$TARGET = xSPARC; then
-    AC_CACHE_CHECK([assembler and linker support unaligned pc related relocs],
-	libffi_cv_as_sparc_ua_pcrel, [
-	save_CFLAGS="$CFLAGS"
-	save_LDFLAGS="$LDFLAGS"
-	CFLAGS="$CFLAGS -fpic"
-	LDFLAGS="$LDFLAGS -shared"
-	AC_TRY_LINK([asm (".text; foo: nop; .data; .align 4; .byte 0; .uaword %r_disp32(foo); .text");],,
-		    [libffi_cv_as_sparc_ua_pcrel=yes],
-		    [libffi_cv_as_sparc_ua_pcrel=no])
-	CFLAGS="$save_CFLAGS"
-	LDFLAGS="$save_LDFLAGS"])
-    if test "x$libffi_cv_as_sparc_ua_pcrel" = xyes; then
-	AC_DEFINE(HAVE_AS_SPARC_UA_PCREL, 1,
-		  [Define if your assembler and linker support unaligned PC relative relocs.])
-    fi
-
-    AC_CACHE_CHECK([assembler .register pseudo-op support],
-       libffi_cv_as_register_pseudo_op, [
-       libffi_cv_as_register_pseudo_op=unknown
-       # Check if we have .register
-       AC_TRY_COMPILE(,[asm (".register %g2, #scratch");],
-		       [libffi_cv_as_register_pseudo_op=yes],
-		       [libffi_cv_as_register_pseudo_op=no])
-    ])
-    if test "x$libffi_cv_as_register_pseudo_op" = xyes; then
-       AC_DEFINE(HAVE_AS_REGISTER_PSEUDO_OP, 1,
-	       [Define if your assembler supports .register.])
-    fi
-fi
-
-if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
-    AC_CACHE_CHECK([assembler supports pc related relocs],
-	libffi_cv_as_x86_pcrel, [
-	libffi_cv_as_x86_pcrel=no
-	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-	if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
-	    libffi_cv_as_x86_pcrel=yes
-	fi
-	])
-    if test "x$libffi_cv_as_x86_pcrel" = xyes; then
-	AC_DEFINE(HAVE_AS_X86_PCREL, 1,
-		  [Define if your assembler supports PC relative relocs.])
-    fi
-
-    AC_CACHE_CHECK([assembler .ascii pseudo-op support],
-       libffi_cv_as_ascii_pseudo_op, [
-       libffi_cv_as_ascii_pseudo_op=unknown
-       # Check if we have .ascii
-       AC_TRY_COMPILE(,[asm (".ascii \\"string\\"");],
-		       [libffi_cv_as_ascii_pseudo_op=yes],
-		       [libffi_cv_as_ascii_pseudo_op=no])
-    ])
-    if test "x$libffi_cv_as_ascii_pseudo_op" = xyes; then
-       AC_DEFINE(HAVE_AS_ASCII_PSEUDO_OP, 1,
-	       [Define if your assembler supports .ascii.])
-    fi
-
-    AC_CACHE_CHECK([assembler .string pseudo-op support],
-       libffi_cv_as_string_pseudo_op, [
-       libffi_cv_as_string_pseudo_op=unknown
-       # Check if we have .string
-       AC_TRY_COMPILE(,[asm (".string \\"string\\"");],
-		       [libffi_cv_as_string_pseudo_op=yes],
-		       [libffi_cv_as_string_pseudo_op=no])
-    ])
-    if test "x$libffi_cv_as_string_pseudo_op" = xyes; then
-       AC_DEFINE(HAVE_AS_STRING_PSEUDO_OP, 1,
-	       [Define if your assembler supports .string.])
-    fi
-fi
-
-# On PaX enable kernels that have MPROTECT enable we can't use PROT_EXEC.
-AC_ARG_ENABLE(pax_emutramp,
-  [  --enable-pax_emutramp       enable pax emulated trampolines, for we can't use PROT_EXEC],
-  if test "$enable_pax_emutramp" = "yes"; then
-    AC_DEFINE(FFI_MMAP_EXEC_EMUTRAMP_PAX, 1,
-      [Define this if you want to enable pax emulated trampolines])
-  fi)
-
-if test x$TARGET = xX86_WIN64; then
-    LT_SYS_SYMBOL_USCORE
-    if test "x$sys_symbol_underscore" = xyes; then
-        AC_DEFINE(SYMBOL_UNDERSCORE, 1, [Define if symbols are underscored.])
-    fi
-fi
-
-FFI_EXEC_TRAMPOLINE_TABLE=0
-case "$target" in
-     *arm*-apple-darwin*)
-       FFI_EXEC_TRAMPOLINE_TABLE=1
-       AC_DEFINE(FFI_EXEC_TRAMPOLINE_TABLE, 1,
-                 [Cannot use PROT_EXEC on this target, so, we revert to
-                   alternative means])
-     ;;
-     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
-       AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
-                 [Cannot use malloc on this target, so, we revert to
-                   alternative means])
-     ;;
-esac
-AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1)
-AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE)
-
-if test x$TARGET = xX86_64; then
-    AC_CACHE_CHECK([assembler supports unwind section type],
-	libffi_cv_as_x86_64_unwind_section_type, [
-	libffi_cv_as_x86_64_unwind_section_type=yes
-	echo '.section .eh_frame,"a",@unwind' > conftest.s
-	if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then
-	    libffi_cv_as_x86_64_unwind_section_type=no
-	fi
-	])
-    if test "x$libffi_cv_as_x86_64_unwind_section_type" = xyes; then
-	AC_DEFINE(HAVE_AS_X86_64_UNWIND_SECTION_TYPE, 1,
-		  [Define if your assembler supports unwind section type.])
-    fi
-fi
-
-if test "x$GCC" = "xyes"; then
-  AC_CACHE_CHECK([whether .eh_frame section should be read-only],
-      libffi_cv_ro_eh_frame, [
-  	libffi_cv_ro_eh_frame=no
-  	echo 'extern void foo (void); void bar (void) { foo (); foo (); }' > conftest.c
-  	if $CC $CFLAGS -c -fpic -fexceptions -o conftest.o conftest.c > /dev/null 2>&1; then
-	    objdump -h conftest.o > conftest.dump 2>&1
-	    libffi_eh_frame_line=`grep -n eh_frame conftest.dump | cut -d: -f 1`
-	    libffi_test_line=`expr $libffi_eh_frame_line + 1`p
-	    sed -n $libffi_test_line conftest.dump > conftest.line
-  	    if grep READONLY conftest.line > /dev/null; then
-  		libffi_cv_ro_eh_frame=yes
-  	    fi
-  	fi
-  	rm -f conftest.*
-      ])
-  if test "x$libffi_cv_ro_eh_frame" = xyes; then
-      AC_DEFINE(HAVE_RO_EH_FRAME, 1,
-  	      [Define if .eh_frame sections should be read-only.])
-      AC_DEFINE(EH_FRAME_FLAGS, "a",
-  	      [Define to the flags needed for the .section .eh_frame directive.  ])
-  else
-      AC_DEFINE(EH_FRAME_FLAGS, "aw",
-  	      [Define to the flags needed for the .section .eh_frame directive.  ])
-  fi
-
-  AC_CACHE_CHECK([for __attribute__((visibility("hidden")))],
-      libffi_cv_hidden_visibility_attribute, [
-  	echo 'int __attribute__ ((visibility ("hidden"))) foo (void) { return 1  ; }' > conftest.c
-  	libffi_cv_hidden_visibility_attribute=no
-  	if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); then
-  	    if grep '\.hidden.*foo' conftest.s >/dev/null; then
-  		libffi_cv_hidden_visibility_attribute=yes
-  	    fi
-  	fi
-  	rm -f conftest.*
-      ])
-  if test $libffi_cv_hidden_visibility_attribute = yes; then
-      AC_DEFINE(HAVE_HIDDEN_VISIBILITY_ATTRIBUTE, 1,
-  	      [Define if __attribute__((visibility("hidden"))) is supported.])
-  fi
-fi
-
-AH_BOTTOM([
-#ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name) .hidden name
-#else
-#define FFI_HIDDEN __attribute__ ((visibility ("hidden")))
-#endif
-#else
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name)
-#else
-#define FFI_HIDDEN
-#endif
-#endif
-])
-
-AC_SUBST(TARGET)
-AC_SUBST(TARGETDIR)
-
-AC_SUBST(SHELL)
-
-AC_ARG_ENABLE(debug,
-[  --enable-debug          debugging mode],
-  if test "$enable_debug" = "yes"; then
-    AC_DEFINE(FFI_DEBUG, 1, [Define this if you want extra debugging.])
-  fi)
-AM_CONDITIONAL(FFI_DEBUG, test "$enable_debug" = "yes")
-
-AC_ARG_ENABLE(structs,
-[  --disable-structs       omit code for struct support],
-  if test "$enable_structs" = "no"; then
-    AC_DEFINE(FFI_NO_STRUCTS, 1, [Define this is you do not want support for aggregate types.])
-  fi)
-AM_CONDITIONAL(FFI_DEBUG, test "$enable_debug" = "yes")
-
-AC_ARG_ENABLE(raw-api,
-[  --disable-raw-api       make the raw api unavailable],
-  if test "$enable_raw_api" = "no"; then
-    AC_DEFINE(FFI_NO_RAW_API, 1, [Define this is you do not want support for the raw API.])
-  fi)
-
-AC_ARG_ENABLE(purify-safety,
-[  --enable-purify-safety  purify-safe mode],
-  if test "$enable_purify_safety" = "yes"; then
-    AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
-  fi)
-
-# These variables are only ever used when we cross-build to X86_WIN32.
-# And we only support this with GCC, so...
-if test "x$GCC" = "xyes"; then
-  if test -n "$with_cross_host" &&
-     test x"$with_cross_host" != x"no"; then
-    toolexecdir='$(exec_prefix)/$(target_alias)'
-    toolexeclibdir='$(toolexecdir)/lib'
-  else
-    toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-    toolexeclibdir='$(libdir)'
-  fi
-  multi_os_directory=`$CC -print-multi-os-directory`
-  case $multi_os_directory in
-    .) ;; # Avoid trailing /.
-    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
-  esac
-  AC_SUBST(toolexecdir)
-else
-  toolexeclibdir='$(libdir)'
-fi
-AC_SUBST(toolexeclibdir)
-
-AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
-AC_CONFIG_COMMANDS(src, [
-test -d src || mkdir src
-test -d src/$TARGETDIR || mkdir src/$TARGETDIR
-], [TARGETDIR="$TARGETDIR"])
-
-AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
-
-AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
-
-AC_OUTPUT

doc/stamp-vti

@@ -1,4 +0,0 @@
-@set UPDATED 6 February 2013
-@set UPDATED-MONTH February 2013
-@set EDITION 3.0.12
-@set VERSION 3.0.12

doc/version.texi

@@ -1,4 +0,0 @@
-@set UPDATED 6 February 2013
-@set UPDATED-MONTH February 2013
-@set EDITION 3.0.12
-@set VERSION 3.0.12

generate-ios-source-and-headers.py

@@ -1,160 +0,0 @@
-#!/usr/bin/env python
-
-import subprocess
-import re
-import os
-import errno
-import collections
-import sys
-
-class Platform(object):
-    pass
-
-sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)')
-
-def sdkinfo(sdkname):
-    ret = {}
-    for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout:
-        kv = line.strip().split(': ', 1)
-        if len(kv) == 2:
-            k,v = kv
-            ret[k] = v
-    return ret
-
-sim_sdk_info = sdkinfo('iphonesimulator')
-device_sdk_info = sdkinfo('iphoneos')
-
-def latest_sdks():
-    latest_sim = None
-    latest_device = None
-    for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout:
-        match = sdk_re.match(line)
-        if match:
-            if 'Simulator' in line:
-                latest_sim = match.group(1)
-            elif 'iOS' in line:
-                latest_device = match.group(1)
-
-    return latest_sim, latest_device
-
-sim_sdk, device_sdk = latest_sdks()
-
-class simulator_platform(Platform):
-    sdk='iphonesimulator'
-    arch = 'i386'
-    name = 'simulator'
-    triple = 'i386-apple-darwin10'
-    sdkroot = sim_sdk_info['Path']
-
-    prefix = "#if !defined(__arm__) && defined(__i386__)\n\n"
-    suffix = "\n\n#endif"
-
-class device_platform(Platform):
-    sdk='iphoneos'
-    name = 'ios'
-    arch = 'armv7'
-    triple = 'arm-apple-darwin10'
-    sdkroot = device_sdk_info['Path']
-
-    prefix = "#ifdef __arm__\n\n"
-    suffix = "\n\n#endif"
-
-
-def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''):
-    if not os.path.exists(dst_dir):
-        os.makedirs(dst_dir)
-
-    out_filename = filename
-
-    if file_suffix:
-        split_name = os.path.splitext(filename)
-        out_filename =  "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
-
-    with open(os.path.join(src_dir, filename)) as in_file:
-        with open(os.path.join(dst_dir, out_filename), 'w') as out_file:
-            if prefix:
-                out_file.write(prefix)
-
-            out_file.write(in_file.read())
-
-            if suffix:
-                out_file.write(suffix)
-
-headers_seen = collections.defaultdict(set)
-
-def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None):
-    for root, dirs, files in os.walk(src_dir, followlinks=True):
-        relroot = os.path.relpath(root,src_dir)
-
-        def move_dir(arch, prefix='', suffix='', files=[]):
-            for file in files:
-                file_suffix = None
-                if file.endswith('.h'):
-                    if dest_include_dir:
-                        file_suffix = arch
-                        if arch:
-                            headers_seen[file].add(arch)
-                        move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix)
-
-                elif dest_dir:
-                    outroot = os.path.join(dest_dir, relroot)
-                    move_file(root, outroot, file, prefix=prefix, suffix=suffix)
-
-        if relroot == '.':
-            move_dir(arch=arch,
-                     files=files,
-                     prefix=prefix,
-                     suffix=suffix)
-        elif relroot == 'arm':
-            move_dir(arch='arm',
-                     prefix="#ifdef __arm__\n\n",
-                     suffix="\n\n#endif",
-                     files=files)
-        elif relroot == 'x86':
-            move_dir(arch='i386',
-                     prefix="#if !defined(__arm__) && defined(__i386__)\n\n",
-                     suffix="\n\n#endif",
-                     files=files)
-
-def build_target(platform):
-    def xcrun_cmd(cmd):
-        return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip()
-
-    build_dir = 'build_' + platform.name
-    if not os.path.exists(build_dir):
-        os.makedirs(build_dir)
-        env = dict(CC=xcrun_cmd('clang'),
-                   LD=xcrun_cmd('ld'),
-                   CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=4.0' % (platform.arch, platform.sdkroot))
-        working_dir=os.getcwd()
-        try:
-            os.chdir(build_dir)
-            subprocess.check_call(['../configure', '-host', platform.triple], env=env)
-            move_source_tree('.', None, '../ios/include',
-                             arch=platform.arch,
-                             prefix=platform.prefix,
-                             suffix=platform.suffix)
-            move_source_tree('./include', None, '../ios/include',
-                            arch=platform.arch,
-                            prefix=platform.prefix,
-                            suffix=platform.suffix)
-        finally:
-            os.chdir(working_dir)
-
-        for header_name, archs in headers_seen.iteritems():
-            basename, suffix = os.path.splitext(header_name)
-
-def main():
-    move_source_tree('src', 'ios/src', 'ios/include')
-    move_source_tree('include', None, 'ios/include')
-    build_target(simulator_platform)
-    build_target(device_platform)
-
-    for header_name, archs in headers_seen.iteritems():
-        basename, suffix = os.path.splitext(header_name)
-        with open(os.path.join('ios/include', header_name), 'w') as header:
-            for arch in archs:
-                header.write('#include <%s_%s%s>\n' % (basename, arch, suffix))
-
-if __name__ == '__main__':
-    main()

generate-osx-source-and-headers.py

@@ -1,153 +0,0 @@
-#!/usr/bin/env python
-import subprocess
-import re
-import os
-import errno
-import collections
-import sys
-
-class Platform(object):
-    pass
-
-sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)')
-
-def sdkinfo(sdkname):
-    ret = {}
-    for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout:
-        kv = line.strip().split(': ', 1)
-        if len(kv) == 2:
-            k,v = kv
-            ret[k] = v
-    return ret
-
-desktop_sdk_info = sdkinfo('macosx')
-
-def latest_sdks():
-    latest_desktop = None
-    for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout:
-        match = sdk_re.match(line)
-        if match:
-            if 'OS X' in line:
-                latest_desktop = match.group(1)
-
-    return latest_desktop
-
-desktop_sdk = latest_sdks()
-
-class desktop_platform_32(Platform):
-    sdk='macosx'
-    arch = 'i386'
-    name = 'mac32'
-    triple = 'i386-apple-darwin10'
-    sdkroot = desktop_sdk_info['Path']
-
-    prefix = "#if defined(__i386__) && !defined(__x86_64__)\n\n"
-    suffix = "\n\n#endif"
-
-class desktop_platform_64(Platform):
-    sdk='macosx'
-    arch = 'x86_64'
-    name = 'mac'
-    triple = 'x86_64-apple-darwin10'
-    sdkroot = desktop_sdk_info['Path']
-
-    prefix = "#if !defined(__i386__) && defined(__x86_64__)\n\n"
-    suffix = "\n\n#endif"
-
-def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''):
-    if not os.path.exists(dst_dir):
-        os.makedirs(dst_dir)
-
-    out_filename = filename
-
-    if file_suffix:
-        split_name = os.path.splitext(filename)
-        out_filename =  "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
-
-    with open(os.path.join(src_dir, filename)) as in_file:
-        with open(os.path.join(dst_dir, out_filename), 'w') as out_file:
-            if prefix:
-                out_file.write(prefix)
-
-            out_file.write(in_file.read())
-
-            if suffix:
-                out_file.write(suffix)
-
-headers_seen = collections.defaultdict(set)
-
-def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None):
-    for root, dirs, files in os.walk(src_dir, followlinks=True):
-        relroot = os.path.relpath(root,src_dir)
-
-        def move_dir(arch, prefix='', suffix='', files=[]):
-            for file in files:
-                file_suffix = None
-                if file.endswith('.h'):
-                    if dest_include_dir:
-                        file_suffix = arch
-                        if arch:
-                            headers_seen[file].add(arch)
-                        move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix)
-
-                elif dest_dir:
-                    outroot = os.path.join(dest_dir, relroot)
-                    move_file(root, outroot, file, prefix=prefix, suffix=suffix)
-
-        if relroot == '.':
-            move_dir(arch=arch,
-                     files=files,
-                     prefix=prefix,
-                     suffix=suffix)
-        elif relroot == 'x86':
-            move_dir(arch='i386',
-                     prefix="#if defined(__i386__) && !defined(__x86_64__)\n\n",
-                     suffix="\n\n#endif",
-                     files=files)
-            move_dir(arch='x86_64',
-                     prefix="#if !defined(__i386__) && defined(__x86_64__)\n\n",
-                     suffix="\n\n#endif",
-                     files=files)
-
-def build_target(platform):
-    def xcrun_cmd(cmd):
-        return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip()
-
-    build_dir = 'build_' + platform.name
-    if not os.path.exists(build_dir):
-        os.makedirs(build_dir)
-        env = dict(CC=xcrun_cmd('clang'),
-                   LD=xcrun_cmd('ld'),
-                   CFLAGS='-arch %s -isysroot %s -mmacosx-version-min=10.6' % (platform.arch, platform.sdkroot))
-        working_dir=os.getcwd()
-        try:
-            os.chdir(build_dir)
-            subprocess.check_call(['../configure', '-host', platform.triple], env=env)
-            move_source_tree('.', None, '../osx/include',
-                             arch=platform.arch,
-                             prefix=platform.prefix,
-                             suffix=platform.suffix)
-            move_source_tree('./include', None, '../osx/include',
-                             arch=platform.arch,
-                             prefix=platform.prefix,
-                             suffix=platform.suffix)
-        finally:
-            os.chdir(working_dir)
-
-        for header_name, archs in headers_seen.iteritems():
-            basename, suffix = os.path.splitext(header_name)
-
-def main():
-    move_source_tree('src', 'osx/src', 'osx/include')
-    move_source_tree('include', None, 'osx/include')
-    build_target(desktop_platform_32)
-    build_target(desktop_platform_64)
-
-    for header_name, archs in headers_seen.iteritems():
-        basename, suffix = os.path.splitext(header_name)
-        with open(os.path.join('osx/include', header_name), 'w') as header:
-            for arch in archs:
-                header.write('#include <%s_%s%s>\n' % (basename, arch, suffix))
-
-if __name__ == '__main__':
-    main()

install-sh

@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

jnalib/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="build.eclipse/test-classes" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="output" path="build.eclipse/classes"/>
+</classpath>

jnalib/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jna</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

jnalib/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,62 @@
+#Wed Aug 29 20:43:29 EDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5

jnalib/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,3 @@
+#Tue Mar 27 21:18:08 EDT 2007
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

jnalib/LICENSE.txt

@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

jnalib/OTHERS

@@ -0,0 +1,33 @@
+* RELATED and/or SIMILAR PROJECTS: 
+* Feel free to add notes and/or descriptions here (this should probably go
+* on a wiki somewhere).
+----
+* nlink.dev.java.net: 
+   pros: simple definitions (same as jna)
+   cons: w32 only
+* sf.net/projects/jnative: 
+   cons: boilerplate, manual code generation by calling setup methods
+   pros: callbacks, byref args?
+* JNIWrapper: kinda like jnative (commercial), includes platform "packs"
+* coroutine for Java, like jnative (commercial)
+* jnieasy: c++ mappings (http://www.innowhere.com:8080/webapp/jsp/products/jnieasy/index.jsp?_page=products.jnieasy)
+* j2native (www.smardec.com)
+* j-interop.sf.net
+* jawinproject.sf.net (COM DLL access)
+* jacob-project.sf.net (COM DLL access)
+* nativecall.sf.net (minimal)
+* cxxwrap.sf.net
+* J/Direct (defunct)
+* NoodleGlue
+* SWIG
+* ctypes4j.sf.net
+* ctypes-java (out of date)
+* jnbridge
+* xFunction (http://excelsior-usa.com/xfunction.html, commercial, osx)
+* JACE c++ mappings
+* JAW Java API wrapper http://www.aplu.ch/home/apluhome.jsp?site=5
+
+# OTHER REFERENCES
+# JNI options: http://staff.develop.com/halloway/JavaWin32.html
+# List of JNI alternatives: http://weblog.janek.org/Archive/2005/07/28/AlternativestoJavaNativeI.html
+

jnalib/TODO

@@ -0,0 +1,273 @@
+# DESIGN GOALS/REQUIREMENTS
+  o no permanent references to java objects in native code (hard to get rid of)
+    this means no java object arguments to callbacks; use some sort of integer
+    key instead (hashcode?) callbacks can hold local data anyway...
+  o make simplest Java usage map to most common C usage
+    - additional constructs provided for less-common cases
+      (WString,Structure.ByValue/ByReference)
+  o structure is treated as a pointer, except within a struct
+  o primitive types are passed directly
+  o arrays are treated as pointers, except within a struct
+    - in structure (inline; otherwise pointer-to-X should be used)
+    - as function argument (auto-convert to pointer via Memory)
+  o pointer to type in struct should use Pointer or ByReference
+  o "free" should be invisible wherever possible
+
+# FUTURE DEMOS:
+* test keyboard keys' state (needs OSX)
+* get system process information, basic process control
+* additional file utilities (meta info, free space, etc)
+* enforce window minimum/maximum size (workaround java bug)
+* OSX ObjC access (see rococoa)
+
+# TODO
+
+* make direct calls call back *once* to Java where conversion is required,
+  and process all arguments from there (instead of potentially swapping back
+  and forth multipel times).  This also makes it easer to perform conversions
+  (no native changes required).  
+
+* direct/raw non-primitive array arguments (String[], Pointer[], NativeMapped[])
+
+* ppc64 direct/raw failures (multiple)
+
+* direct calls on ppc to varargs (callbacks) with FP args fail; avoid them for
+  now 
+
+* combine direct and interface mapping calling code where possible
+
+* make native dll extraction from jar public, to use with user dlls packaged
+  in a jar
+
+* Callback.PostCallWrite.write() cf PostCallRead; do Structure.write for any
+  arguments as well
+
+* pointer.setValue(), to handle NativeMapped types and move read/writeValue
+  methods out of Structure, to be used by Function w/NativeMapped[] parameter
+
+* GetPrimitiveArrayCritical: use this if flagged (by annotation? method name?)
+
+* MethodArgument/ReturnMapper: per method mapping of arguments/return type.
+  Can use annotations as shorthand to initialize a map, but basically set up a
+  per-NativeLibrary (or per-Function?) map of methods to mappers.
+
+  Requires separate compilation of annotation handling.
+
+* ditch type conversion context.  
+
+* packaging: 'types', 'convert/marshal' subpackages?
+  note: marshal/unmarshal vs to/fromnative: to/fromnative is more
+  explicit, since marshal/unmarshal doesn't indicate src/dst.
+  o moving conversion contexts to subpackage cleans up top level
+  substantially, but we probably don't want to move things like Structure and
+  Pointer into a types subpackage (which would leave just a few top-level
+  classes).  Javadoc is cluttered by example classes anyway.
+
+* support annotations of parameters and return values w/o breaking
+  1.4 compatibility (retroweaver?), e.g.
+  -- retroweaver (requires retroweaver runtime classes to provide annotation
+  features) not yet worth doing
+
+  void my_function(@MarshalAs(off_t)long arg);
+
+  trading off cruft in the interface def to avoid cruft in the usage:
+
+  my_function(0) versus my_function(new off_t(0))
+  
+  this only really applies to NativeLong/IntegerType types that want to use a
+  primitive value instead of creating an object instance.
+
+* flag string(/wstring)-returning methods which need to free their result
+   to avoid leaking memory whan auto-creating strings from the result
+   (since normally we don't take explicit ownership of any returned pointers)
+   this is a special case for returned strings only, since other returned
+   pointers are available to the user for later "freeing"
+   Use a map on library creation, an iface for the library, or annotation
+   NOTE: how many methods actually do this? strdup...
+   Maybe make function return "Memory", which can then be converted to a
+   Structure or some other type.  Then memory will free itself when no longer
+   referenced. 
+* make Pointer free-able (system allocates memory, client frees it); actually,
+  this should probably be automatic so the user doesn't have to think about it.
+  Maybe a custom type representing "function-allocated-pointer" or
+  "pointer-requiring-free" (which is just Memory).  For now, leave it up to
+  the user to manage the pointer, since they have to define the free method
+  anyway.  use could always put a finalizer on a PointerType-derived type.
+* if method has "GetLastErrorException/ErrnoException" in its signature, use
+  result codes + GetLastError/errno/errstr to auto-generate 
+  runtime exceptions? (cf P/Invoke; also useful for X11 return types)
+  provide annotation/custom invocation handler/hook to examine return value and
+  throw an exception if the return value indicates an error
+
+  o are error return values consistent (if so, a single handler works)?
+    if null -> call GetLastError
+    if nonzero ?
+  o otherwise, need an ExceptionOnZero, ExceptionOnNonZero runtime, from which
+  derive GetLastError/ErrnoExceptionOnZero/NZ
+* universal GCC build w/cross-compile (needs cross compilers...)
+* return Pointer.SIZE/LONG_SIZE/WCHAR_SIZE in bits (for consistency with 1.5)
+  Long.SIZE, Integer.SIZE, et al.
+* interface "lvalue", which can provide a pointer to itself (reference() or
+  addressOf())?
+* bitfields for structs (how?)
+
+
+# DONE
+* verify get/set methods vs read/write for performance (Pointer)?
+  (see RawTest for performance comparisons)
+* Allow Buffer in Structures (and callbacks) (auto-wrap in direct byte buffer)?
+  o this gets tricky when reading structs from native memory; we don't know if
+  the value is already mapped to a buffer (cf CallbackReference)
+* standard types for various platforms: posix/types.h, w32 (DWORD, HANDLE)
+
+* embed version in DLL ('depends'-done)/so (symlink?)
+* use libffi closure allocation/deallocation
+
+* ensure Library options are passed to NativeFunctionHandler
+  (needs getLibraryOptions(Class cls))
+
+* handle array of Structure.ByReference as parameter/return value (cf Pointer[])
+* test performance of setByte/getByte and pass pointer field directly if it
+  makes sense to do so (done, halves access time to use pointer field directly,
+  slight variations on 1.4/1.5/1.6).
+* test callback arg/return value for callback type 
+* structure by value in callback
+
+* call native to fix up FFIType on creation (avoid multithreading problems)
+  properly handle union by value (or punt; must pass union field instead)
+
+* hash javah-generated headers; when changed, invalidate platform-specific
+
+* add main class which spits out version information
+  
+* docs: split pages: FAQ
+  FAQ: J2ME, new platform builds, stdcall
+
+* struct by reference within structure
+* struct by value
+  (how to do struct value return (vs struct pointer) (uncommon)?)
+  (how to do struct value argument (vs struct pointer) (uncommon)?) 
+* use appropriate size_t and off_t sizes (use long offsets everywhere in
+  Pointer) 
+* Callback/function pointer as return value (e.g. signal())
+* type safety between returned and passed in pointers (w32 API); advantage of
+  deriving from Pointer is that type mapping can be made automatic, without an
+  explicit type mapping defined.
+* catch native crash/exception/faults and re-throw as java exception
+  this is mostly for debugging a new mapping to avoid crashing the VM
+  could do setjmp/longjmp on *nix and catch C++ exception on w32
+* NativeMapped: provide interface to automatically convert custom Java
+  type to/from native types. 
+* update X11 libs for 64-bit
+* use libffi from gcc to handle calls and callbacks?
+  or move callback asm templates into dispatch_<arch>.c
+* more tests for argument types (2 args, all permutations of basic data types)
+   ensures native stack handling is done properly (handled by libffi)
+* universal OSX build w/cross-compile (hard to do with libffi)
+* use jna.encoding property to affect string encoding instead of just using
+  the system default encoding.
+* change/augment getWindowHandle0 to provide any heavyweight component window
+* unions (copy-on-call is problematic: which member is active?) must require
+  explicit write, either per member or whole object before export
+* rename Argument/Result Converter to be fromNative/toNative
+* split unit tests
+* auto-convert struct pointers in callback args to Java Structure
+  (may need a proxy wrapper around callback to avoid excessive JNI)
+  use proxy for callbacks to enable auto-conversion of arguments and/or return
+  value (in java-land instead of C-land). 
+* review/use refactor nativelibrary/function
+* auto-generate stdcall decorated symbols (try if undecorated lookup fails)
+* per-library jna.library.path: many libraries have a "standard" location (or
+  several); let the library author indicate what these are (X11, for example)
+* return array of struct (annotation to indicate which argument has the
+  length of the returned value might be nice) (this can now be done with a
+  type mapper)
+* callbacks need a dispose if they are to live beyond the lifetime of the
+function to which they are passed; maybe a simpler callback interface for
+transient callbacks, and require callback+dispose for most callbacks?
+  TransientCallback: callback
+  NonTransientCallback: callback+dispose
+  (callback is disposed when no longer referenced; user must ensure callback
+  is not GC'd until it is removed as a native callback)
+* auto-convert strings in w32 functions ending in 'W'?  would this introduce
+  any ambiguity?
+* Dispose/unload library on GC (use ref queue)
+* fix dnd on linux (no hole?) (mostly fixed, still some artifacts)
+* transparent/shaped drag image
+* windows handles need to be Pointer (void*), not 'int'
+* other demos: move to trash, file change notification
+* tests for other primitive array types
+* build test dll/dispatch lib w/cygwin/gcc instead of msvc (?) under w32
+* nested struct alignment (4/8 byte?  depends on first element?)
+* nested structs in structs: easier to define using struct; use pointer
+   if you need a pointer
+   struct auto-converts to pointer as argument, should be inline in struct
+   (struct should require explicit pointer, argument should require explicit
+   non-pointer) (maybe use object version of basic type as "pointer" version)
+* provide JNA-only search path for libraries
+* callbacks
+* move javah-generated files to own space
+* darwin/PPC asm layer
+* enable w32 build with either GCC or MSVC (GCC-built dll doesn't work yet)
+* support pointer to basic type argument (int *) w/type safety - what's the
+   best API from a user perspective? new Pointer(int)? new Pointer<int>?
+   Base class "pointer to" gets converted to Pointer in invocation handler;
+   provide a getValue() to retrieve the result; otherwise the memory is opaque
+
+  o IntPtr, WCharPtr, CharPtr, ShortPtr, LongPtr, DoublePtr, FloatPtr, 
+    Handle (PtrPtr), getValue(), getPointer()
+  o add getCharArray() et al. to Pointer?
+
+* inline arrays of primitive types
+* remove debug flags (they're not useful)
+* Use WString to identify return type and arg
+* use interface to identify native, instead of annotation
+* isolate stdcall to w32 (should be private to platform)
+* generic gcc build/osx(ppc/x86)/linux
+* remove generics/enable build under 1.4
+* tests for structs
+* test float/double
+* offset placeholders for structs (explicit alignment)
+* vanilla ant build file
+* build native stuff from build.xml
+* implement basic junit tests
+* auto-align struct fields
+* handle long/byte/short
+* make annotations for native method names optional
+// hard clip for now, alpha transparency later
+// also allow ImageIcon to be used as clip (getImage())
+void setWindowMask(Window w, Shape clip);
+// needs:
+int findNativeWindow(Window w);
+
+#MAYBE NOT
+* should structure offsets be 64-bit? technically yes, but in practice I don't
+  think a structure that big actually works.
+* (maybe) move all native functions into Native (limit header files, easier
+  management) 
+* Does it make sense to define Int16/UInt16, Int32/UInt32, etc?  Probably not
+  the signed versions, but maybe the unsigned ones, to facilitate generating
+  unsigned values (maybe just provide utilities to pack an unsigned int into a
+  signed int).  What about size_t, off_t, et al.?  Would either need a
+  bunch of native lookup functions (more accurate) or java-side conditionals
+  (less robust but easier to change).
+  o bounds checking is handled by IntegerType (pass in a long, get an
+    exception if the value is out of bounds).
+  o when used as struct fields, could allow detection of field order by order
+    of initialization (requires all-or-nothing usage, though)
+* Make a separate jar file for all OS-specific headers
+  Maybe make interfaces per-header file (winbase, winnt, stdlib, etc),
+  aggregated per-library (interface CLibrary extends stdlib, stdio, etc)
+  (how useful would it really be, or is this just sorting legos?)
+  o same for windowutils, fileutils, etc. (not useful)
+* StringBuffer/StringBuilder as mutable char*/wchar_t* argument
+  NOTE: byte[]/char[] is probably better; it's trivial to convert to String
+  and native code can't change the size anyway
+* provide library load/unload hooks (Runnables in options?). Examples:
+  o GetLastError (no longer needed)
+  o WSAInit?
+* determine X11 display name from current java program (if any); null is ok
+  since it uses getenv(DISPLAY), which is what java would do
+  note: DISPLAY may be available in GraphicsDevice->getIDstring
+
+

jnalib/build.xml

@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="JNA" default="default" basedir=".">
+  <description>Builds and tests JNA</description>
+
+  <!--  
+  Conventions (since ant can't easily specify arbitrary file dependencies):
+  The uptodate property for a given target TARGET is "-TARGET"; the actual
+  target to generate the uptodate property is named ":TARGET".
+
+  Properties (except for uptodate properties) separate words by dots, targets
+  by dashes. 
+  -->
+
+  <!-- global properties -->
+  <!-- (all build-related props should go in -dynamic-properties) -->
+  <property name="name" value="jna"/>
+  <property name="jar" value="${name}.jar"/>
+  <property name="testjar" value="${name}-test.jar"/>
+  <property name="debug" value="true"/>
+  <property name="debug.native" value="false"/>
+  <property name="cflags_extra.native" value=""/>
+  <property name="dynlink.native" value="false"/>
+  <property name="native" location="native"/>
+  <property name="src" location="src"/>
+  <property name="dist" location="dist"/>
+  <property name="test.src" location="test"/>
+  <property name="doc" location="doc"/>
+  <property name="javadoc" location="${doc}/javadoc"/>
+  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
+  <property name="vendor" value="JNA Development Team"/>
+  <property name="copyright"
+            value="Copyright &amp;copy; 2007-2009 Timothy Wall. All Rights Reserved."/>
+  <buildnumber/>
+  <!-- JNA library release version -->            
+  <property name="jna.major" value="3"/>
+  <property name="jna.minor" value="2"/>
+  <property name="jna.revision" value="1"/>
+  <property name="jna.build" value="${build.number}"/>
+  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
+  <!-- jnidispatch library release version -->
+  <property name="jni.major" value="3"/>
+  <property name="jni.minor" value="2"/>
+  <property name="jni.revision" value="0"/>
+  <property name="jni.build" value="${build.number}"/>
+  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
+  <property name="jni.md5" value="c870290c36c8d3fdf85db7c782febc3f"/>
+  <property name="spec.title" value="Java Native Access (JNA)"/>
+  <property name="spec.vendor" value="${vendor}"/>
+  <property name="spec.version" value="${jna.major}"/>
+  <property name="impl.title" value="com.sun.jna"/>
+  <property name="impl.vendor" value="${spec.vendor}"/>
+  <property name="impl.version" value="${jna.version} b${jna.build}"/>
+
+  <property name="compatibility" value="1.4"/>
+  <property name="test.compatibility" value="1.5"/>
+
+  <!-- Miscellaneous -->
+  <property name="build.compiler.emacs" value="true"/>
+
+  <target name="default" depends="test" description="Build and Test."/>
+
+  <import file="nbproject/profiler-build-impl.xml"/>
+  <target name="init" depends="-setup"/>
+  <target name="compile-test-single" depends="compile-tests"/>
+  <target name="compile-single" depends="compile"/>
+
+  <target name="-dynamic-properties">
+    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
+    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
+    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
+    <echo>java.home=${java.home}</echo>
+    <echo>java.library.path=${java.library.path}</echo>
+
+    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
+                   replace="\1${jna.version}\2" 
+                   file="pom.xml"/>
+
+    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
+      <isset property="omit-jnilib"/>
+    </condition>
+    <condition property="vm.arch" value="-d64" else="">
+      <or>
+        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
+        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
+        <os arch="x86_64"/>
+        <os arch="ppc64"/>
+        <os arch="sparcv9"/>
+        <os arch="amd64"/>
+      </or>
+    </condition>
+    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
+      <and>
+        <os name="SunOS"/>
+        <equals arg1="${vm.arch}" arg2="-d64"/>
+      </and>
+    </condition>
+    <property name="build" value="build${vm.arch}"/>
+    <property name="classes" location="${build}/classes"/>
+    <property name="eclipse.classes" location="build.eclipse/classes"/>
+    <property name="test.classes" location="${build}/test-classes"/>
+    <property name="reports" value="${build}/reports"/>
+
+    <!-- Add other supported platforms here -->
+    <condition property="jre.arch" value="i386">
+      <equals arg1="x86" arg2="${os.arch}"/>
+    </condition>
+    <condition property="jre.arch" value="amd64">
+      <equals arg1="x86_64" arg2="${os.arch}"/>
+    </condition>
+    <property name="jre.arch" value="${os.arch}"/>
+    <condition property="os.prefix" value="linux-${jre.arch}">
+      <os name="Linux"/>
+    </condition>
+    <condition property="os.prefix" value="win32-${os.arch}">
+      <os family="windows"/>
+    </condition>
+    <!-- Darwin builds are universal, no arch required -->
+    <condition property="os.prefix" value="darwin">
+      <os family="mac"/>
+    </condition>
+    <condition property="os.prefix" value="sunos-${os.arch}">
+      <os name="SunOS"/>
+    </condition>
+    <condition property="os.prefix" value="freebsd-${os.arch}">
+      <os name="FreeBSD"/>
+    </condition>
+    <condition property="os.prefix" value="openbsd-${os.arch}">
+      <os name="OpenBSD"/>
+    </condition>
+    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
+    <condition property="jdk.home" value="${java.home}">
+      <available file="${java.home}/include"/>
+    </condition>
+    <condition property="jdk.home" value="${java.home}/..">
+      <available file="${java.home}/../include"/>
+    </condition>
+    <fail unless="jdk.home" message="JAVA_HOME/java.home must be a JDK, not JRE"/>
+    <condition property="libjsig"
+               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
+      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
+    </condition>
+    <property name="native.jar" value="${os.prefix}.jar"/>
+    <property name="build.native" location="${build}/native"/>
+    <property name="md5.file" location="${build.native}/sig"/>
+
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build.native}"/>
+    <mkdir dir="${classes}"/>
+    <mkdir dir="${test.classes}"/>
+    <mkdir dir="${reports}"/>
+    <mkdir dir="${doc}"/>
+
+  </target>
+
+  <target name="-setup" depends="-dynamic-properties">
+    <path id="compile-test.path">
+      <pathelement path="${test.src}"/>
+      <path id="test.libs">
+        <fileset dir="lib">
+          <include name="junit.jar"/>   
+        </fileset>
+        <pathelement path="${classes}"/>
+      </path>
+      <path id="compile.path">
+        <path id="src.path">
+          <pathelement location="${src}"/>
+        </path>
+      </path>                           
+    </path>                           
+
+    <path id="test.runpath">
+      <pathelement path="${build}/${jar}"/>
+      <pathelement path="${build}/examples.jar"/>
+      <pathelement path="${test.classes}"/>
+      <pathelement path="lib/clover.jar"/>
+      <path refid="test.libs"/>
+    </path>
+  </target>
+
+  <target name="compile" depends="-setup"
+          description="Compile all Java source">
+    <javac classpathref="compile.path"
+           source="${compatibility}"
+           target="${compatibility}"
+           destdir="${classes}" 
+           deprecation="on" debug="${debug}">
+      <src path="${src}"/>
+    </javac>
+  </target>
+
+  <target name=":jar">
+    <uptodate property="-jar" targetfile="${build}/${jar}">
+      <srcfiles dir="${classes}">
+        <patternset id="jar-compiled">
+          <include name="com/sun/jna/*"/>
+          <include name="com/sun/jna/**/*"/>
+          <exclude name="com/sun/jna/examples/*"/>
+          <exclude name="com/sun/jna/examples/**/*"/>
+        </patternset>
+      </srcfiles>
+    </uptodate>
+  </target>
+  <target name="jar" depends="-setup,native,:jar" unless="-jar"
+          description="Build primary jar">
+    <jar jarfile="${build}/${jar}">
+      <manifest>
+        <attribute name="Main-Class" value="com.sun.jna.Native"/>
+        <section name="com/sun/jna/">
+          <attribute name="Implementation-Title" value="${impl.title}"/>
+          <attribute name="Implementation-Vendor" value="${vendor}"/>
+          <attribute name="Implementation-Version" value="${impl.version}"/>
+          <attribute name="Specification-Title" value="${spec.title}"/>
+          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
+          <attribute name="Specification-Version" value="${spec.version}"/>
+        </section>
+      </manifest>
+      <fileset dir="${classes}" excludes="${jar.omitted}">
+        <patternset refid="jar-compiled"/>
+      </fileset>
+    </jar>
+  </target>
+  <target name="examples" depends="jar,native">
+    <jar jarfile="${build}/examples.jar">
+      <manifest>
+        <attribute name="Class-Path" value="jna.jar"/>
+        <attribute name="Main-Class" value="com.sun.jna.examples.ShapedWindowDemo"/>
+      </manifest>
+      <fileset dir="${src}" includes="**/examples/**/*.png"/>
+      <fileset dir="${classes}" includes="**/examples/*,**/examples/**/*"/>
+      <fileset dir="${classes}" includes="jnidispatch.dll"/>
+    </jar>
+  </target>
+
+  <target name="javah" depends="compile">
+    <javah classpath="${classes}" destdir="${build.native}" force="yes">
+      <class name="com.sun.jna.Function"/>
+      <class name="com.sun.jna.Pointer"/>
+      <class name="com.sun.jna.Memory"/>
+      <class name="com.sun.jna.Native"/>
+      <class name="com.sun.jna.NativeLibrary"/>
+      <class name="com.sun.jna.CallbackReference"/>
+    </javah>
+    <condition property="grep" value="/usr/sfw/bin/ggrep">
+      <os name="SunOS"/>
+    </condition>
+    <condition property="grep" value="ggrep">
+      <os name="OpenBSD"/>
+    </condition>
+    <property name="grep" value="grep"/>
+    <apply dir="${build.native}" executable="${grep}" parallel="true"
+           failonerror="true" relative="true" output="${md5.file}">
+      <arg value="-A"/>
+      <arg value="1"/>
+      <arg value="JNIEXPORT"/>
+      <fileset dir="${build.native}" includes="*.h"/>
+    </apply>
+    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
+    <checksum property="md5" file="${md5.file}" />
+    <condition property="jni.valid" value="true">
+      <or>
+        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
+        <equals arg1="${jni.md5}" arg2=""/>
+      </or>
+    </condition>
+  </target>
+
+  <!-- Invalidate native libraries when native API changes -->
+  <target name="-native-api-check" depends="javah" unless="jni.valid">
+    <echo>Invalidating native code, new checksum is ${md5}</echo>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
+    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
+    <delete failOnError="false" includeEmptyDirs="true">
+      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
+    </delete>
+    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
+  </target>
+
+  <target name=":rsrc">
+    <condition property="-rsrc">
+      <not><os family="windows"/></not>
+    </condition>
+  </target>
+  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
+          description="Generate w32 DLL version resource information">
+    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
+    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
+    <replaceregexp match="FILEVERSION.*"
+                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
+                   file="${rsrc}" byline="true"/>
+    <replaceregexp match="PRODUCTVERSION.*"
+                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
+                   file="${rsrc}" byline="true"/>
+    <replaceregexp match="FileVersion.*"
+                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
+                   file="${rsrc}" byline="true"/>
+    <replaceregexp match="Full Version.*"
+                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
+                   file="${rsrc}" byline="true"/>
+    <replaceregexp match="ProductVersion.*"
+                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
+                   file="${rsrc}" byline="true"/>
+  </target>
+
+  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
+          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
+    <property name="comment" value="# auto-generated by ant"/>
+    <replaceregexp match="^VERSION=.*"
+                   replace="VERSION=${jni.version} ${comment}"
+                   file="native/Makefile" byline="true"/>
+    <replaceregexp match="^CHECKSUM=.*"
+                   replace="CHECKSUM=${jni.md5} ${comment}"
+                   file="native/Makefile" byline="true"/>
+    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
+    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
+    <property name="ARCH" value="${os.arch}"/>
+    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
+      <isset property="CC"/>
+    </condition>
+    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
+      <isset property="ARCH"/>
+    </condition>
+    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
+      <isset property="SDKROOT"/>
+    </condition>
+    <condition property="make.SDKROOT"
+	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
+      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
+    </condition>
+    <condition property="make.SDKROOT"
+	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
+      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
+    </condition>
+    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
+         make --> 
+    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
+      <os family="windows"/>
+    </condition>
+    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
+      <os name="SunOS"/>
+    </condition>
+    <condition property="make" value="/usr/sfw/bin/gmake">
+      <os name="SunOS"/>
+    </condition>
+    <condition property="make" value="gmake">
+      <or>
+        <os name="FreeBSD"/>
+        <os name="OpenBSD"/>
+      </or>
+    </condition>
+    <!-- Default make program -->
+    <property name="make" value="make"/>
+
+    <exec executable="${make}" dir="${native}" failonerror="true">
+      <arg value="JAVA_HOME=${jdk.home}"/>
+      <arg value="JAVAH=${build.native}"/>
+      <arg value="DEBUG=${debug.native}"/>
+      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
+      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
+      <arg value="${make.CC}"/>
+      <arg value="${make.BUILD}"/>
+      <arg value="${make.SDKROOT}"/>
+      <arg value="${make.ARCH}"/>
+      <arg value="${make.PATH}"/>
+      <arg value="VERSION=${jni.version}"/>
+      <arg value="CHECKSUM=${jni.md5}"/>
+    </exec>
+    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
+    <copy todir="${classes}/com/sun/jna/${os.prefix}">
+      <fileset dir="${build.native}"
+               includes="jnidispatch.dll,libjnidispatch.*"/>
+    </copy>
+    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
+    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
+          failonerror="false">
+      <fileset dir="${build.native}"
+               includes="jnidispatch.dll,libjnidispatch.*"/>
+    </copy>
+    <!-- For web start, native libraries may be provided in the root of -->
+    <!-- an included jar file -->
+    <jar jarfile="${build}/${native.jar}">
+      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
+      <manifest>
+        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
+        <attribute name="Specification-Version" value="${jni.version}"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="compile-tests" depends="compile,native,jar"
+          description="Compile all test code">
+    <javac classpathref="compile-test.path"
+           source="${test.compatibility}"
+           target="${test.compatibility}"
+           destdir="${test.classes}" 
+           deprecation="on" debug="${debug}">
+      <src path="${test.src}"/>
+    </javac>
+    <jar jarfile="${build}/${testjar}">
+      <fileset dir="${test.classes}">
+        <patternset refid="jar-compiled"/>
+      </fileset>
+    </jar>
+    <mkdir dir="${build}/jws"/>
+    <copy todir="${build}/jws" file="${build}/${jar}"/>
+    <copy todir="${build}/jws" file="${build}/${testjar}"/>
+    <copy todir="${build}/jws" file="lib/junit.jar"/>
+    <copy todir="${build}/jws" file="lib/clover.jar"/>
+    <jar jarfile="${build}/jws/jnidispatch.jar">
+      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
+    </jar>
+    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
+      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
+    </signjar>
+  </target>
+
+  <!-- When running tests from an IDE, be sure to set jna.library.path -->
+  <!-- to where the test library (testlib) is found.                   -->
+  <target name="test" depends="jar,examples,compile-tests"
+          description="Run all unit tests">
+    <property name="test.fork" value="yes"/>
+    <property name="reports.junit" location="${reports}/junit"/>
+    <property name="results.junit" location="${build}/junit-results"/>
+    <mkdir dir="${results.junit}"/>
+    <echo>Saving test results in ${results.junit}</echo>
+    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
+    <condition property="tests.platform" value="**/win32/*Test.java">
+      <os family="windows"/>
+    </condition>
+    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
+      <and><os family="windows"/><not><os arch="x86"/></not></and>
+    </condition>
+    <condition property="tests.platform" value="**/unix/*Test.java">
+      <and>
+        <os family="unix"/>
+        <not><os family="mac"/></not>
+      </and>
+    </condition>
+    <condition property="vmopt.arch" value="-d64" else="-Dignore">
+      <and>
+        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
+        <not><os family="windows"/></not>
+        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
+      </and>
+    </condition>
+    <property name="tests.platform" value=""/>
+    <property name="tests.exclude" value=""/>
+    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
+      <!-- avoid VM conflicts with JNA protected mode -->
+      <env key="${ld.preload}" file="${libjsig}"/>
+      <jvmarg value="-Djna.library.path=${build.native}"/>
+      <!-- Avoid VM crashes, if possible -->
+      <jvmarg value="-Djna.protected=true"/>
+      <jvmarg value="-Djna.builddir=${build}"/>
+      <jvmarg value="${vmopt.arch}"/>
+      <classpath><path refid="test.runpath"/></classpath>
+      <formatter type="xml"/>
+      <batchtest todir="${results.junit}">
+        <fileset dir="${test.src}">
+          <include name="com/sun/jna/*Test.java"/>
+          <include name="com/sun/jna/examples/*Test.java"/>
+          <include name="${tests.platform}"/>
+          <exclude name="${tests.exclude}"/>
+        </fileset>
+      </batchtest>
+    </junit>
+    <junitreport todir="${results.junit}">
+      <fileset dir="${results.junit}">
+        <include name="TEST-*.xml"/>
+      </fileset>
+      <report todir="${reports.junit}"/>
+    </junitreport>
+    <echo>View test report in file://${reports.junit}/index.html</echo>
+    <fail if="testfailure" unless="clover">One or more tests failed</fail>
+  </target>
+
+  <target name="with.clover" description="Enable code coverage for tests">
+    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
+    <property name="clover" value="true"/>
+    <property name="build" value="build.clover"/>
+    <clover-setup/>
+  </target>
+
+  <target name="clover" depends="with.clover,test"
+          description="Generate test code coverage reports">
+    <property name="reports.clover" value="${reports}/clover"/>
+    <mkdir dir="${reports.clover}"/>
+    <clover-report>
+      <current outfile="${reports.clover}" title="clover">
+        <fileset dir="." includes="**/*.java" excludes="**/examples/**/*.java"/>
+        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
+        <format type="html"/>
+      </current>
+    </clover-report>
+    <echo>Reports generated in ${reports.clover}</echo>
+  </target>
+
+  <target name="javadoc" depends="-setup">
+    <property name="header"
+              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
+    <property name="footer"
+              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
+
+    <mkdir dir="${javadoc}"/>
+    <javadoc package="true"
+             windowtitle="JNA API"
+             sourcepathref="src.path"
+             classpathref="compile.path"
+             maxmemory="256m"
+             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.examples,com.sun.jna.examples.win32,com.sun.jna.exmaples.unix"
+             overview="${src}/com/sun/jna/overview.html"
+             destdir="${javadoc}">
+      <!-- stylesheetfile="${stylesheet}" -->
+      <doctitle>JNA API Documentation</doctitle>
+      <header>${header}</header>
+      <bottom>${footer}</bottom>
+      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+
+      <packageset dir="${src}" defaultexcludes="yes">
+        <patternset>
+          <include name="com/sun/jna/**/*"/>
+        </patternset>
+      </packageset>
+
+      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
+      <group title="Examples" packages="com.sun.jna.examples,com.sun.jna.examples.dnd"/>
+      <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
+      <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
+
+      <arg value="-notimestamp"/>
+    </javadoc>
+  </target>
+
+  <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
+          description="Build distribution files">
+    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
+      <manifest>
+        <attribute name="Main-Class" value="com.sun.jna.Native"/>
+        <section name="com/sun/jna/">
+          <attribute name="Implementation-Title" value="${impl.title}"/>
+          <attribute name="Implementation-Vendor" value="${vendor}"/>
+          <attribute name="Implementation-Version" value="${impl.version}"/>
+          <attribute name="Specification-Title" value="${spec.title}"/>
+          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
+          <attribute name="Specification-Version" value="${spec.version}"/>
+        </section>
+      </manifest>
+      <zipfileset src="${build}/${jar}"/>
+      <zipfileset src="${dist}/win32-x86.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/win32-x86"/>
+      <zipfileset src="${dist}/darwin.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/darwin"/>
+      <zipfileset src="${dist}/linux-i386.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-i386"/>
+      <zipfileset src="${dist}/linux-amd64.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-amd64"/>
+      <zipfileset src="${dist}/sunos-x86.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-x86"/>
+      <zipfileset src="${dist}/sunos-amd64.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-amd64"/>
+      <zipfileset src="${dist}/sunos-sparc.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-sparc"/>
+      <zipfileset src="${dist}/sunos-sparcv9.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-sparcv9"/>
+      <zipfileset src="${dist}/freebsd-i386.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/freebsd-i386"/>
+      <zipfileset src="${dist}/freebsd-amd64.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/freebsd-amd64"/>
+      <zipfileset src="${dist}/openbsd-i386.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/openbsd-i386"/>
+      <zipfileset src="${dist}/win32-amd64.jar" 
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/win32-amd64"/>
+    </jar>
+    <copy todir="${dist}">
+      <fileset dir="${build}">
+        <include name="${native.jar}"/>
+        <include name="examples.jar"/>
+      </fileset>
+    </copy>
+    <zip zipfile="${dist}/doc.zip">
+      <zipfileset dir="${javadoc}" prefix="javadoc"/>
+    </zip>
+    <!-- JNA sources only, for use in Linux build from source -->
+    <zip zipfile="${dist}/src.zip">
+      <zipfileset dir="." includes="build.xml,LICENSE.txt"/>
+      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
+      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
+      <zipfileset dir="${native}" excludes="libffi,libffi/**/*" prefix="native"/>
+    </zip>
+    <!-- Full sources required to build and test everything -->
+    <zip zipfile="${dist}/src-full.zip">
+      <zipfileset src="${dist}/src.zip"/>
+      <zipfileset dir="lib" includes="junit.jar" prefix="lib"/>
+      <zipfileset dir="." includes=".classpath,.project"/>
+      <zipfileset dir="nbproject" includes="**/*" prefix="nbproject"/>
+      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
+    </zip>
+    <!-- Sources package as required by maven -->
+    <zip zipfile="${dist}/src-mvn.zip">
+      <zipfileset dir="${src}" includes="**/*.jar,**/*.html,**/*.png"/>
+    </zip>
+  </target>
+
+  <target name="clean" depends="-dynamic-properties">
+    <delete failOnError="false" includeEmptyDirs="true">
+      <fileset dir="${build}"/>
+    </delete>
+    <delete quiet="true" includeEmptyDirs="true">
+      <fileset dir="${javadoc}"/>
+      <fileset dir="." includes="*~,**/*~"/>
+    </delete>
+  </target>
+
+</project>
+
+

jnalib/contrib/README

@@ -0,0 +1,4 @@
+This directory contains code which has been contributed by JNA users.  If no
+tests are included, you should assume the code has only been checked for
+compile-time errors :)
+

jnalib/contrib/balloontips/BalloonTipManager.java

@@ -0,0 +1,522 @@
+//package bms.ui.widgets;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.GraphicsConfiguration;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.geom.Area;
+import java.awt.geom.RoundRectangle2D;
+
+import javax.swing.AbstractAction;
+import javax.swing.JLabel;
+import javax.swing.JWindow;
+import javax.swing.Popup;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+import com.sun.jna.examples.WindowUtils;
+
+/**
+ * The BalloonTipManager class handles creation and disposal of balloon style 
+ * tips that are typically used to display warning/error information based on
+ * results from input validation.  The balloon tip location and direction are
+ * computed based on the owner component location on the screen.  The balloon
+ * tip is only displayed for a limited amount of time that is configurable.  
+ * The balloon tip is also disposed when the owner component loses focus or the
+ * mouse is pressed.
+ */
+public class BalloonTipManager {
+  public static final Color DEFAULT_BORDER_COLOR = Color.BLACK;
+  public static final Color DEFAULT_BACKGROUND_COLOR = new Color(255, 255, 225);
+  public static final Color DEFAULT_TEXT_COLOR = Color.BLACK;
+  
+  private static final Integer VPOS_ABOVE = 0; // Positioned above component.
+  private static final Integer VPOS_BELOW = 1; // Positioned below component.
+  private static final Integer HPOS_LEFT = 0; // Arrow is on the left side.
+  private static final Integer HPOS_RIGHT = 1; // Arros is on the right side.
+
+  private static Integer vpos = null;
+  private static Integer hpos = null;
+  
+  private static Timer hidePopupTimer = null;
+  private static boolean isShowing = false;
+  
+  
+  /*
+   * The BalloonTip class defines the look of the BalloonTip object.
+   */
+  @SuppressWarnings("serial")
+  private static final class BalloonTip extends JWindow {
+    private static final Integer HMARGIN = 10;
+    private static final Integer VMARGIN = 6;
+    private static final Integer VSPACER = 4;
+    private static final int ARC_D = 16;
+    
+    private Area mask = null;
+    private Dimension maskSize = null;
+    private String[] textList = null;
+    
+    private Color backgroundColor = null;
+    private Color borderColor = null;
+    private Color textColor = null;
+    
+    /**
+     * Create a BalloonTip object.
+     * @param owner the parent window for the components
+     * @param content the string for the balloon tip
+     * @param position the position for the balloon; either above or below the
+     * owner component
+     * @param origin the origin point for the balloon tip
+     * @param bordercolor the background color for the balloon tip
+     * @param backgroundcolor the border color for the balloon tip
+     * @param textcolor the text color for the balloon tip
+     */
+    public BalloonTip (
+        Window owner, String content, Point origin, Color bordercolor,
+        Color backgroundcolor, Color textcolor)
+    {
+      super(owner);
+      textList = content.split("\n");
+      borderColor = bordercolor;
+      backgroundColor = backgroundcolor;
+      textColor = textcolor;
+      setFocusableWindowState(false);
+      setName("###overrideRedirect###");
+      setSize(getPreferredSize());
+    }
+    
+    /*
+     * Sets the mask for the Balloon Tip.
+     */
+    private void setWindowMask () {
+      mask = new Area(getMask());
+      maskSize = getSize();
+      WindowUtils.setWindowMask(BalloonTip.this, mask);
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see java.awt.Container#paint(java.awt.Graphics)
+     */
+    public void paint (Graphics g) {
+      super.paint(g);
+      Dimension d = getMinimumWindowSize();
+      int width = d.width + 2 * HMARGIN;
+      int height = d.height + 2 * VMARGIN;
+      int x = 0;
+      int y = 0;
+      if (vpos == VPOS_BELOW) {
+        y += 15;
+      }
+      // Draw the filled rounded rectangle and clean up the missed pixels.
+      g.setColor(backgroundColor);
+      g.fillRoundRect(x, y, width, height, ARC_D, ARC_D);
+      g.drawLine(x + 6, y + height - 1, x + 6, y + height - 1);
+      g.drawLine(x + width - 1, y + 6, x + width - 1, y + 6);
+      g.drawLine(x + width - 1, y + height - 6, x + width - 1, y + height - 7);
+      g.drawLine(x + width - 2, y + height - 4, x + width - 4, y + height - 2);
+      g.drawLine(x + width - 6, y + height - 1, x + width - 7, y + height - 1);
+      g.clearRect(x + 2, y + 2, 1, 1);
+      // Draw the border of the rounded rectangle.
+      g.setColor(borderColor);
+      g.drawRoundRect(x, y, width, height, ARC_D, ARC_D);
+      // Draw the external triangle for the balloon.
+      if (vpos == VPOS_BELOW) {
+        if (hpos == HPOS_LEFT) {
+          g.setColor(backgroundColor);
+          int[] xPts = {16, 16, 31};
+          int[] yPts = {0, 16, 16};
+          g.fillPolygon(xPts, yPts, 3);
+          g.setColor(borderColor);
+          g.drawLine(16, 0, 16, 15);
+          g.drawLine(16, 0, 31, 15);
+          g.drawLine(16, 1, 30, 15);
+        }
+        else {
+          g.setColor(backgroundColor);
+          int[] xPts = {width - 16, width - 16, width - 31};
+          int[] yPts = {0, 16, 16};
+          g.fillPolygon(xPts, yPts, 3);
+          g.setColor(borderColor);
+          g.drawLine(width - 16, 0, width - 16, 15);
+          g.drawLine(width - 16, 0, width - 31, 15);
+          g.drawLine(width - 16, 1, width - 30, 15);
+        }
+      }
+      else {
+        if (hpos == HPOS_LEFT) {
+          g.setColor(backgroundColor);
+          int[] xPts = {16, 16, 31};
+          int[] yPts = {height, height + 16, height};
+          g.fillPolygon(xPts, yPts, 3);
+          g.setColor(borderColor);
+          g.drawLine(16, height, 16, height + 15);
+          g.drawLine(16, height + 15, 31, height);
+          g.drawLine(16, height + 14, 30, height);
+        }
+        else {
+          g.setColor(backgroundColor);
+          int[] xPts = {width - 16, width - 16, width - 31};
+          int[] yPts = {height, height + 16, height};
+          g.fillPolygon(xPts, yPts, 3);
+          g.setColor(borderColor);
+          g.drawLine(width - 16, height, width - 16, height + 15);
+          g.drawLine(width - 16, height + 15, width - 31, height);
+          g.drawLine(width - 16, height + 14, width - 30, height);
+        }
+      }
+      // Draw the inner component for the balloon.
+      g.setColor(textColor);
+      g.setFont(new Font("Tahoma", Font.PLAIN, 11));
+      int stringY = y + VMARGIN / 2;
+      for (int i = 0; i < textList.length; i++) {
+        stringY += new JLabel(textList[i]).getPreferredSize().height;
+        if (i > 0) {
+          stringY += VSPACER;
+        }
+        g.drawString(textList[i], HMARGIN, stringY);
+      }
+    }
+    
+    /*
+     * Returns the mask for the balloon tip window.
+     */
+    private Shape getMask () {
+      Dimension d = getMinimumWindowSize();
+      int width = d.width + 2 * HMARGIN;
+      int height = d.height + 2 * VMARGIN;
+      int x = 0;
+      int y = 0;
+      if (vpos == VPOS_BELOW) {
+        y += 15;
+      }
+      // Start by creating the area of the main rounded rectangle.
+      Area area = new Area(
+        new RoundRectangle2D.Float(x, y, width + 1, height + 1, ARC_D, ARC_D));
+      // Add in the remaining pixels that are not included by default due to
+      // the differences between Graphics drawing and Shape creation.
+      area.add(new Area(new Rectangle(0, y + 6, 1, 2)));
+      area.add(new Area(new Rectangle(0, y + height - 7, 1, 2)));
+      area.add(new Area(new Rectangle(1, y + 4, 1, 1)));
+      area.add(new Area(new Rectangle(1, y + height - 5, 1, 2)));
+      area.add(new Area(new Rectangle(4, y + 1, 1, 1)));
+      area.add(new Area(new Rectangle(6, y, 2, 1)));
+      area.add(new Area(new Rectangle(width - 7, y, 2, 1)));
+      // Subtract the extra pixels that are not included by default due to the
+      // differences between Graphics drawing and Shape creation.
+      area.subtract(new Area(new Rectangle(2, y + height - 2, 1, 1)));
+      area.subtract(new Area(new Rectangle(3, y + height - 1, 1, 1)));
+      area.subtract(new Area(new Rectangle(5, y + height, 1, 1)));
+      area.subtract(new Area(new Rectangle(width - 5, y + height, 2, 1)));
+      area.subtract(new Area(new Rectangle(width - 3, y + height - 1, 2, 1)));
+      area.subtract(new Area(new Rectangle(width - 2, y + 2, 1, 1)));
+      area.subtract(new Area(new Rectangle(width - 2, y + height - 2, 2, 1)));
+      area.subtract(new Area(new Rectangle(width - 1, y + 3, 1, 1)));
+      area.subtract(new Area(new Rectangle(width - 1, y + height - 3, 1, 1)));
+      area.subtract(new Area(new Rectangle(width, y + 5, 1, 1)));
+      area.subtract(new Area(new Rectangle(width, y + height - 5, 1, 2)));
+      // Add in the triangle piece for the balloon.
+      if (vpos == VPOS_BELOW) {
+        if (hpos == HPOS_LEFT) {
+          int[] xPts = {16, 16, 32};
+          int[] yPts = {-1, 16, 16};
+          area.add(new Area(new Polygon(xPts, yPts, 3)));
+        }
+        else {
+          int[] xPts = {width - 15, width - 15, width - 32};
+          int[] yPts = {-1, 16, 16};
+          area.add(new Area(new Polygon(xPts, yPts, 3)));
+        }
+      }
+      else {
+        if (hpos == HPOS_LEFT) {
+          int[] xPts = {16, 16, 31};
+          int[] yPts = {height, height + 16, height};
+          area.add(new Area(new Polygon(xPts, yPts, 3)));
+        }
+        else {
+          int[] xPts = {width - 15, width - 15, width - 32};
+          int[] yPts = {height, height + 16, height};
+          area.add(new Area(new Polygon(xPts, yPts, 3)));
+        }
+      }
+      return area;
+    }
+    
+    /*
+     * Returns the dimension of the window based on the preferred component
+     * sizes.
+     */
+    private Dimension getMinimumWindowSize () {
+      int maxWidth = 0;
+      int textHeight = 0;
+      JLabel tempLabel = null;
+      for (int i = 0; i < textList.length; i++) {
+        tempLabel = new JLabel(textList[i]);
+        maxWidth = Math.max(maxWidth, tempLabel.getPreferredSize().width);
+        textHeight += tempLabel.getPreferredSize().height;
+      }
+      int w = Math.max(maxWidth, 32);
+      int h = Math.max(textHeight + (textList.length - 1) * VSPACER, 8);
+      return new Dimension(w, h);
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see java.awt.Window#setBounds(int, int, int, int)
+     */
+    public void setBounds (int x, int y, int w, int h) {
+      super.setBounds(x, y, w, h);
+      Dimension size = new Dimension(w, h);
+      if (mask != null && !size.equals(maskSize)) {
+        mask.subtract(mask);
+        mask.add(new Area(getMask()));
+        maskSize = size;
+      }
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see java.awt.Container#getPreferredSize()
+     */
+    public Dimension getPreferredSize () {
+      Dimension d = getMinimumWindowSize();
+      int w = d.width + 2 * HMARGIN + 1;
+      int h = d.height + 2 * VMARGIN + 16;
+      return new Dimension(w, h);
+    }
+  }
+  
+
+  /**
+   * Returns the popup window of the balloon tip.
+   * @param owner the owner component for the balloon tip
+   * @param content the text string to display in the balloon tip
+   * @param x the x coordinate for the origin for the balloon tip in relation
+   * to the owner component
+   * @param y the y coordinate for the origin for the balloon tip in relation
+   * to the owner component
+   * @param position the position for the balloon; either above or below the
+     * owner component
+   * @param duration the duration in milliseconds to display balloon tip
+   * @return the popup window of the balloon tip
+   */
+  public static Popup getBalloonTip (final Component owner,
+      final String content, int x, int y, final int duration)
+  {
+    return getBalloonTip(owner, content, x, y, duration, DEFAULT_BORDER_COLOR,
+      DEFAULT_BACKGROUND_COLOR, DEFAULT_TEXT_COLOR);
+  }
+  
+  /**
+   * Returns whether the popup is showing or not.
+   * @return true if the popup is showing, else false
+   */
+  public static boolean isShowing () {
+    return isShowing;
+  }
+  
+  /**
+   * Restarts the popup timer.
+   */
+  public static void restartTimer () {
+    hidePopupTimer.restart();
+  }
+  
+  /**
+   * Returns the popup window of the balloon tip.
+   * @param owner the owner component for the balloon tip
+   * @param content the text string to display in the balloon tip
+   * @param x the x coordinate for the origin for the balloon tip in relation
+   * to the owner component
+   * @param y the y coordinate for the origin for the balloon tip in relation
+   * to the owner component
+   * @param position the position for the balloon; either above or below the
+     * owner component
+   * @param duration the duration in milliseconds to display balloon tip
+   * @param bordercolor the background color for the balloon tip
+   * @param backgroundcolor the border color for the balloon tip
+   * @param textcolor the text color for the balloon tip
+   * @return the popup window of the balloon tip
+   */
+  public static Popup getBalloonTip (final Component owner,
+      final String content, int x, int y, final Integer duration,
+      final Color bordercolor, final Color backgroundcolor,
+      final Color textcolor)
+  {
+    final Point origin =
+      owner == null ? new Point(0, 0) : owner.getLocationOnScreen();
+    final Window parent =
+      owner != null ? SwingUtilities.getWindowAncestor(owner) : null;
+    final String text =
+      content != null ? content : "";
+    final Integer timerDuration =
+      duration != null ? duration : 10000;
+    origin.translate(x, y);
+    vpos = VPOS_BELOW;
+    hpos = HPOS_LEFT;
+    return new Popup () {
+      private BalloonTip bt = null;
+      final ComponentEar componentEar = new ComponentEar();
+      final MouseEar mouseEar = new MouseEar();
+      final FocusEar focusEar = new FocusEar();
+      
+      /*
+       * (non-Javadoc)
+       * @see javax.swing.Popup#show()
+       */
+      public void show () {
+        hidePopupTimer = new Timer(timerDuration, new TimerAction());
+        bt = new BalloonTip(parent, text, origin, bordercolor,
+          backgroundcolor, textcolor);
+        bt.pack();
+        Point pt = new Point(origin);
+        pt.translate(10, owner.getHeight());
+        bt.setLocation(getAdjustedOrigin(pt));
+        bt.setWindowMask();
+        bt.setVisible(true);
+        owner.addFocusListener(focusEar);
+        owner.addMouseListener(mouseEar);
+        parent.addMouseListener(mouseEar);
+        parent.addComponentListener(componentEar);
+        hidePopupTimer.start();
+        isShowing = true;
+      }
+      
+      /*
+       * (non-Javadoc)
+       * @see javax.swing.Popup#hide()
+       */
+      public void hide () {
+        if (bt != null) {
+          isShowing = false;
+          hidePopupTimer.stop();
+          parent.removeComponentListener(componentEar);
+          parent.removeMouseListener(mouseEar);
+          owner.removeMouseListener(mouseEar);
+          owner.removeFocusListener(focusEar);
+          bt.setVisible(false);
+          bt.dispose();
+        }
+      }
+      
+      /*
+       * Adjust the location of the balloon popup so that is drawn completely
+       * on the screen and specify the orientation.
+       */
+      private Point getAdjustedOrigin (Point pt) {
+        Point ret = new Point(pt.x, pt.y);
+        GraphicsConfiguration gc = owner.getGraphicsConfiguration();
+        Rectangle sBounds = gc.getBounds();
+        Insets sInsets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
+        sBounds.x += sInsets.left;
+        sBounds.y += sInsets.top;
+        sBounds.width -= (sInsets.left + sInsets.right);
+        sBounds.height -= (sInsets.top + sInsets.bottom);
+        
+        if (ret.x < sBounds.x) {
+          ret.x = sBounds.x;
+        }
+        else if (ret.x - sBounds.x + bt.getWidth() > sBounds.width) {
+          ret.x = owner.getLocationOnScreen().x - bt.getWidth() + 43;
+        }
+        if (ret.x >= pt.x) {
+          hpos = HPOS_LEFT;
+        }
+        else {
+          hpos = HPOS_RIGHT;
+        }
+
+        if (ret.y < sBounds.y) {
+          ret.y = sBounds.y;
+        }
+        else if (ret.y - sBounds.y + bt.getHeight() > sBounds.height) {
+          ret.y = owner.getLocationOnScreen().y - bt.getHeight();
+        }
+        if (ret.y >= pt.y) {
+          vpos = VPOS_BELOW;
+        }
+        else {
+          vpos = VPOS_ABOVE;
+        }
+        return ret;
+      }
+      
+      /*
+       * This class handles actions from the balloon tip timer.
+       */
+      @SuppressWarnings("serial")
+      final class TimerAction extends AbstractAction {
+        /*
+         * (non-Javadoc)
+         * @see java.awt.event.ActionListener#actionPerformed(
+         * java.awt.event.ActionEvent)
+         */
+        public void actionPerformed (ActionEvent e) {
+          hide();
+        }
+      }
+      
+      /*
+       * This class handles events spawned from moving the component.
+       */
+      @SuppressWarnings("serial")
+      final class ComponentEar extends ComponentAdapter {
+        /*
+         * (non-Javadoc)
+         * @see java.awt.event.ComponentAdapter#componentMoved(
+         * java.awt.event.ComponentEvent)
+         */
+        public void componentMoved (ComponentEvent e) {
+          hide();
+        }
+      }
+      
+      /*
+       * This class handles events spawned when a mouse button is pressed.
+       */
+      @SuppressWarnings("serial")
+      final class MouseEar extends MouseAdapter {
+        /*
+         * (non-Javadoc)
+         * @see java.awt.event.MouseAdapter#mousePressed(
+         * java.awt.event.MouseEvent)
+         */
+        public void mousePressed (MouseEvent e) {
+          hide();
+        }
+      }
+
+      /*
+       * This class handles events spawned when the component loses focus.
+       */
+      @SuppressWarnings("serial")
+      final class FocusEar extends FocusAdapter {
+        /*
+         * (non-Javadoc)
+         * @see java.awt.event.FocusAdapter#focusLost(
+         * java.awt.event.FocusEvent)
+         */
+        public void focusLost (FocusEvent e) {
+          hide();
+        }
+      }
+    };
+  }
+}

jnalib/contrib/balloontips/FilteredTextField.java

@@ -0,0 +1,422 @@
+//package bms.ui.widgets;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.util.ArrayList;
+
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.Popup;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.PlainDocument;
+//TODO: FilteredTextField - Comment this class.
+/**
+ * The FilteredTextField class is a JTextField that only allows specified
+ * characters to be entered into it.  The allowed characters can be added to
+ * the text field, and entry validation is performed as each character is
+ * typed.  In addition, complete string validation is tested against a
+ * configurable regular expression when leaving the field.  If the string is
+ * invalid the text field is bordered with a red line, and the user is notified
+ * of the error upon returning to the text field.  The text field can also be
+ * configured to accept a limited number of characters.
+ */
+@SuppressWarnings("serial")
+public class FilteredTextField extends JTextField {
+  public static final Character[] UPPERCASE_CHARS = {'A', 'B', 'C', 'D', 'E',
+    'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+    'U', 'V', 'W', 'X', 'Y', 'Z'};
+  public static final Character[] LOWERCASE_CHARS = {'a', 'b', 'c', 'd', 'e',
+    'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+    'u', 'v', 'w', 'x', 'y', 'z'};
+  public static final Character[] NUMERIC_CHARS = {'1', '2', '3', '4', '5',
+    '6', '7', '8', '9', '0'};
+  
+  private static final Integer ENTRY_BALLOON = 0;
+  private static final Integer VALID_BALLOON = 1;
+  private static final Integer LENGTH_BALLOON = 2;
+  private static final Border RED_BORDER =
+    BorderFactory.createLineBorder(Color.RED, 2);
+  
+  private ArrayList<Character> allowable = new ArrayList<Character>();
+  private int maximumLength = String.valueOf(Long.MAX_VALUE).length();
+  
+  private Border defaultBorder = null;
+  private boolean isValid = true;
+  
+  private Popup balloon = null;
+  private String entryError = null;
+  private String validRegex = null;
+  private String validError = null;
+  private Color balloonBorderColor = null;
+  private Color balloonBackgroundColor = null;
+  private Color balloonTextColor = null;
+  private Integer balloonDuration = null;
+  
+  private Integer balloonType = null;
+  
+  /**
+   * Create a FilteredTextField.
+   */
+  public FilteredTextField () {
+    super();
+    init();
+  }
+  
+  /**
+   * Create a FilteredTextField.
+   * @param columns the number of columns to use to calculate the preferred
+   * width
+   */
+  public FilteredTextField (int columns) {
+    super(columns);
+    init();
+  }
+  
+  /*
+   * Initialize the FilteredTextField.
+   */
+  private void init () {
+    defaultBorder = getBorder();
+    entryError = "";
+    validRegex = "";
+    validError = "";
+    balloonBorderColor = BalloonTipManager.DEFAULT_BORDER_COLOR;
+    balloonBackgroundColor = BalloonTipManager.DEFAULT_BACKGROUND_COLOR;
+    balloonTextColor = BalloonTipManager.DEFAULT_TEXT_COLOR;
+    balloonDuration = 10000;
+    balloonType = ENTRY_BALLOON;
+    addFocusListener(new ValidationEar());
+  }
+  
+  /**
+   * Sets the allowable character used for entry validation.
+   * @param characters the allowable characters
+   */
+  public void setCharacters (Character[] characters) {
+    clearCharacters();
+    for (int i = 0; i < characters.length; i++) {
+      addCharacter(characters[i]);
+    }
+  }
+  
+  /**
+   * Adds the character array to the list used for entry validation.
+   * @param characters the character array
+   */
+  public void addCharacters (Character[] characters) {
+    for (int i = 0; i < characters.length; i++) {
+      addCharacter(characters[i]);
+    }
+  }
+  
+  /**
+   * Adds the character to the list used for entry validation.
+   * @param characters the character
+   */
+  public void addCharacter (Character character) {
+    if (!allowable.contains(character)) {
+      allowable.add(character);
+    }
+  }
+  
+  /**
+   * Clears the list of allowable characters for entry validation.
+   */
+  public void clearCharacters () {
+    allowable.clear();
+  }
+  
+  /**
+   * Removes the character array from the list used for entry validation.
+   * @param characters the character array
+   */
+  public void removeCharacters (Character[] characters) {
+    for (int i = 0; i < characters.length; i++) {
+      removeCharacter(characters[i]);
+    }
+  }
+  
+  /**
+   * Removes the character from the list used for entry validation.
+   * @param character the character
+   */
+  public void removeCharacter (Character character) {
+    if (allowable.contains(character)) {
+      allowable.remove(character);
+    }
+  }
+  
+  /**
+   * Sets the maximum number of characters for the length of the entry string.
+   * @param maximumLength the number of characters
+   */
+  public void setMaximumLength (int maximumLength) {
+    this.maximumLength = maximumLength;
+  }
+  
+  /**
+   * Sets the message that is displayed when there is an entry error.
+   * @param entryError the entry error message
+   */
+  public void setEntryError (String entryError) {
+    this.entryError = entryError;
+  }
+  
+  /**
+   * Sets the regular expression that is used for string validation.  String
+   * validation is checked when exiting the text field.
+   * @param validRegex the validation regular expression
+   */
+  public void setValidRegex (String validRegex) {
+    this.validRegex = validRegex;
+  }
+  
+  /**
+   * Sets the message that is displayed when there is a validation error.
+   * @param validError the validation error message
+   */
+  public void setValidError (String validError) {
+    this.validError = validError;
+  }
+  
+  /**
+   * Sets the color to use for the balloon border.
+   * @param borderColor the balloon border color
+   */
+  public void setBalloonBorderColor (Color borderColor) {
+    balloonBorderColor = borderColor;
+  }
+  
+  /**
+   * Sets the color to use for the balloon background.
+   * @param backgroundColor the balloon background color
+   */
+  public void setBalloonBackgroundColor (Color backgroundColor) {
+    balloonBackgroundColor = backgroundColor;
+  }
+  
+  /**
+   * Sets the color to use for the balloon text.
+   * @param textColor the balloon text color
+   */
+  public void setBalloonTextColor (Color textColor) {
+    balloonTextColor = textColor;
+  }
+  
+  /**
+   * Sets the time in milliseconds that the balloon is visible before
+   * disappearing.  This is the maximum time that the balloon will be visible,
+   * as other events can also make the balloon disappear.
+   * @param duration the time in milliseconds
+   */
+  public void setBalloonDuration (Integer duration) {
+    balloonDuration = duration;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * @see javax.swing.JTextField#createDefaultModel()
+   */
+  protected Document createDefaultModel () {
+    return new FilteredTextFieldDocument();
+  }
+  
+  /*
+   * This class defines the document used for the FilteredTextField.
+   */
+  private class FilteredTextFieldDocument extends PlainDocument {
+    /*
+     * Create a FilteredTextFieldDocument.
+     */
+    public FilteredTextFieldDocument () {
+      addDocumentListener(new FilteredTextFieldEar());
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see javax.swing.text.PlainDocument#insertString(
+     * int, java.lang.String, javax.swing.text.AttributeSet)
+     */
+    public void insertString (int offset, String str, AttributeSet a)
+        throws BadLocationException
+    {
+      if (balloon != null && BalloonTipManager.isShowing()) {
+        if (balloonType == VALID_BALLOON) {
+          balloon.hide();
+        }
+      }
+      StringBuffer buffer =
+        new StringBuffer(FilteredTextField.this.getText());
+      if (offset >= 0 && offset <= buffer.length()) {
+        buffer.insert(offset, str);
+        String strBuf = buffer.toString();
+        
+        if (buffer.length() > maximumLength) {
+          if (balloon != null && BalloonTipManager.isShowing()) {
+            if (balloonType == LENGTH_BALLOON) {
+              BalloonTipManager.restartTimer();
+              return;
+            }
+            else {
+              balloon.hide();
+            }
+          }
+          balloon = BalloonTipManager.getBalloonTip(FilteredTextField.this,
+            "The number of characters must be less than or equal to " +
+              maximumLength, 0, 0, balloonDuration, balloonBorderColor,
+              balloonBackgroundColor, balloonTextColor);
+          balloon.show();
+          balloonType = LENGTH_BALLOON;
+          return;
+        }
+        
+        if (strBuf == null || strBuf.equals("")) {
+          remove(0, getLength());
+          super.insertString(0, "", null);
+          if (balloon != null && BalloonTipManager.isShowing()) {
+            balloon.hide();
+          }
+          return;
+        }
+
+        if (allowable.contains(str.charAt(0))) {
+          super.insertString(offset, str, a);
+          if (balloon != null && BalloonTipManager.isShowing()) {
+            balloon.hide();
+          }
+        }
+        else {
+          if (balloon != null && BalloonTipManager.isShowing()) {
+            if (balloonType == ENTRY_BALLOON) {
+              BalloonTipManager.restartTimer();
+              return;
+            }
+            else {
+              balloon.hide();
+            }
+          }
+          balloon = BalloonTipManager.getBalloonTip(FilteredTextField.this,
+            entryError, 0, 0, balloonDuration, balloonBorderColor,
+            balloonBackgroundColor, balloonTextColor);
+          balloon.show();
+          balloonType = ENTRY_BALLOON;
+        }
+      }
+    }
+    
+    /*
+     * This listener class is needed to catch character removal events.
+     */
+    private class FilteredTextFieldEar implements DocumentListener {
+      /*
+       * (non-Javadoc)
+       * @see javax.swing.event.DocumentListener#insertUpdate(
+       * javax.swing.event.DocumentEvent)
+       */
+      public void insertUpdate (DocumentEvent e) {/* N/A */}
+      
+      /*
+       * (non-Javadoc)
+       * @see javax.swing.event.DocumentListener#removeUpdate(
+       * javax.swing.event.DocumentEvent)
+       */
+      public void removeUpdate (DocumentEvent e) {
+        if (balloon != null && BalloonTipManager.isShowing())
+        {
+          balloon.hide();
+        }
+      }
+      
+      /*
+       * (non-Javadoc)
+       * @see javax.swing.event.DocumentListener#changedUpdate(
+       * javax.swing.event.DocumentEvent)
+       */
+      public void changedUpdate (DocumentEvent e) {/* N/A */}
+    }
+  }
+
+  /*
+   * This listener class is used to determine whether the string is valid based
+   * on a regular expression.  The validation is tested when leaving the text
+   * field, and notification is performed when returning to the text field.
+   */
+  private class ValidationEar extends FocusAdapter {
+    /*
+     * (non-Javadoc)
+     * @see java.awt.event.FocusAdapter#focusLost(java.awt.event.FocusEvent)
+     */
+    public void focusLost (FocusEvent e) {
+      String entered = getText().trim();
+      if (!entered.matches(validRegex)) {
+        if (balloon != null) {
+          balloon.hide();
+        }
+        setBorder(
+          BorderFactory.createCompoundBorder(RED_BORDER, defaultBorder));
+        isValid = false;
+      }
+      else {
+        setBorder(defaultBorder);
+        isValid = true;
+      }
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see java.awt.event.FocusAdapter#focusGained(java.awt.event.FocusEvent)
+     */
+    public void focusGained (FocusEvent e) {
+      if (!isValid) {
+        balloon = BalloonTipManager.getBalloonTip(FilteredTextField.this,
+          validError, 0, 0, balloonDuration, balloonBorderColor,
+          balloonBackgroundColor, balloonTextColor);
+        balloon.show();
+        balloonType = VALID_BALLOON;
+      }
+    }
+  }
+
+  /*
+   * A main entry point to test the FilteredTextField.
+   * @param args application arguments
+   */
+  public static void main (String[] args) {
+    try {
+      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+    }
+    catch (Exception e) {
+      e.printStackTrace();
+    }
+    JFrame jframe = new JFrame("FilteredTextField Test");
+    jframe.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    jframe.setSize(400, 75);
+    jframe.setLocation(400, 400);
+    JPanel jpanel = new JPanel();
+    jpanel.setLayout(new BorderLayout());
+    FilteredTextField ftfield = new FilteredTextField(10);
+    ftfield.setCharacters(LOWERCASE_CHARS);
+    ftfield.addCharacter('-');
+    ftfield.addCharacter('_');
+    ftfield.addCharacter(' ');
+    ftfield.setMaximumLength(10);
+    ftfield.setEntryError(
+      "Only lower case letters, hyphens, underscores, and spaces allowed.");
+    ftfield.setValidRegex("^a+[a-z-_ ]*");
+    ftfield.setValidError("The string must begin with the letter 'a'.");
+    jpanel.add(ftfield, BorderLayout.CENTER);
+    jpanel.add(new FilteredTextField(10), BorderLayout.SOUTH);
+    jframe.getContentPane().add(jpanel);
+    jframe.setVisible(true);
+  }
+}

jnalib/contrib/balloontips/README

@@ -0,0 +1,5 @@
+Compile the two classes in this directory.  Requires Java 1.5+.
+
+javac -cp examples.jar *.java
+java -cp .:examples.jar FilteredTextField
+

jnalib/contrib/ntservice/README

@@ -0,0 +1,60 @@
+Copyright (c) 2007 Thomas Boerkel, All Rights Reserved
+
+Disclaimer:
+===========
+This code is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.  
+
+
+Description:
+============
+
+Accounts.java:
+--------------
+Static methods for getting information about Win32 accounts (users
+and groups).
+- list all domain users
+- list all domain groups
+- list all local or domain groups where a user belongs to
+- get account by SID
+- get SID of account
+- get domain controller name
+- get domain name
+
+Registry.java:
+--------------
+Static methods for reading and manipulating the Windows Registry.
+Only String and DWORD values supported, but could be easily
+extended.
+- create key
+- delete key
+- delete value
+- read value
+- get all sub keys of a key
+- get all values of a key
+- set value
+- check existence of value
+
+Win32Service.java:
+------------------
+Abstract class to wrap a Win32 service. Derive from this class
+to build your own service. Supports only one type of service and
+startup, but could be easily extended.
+- install service
+- uninstall service
+- start service
+- stop service
+- callback for service start request (onStart), should spawn a thread
+- callback for service stop request (onStop)
+
+TestService.java:
+-----------------
+Very simple example of an implementation of Win32Service.java.
+Does nothing but starting and stopping (no "useful" work).

jnalib/contrib/ntservice/build.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<project name="JnaContrib" default="default" basedir=".">
+    <description>Builds, tests, and runs the project JnaContrib.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="JnaContrib-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

jnalib/contrib/ntservice/manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

jnalib/contrib/ntservice/nbproject/build-impl.xml

@@ -0,0 +1,541 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+-->
+<project name="JnaContrib-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
+    <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
+    <!-- 
+    ======================
+    INITIALIZATION SECTION 
+    ======================
+    -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-init-private" depends="-pre-init">
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target name="-init-user" depends="-pre-init,-init-private">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target name="-init-project" depends="-pre-init,-init-private,-init-user">
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <isfalse value="${javadoc.preview}"/>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="srcdir" default="${src.dir}"/>
+            <attribute name="destdir" default="${build.classes.dir}"/>
+            <attribute name="classpath" default="${javac.classpath}"/>
+            <attribute name="debug" default="${javac.debug}"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="includes" default="**/*Test.java"/>
+            <sequential>
+                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name" default="${main.class}"/>
+            <attribute name="classpath" default="${debug.classpath}"/>
+            <attribute name="stopclassname" default=""/>
+            <sequential>
+                <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="dir" default="${build.classes.dir}"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="classname" default="${main.class}"/>
+            <attribute name="classpath" default="${debug.classpath}"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java fork="true" classname="@{classname}" dir="${work.dir}">
+                    <jvmarg value="-Xdebug"/>
+                    <jvmarg value="-Xnoagent"/>
+                    <jvmarg value="-Djava.compiler=none"/>
+                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="classname" default="${main.class}"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java fork="true" classname="@{classname}" dir="${work.dir}">
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar jarfile="${dist.jar}" compress="${jar.compress}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar"/>
+    <!--
+    ===================
+    COMPILATION SECTION
+    ===================
+    -->
+    <target name="deps-jar" depends="init" unless="no.deps"/>
+    <target name="-pre-pre-compile" depends="init,deps-jar">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
+        <j2seproject3:javac/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:javac>
+            <customize>
+                <patternset includes="${javac.includes}"/>
+            </customize>
+        </j2seproject3:javac>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
+    <!--
+    ====================
+    JAR BUILDING SECTION
+    ====================
+    -->
+    <target name="-pre-pre-jar" depends="init">
+        <dirname property="dist.jar.dir" file="${dist.jar}"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
+        <property name="dist.jar.resolved" location="${dist.jar}"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
+        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert property="jar.classpath" pathsep=" ">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
+        <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property name="dist.jar.resolved" location="${dist.jar}"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR."/>
+    <!--
+    =================
+    EXECUTION SECTION
+    =================
+    -->
+    <target name="run" depends="init,compile" description="Run a main class.">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="run-single" depends="init,compile-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <!--
+    =================
+    DEBUGGING SECTION
+    =================
+    -->
+    <target name="-debug-start-debugger" if="netbeans.home" depends="init">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target name="-debug-start-debuggee" depends="init,compile">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
+    <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
+    <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
+    <target name="-pre-debug-fix" depends="init">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
+    <!--
+    ===============
+    JAVADOC SECTION
+    ===============
+    -->
+    <target name="-javadoc-build" depends="init">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <sourcepath>
+                <pathelement location="${src.dir}"/>
+            </sourcepath>
+            <packageset dir="${src.dir}" includes="*/**"/>
+            <fileset dir="${src.dir}" includes="*.java"/>
+        </javadoc>
+    </target>
+    <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
+    <!--
+    =========================
+    JUNIT COMPILATION SECTION
+    =========================
+    -->
+    <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
+        <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}">
+            <customize>
+                <patternset includes="${javac.includes}"/>
+            </customize>
+        </j2seproject3:javac>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
+    <!--
+    =======================
+    JUNIT EXECUTION SECTION
+    =======================
+    -->
+    <target name="-pre-test-run" if="have.tests" depends="init">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
+        <j2seproject3:junit/>
+    </target>
+    <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target name="test-report" if="have.tests" depends="init"/>
+    <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
+    <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
+    <target name="-pre-test-run-single" if="have.tests" depends="init">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit includes="${test.includes}"/>
+    </target>
+    <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
+    <!--
+    =======================
+    JUNIT DEBUGGING SECTION
+    =======================
+    -->
+    <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
+            <customize>
+                <arg line="${test.class}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
+        <j2seproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
+    <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
+    <!--
+    =========================
+    APPLET EXECUTION SECTION
+    =========================
+    -->
+    <target name="run-applet" depends="init,compile-single">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+    =========================
+    APPLET DEBUGGING  SECTION
+    =========================
+    -->
+    <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
+    <!--
+    ===============
+    CLEANUP SECTION
+    ===============
+    -->
+    <target name="deps-clean" depends="init" unless="no.deps"/>
+    <target name="-do-clean" depends="init">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
+</project>

jnalib/contrib/ntservice/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=94714fd7
+build.xml.script.CRC32=64128189
+build.xml.stylesheet.CRC32=240b97a2
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=94714fd7
+nbproject/build-impl.xml.script.CRC32=9d2a0176
+nbproject/build-impl.xml.stylesheet.CRC32=65d7ca21

jnalib/contrib/ntservice/nbproject/private/private.properties

@@ -0,0 +1,6 @@
+application.args=
+file.reference.jna.jar=D:\\temp\\JnaContrib\\lib\\jna.jar
+javac.debug=true
+javadoc.preview=true
+jaxws.endorsed.dir=D:\\Program Files\\netbeans551\\ide7\\modules\\ext\\jaxws21\\api
+user.properties.file=C:\\Users\\tb\\.netbeans\\5.5.1\\build.properties

jnalib/contrib/ntservice/nbproject/project.properties

@@ -0,0 +1,58 @@
+application.args=
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/JnaContrib.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+file.reference.jna.jar=lib/jna.jar
+jar.compress=false
+javac.classpath=\
+    ${file.reference.jna.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.6
+javac.target=1.6
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+src.dir=src
+test.src.dir=test

jnalib/contrib/ntservice/nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>JnaContrib</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

jnalib/contrib/ntservice/src/jnacontrib/jna/Advapi32.java

@@ -0,0 +1,335 @@
+/*
+ * Advapi32.java
+ *
+ * Created on 6. August 2007, 11:24
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import com.sun.jna.*;
+import com.sun.jna.ptr.*;
+import com.sun.jna.win32.*;
+
+/**
+ *
+ * @author TB
+ */
+public interface Advapi32  extends StdCallLibrary {
+  Advapi32 INSTANCE = (Advapi32) Native.loadLibrary("Advapi32", Advapi32.class, Options.UNICODE_OPTIONS);
+  
+/*  
+BOOL WINAPI LookupAccountName(
+  LPCTSTR lpSystemName,
+  LPCTSTR lpAccountName,
+  PSID Sid,
+  LPDWORD cbSid,
+  LPTSTR ReferencedDomainName,
+  LPDWORD cchReferencedDomainName,
+  PSID_NAME_USE peUse
+);*/ 
+  public boolean LookupAccountName(String lpSystemName, String lpAccountName,
+          byte[] Sid, IntByReference cbSid, char[] ReferencedDomainName,
+          IntByReference cchReferencedDomainName, PointerByReference peUse);
+  
+/*  
+BOOL WINAPI LookupAccountSid(
+  LPCTSTR lpSystemName,
+  PSID lpSid,
+  LPTSTR lpName,
+  LPDWORD cchName,
+  LPTSTR lpReferencedDomainName,
+  LPDWORD cchReferencedDomainName,
+  PSID_NAME_USE peUse
+);*/
+  public boolean LookupAccountSid(String lpSystemName, byte[] Sid,
+          char[] lpName, IntByReference cchName,  char[] ReferencedDomainName,
+          IntByReference cchReferencedDomainName, PointerByReference peUse);
+  
+/*
+BOOL ConvertSidToStringSid(
+  PSID Sid,
+  LPTSTR* StringSid
+);*/  
+  public boolean ConvertSidToStringSid(byte[] Sid, PointerByReference StringSid);
+  
+/*
+BOOL WINAPI ConvertStringSidToSid(
+  LPCTSTR StringSid,
+  PSID* Sid
+);*/
+  public boolean ConvertStringSidToSid(String StringSid, PointerByReference Sid);
+  
+/*
+SC_HANDLE WINAPI OpenSCManager(
+  LPCTSTR lpMachineName,
+  LPCTSTR lpDatabaseName,
+  DWORD dwDesiredAccess
+);*/
+  public Pointer OpenSCManager(String lpMachineName, WString lpDatabaseName, int dwDesiredAccess);
+  
+/*
+BOOL WINAPI CloseServiceHandle(
+  SC_HANDLE hSCObject
+);*/
+  public boolean CloseServiceHandle(Pointer hSCObject);
+  
+/*
+SC_HANDLE WINAPI OpenService(
+  SC_HANDLE hSCManager,
+  LPCTSTR lpServiceName,
+  DWORD dwDesiredAccess
+);*/
+  public Pointer OpenService(Pointer hSCManager, String lpServiceName, int dwDesiredAccess);
+  
+/*
+BOOL WINAPI StartService(
+  SC_HANDLE hService,
+  DWORD dwNumServiceArgs,
+  LPCTSTR* lpServiceArgVectors
+);*/
+  public boolean StartService(Pointer hService, int dwNumServiceArgs, char[] lpServiceArgVectors);
+  
+/*
+BOOL WINAPI ControlService(
+  SC_HANDLE hService,
+  DWORD dwControl,
+  LPSERVICE_STATUS lpServiceStatus
+);*/
+  public boolean ControlService(Pointer hService, int dwControl, SERVICE_STATUS lpServiceStatus);
+ 
+/*  
+BOOL WINAPI StartServiceCtrlDispatcher(
+  const SERVICE_TABLE_ENTRY* lpServiceTable
+);*/
+  public boolean StartServiceCtrlDispatcher(Structure[] lpServiceTable);
+  
+/*
+SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandler(
+  LPCTSTR lpServiceName,
+  LPHANDLER_FUNCTION lpHandlerProc
+);*/
+  public Pointer RegisterServiceCtrlHandler(String lpServiceName, Handler lpHandlerProc);
+  
+/*
+SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerEx(
+  LPCTSTR lpServiceName,
+  LPHANDLER_FUNCTION_EX lpHandlerProc,
+  LPVOID lpContext
+);*/
+  public Pointer RegisterServiceCtrlHandlerEx(String lpServiceName, HandlerEx lpHandlerProc, Pointer lpContext);
+  
+/*
+BOOL WINAPI SetServiceStatus(
+  SERVICE_STATUS_HANDLE hServiceStatus,
+  LPSERVICE_STATUS lpServiceStatus
+);*/
+  public boolean SetServiceStatus(Pointer hServiceStatus, SERVICE_STATUS lpServiceStatus);
+  
+/*
+SC_HANDLE WINAPI CreateService(
+  SC_HANDLE hSCManager,
+  LPCTSTR lpServiceName,
+  LPCTSTR lpDisplayName,
+  DWORD dwDesiredAccess,
+  DWORD dwServiceType,
+  DWORD dwStartType,
+  DWORD dwErrorControl,
+  LPCTSTR lpBinaryPathName,
+  LPCTSTR lpLoadOrderGroup,
+  LPDWORD lpdwTagId,
+  LPCTSTR lpDependencies,
+  LPCTSTR lpServiceStartName,
+  LPCTSTR lpPassword
+);*/
+  public Pointer CreateService(Pointer hSCManager, String lpServiceName, String lpDisplayName,
+          int dwDesiredAccess, int dwServiceType, int dwStartType, int dwErrorControl,
+          String lpBinaryPathName, String lpLoadOrderGroup, IntByReference lpdwTagId,
+          String lpDependencies, String lpServiceStartName, String lpPassword);
+ 
+/*
+BOOL WINAPI DeleteService(
+  SC_HANDLE hService
+);*/
+  public boolean DeleteService(Pointer hService);
+  
+/*
+BOOL WINAPI ChangeServiceConfig2(
+  SC_HANDLE hService,
+  DWORD dwInfoLevel,
+  LPVOID lpInfo
+);*/
+  public boolean ChangeServiceConfig2(Pointer hService, int dwInfoLevel, ChangeServiceConfig2Info lpInfo);
+  
+/*
+LONG WINAPI RegOpenKeyEx(
+  HKEY hKey,
+  LPCTSTR lpSubKey,
+  DWORD ulOptions,
+  REGSAM samDesired,
+  PHKEY phkResult
+);*/
+  public int RegOpenKeyEx(int hKey, String lpSubKey, int ulOptions, int samDesired, IntByReference phkResult);
+  
+/*
+LONG WINAPI RegQueryValueEx(
+  HKEY hKey,
+  LPCTSTR lpValueName,
+  LPDWORD lpReserved,
+  LPDWORD lpType,
+  LPBYTE lpData,
+  LPDWORD lpcbData
+);*/  
+  public int RegQueryValueEx(int hKey, String lpValueName, IntByReference lpReserved, IntByReference lpType, byte[] lpData, IntByReference lpcbData);
+  
+/*
+LONG WINAPI RegCloseKey(
+  HKEY hKey
+);*/
+  public int RegCloseKey(int hKey);
+
+/*
+LONG WINAPI RegDeleteValue(
+  HKEY hKey,
+  LPCTSTR lpValueName
+);*/
+  public int RegDeleteValue(int hKey, String lpValueName);
+  
+/*
+LONG WINAPI RegSetValueEx(
+  HKEY hKey,
+  LPCTSTR lpValueName,
+  DWORD Reserved,
+  DWORD dwType,
+  const BYTE* lpData,
+  DWORD cbData
+);*/
+  public int RegSetValueEx(int hKey, String lpValueName, int Reserved, int dwType, byte[] lpData, int cbData);
+  
+/*
+LONG WINAPI RegCreateKeyEx(
+  HKEY hKey,
+  LPCTSTR lpSubKey,
+  DWORD Reserved,
+  LPTSTR lpClass,
+  DWORD dwOptions,
+  REGSAM samDesired,
+  LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+  PHKEY phkResult,
+  LPDWORD lpdwDisposition
+);*/
+  public int RegCreateKeyEx(int hKey, String lpSubKey, int Reserved, String lpClass, int dwOptions, 
+          int samDesired, WINBASE.SECURITY_ATTRIBUTES lpSecurityAttributes, IntByReference phkResult,
+          IntByReference lpdwDisposition);
+  
+/*
+LONG WINAPI RegDeleteKey(
+  HKEY hKey,
+  LPCTSTR lpSubKey
+);*/
+  public int RegDeleteKey(int hKey, String name);
+  
+/*
+LONG WINAPI RegEnumKeyEx(
+  HKEY hKey,
+  DWORD dwIndex,
+  LPTSTR lpName,
+  LPDWORD lpcName,
+  LPDWORD lpReserved,
+  LPTSTR lpClass,
+  LPDWORD lpcClass,
+  PFILETIME lpftLastWriteTime
+);*/
+  public int RegEnumKeyEx(int hKey, int dwIndex, char[] lpName, IntByReference lpcName, IntByReference reserved,
+          char[] lpClass, IntByReference lpcClass, WINBASE.FILETIME lpftLastWriteTime);
+  
+/*
+LONG WINAPI RegEnumValue(
+  HKEY hKey,
+  DWORD dwIndex,
+  LPTSTR lpValueName,
+  LPDWORD lpcchValueName,
+  LPDWORD lpReserved,
+  LPDWORD lpType,
+  LPBYTE lpData,
+  LPDWORD lpcbData
+);*/
+  public int RegEnumValue(int hKey, int dwIndex, char[] lpValueName, IntByReference lpcchValueName, IntByReference reserved,
+          IntByReference lpType, byte[] lpData, IntByReference lpcbData);
+
+  interface SERVICE_MAIN_FUNCTION extends StdCallCallback {
+    /*
+    VOID WINAPI ServiceMain(
+    DWORD dwArgc,
+    LPTSTR* lpszArgv
+    );*/
+    public void callback(int dwArgc, Pointer lpszArgv);
+  }
+
+  interface Handler extends StdCallCallback {
+    /*
+    VOID WINAPI Handler(
+      DWORD fdwControl
+    );*/  
+    public void callback(int fdwControl);
+  }
+  
+  interface HandlerEx extends StdCallCallback {
+    /*
+    DWORD WINAPI HandlerEx(
+      DWORD dwControl,
+      DWORD dwEventType,
+      LPVOID lpEventData,
+      LPVOID lpContext
+    );*/
+    public int callback(int dwControl, int dwEventType, Pointer lpEventData, Pointer lpContext);
+  }
+  
+/*
+typedef struct _SERVICE_STATUS {
+  DWORD dwServiceType;
+  DWORD dwCurrentState;
+  DWORD dwControlsAccepted;
+  DWORD dwWin32ExitCode;
+  DWORD dwServiceSpecificExitCode;
+  DWORD dwCheckPoint;
+  DWORD dwWaitHint;
+} SERVICE_STATUS, 
+ *LPSERVICE_STATUS;*/
+  public static class SERVICE_STATUS extends Structure {
+    public int dwServiceType;
+    public int dwCurrentState;
+    public int dwControlsAccepted;
+    public int dwWin32ExitCode;
+    public int dwServiceSpecificExitCode;
+    public int dwCheckPoint;
+    public int dwWaitHint;
+  }
+  
+/*  
+typedef struct _SERVICE_TABLE_ENTRY {
+  LPTSTR lpServiceName;
+  LPSERVICE_MAIN_FUNCTION lpServiceProc;
+} SERVICE_TABLE_ENTRY, 
+ *LPSERVICE_TABLE_ENTRY;*/  
+  public static class SERVICE_TABLE_ENTRY extends Structure {
+    public String lpServiceName;
+    public SERVICE_MAIN_FUNCTION lpServiceProc;
+  }
+ 
+  public static class ChangeServiceConfig2Info extends Structure {
+  }
+  
+/*
+ typedef struct _SERVICE_DESCRIPTION {
+  LPTSTR lpDescription;
+} SERVICE_DESCRIPTION, 
+ *LPSERVICE_DESCRIPTION;*/
+  public static class SERVICE_DESCRIPTION extends ChangeServiceConfig2Info {
+    public String lpDescription;
+  }  
+}
+
+

jnalib/contrib/ntservice/src/jnacontrib/jna/Kernel32b.java

@@ -0,0 +1,32 @@
+/*
+ * Kernel32b.java
+ *
+ * Created on 6. August 2007, 14:43
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ *
+ * @author TB
+ */
+public interface Kernel32b extends StdCallLibrary {
+  Kernel32b INSTANCE = (Kernel32b) Native.loadLibrary("Kernel32", Kernel32b.class, Options.UNICODE_OPTIONS);
+  
+/*  
+HLOCAL WINAPI LocalFree(
+  HLOCAL hMem
+);*/
+  public Pointer LocalFree(Pointer hMem);
+/*
+
+DWORD WINAPI GetLastError(void);*/
+  public int GetLastError();
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/LMACCESS.java

@@ -0,0 +1,19 @@
+/*
+ * LMACCESS.java
+ *
+ * Created on 7. August 2007, 12:42
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+
+/**
+ *
+ * @author TB
+ */
+public interface LMACCESS {
+  public final static int FILTER_NORMAL_ACCOUNT = 2;
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/LMCONS.java

@@ -0,0 +1,19 @@
+/*
+ * LMCONS.java
+ *
+ * Created on 7. August 2007, 08:46
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+
+/**
+ *
+ * @author TB
+ */
+public interface LMCONS {
+  public final static int MAX_PREFERRED_LENGTH = -1;
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/LMERR.java

@@ -0,0 +1,19 @@
+/*
+ * LMERR.java
+ *
+ * Created on 7. August 2007, 08:22
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+
+/**
+ *
+ * @author TB
+ */
+public interface LMERR {
+  public final static int NERR_Success = 0;
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/Netapi32.java

@@ -0,0 +1,239 @@
+/*
+ * Netapi32.java
+ *
+ * Created on 2. August 2007, 13:12
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import com.sun.jna.*;
+import com.sun.jna.ptr.*;
+import com.sun.jna.win32.*;
+
+/**
+ *
+ * @author TB
+ */
+public interface Netapi32  extends StdCallLibrary {
+  Netapi32 INSTANCE = (Netapi32) Native.loadLibrary("Netapi32", Netapi32.class, Options.UNICODE_OPTIONS);
+/*
+NET_API_STATUS NetGetDCName(
+  LPCWSTR servername,
+  LPCWSTR domainname,
+  LPBYTE* bufptr
+);*/  
+  public int NetGetDCName(String serverName, String domainName, PointerByReference bufptr);
+  
+/*  
+DWORD DsGetDcName(
+  LPCTSTR ComputerName,
+  LPCTSTR DomainName,
+  GUID* DomainGuid,
+  LPCTSTR SiteName,
+  ULONG Flags,
+  PDOMAIN_CONTROLLER_INFO* DomainControllerInfo
+);*/  
+  public int DsGetDcName(String ComputerName, String DomainName, ByReference DomainGuid,
+                   String SiteName, int Flags, PointerByReference DomainControllerInfo);
+  
+/*  
+NET_API_STATUS NetUserGetGroups(
+  LPCWSTR servername,
+  LPCWSTR username,
+  DWORD level,
+  LPBYTE* bufptr,
+  DWORD prefmaxlen,
+  LPDWORD entriesread,
+  LPDWORD totalentries
+);*/ 
+  public int NetUserGetGroups(String servername, String username, int level,
+                       PointerByReference bufptr, int prefmaxlen,
+                       IntByReference entriesread, IntByReference totalentries);
+  
+/* 
+NET_API_STATUS NetUserGetLocalGroups(
+  LPCWSTR servername,
+  LPCWSTR username,
+  DWORD level,
+  DWORD flags,
+  LPBYTE* bufptr,
+  DWORD prefmaxlen,
+  LPDWORD entriesread,
+  LPDWORD totalentries
+);*/
+  public int NetUserGetLocalGroups(String servername, String username, int level,
+                        int flags, PointerByReference bufptr, int prefmaxlen,
+                       IntByReference entriesread, IntByReference totalentries);
+  
+/*  
+NET_API_STATUS NetGroupEnum(
+  LPCWSTR servername,
+  DWORD level,
+  LPBYTE* bufptr,
+  DWORD prefmaxlen,
+  LPDWORD entriesread,
+  LPDWORD totalentries,
+  PDWORD_PTR resume_handle
+);*/  
+  public int NetGroupEnum(String servername, int level, PointerByReference bufptr,
+          int prefmaxlen, IntByReference entriesread, IntByReference totalentries,
+          IntByReference resume_handle);
+  
+/*
+NET_API_STATUS NetUserEnum(
+  LPCWSTR servername,
+  DWORD level,
+  DWORD filter,
+  LPBYTE* bufptr,
+  DWORD prefmaxlen,
+  LPDWORD entriesread,
+  LPDWORD totalentries,
+  LPDWORD resume_handle
+);*/  
+  public int NetUserEnum(String servername, int level, int filter, PointerByReference bufptr,
+          int prefmaxlen, IntByReference entriesread, IntByReference totalentries,
+          IntByReference resume_handle);
+  
+/*  
+NET_API_STATUS NetApiBufferFree(
+  LPVOID Buffer
+);*/  
+  public int NetApiBufferFree(Pointer Buffer);
+  
+/*  
+typedef struct _GUID {
+  DWORD Data1;
+  WORD Data2;
+  WORD Data3;
+  BYTE Data4[8];
+} GUID;
+*/
+  public static class GUID extends Structure {
+    public GUID() {
+      super();
+    }
+    
+    public GUID(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+    
+    public int Data1;
+    public short Data2;
+    public short Data3;
+    public byte[] Data4 = new byte[8];
+  }
+  
+/*  
+typedef struct _DOMAIN_CONTROLLER_INFO {
+  LPTSTR DomainControllerName;
+  LPTSTR DomainControllerAddress;
+  ULONG DomainControllerAddressType;
+  GUID DomainGuid;
+  LPTSTR DomainName;
+  LPTSTR DnsForestName;
+  ULONG Flags;
+  LPTSTR DcSiteName;
+  LPTSTR ClientSiteName;
+} DOMAIN_CONTROLLER_INFO, 
+*/
+  public static class DOMAIN_CONTROLLER_INFO extends Structure {
+    public DOMAIN_CONTROLLER_INFO(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+    
+    public String DomainControllerName;
+    public String DomainControllerAddress;
+    public int DomainControllerAddressType;
+    public GUID DomainGuid;
+    public String DomainName;
+    public String DnsForestName;
+    public int Flags;
+    public String DcSiteName;
+    public String ClientSiteName;
+  }
+  
+/*  
+typedef struct _GROUP_USERS_INFO_0 {
+  LPWSTR grui0_name;
+} GROUP_USERS_INFO_0, 
+ *PGROUP_USERS_INFO_0, 
+ *LPGROUP_USERS_INFO_0;  
+*/
+  public static class GROUP_USERS_INFO_0 extends Structure {
+    public GROUP_USERS_INFO_0() {
+      super();
+    }
+    
+    public GROUP_USERS_INFO_0(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+    
+    public String grui0_name;
+  }
+  
+/*  
+typedef struct _LOCALGROUP_USERS_INFO_0 {
+  LPWSTR lgrui0_name;
+} LOCALGROUP_USERS_INFO_0, 
+ *PLOCALGROUP_USERS_INFO_0, 
+ *LPLOCALGROUP_USERS_INFO_0;  
+ */
+  public static class LOCALGROUP_USERS_INFO_0 extends Structure {
+    public LOCALGROUP_USERS_INFO_0() {
+      super();
+    }
+    
+    public LOCALGROUP_USERS_INFO_0(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+    
+    public String lgrui0_name;
+  }
+  
+/*  
+typedef struct _GROUP_INFO_0 {
+  LPWSTR grpi0_name;
+} GROUP_INFO_0, 
+ *PGROUP_INFO_0, 
+ *LPGROUP_INFO_0;
+*/
+  public static class GROUP_INFO_0 extends Structure {
+    public GROUP_INFO_0() {
+      super();
+    }
+    
+    public GROUP_INFO_0(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+    
+    public String grpi0_name;
+  }
+  
+/*
+typedef struct _USER_INFO_0 {
+  LPWSTR usri0_name;
+} USER_INFO_0, 
+ *PUSER_INFO_0, 
+ *LPUSER_INFO_0;*/  
+  public static class USER_INFO_0 extends Structure {
+    public USER_INFO_0() {
+      super();
+    }
+    
+    public USER_INFO_0(Pointer memory) {
+      useMemory(memory);
+      read();
+    }
+    
+    public String usri0_name;
+  }
+}
+  

jnalib/contrib/ntservice/src/jnacontrib/jna/Options.java

@@ -0,0 +1,28 @@
+/*
+ * Options.java
+ *
+ * Created on 8. August 2007, 17:07
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import static com.sun.jna.Library.*;
+import com.sun.jna.TypeMapper;
+import com.sun.jna.win32.*;
+import java.util.*;
+
+/**
+ *
+ * @author TB
+ */
+public interface Options {
+  Map<String, Object> UNICODE_OPTIONS = new HashMap<String, Object>() {
+    {
+      put(OPTION_TYPE_MAPPER, W32APITypeMapper.UNICODE);
+      put(OPTION_FUNCTION_MAPPER, W32APIFunctionMapper.UNICODE);
+    }
+  };
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINBASE.java

@@ -0,0 +1,43 @@
+/*
+ * WINBASE.java
+ *
+ * Created on 5. September 2007, 11:24
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+
+/**
+ *
+ * @author TB
+ */
+public interface WINBASE {
+/*
+typedef struct _SECURITY_ATTRIBUTES {
+  DWORD nLength;
+  LPVOID lpSecurityDescriptor;
+  BOOL bInheritHandle;
+} SECURITY_ATTRIBUTES, 
+ *PSECURITY_ATTRIBUTES, 
+ *LPSECURITY_ATTRIBUTES;*/
+  public static class SECURITY_ATTRIBUTES extends Structure {
+    public int nLength;
+    public Pointer lpSecurityDescriptor;
+    public boolean bInheritHandle;
+  }
+  
+/*
+typedef struct _FILETIME {
+    DWORD dwLowDateTime;
+    DWORD dwHighDateTime;
+} FILETIME, *PFILETIME, *LPFILETIME;*/
+  public static class FILETIME extends Structure {
+    public int dwLowDateTime;
+    public int dwHighDateTime;
+  }
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINERROR.java

@@ -0,0 +1,22 @@
+/*
+ * WINERROR.java
+ *
+ * Created on 7. August 2007, 08:09
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+
+/**
+ *
+ * @author TB
+ */
+public interface WINERROR {
+  public final static int ERROR_SUCCESS = 0;
+  public final static int NO_ERROR = 0;
+  public final static int ERROR_FILE_NOT_FOUND = 2;
+  public final static int ERROR_MORE_DATA = 234;
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINNT.java

@@ -0,0 +1,73 @@
+/*
+ * WINNT.java
+ *
+ * Created on 8. August 2007, 13:41
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+/**
+ *
+ * @author TB
+ */
+public interface WINNT {
+  public final static int DELETE       = 0x00010000;
+  public final static int READ_CONTROL = 0x00020000;
+  public final static int WRITE_DAC    = 0x00040000;
+  public final static int WRITE_OWNER  = 0x00080000;
+  public final static int SYNCHRONIZE  = 0x00100000;
+
+  public final static int STANDARD_RIGHTS_REQUIRED = 0x000F0000;
+
+  public final static int STANDARD_RIGHTS_READ    = READ_CONTROL;
+  public final static int STANDARD_RIGHTS_WRITE   = READ_CONTROL;
+  public final static int STANDARD_RIGHTS_EXECUTE = READ_CONTROL;
+
+  public final static int STANDARD_RIGHTS_ALL = 0x001F0000;
+
+  public final static int SPECIFIC_RIGHTS_ALL = 0x0000FFFF;
+
+  public final static int GENERIC_EXECUTE = 0x20000000;
+  
+  public final static int SERVICE_WIN32_OWN_PROCESS = 0x00000010;
+  
+  public final static int KEY_QUERY_VALUE        = 0x0001;
+  public final static int KEY_SET_VALUE          = 0x0002;
+  public final static int KEY_CREATE_SUB_KEY     = 0x0004;
+  public final static int KEY_ENUMERATE_SUB_KEYS = 0x0008;
+  public final static int KEY_NOTIFY             = 0x0010;
+  public final static int KEY_CREATE_LINK        = 0x0020;
+  
+  public final static int KEY_READ  = ((STANDARD_RIGHTS_READ | KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY) & (~SYNCHRONIZE));
+  public final static int KEY_WRITE = ((STANDARD_RIGHTS_WRITE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY) & (~SYNCHRONIZE));
+  
+  public final static int REG_NONE                       = 0;   // No value type
+  public final static int REG_SZ                         = 1;   // Unicode nul terminated string
+  public final static int REG_EXPAND_SZ                  = 2;   // Unicode nul terminated string
+                                                                // (with environment variable references)
+  public final static int REG_BINARY                     = 3;   // Free form binary
+  public final static int REG_DWORD                      = 4;   // 32-bit number
+  public final static int REG_DWORD_LITTLE_ENDIAN        = 4;   // 32-bit number (same as REG_DWORD)
+  public final static int REG_DWORD_BIG_ENDIAN           = 5;   // 32-bit number
+  public final static int REG_LINK                       = 6;   // Symbolic Link (unicode)
+  public final static int REG_MULTI_SZ                   = 7;   // Multiple Unicode strings
+  public final static int REG_RESOURCE_LIST              = 8;   // Resource list in the resource map
+  public final static int REG_FULL_RESOURCE_DESCRIPTOR   = 9;  // Resource list in the hardware description
+  public final static int REG_RESOURCE_REQUIREMENTS_LIST = 10;
+  
+  public final static int REG_OPTION_RESERVED       = 0x00000000;   // Parameter is reserved
+  public final static int REG_OPTION_NON_VOLATILE   = 0x00000000;   // Key is preserved
+                                                                    // when system is rebooted
+  public final static int REG_OPTION_VOLATILE       = 0x00000001;   // Key is not preserved
+                                                                    // when system is rebooted
+  public final static int REG_OPTION_CREATE_LINK    = 0x00000002;   // Created key is a
+                                                                    // symbolic link
+  public final static int REG_OPTION_BACKUP_RESTORE = 0x00000004;   // open for backup or restore
+                                                                    // special access rules
+                                                                    // privilege required
+  public final static int REG_OPTION_OPEN_LINK      = 0x00000008;   // Open symbolic link
+  
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINREG.java

@@ -0,0 +1,23 @@
+/*
+ * WINREG.java
+ *
+ * Created on 17. August 2007, 14:32
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import com.sun.jna.Pointer;
+
+/**
+ *
+ * @author TB
+ */
+public interface WINREG {
+  public final static int HKEY_CLASSES_ROOT = 0x80000000;
+  public final static int HKEY_CURRENT_USER = 0x80000001;
+  public final static int HKEY_LOCAL_MACHINE = 0x80000002;
+  public final static int HKEY_USERS = 0x80000003;
+}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINSVC.java

@@ -0,0 +1,109 @@
+/*
+ * WINSVC.java
+ *
+ * Created on 8. August 2007, 15:07
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
+
+
+/**
+ *
+ * @author TB
+ */
+public interface WINSVC {
+  public final static int SERVICE_CONTROL_STOP         = 0x00000001;
+  public final static int SERVICE_CONTROL_SHUTDOWN     = 0x00000005;
+  
+  public final static int SERVICE_STOPPED              = 0x00000001;
+  public final static int SERVICE_START_PENDING        = 0x00000002;
+  public final static int SERVICE_STOP_PENDING         = 0x00000003;
+  public final static int SERVICE_RUNNING              = 0x00000004;
+  public final static int SERVICE_CONTINUE_PENDING     = 0x00000005;
+  public final static int SERVICE_PAUSE_PENDING        = 0x00000006;
+  public final static int SERVICE_PAUSED               = 0x00000007;
+  
+  public final static int SERVICE_ACCEPT_STOP           = 0x00000001;
+  public final static int SERVICE_ACCEPT_PAUSE_CONTINUE = 0x00000002;
+  public final static int SERVICE_ACCEPT_SHUTDOWN       = 0x00000004;
+  public final static int SERVICE_ACCEPT_PARAMCHANGE    = 0x00000008;
+  public final static int SERVICE_ACCEPT_NETBINDCHANGE  = 0x00000010;
+  
+  public final static int SC_MANAGER_CONNECT = 0x0001;
+  public final static int SC_MANAGER_CREATE_SERVICE = 0x0002;
+  public final static int SC_MANAGER_ENUMERATE_SERVICE = 0x0004;
+  public final static int SC_MANAGER_LOCK = 0x0008;
+  public final static int SC_MANAGER_QUERY_LOCK_STATUS = 0x0010;
+  public final static int SC_MANAGER_MODIFY_BOOT_CONFIG = 0x0020;
+
+  public final static int SC_MANAGER_ALL_ACCESS = WINNT.STANDARD_RIGHTS_REQUIRED |
+                                                  SC_MANAGER_CONNECT             |
+                                                  SC_MANAGER_CREATE_SERVICE      |
+                                                  SC_MANAGER_ENUMERATE_SERVICE   |
+                                                  SC_MANAGER_LOCK                |
+                                                  SC_MANAGER_QUERY_LOCK_STATUS   |
+                                                  SC_MANAGER_MODIFY_BOOT_CONFIG;
+                                        
+  public final static int SERVICE_QUERY_CONFIG         = 0x0001;
+  public final static int SERVICE_CHANGE_CONFIG        = 0x0002;
+  public final static int SERVICE_QUERY_STATUS         = 0x0004;
+  public final static int SERVICE_ENUMERATE_DEPENDENTS = 0x0008;
+  public final static int SERVICE_START                = 0x0010;
+  public final static int SERVICE_STOP                 = 0x0020;
+  public final static int SERVICE_PAUSE_CONTINUE       = 0x0040;
+  public final static int SERVICE_INTERROGATE          = 0x0080;
+  public final static int SERVICE_USER_DEFINED_CONTROL = 0x0100;
+
+  public final static int SERVICE_ALL_ACCESS = WINNT.STANDARD_RIGHTS_REQUIRED |
+                                               SERVICE_QUERY_CONFIG           |
+                                               SERVICE_CHANGE_CONFIG          |
+                                               SERVICE_QUERY_STATUS           |
+                                               SERVICE_ENUMERATE_DEPENDENTS   |
+                                               SERVICE_START                  |
+                                               SERVICE_STOP                   |
+                                               SERVICE_PAUSE_CONTINUE         |
+                                               SERVICE_INTERROGATE            |
+                                               SERVICE_USER_DEFINED_CONTROL;
+
+  public final static int SERVICE_CONFIG_DESCRIPTION     = 1;
+  public final static int SERVICE_CONFIG_FAILURE_ACTIONS = 2;
+  
+  public final static int SERVICE_KERNEL_DRIVER      = 0x00000001;
+  public final static int SERVICE_FILE_SYSTEM_DRIVER = 0x00000002;
+  public final static int SERVICE_ADAPTER            = 0x00000004;
+  public final static int SERVICE_RECOGNIZER_DRIVER  = 0x00000008;
+
+  public final static int SERVICE_DRIVER = SERVICE_KERNEL_DRIVER      |
+                                           SERVICE_FILE_SYSTEM_DRIVER |
+                                           SERVICE_RECOGNIZER_DRIVER;
+                                        
+  public final static int SERVICE_WIN32_OWN_PROCESS   = 0x00000010;
+  public final static int SERVICE_WIN32_SHARE_PROCESS = 0x00000020;
+  public final static int SERVICE_WIN32 = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS;
+
+  public final static int SERVICE_INTERACTIVE_PROCESS = 0x00000100;
+
+  public final static int SERVICE_TYPE_ALL = SERVICE_WIN32   |
+                                             SERVICE_ADAPTER | 
+                                             SERVICE_DRIVER  |
+                                             SERVICE_INTERACTIVE_PROCESS;
+  
+  public final static int SERVICE_BOOT_START   = 0x00000000;
+  public final static int SERVICE_SYSTEM_START = 0x00000001;
+  public final static int SERVICE_AUTO_START   = 0x00000002;
+  public final static int SERVICE_DEMAND_START = 0x00000003;
+  public final static int SERVICE_DISABLED     = 0x00000004;
+  
+  public final static int SERVICE_ERROR_IGNORE   = 0x00000000;
+  public final static int SERVICE_ERROR_NORMAL   = 0x00000001;
+  public final static int SERVICE_ERROR_SEVERE   = 0x00000002;
+  public final static int SERVICE_ERROR_CRITICAL = 0x00000003;
+}

jnalib/contrib/ntservice/src/jnacontrib/win32/Accounts.java

@@ -0,0 +1,431 @@
+/*
+ * Accounts.java
+ *
+ * Created on 7. August 2007, 07:58
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.win32;
+
+import jnacontrib.jna.*;
+import com.sun.jna.*;
+import com.sun.jna.ptr.*;
+import java.util.*;
+
+/**
+ *
+ * @author TB
+ */
+public class Accounts {
+  private static Object userInfoLock = new Object();
+  private static Object groupInfoLock = new Object();
+  
+  /** Creates a new instance of Accounts */
+  private Accounts() {
+  }
+  
+  /**
+   * Testing.
+   * @param args arguments
+   * @throws java.lang.Exception on error
+   */
+  public static void main(String[] args) throws Exception {
+    System.out.println("FullDomainName: " + getFullDomainName());
+    System.out.println("DomainControllerName: " + getDomainControllerName());
+    System.out.println("UserDomainGroups: " + getUserDomainGroups("administrator"));
+    System.out.println("UserLocalGroups: " + getUserLocalGroups(null, "administrator"));
+    System.out.println("AllDomainGroups: " + getAllDomainGroups());
+    System.out.println("AllDomainUsers: " + getAllDomainUsers());
+    System.out.println("AccountSidString: " + getAccountSidString("administrator"));
+    System.out.println("AccountNameBySid: " + getAccountName(getAccountSid("administrator")));
+    System.out.println("AccountNameBySidString: " + getAccountName(getAccountSidString("administrator")));
+  }
+  
+  /**
+   * Get name of the domain.
+   *
+   * @return name
+   */
+  public static String getFullDomainName() {
+    Netapi32.DOMAIN_CONTROLLER_INFO dci;
+    String domain = null;
+    
+    dci = getDomainControllerInfo();
+    
+    if(dci != null) {
+      domain = dci.DomainName;
+    }
+    return(domain);
+  }
+  
+  /**
+   * Get the name of the domain controller.
+   *
+   * @return name
+   */
+  public static String getDomainControllerName() {
+    Netapi32.DOMAIN_CONTROLLER_INFO dci;
+    String domainController = null;
+
+    dci = getDomainControllerInfo();
+    
+    if(dci != null) {
+      domainController = dci.DomainControllerName;
+    }
+    return(domainController);
+  }
+  
+  /**
+   * Get info about the domain controller.
+   *
+   * @return info
+   */
+  private static Netapi32.DOMAIN_CONTROLLER_INFO getDomainControllerInfo() {
+    Netapi32 netapi32;
+    PointerByReference pDci;
+    Netapi32.DOMAIN_CONTROLLER_INFO dci = null;
+    
+    netapi32 = Netapi32.INSTANCE;
+    pDci = new PointerByReference();
+    
+    if(netapi32.DsGetDcName(null, null, null, null, 0, pDci) == WINERROR.ERROR_SUCCESS) {
+      dci = new Netapi32.DOMAIN_CONTROLLER_INFO(pDci.getValue());
+      netapi32.NetApiBufferFree(pDci.getValue());
+    }
+    return(dci);
+  }
+  
+  /**
+   * Get all the domain groups where a user belongs to.
+   *
+   * @param userName user
+   * @return TreeSet of group names
+   */
+  public static TreeSet<String> getUserDomainGroups(String userName) {
+    Netapi32 netapi32;
+    PointerByReference buf;
+    IntByReference entriesread;
+    IntByReference totalentries;
+    Netapi32.GROUP_USERS_INFO_0 group;
+    Structure[] groups;
+    TreeSet<String> domainGroups;
+    int i;
+    
+    domainGroups = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+    netapi32 = Netapi32.INSTANCE;
+    
+    buf = new PointerByReference();
+    entriesread = new IntByReference();
+    totalentries = new IntByReference();
+    
+    if(netapi32.NetUserGetGroups(getDomainControllerName(), // servername
+                                        userName, // username
+                                        0, // level of user info in buffer
+                                        buf, // user info buffer
+                                        LMCONS.MAX_PREFERRED_LENGTH,     
+                                        entriesread, // read ( out )
+                                        totalentries // total ( out )
+                                        ) == LMERR.NERR_Success) {
+      group = new Netapi32.GROUP_USERS_INFO_0(buf.getValue());
+      groups = group.toArray(entriesread.getValue());
+      
+      for(i = 0; i < entriesread.getValue(); i++) {
+        group = (Netapi32.GROUP_USERS_INFO_0)groups[i];
+        domainGroups.add(group.grui0_name);
+      }
+      
+      if(entriesread.getValue() > 0) {
+        netapi32.NetApiBufferFree(buf.getValue());
+      }
+    }
+    return(domainGroups);
+  }
+  
+  /**
+   * Get all the local groups a user belongs to.
+   *
+   * @param serverName server name
+   * @param userName user
+   * @return TreeSetof group names
+   */
+  public static TreeSet<String> getUserLocalGroups(String serverName, String userName) {
+    Netapi32 netapi32;
+    PointerByReference lbuf;
+    IntByReference lentriesread;
+    IntByReference ltotalentries;
+    Netapi32.LOCALGROUP_USERS_INFO_0 lgroup;
+    Structure[] lgroups;
+    TreeSet<String> localGroups;
+    int i;
+    
+    localGroups = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+    netapi32 = Netapi32.INSTANCE;
+    
+    lbuf = new PointerByReference();
+    lentriesread = new IntByReference();
+    ltotalentries = new IntByReference();
+    if(netapi32.NetUserGetLocalGroups(null, // servername
+                                        userName, // username
+                                        0, // level of user info in buffer
+                                        0, // flags
+                                        lbuf, // user info buffer
+                                        LMCONS.MAX_PREFERRED_LENGTH,     
+                                        lentriesread, // read ( out )
+                                        ltotalentries // total ( out )
+                                        ) == LMERR.NERR_Success) {
+      lgroup = new Netapi32.LOCALGROUP_USERS_INFO_0(lbuf.getValue());
+      lgroups = lgroup.toArray(lentriesread.getValue());
+      
+      for(i = 0; i < lentriesread.getValue(); i++) {
+        lgroup = (Netapi32.LOCALGROUP_USERS_INFO_0)lgroups[i];
+        localGroups.add(lgroup.lgrui0_name);
+      }
+      
+      if(lentriesread.getValue() > 0) {
+        netapi32.NetApiBufferFree(lbuf.getValue());
+      }
+    }
+    return(localGroups);
+  }
+  
+  /**
+   * Get all domain groups.
+   *
+   * @return  TreeSet of group names
+   */
+  public static TreeSet<String> getAllDomainGroups() {
+    Netapi32 netapi32;
+    PointerByReference gbuf;
+    IntByReference gentriesread;
+    IntByReference gtotalentries;
+    Netapi32.GROUP_INFO_0 ggroup;
+    Structure[] ggroups;
+    TreeSet<String> domainGroups;
+    int i;
+    
+    netapi32 = Netapi32.INSTANCE;
+    domainGroups = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+    gbuf = new PointerByReference();
+    gentriesread = new IntByReference();
+    gtotalentries = new IntByReference();
+    
+    if(netapi32.NetGroupEnum(getDomainControllerName(), // servername
+                                        0, // level of user info in buffer
+                                        gbuf, // user info buffer
+                                        LMCONS.MAX_PREFERRED_LENGTH,     
+                                        gentriesread, // read ( out )
+                                        gtotalentries, // total ( out )
+                                        null // resume_handle
+                                        ) == LMERR.NERR_Success) {
+      ggroup = new Netapi32.GROUP_INFO_0(gbuf.getValue());
+      ggroups = ggroup.toArray(gentriesread.getValue());
+      
+      for(i = 0; i < gentriesread.getValue(); i++) {
+        ggroup = (Netapi32.GROUP_INFO_0)ggroups[i];
+        domainGroups.add(ggroup.grpi0_name);
+      }
+
+      if(gentriesread.getValue() > 0) {
+        netapi32.NetApiBufferFree(gbuf.getValue());
+      }
+    }
+    return(domainGroups);
+  }
+  
+  /**
+   * Get all domain users.
+   *
+   * @return TreeSet of user names
+   */
+  public static TreeSet<String> getAllDomainUsers() {
+    Netapi32 netapi32;
+    PointerByReference ubuf;
+    IntByReference uentriesread;
+    IntByReference utotalentries;
+    Netapi32.USER_INFO_0 user;
+    Structure[] users;
+    TreeSet<String> domainUsers;
+    int i;
+    
+    netapi32 = Netapi32.INSTANCE;
+    domainUsers = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+    ubuf = new PointerByReference();
+    uentriesread = new IntByReference();
+    utotalentries = new IntByReference();
+    
+    if(netapi32.NetUserEnum(getDomainControllerName(), // servername
+                                        0, // level of user info in buffer
+                                        LMACCESS.FILTER_NORMAL_ACCOUNT, // filter
+                                        ubuf, // user info buffer
+                                        LMCONS.MAX_PREFERRED_LENGTH,     
+                                        uentriesread, // read ( out )
+                                        utotalentries, // total ( out )
+                                        null // resume_handle
+                                        ) == LMERR.NERR_Success) {
+      user = new Netapi32.USER_INFO_0(ubuf.getValue());
+      users = user.toArray(uentriesread.getValue());
+      
+      for(i = 0; i < uentriesread.getValue(); i++) {
+        user = (Netapi32.USER_INFO_0)users[i];
+        domainUsers.add(user.usri0_name);
+      }
+
+      if(uentriesread.getValue() > 0) {
+        netapi32.NetApiBufferFree(ubuf.getValue());
+      }
+    }
+    return(domainUsers);
+  }
+
+  /**
+   * Get SID of account.
+   *
+   * @param account account name
+   * @return SID
+   */
+  public static byte[] getAccountSid(String account) {
+    Advapi32 advapi32;
+    IntByReference cbSid;
+    IntByReference cchReferencedDomainName;
+    PointerByReference peUse;
+    String sidString = null;
+    byte[] sid;
+    char[] referencedDomainName;
+    
+    advapi32 = Advapi32.INSTANCE;
+    
+    cbSid = new IntByReference(0);
+    cchReferencedDomainName = new IntByReference(0);
+    peUse = new PointerByReference();
+    advapi32.LookupAccountName(null, account, null, cbSid,
+            null, cchReferencedDomainName, peUse);
+    sid = new byte[cbSid.getValue()];
+    referencedDomainName = new char[cchReferencedDomainName.getValue()];
+    
+    if(! advapi32.LookupAccountName(null, account, sid, cbSid,
+            referencedDomainName, cchReferencedDomainName, peUse)) {
+      sid = null;
+    }
+    return(sid);
+  }
+  
+  /**
+   * Get account name of SID.
+   *
+   * @param sid SID
+   * @return account name
+   */
+  public static String getAccountName(byte[] sid) {
+    Advapi32 advapi32;
+    IntByReference cchName;
+    IntByReference cchReferencedDomainName;
+    PointerByReference peUse;
+    String sidString = null;
+    char[] lpName;
+    char[] referencedDomainName;
+    
+    advapi32 = Advapi32.INSTANCE;
+    
+    cchName = new IntByReference(0);
+    cchReferencedDomainName = new IntByReference(0);
+    peUse = new PointerByReference();
+    advapi32.LookupAccountSid(null, sid, null, cchName,
+            null, cchReferencedDomainName, peUse);
+    lpName = new char[cchName.getValue()];
+    referencedDomainName = new char[cchReferencedDomainName.getValue()];
+    
+    if(! advapi32.LookupAccountSid(null, sid, lpName, cchName,
+            referencedDomainName, cchReferencedDomainName, peUse)) {
+      lpName = null;
+    }
+    
+    if(lpName != null) {
+      return(Native.toString(lpName));
+      
+    } else {
+      return(null);
+    }
+  }
+  
+  /**
+   * Get SID of account as String.
+   *
+   * @param account account name
+   * @return SID
+   */
+  public static String getAccountSidString(String account) {
+    String sidString = null;
+    byte[] sid;
+    
+    sid = getAccountSid(account);
+    
+    if(sid != null) {
+      sidString = convertSidToString(sid);
+    }
+    return(sidString);
+  }
+  
+  /**
+   * Get account of SID String.
+   *
+   * @param sidString SID
+   * @return account name
+   */
+  public static String getAccountName(String sidString) {
+    String name = null;
+    byte[] sid;
+    
+    sid = convertStringToSid(sidString);
+    
+    if(sid != null) {
+      name = getAccountName(sid);
+    }
+    return(name);
+  }  
+
+  /**
+   * Convert a SID to String.
+   *
+   * @param sid SID
+   * @return SID String
+   */
+  public static String convertSidToString(byte[] sid) {
+    Advapi32 advapi32;
+    PointerByReference stringSid;
+    String sidString = null;
+
+    advapi32 = Advapi32.INSTANCE;
+    
+    stringSid = new PointerByReference();
+    
+    if(advapi32.ConvertSidToStringSid(sid, stringSid)) {
+      sidString = stringSid.getValue().getString(0, true);
+      Kernel32b.INSTANCE.LocalFree(stringSid.getValue());
+    }
+    return(sidString);
+  }
+  
+  /**
+   * Convert a SID String to SID.
+   *
+   * @param sidString SID String
+   * @return SID
+   */
+  public static byte[] convertStringToSid(String sidString) {
+    Advapi32 advapi32;
+    PointerByReference pSid;
+    byte[] sid = null;
+
+    advapi32 = Advapi32.INSTANCE;
+    
+    pSid = new PointerByReference();
+    
+    if(advapi32.ConvertStringSidToSid(sidString, pSid)) {
+      sid = pSid.getValue().getByteArray(0, 100);
+      Kernel32b.INSTANCE.LocalFree(pSid.getValue());
+    }
+    return(sid);
+  }
+}

jnalib/contrib/ntservice/src/jnacontrib/win32/Registry.java

@@ -0,0 +1,464 @@
+/*
+ * Registry.java
+ *
+ * Created on 17. August 2007, 15:07
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.win32;
+
+import jnacontrib.jna.*;
+import com.sun.jna.ptr.ByteByReference;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+/**
+ * Methods for accessing the Windows Registry. Only String and DWORD values supported at the moment.
+ */
+public class Registry {
+  public static enum REGISTRY_ROOT_KEY{CLASSES_ROOT, CURRENT_USER, LOCAL_MACHINE, USERS};
+  private final static HashMap<REGISTRY_ROOT_KEY, Integer> rootKeyMap = new HashMap<REGISTRY_ROOT_KEY, Integer>();
+  
+  static {
+    rootKeyMap.put(REGISTRY_ROOT_KEY.CLASSES_ROOT, WINREG.HKEY_CLASSES_ROOT);
+    rootKeyMap.put(REGISTRY_ROOT_KEY.CURRENT_USER, WINREG.HKEY_CURRENT_USER);
+    rootKeyMap.put(REGISTRY_ROOT_KEY.LOCAL_MACHINE, WINREG.HKEY_LOCAL_MACHINE);
+    rootKeyMap.put(REGISTRY_ROOT_KEY.USERS, WINREG.HKEY_USERS);
+  }
+  
+  /**
+   * Testing.
+   *
+   * @param args arguments
+   * @throws java.lang.Exception on error
+   */
+  public static void main(String[] args) throws Exception {
+  }
+
+  /**
+   * Gets one of the root keys.
+   *
+   * @param key key type
+   * @return root key
+   */
+  private static int getRegistryRootKey(REGISTRY_ROOT_KEY key) {
+    Advapi32 advapi32;
+    IntByReference pHandle;
+    int handle = 0;
+    
+    advapi32 = Advapi32.INSTANCE;
+    pHandle = new IntByReference();
+    
+    if(advapi32.RegOpenKeyEx(rootKeyMap.get(key), null, 0, 0, pHandle) == WINERROR.ERROR_SUCCESS) {
+      handle = pHandle.getValue();
+    }
+    return(handle);
+  }
+  
+  /**
+   * Opens a key.
+   *
+   * @param rootKey root key
+   * @param subKeyName name of the key
+   * @param access access mode
+   * @return handle to the key or 0
+   */
+  private static int openKey(REGISTRY_ROOT_KEY rootKey, String subKeyName, int access) {
+    Advapi32 advapi32;
+    IntByReference pHandle;
+    int rootKeyHandle;
+    
+    advapi32 = Advapi32.INSTANCE;
+    rootKeyHandle = getRegistryRootKey(rootKey);
+    pHandle = new IntByReference();
+    
+    if(advapi32.RegOpenKeyEx(rootKeyHandle, subKeyName, 0, access, pHandle) == WINERROR.ERROR_SUCCESS) {
+      return(pHandle.getValue());
+      
+    } else {
+      return(0);
+    }
+  }
+  
+  /**
+   * Converts a Windows buffer to a Java String.
+   *
+   * @param buf buffer
+   * @throws java.io.UnsupportedEncodingException on error
+   * @return String
+   */
+  private static String convertBufferToString(byte[] buf) throws UnsupportedEncodingException {
+    return(new String(buf, 0, buf.length - 2, "UTF-16LE"));
+  }
+  
+  /**
+   * Converts a Windows buffer to an int.
+   *
+   * @param buf buffer
+   * @return int
+   */
+  private static int convertBufferToInt(byte[] buf) {
+   return(((int)(buf[0] & 0xff)) + (((int)(buf[1] & 0xff)) << 8) + (((int)(buf[2] & 0xff)) << 16) + (((int)(buf[3] & 0xff)) << 24)); 
+  }
+  
+  /**
+   * Read a String value.
+   *
+   * @param rootKey root key
+   * @param subKeyName key name
+   * @param name value name
+   * @throws java.io.UnsupportedEncodingException on error
+   * @return String or null
+   */
+  public static String getStringValue(REGISTRY_ROOT_KEY rootKey, String subKeyName, String name) throws UnsupportedEncodingException {
+    Advapi32 advapi32;
+    IntByReference pType, lpcbData;
+    byte[] lpData = new byte[1];
+    int handle = 0;
+    String ret = null;
+    
+    advapi32 = Advapi32.INSTANCE;
+    pType = new IntByReference();
+    lpcbData = new IntByReference();
+    handle = openKey(rootKey, subKeyName, WINNT.KEY_READ);
+    
+    if(handle != 0) {
+      
+      if(advapi32.RegQueryValueEx(handle, name, null, pType, lpData, lpcbData) == WINERROR.ERROR_MORE_DATA) {
+        lpData = new byte[lpcbData.getValue()];
+
+        if(advapi32.RegQueryValueEx(handle, name, null, pType, lpData, lpcbData) == WINERROR.ERROR_SUCCESS) {
+          ret = convertBufferToString(lpData);
+        }
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+
+  /**
+   * Read an int value.
+   * 
+   * 
+   * @return int or 0
+   * @param rootKey root key
+   * @param subKeyName key name
+   * @param name value name
+   */
+  public static int getIntValue(REGISTRY_ROOT_KEY rootKey, String subKeyName, String name) {
+    Advapi32 advapi32;
+    IntByReference pType, lpcbData;
+    byte[] lpData = new byte[1];
+    int handle = 0;
+    int ret = 0;
+    
+    advapi32 = Advapi32.INSTANCE;
+    pType = new IntByReference();
+    lpcbData = new IntByReference();
+    handle = openKey(rootKey, subKeyName, WINNT.KEY_READ);
+    
+    if(handle != 0) {
+      
+      if(advapi32.RegQueryValueEx(handle, name, null, pType, lpData, lpcbData) == WINERROR.ERROR_MORE_DATA) {
+        lpData = new byte[lpcbData.getValue()];
+
+        if(advapi32.RegQueryValueEx(handle, name, null, pType, lpData, lpcbData) == WINERROR.ERROR_SUCCESS) {
+          ret = convertBufferToInt(lpData);
+        }
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Delete a value.
+   *
+   * @param rootKey root key
+   * @param subKeyName key name
+   * @param name value name
+   * @return true on success
+   */
+  public static boolean deleteValue(REGISTRY_ROOT_KEY rootKey, String subKeyName, String name) {
+    Advapi32 advapi32;
+    int handle;
+    boolean ret = true;
+    
+    advapi32 = Advapi32.INSTANCE;
+    
+    handle = openKey(rootKey, subKeyName, WINNT.KEY_READ | WINNT.KEY_WRITE);
+    
+    if(handle != 0) {
+      if(advapi32.RegDeleteValue(handle, name) == WINERROR.ERROR_SUCCESS) {
+        ret = true;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Writes a String value.
+   *
+   * @param rootKey root key
+   * @param subKeyName key name
+   * @param name value name
+   * @param value value
+   * @throws java.io.UnsupportedEncodingException on error
+   * @return true on success
+   */
+  public static boolean setStringValue(REGISTRY_ROOT_KEY rootKey, String subKeyName, String name, String value) throws UnsupportedEncodingException {
+    Advapi32 advapi32;
+    int handle;
+    byte[] data;
+    boolean ret = false;
+    
+    data = Arrays.copyOf(value.getBytes("UTF-16LE"), value.length() * 2 + 2);
+    advapi32 = Advapi32.INSTANCE;
+    handle = openKey(rootKey, subKeyName, WINNT.KEY_READ | WINNT.KEY_WRITE);
+    
+    if(handle != 0) {
+      if(advapi32.RegSetValueEx(handle, name, 0, WINNT.REG_SZ, data, data.length) == WINERROR.ERROR_SUCCESS) {
+        ret = true;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Writes an int value.
+   * 
+   * 
+   * @return true on success
+   * @param rootKey root key
+   * @param subKeyName key name
+   * @param name value name
+   * @param value value
+   */
+  public static boolean setIntValue(REGISTRY_ROOT_KEY rootKey, String subKeyName, String name, int value) {
+    Advapi32 advapi32;
+    int handle;
+    byte[] data;
+    boolean ret = false;
+    
+    data = new byte[4];
+    data[0] = (byte)(value & 0xff);
+    data[1] = (byte)((value >> 8) & 0xff);
+    data[2] = (byte)((value >> 16) & 0xff);
+    data[3] = (byte)((value >> 24) & 0xff);
+    advapi32 = Advapi32.INSTANCE;
+    handle = openKey(rootKey, subKeyName, WINNT.KEY_READ | WINNT.KEY_WRITE);
+    
+    if(handle != 0) {
+      
+      if(advapi32.RegSetValueEx(handle, name, 0, WINNT.REG_DWORD, data, data.length) == WINERROR.ERROR_SUCCESS) {
+        ret = true;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Check for existence of a value.
+   *
+   * @param rootKey root key
+   * @param subKeyName key name
+   * @param name value name
+   * @return true if exists
+   */
+  public static boolean valueExists(REGISTRY_ROOT_KEY rootKey, String subKeyName, String name) {
+    Advapi32 advapi32;
+    IntByReference pType, lpcbData;
+    byte[] lpData = new byte[1];
+    int handle = 0;
+    boolean ret = false;
+    
+    advapi32 = Advapi32.INSTANCE;
+    pType = new IntByReference();
+    lpcbData = new IntByReference();
+    handle = openKey(rootKey, subKeyName, WINNT.KEY_READ);
+    
+    if(handle != 0) {
+      
+      if(advapi32.RegQueryValueEx(handle, name, null, pType, lpData, lpcbData) != WINERROR.ERROR_FILE_NOT_FOUND) {
+        ret = true;
+        
+      } else {
+        ret = false;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Create a new key.
+   *
+   * @param rootKey root key
+   * @param parent name of parent key
+   * @param name key name
+   * @return true on success
+   */
+  public static boolean createKey(REGISTRY_ROOT_KEY rootKey, String parent, String name) {
+    Advapi32 advapi32;
+    IntByReference hkResult, dwDisposition;
+    int handle = 0;
+    boolean ret = false;
+    
+    advapi32 = Advapi32.INSTANCE;
+    hkResult = new IntByReference();
+    dwDisposition = new IntByReference();
+    handle = openKey(rootKey, parent, WINNT.KEY_READ);
+    
+    if(handle != 0) {
+      
+      if(advapi32.RegCreateKeyEx(handle, name, 0, null, WINNT.REG_OPTION_NON_VOLATILE, WINNT.KEY_READ, null,
+         hkResult, dwDisposition) == WINERROR.ERROR_SUCCESS) {
+        ret = true;
+        advapi32.RegCloseKey(hkResult.getValue());
+        
+      } else {
+        ret = false;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Delete a key.
+   *
+   * @param rootKey root key
+   * @param parent name of parent key
+   * @param name key name
+   * @return true on success
+   */
+  public static boolean deleteKey(REGISTRY_ROOT_KEY rootKey, String parent, String name) {
+    Advapi32 advapi32;
+    int handle = 0;
+    boolean ret = false;
+    
+    advapi32 = Advapi32.INSTANCE;
+    handle = openKey(rootKey, parent, WINNT.KEY_READ);
+    
+    if(handle != 0) {
+      
+      if(advapi32.RegDeleteKey(handle, name) == WINERROR.ERROR_SUCCESS) {
+        ret = true;
+        
+      } else {
+        ret = false;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    return(ret);
+  }
+  
+  /**
+   * Get all sub keys of a key.
+   *
+   * @param rootKey root key
+   * @param parent key name
+   * @return array with all sub key names
+   */
+  public static String[] getSubKeys(REGISTRY_ROOT_KEY rootKey, String parent) {
+    Advapi32 advapi32;
+    int handle = 0, dwIndex;
+    char[] lpName;
+    IntByReference lpcName;
+    WINBASE.FILETIME lpftLastWriteTime;
+    TreeSet<String> subKeys = new TreeSet<String>();
+    
+    advapi32 = Advapi32.INSTANCE;
+    handle = openKey(rootKey, parent, WINNT.KEY_READ);
+    lpName = new char[256];
+    lpcName = new IntByReference(256);
+    lpftLastWriteTime = new WINBASE.FILETIME();
+    
+    if(handle != 0) {
+      dwIndex = 0;
+      
+      while(advapi32.RegEnumKeyEx(handle, dwIndex, lpName, lpcName, null,
+            null, null, lpftLastWriteTime) == WINERROR.ERROR_SUCCESS) {
+        subKeys.add(new String(lpName, 0, lpcName.getValue()));
+        lpcName.setValue(256);
+        dwIndex++;
+      }
+      advapi32.RegCloseKey(handle);
+    }
+    
+    return(subKeys.toArray(new String[]{}));
+  }
+  
+  /**
+   * Get all values under a key.
+   *
+   * @param rootKey root key
+   * @param key jey name
+   * @throws java.io.UnsupportedEncodingException on error
+   * @return TreeMap with name and value pairs
+   */
+  public static TreeMap<String, Object> getValues(REGISTRY_ROOT_KEY rootKey, String key) throws UnsupportedEncodingException {
+    Advapi32 advapi32;
+    int handle = 0, dwIndex, result = 0;
+    char[] lpValueName;
+    byte[] lpData;
+    IntByReference lpcchValueName, lpType, lpcbData;
+    String name;
+    TreeMap<String, Object> values = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+    
+    advapi32 = Advapi32.INSTANCE;
+    handle = openKey(rootKey, key, WINNT.KEY_READ);
+    lpValueName = new char[16384];
+    lpcchValueName = new IntByReference(16384);
+    lpType = new IntByReference();
+    lpData = new byte[1];
+    lpcbData = new IntByReference();
+    
+    if(handle != 0) {
+      dwIndex = 0;
+      
+      do {
+        lpcbData.setValue(0);
+        result = advapi32.RegEnumValue(handle, dwIndex, lpValueName, lpcchValueName, null,
+          lpType, lpData, lpcbData);
+        
+        if(result == WINERROR.ERROR_MORE_DATA) {
+          lpData = new byte[lpcbData.getValue()];
+          lpcchValueName =  new IntByReference(16384);
+          result = advapi32.RegEnumValue(handle, dwIndex, lpValueName, lpcchValueName, null,
+            lpType, lpData, lpcbData);
+          
+          if(result == WINERROR.ERROR_SUCCESS) {
+            name = new String(lpValueName, 0, lpcchValueName.getValue());
+            
+            switch(lpType.getValue()) {
+              case WINNT.REG_SZ:
+                values.put(name, convertBufferToString(lpData));
+                break;
+              case WINNT.REG_DWORD:
+                values.put(name, convertBufferToInt(lpData));
+                break;
+              default:
+                break;
+            }
+          }
+        }
+        dwIndex++;
+      } while(result == WINERROR.ERROR_SUCCESS);
+      
+      advapi32.RegCloseKey(handle);
+    }
+    return(values);
+  }
+}

jnalib/contrib/ntservice/src/jnacontrib/win32/TestService.java

@@ -0,0 +1,66 @@
+/*
+ * TestService.java
+ *
+ * Created on 12. September 2007, 12:49
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.win32;
+
+/**
+ * TestService.
+ */
+public class TestService extends Win32Service {
+  
+  /**
+   * main.
+   * @param args arguments
+   */
+  public static void main(String[] args) {
+    TestService service = new TestService();
+    
+    if(args.length == 1) {
+      
+      if(args[0].equalsIgnoreCase("install")) {
+        System.out.println(service.install("TestService DisplayName", "TestService Description",
+                null, null, null));
+        
+      } else if(args[0].equalsIgnoreCase("uninstall")) {
+        System.out.println(service.uninstall());
+        
+      } else {
+        System.out.println("Arguments:");
+        System.out.println("install   = install service");
+        System.out.println("uninstall = uninstall service");
+        System.out.println("<none>    = run service");
+        System.exit(0);
+      }
+      
+    } else {
+      service.init();
+    }
+  }
+  
+  /** 
+   * Creates a new instance of TestService.
+   */
+  public TestService() {
+    super("TestService");
+  }
+
+  /**
+   * Will be called on start.
+   */
+  public void onStart() {
+    
+  }
+
+  /**
+   * Will be called on stop.
+   */
+  public void onStop() {
+  }
+  
+}

jnalib/contrib/ntservice/src/jnacontrib/win32/Win32Service.java

@@ -0,0 +1,311 @@
+/*
+ * Win32Service.java
+ *
+ * Created on 12. September 2007, 12:05
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.win32;
+
+import jnacontrib.jna.*;
+import com.sun.jna.Pointer;
+
+/**
+ * Baseclass for a Win32 service.
+ */
+public abstract class Win32Service {
+  protected String serviceName;
+  private ServiceMain serviceMain;
+  private ServiceControl serviceControl;
+  private Pointer serviceStatusHandle;
+  private Object waitObject = new Object();
+  
+  /**
+   * Creates a new instance of Win32Service.
+   *
+   * @param serviceName internal name of the service
+   */
+  public Win32Service(String serviceName) {
+    this.serviceName = serviceName;
+  }
+  
+  /**
+   * Install the service.
+   *
+   * @param displayName visible name
+   * @param description description
+   * @param dependencies array of other services to depend on or null
+   * @param account service account or null for LocalSystem
+   * @param password password for service account or null
+   * @throws java.lang.Exception 
+   * @return true on success
+   */
+  public boolean install(String displayName, String description, String[] dependencies, String account, String password) {
+    return(install(displayName, description, dependencies, account, password, "java.exe -cp \"" + 
+           System.getProperty("java.class.path") + "\" -Xrs " + this.getClass().getName()));
+  }
+  
+  /**
+   * Install the service.
+   * 
+   * @return true on success
+   * @param displayName visible name
+   * @param description description
+   * @param dependencies array of other services to depend on or null
+   * @param account service account or null for LocalSystem
+   * @param password password for service account or null
+   * @param command command line to start the service
+   * @throws java.lang.Exception 
+   */
+  public boolean install(String displayName, String description, String[] dependencies, String account, String password, String command) {
+    Advapi32 advapi32;
+    Advapi32.SERVICE_DESCRIPTION desc;
+    Pointer serviceManager, service;
+    boolean success = false;
+    String dep = "";
+    
+    if(dependencies != null) {
+      for(String s : dependencies) {
+        dep += s + "\0";
+      }
+    }
+    dep += "\0";
+    
+    desc = new Advapi32.SERVICE_DESCRIPTION();
+    desc.lpDescription = description;
+    
+    advapi32 = Advapi32.INSTANCE;
+    serviceManager = openServiceControlManager(null, WINSVC.SC_MANAGER_ALL_ACCESS);
+    
+    if(serviceManager != null) {
+      service = advapi32.CreateService(serviceManager, serviceName, displayName,
+              WINSVC.SERVICE_ALL_ACCESS, WINSVC.SERVICE_WIN32_OWN_PROCESS, WINSVC.SERVICE_DEMAND_START, 
+              WINSVC.SERVICE_ERROR_NORMAL, 
+              command, 
+              null, null, dep, account, password);
+      
+      if(service != null) {
+        success = advapi32.ChangeServiceConfig2(service, WINSVC.SERVICE_CONFIG_DESCRIPTION, desc);
+        advapi32.CloseServiceHandle(service);
+      }
+      advapi32.CloseServiceHandle(serviceManager);
+    }
+    return(success);
+  }
+  
+  /**
+   * Uninstall the service.
+   *
+   * @throws java.lang.Exception 
+   * @return true on success
+   */
+  public boolean uninstall() {
+    Advapi32 advapi32;
+    Pointer serviceManager, service;
+    boolean success = false;
+    
+    advapi32 = Advapi32.INSTANCE;
+    serviceManager = openServiceControlManager(null, WINSVC.SC_MANAGER_ALL_ACCESS);
+    
+    if(serviceManager != null) {
+      service = advapi32.OpenService(serviceManager, serviceName, WINSVC.SERVICE_ALL_ACCESS);
+      
+      if(service != null) {
+        success = advapi32.DeleteService(service);
+        advapi32.CloseServiceHandle(service);
+      }
+      advapi32.CloseServiceHandle(serviceManager);
+    }
+    return(success);
+  }
+  
+  /**
+   * Ask the ServiceControlManager to start the service.
+   * @return true on success
+   */
+  public boolean start() {
+    Advapi32 advapi32;
+    Pointer serviceManager, service;
+    boolean success = false;
+    
+    advapi32 = Advapi32.INSTANCE;
+    
+    serviceManager = openServiceControlManager(null, WINNT.GENERIC_EXECUTE);
+    
+    if(serviceManager != null) {
+      service = advapi32.OpenService(serviceManager, serviceName, WINNT.GENERIC_EXECUTE);
+      
+      if(service != null) {
+        success = advapi32.StartService(service, 0, null);
+        advapi32.CloseServiceHandle(service);
+      }
+      advapi32.CloseServiceHandle(serviceManager);
+    }
+    
+    return(success);
+  }
+  
+  /**
+   * Ask the ServiceControlManager to stop the service.
+   * @return true on success
+   */
+  public boolean stop() throws Exception {
+    Advapi32 advapi32;
+    Pointer serviceManager, service;
+    Advapi32.SERVICE_STATUS serviceStatus;
+    boolean success = false;
+    
+    advapi32 = Advapi32.INSTANCE;
+    
+    serviceManager = openServiceControlManager(null, WINNT.GENERIC_EXECUTE);
+    
+    if(serviceManager != null) {
+      service = advapi32.OpenService(serviceManager, serviceName, WINNT.GENERIC_EXECUTE);
+      
+      if(service != null) {
+        serviceStatus = new Advapi32.SERVICE_STATUS();
+        success = advapi32.ControlService(service, WINSVC.SERVICE_CONTROL_STOP, serviceStatus);
+        advapi32.CloseServiceHandle(service);
+      }
+      advapi32.CloseServiceHandle(serviceManager);
+    }
+    
+    return(success);
+  }
+  
+  /**
+   * Initialize the service, connect to the ServiceControlManager.
+   */
+  public void init() {
+    Advapi32 advapi32;
+    Advapi32.SERVICE_TABLE_ENTRY[] entries = new Advapi32.SERVICE_TABLE_ENTRY[2];
+    Advapi32.SERVICE_TABLE_ENTRY entry;
+    
+    serviceMain = new ServiceMain();
+    advapi32 = Advapi32.INSTANCE;
+    entry = new Advapi32.SERVICE_TABLE_ENTRY();
+    entry.lpServiceName = serviceName;
+    entry.lpServiceProc = serviceMain;
+    
+    advapi32.StartServiceCtrlDispatcher(entry.toArray(2));
+  }
+  
+  /**
+   * Get a handle to the ServiceControlManager.
+   *
+   * @param machine name of the machine or null for localhost
+   * @param access access flags
+   * @return handle to ServiceControlManager or null when failed
+   */
+  private Pointer openServiceControlManager(String machine, int access) {
+    Pointer handle = null;
+    Advapi32 advapi32;
+    
+    advapi32 = Advapi32.INSTANCE;
+    handle = advapi32.OpenSCManager(machine, null, access);
+    return(handle);
+  }
+  
+  /**
+   * Report service status to the ServiceControlManager.
+   *
+   * @param status status
+   * @param win32ExitCode exit code 
+   * @param waitHint time to wait
+   */
+  private void reportStatus(int status, int win32ExitCode, int waitHint) {
+    Advapi32 advapi32;
+    Advapi32.SERVICE_STATUS serviceStatus;
+    
+    advapi32 = Advapi32.INSTANCE;
+    serviceStatus = new Advapi32.SERVICE_STATUS();
+    serviceStatus.dwServiceType = WINNT.SERVICE_WIN32_OWN_PROCESS;
+    serviceStatus.dwControlsAccepted = WINSVC.SERVICE_ACCEPT_STOP | WINSVC.SERVICE_ACCEPT_SHUTDOWN;
+    serviceStatus.dwWin32ExitCode = win32ExitCode;
+    serviceStatus.dwWaitHint = waitHint;
+    serviceStatus.dwCurrentState = status;
+    
+    advapi32.SetServiceStatus(serviceStatusHandle, serviceStatus);
+  }
+  
+  /**
+   * Called when service is starting.
+   */
+  public abstract void onStart();
+  
+  /*
+   * Called when service should stop.
+   */
+  public abstract void onStop();
+  
+  
+  /**
+   * Implementation of the service main function.
+   */
+  private class ServiceMain implements Advapi32.SERVICE_MAIN_FUNCTION {
+    
+    /**
+     * Called when the service is starting.
+     *
+     * @param dwArgc number of arguments
+     * @param lpszArgv pointer to arguments
+     */
+    public void callback(int dwArgc, Pointer lpszArgv) {
+      Advapi32 advapi32;
+      
+      advapi32 = Advapi32.INSTANCE;
+      
+      serviceControl = new ServiceControl();
+      serviceStatusHandle = advapi32.RegisterServiceCtrlHandlerEx(serviceName, serviceControl, null);
+      
+      reportStatus(WINSVC.SERVICE_START_PENDING, WINERROR.NO_ERROR, 3000);
+      reportStatus(WINSVC.SERVICE_RUNNING, WINERROR.NO_ERROR, 0);
+      
+      onStart();
+      
+      try {
+        synchronized(waitObject) {
+          waitObject.wait();
+        }
+      } catch (InterruptedException ex) {
+      }
+      reportStatus(WINSVC.SERVICE_STOPPED, WINERROR.NO_ERROR, 0);
+
+      // Avoid returning from ServiceMain, which will cause a crash
+      // See http://support.microsoft.com/kb/201349, which recommends
+      // having init() wait for this thread.  
+      // Waiting on this thread in init() won't fix the crash, though.
+      //System.exit(0);
+    }
+  }
+  
+  
+  /**
+   * Implementation of the service control function.
+   */
+  private class ServiceControl implements Advapi32.HandlerEx {
+
+    /**
+     * Called when the service get a control code.
+     *
+     * @param dwControl 
+     * @param dwEventType 
+     * @param lpEventData 
+     * @param lpContext 
+     */
+    public int callback(int dwControl, int dwEventType, Pointer lpEventData, Pointer lpContext) {
+      switch(dwControl) {
+        case WINSVC.SERVICE_CONTROL_STOP:
+        case WINSVC.SERVICE_CONTROL_SHUTDOWN:
+          reportStatus(WINSVC.SERVICE_STOP_PENDING, WINERROR.NO_ERROR, 5000);
+          onStop();
+          synchronized(waitObject) {
+            waitObject.notifyAll();
+          }
+      }
+      return WINERROR.NO_ERROR;
+    }
+  }
+}

jnalib/contrib/w32keyhook/KeyHook.java

@@ -0,0 +1,69 @@
+package w32keyhook;
+
+import com.sun.jna.*;
+import com.sun.jna.win32.*;
+import com.sun.jna.examples.win32.*;
+import com.sun.jna.examples.win32.User32.MSG;
+import com.sun.jna.examples.win32.User32.LowLevelKeyboardProc;
+import com.sun.jna.examples.win32.User32.KBDLLHOOKSTRUCT;
+import com.sun.jna.examples.win32.W32API.LRESULT;
+import com.sun.jna.examples.win32.W32API.WPARAM;
+import com.sun.jna.examples.win32.W32API.HMODULE;
+import com.sun.jna.examples.win32.User32.HHOOK;
+
+/** Sample implementation of a low-level keyboard hook on W32. */
+public class KeyHook {
+    private static volatile boolean quit;
+    private static HHOOK hhk;
+    private static LowLevelKeyboardProc keyboardHook;
+
+    public static void main(String[] args) {
+        final User32 lib = User32.INSTANCE;
+        HMODULE hMod = Kernel32.INSTANCE.GetModuleHandle(null);
+        keyboardHook = new LowLevelKeyboardProc() {
+            public LRESULT callback(int nCode, WPARAM wParam, KBDLLHOOKSTRUCT info) {
+                if (nCode >= 0) {
+                    switch(wParam.intValue()) {
+                    case User32.WM_KEYUP:
+                    case User32.WM_KEYDOWN:
+                    case User32.WM_SYSKEYUP:
+                    case User32.WM_SYSKEYDOWN:
+                        System.err.println("in callback, key=" + info.vkCode);
+                        if (info.vkCode == 81) {
+                            quit = true;
+                        }
+                    }
+                }
+                return lib.CallNextHookEx(hhk, nCode, wParam, info.getPointer());
+            }
+        };
+        hhk = lib.SetWindowsHookEx(User32.WH_KEYBOARD_LL, keyboardHook, hMod, 0);
+        System.out.println("Keyboard hook installed, type anywhere, 'q' to quit");
+        new Thread() {
+            public void run() {
+                while (!quit) {
+                    try { Thread.sleep(10); } catch(Exception e) { }
+                }
+                System.err.println("unhook and exit");
+                lib.UnhookWindowsHookEx(hhk);
+                System.exit(0);
+            }
+        }.start();
+
+        // This bit never returns from GetMessage
+        int result;
+        MSG msg = new MSG();
+        while ((result = lib.GetMessage(msg, null, 0, 0)) != 0) {
+            if (result == -1) {
+                System.err.println("error in get message");
+                break;
+            }
+            else {
+                System.err.println("got message");
+                lib.TranslateMessage(msg);
+                lib.DispatchMessage(msg);
+            }
+        }
+        lib.UnhookWindowsHookEx(hhk);
+    }
+}

jnalib/contrib/x11/README

@@ -0,0 +1,66 @@
+Copyright (c) 2008 Stefan Endrullis, All Rights Reserved
+
+Disclaimer:
+===========
+This code is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.  
+
+
+Description:
+============
+
+The intension of this contribution is to provide an object oriented
+interface to X11. It doesn't not cover all available X11 functions, but
+it supports major functions to manage the X11 desktop, windows and keys.
+
+If you want to help to extend this API, you're welcome!
+
+
+Project structure:
+==================
+
+The project has been divided into two parts:
+- jnacontrib.x11.api
+- jnacontrib.c11.demos
+
+The first part contains the API files. The main class is the class X.
+The second part contains some demos showing you how you can use the API.
+
+X.java:
+-------
+Object oriented interface to X11. It mainly contains methods related
+to window management but also some functions for keys.
+Static methods for getting information about Win32 accounts (users
+and groups).
+- list all domain users
+- list all domain groups
+- list all local or domain groups where a user belongs to
+- get account by SID
+- get SID of account
+- get domain controller name
+- get domain name
+
+X11KeySymDef.java
+-----------------
+Class X11KeySymDef is a Java translation of keysymdef.h and contains all
+KeySym definitions of the X server.
+
+XDesktopDemo.java
+-----------------
+Class XDesktopDemo is a small demonstration of the window management
+capabilities of X. It's a GUI which allows you to move windows to other
+desktops, switch to other desktops, hide all windows etc.
+
+XTestDemo.java
+--------------
+This class demonstrates how you can use the "Test extension" of the X
+server, which allows you to simulate key and mouse events. Be careful
+when running the program, because it simulates keystrokes and "types"
+the words "hello world" in the active window.

jnalib/contrib/x11/build.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jnacontrib.x11" default="jar" basedir=".">
+    <description>Builds, tests, and runs the project jnacontrib.x11.</description>
+    <!-- Locations -->
+    <property name="src"                location="src"/>
+    <property name="build"              location="build"/>
+    <property name="jna-src"            location="../../src"/>
+    <property name="jna-dist"           location="../../dist"/>
+
+    <property name="buildClasses"       location="${build}/classes"/>
+    <property name="buildJar"           location="${build}/jnacontrib-x11.jar"/>
+
+    <path id="classpath">
+        <fileset dir="../../dist">
+            <include name="jna.jar"/>
+        </fileset>
+    </path>
+
+    <!-- Run XDesktopDemo. -->
+    <target name="runXDesktopDemo" depends="compile">
+        <java classname="jnacontrib.x11.demos.XDesktopDemo" fork="true">
+            <classpath>
+                <pathelement location="${buildClasses}" />
+                <path refid="classpath"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- Run XTestDemo. -->
+    <target name="runXTestDemo" depends="compile">
+        <java classname="jnacontrib.x11.demos.XTestDemo" fork="true">
+            <classpath>
+                <pathelement location="${buildClasses}" />
+                <path refid="classpath"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- Delete class and jar files. -->
+    <target name="clean">
+        <delete dir="${buildClasses}"/>
+        <delete file="${buildJar}"/>
+        <delete dir="${build}"/>
+    </target>
+
+    <!-- Compile all classes. -->
+    <target name="compile">
+        <mkdir dir="${buildClasses}"/>
+
+        <!-- Compile the project. -->
+        <javac srcdir="${src}" destdir="${buildClasses}" target="1.5" source="1.5" encoding="UTF-8" debug="on">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+            <src>
+                <dirset dir="${src}"/>
+                <dirset dir="${jna-src}/com/sun/jna/examples/unix"/>
+            </src>
+        </javac>
+
+        <!-- Copy all non-java files to classes. -->
+        <copy todir="${buildClasses}">
+            <fileset dir="src">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
+        <jar jarfile="${buildJar}" basedir="${buildClasses}">
+            <manifest>
+                <attribute name="Main-Class" value="jnacontrib.x11.demos.XDesktopDemo"/>
+                <attribute name="Class-Path" value="${jna-dist}/jna.jar"/>
+            </manifest>
+        </jar>
+    </target>
+</project>

jnalib/contrib/x11/src/jnacontrib/x11/demos/XDesktopDemo.java

@@ -0,0 +1,365 @@
+/* Copyright (c) 2008 Stefan Endrullis, All Rights Reserved
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * <p/>
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ */
+package jnacontrib.x11.demos;
+
+import jnacontrib.x11.api.X;
+
+import javax.swing.*;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+
+/**
+ * Demonstrates some possibilities on your X Window System.
+ *
+ * @author Stefan Endrullis
+ */
+public class XDesktopDemo extends JFrame {
+    public static void main(String[] args) throws X.X11Exception {
+        new XDesktopDemo();
+    }
+
+    private X.Display display = new X.Display();
+    private JList desktopList;
+    private JTable windowTable;
+    private JButton refreshButton;
+    private JButton moveWindowToDesktopButton;
+    private JButton goToDesktopButton;
+    private JButton moveWindowAndGoToDesktopButton;
+    private JButton closeWindowButton;
+    private JButton goToWindowButton;
+    private JButton showDesktop;
+    
+    public XDesktopDemo() throws X.X11Exception {
+        super("XDesktopDemo");
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        initGui();
+
+        refreshDesktopsAndWindows();
+
+        pack();
+        addListeners();
+        setVisible(true);
+
+        printWmInfo();
+    }
+
+    private void printWmInfo() throws X.X11Exception {
+        X.Window wm = display.getWindowManagerInfo();
+        System.out.println("wm.getTitle() = " + wm.getTitle());
+        System.out.println("wm.getWindowClass() = " + wm.getWindowClass());
+        System.out.println("wm.getPID() = " + wm.getPID());
+    }
+
+    private void addListeners() {
+        refreshButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                try {
+                    refreshDesktopsAndWindows();
+                } catch (X.X11Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        goToDesktopButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                int desktopNr = desktopList.getSelectedIndex();
+                if (desktopNr >= 0) {
+                    try {
+                        display.switchDesktop(desktopNr);
+                        display.flush();
+                    } catch (X.X11Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+        goToWindowButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                X.Window window = getSelectedWindow();
+                try {
+                    window.activate();
+                    display.flush();
+                } catch (X.X11Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        showDesktop.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                try {
+                    display.showingDesktop(true);
+                    display.flush();
+                } catch (X.X11Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        moveWindowToDesktopButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                X.Window window = getSelectedWindow();
+                try {
+                    window.moveToDesktop(desktopList.getSelectedIndex());
+                    display.flush();
+                } catch (X.X11Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        moveWindowAndGoToDesktopButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                X.Window window = getSelectedWindow();
+                try {
+                    window.moveToDesktop(desktopList.getSelectedIndex());
+                    window.activate();
+                    display.flush();
+                } catch (X.X11Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        closeWindowButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent event) {
+                X.Window window = getSelectedWindow();
+                try {
+                    window.close();
+                    display.flush();
+                } catch (X.X11Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    private X.Window getSelectedWindow() {
+        WindowTableModel tableModel = (WindowTableModel) windowTable.getModel();
+        return tableModel.getWindow(windowTable.getSelectedRow());
+    }
+
+    private void refreshDesktopsAndWindows() throws X.X11Exception {
+        // update desktop list
+        X.Desktop[] desktops = display.getDesktops();
+        ArrayList list = new ArrayList(desktops.length);
+        for (int i = 0; i < desktops.length; i++) {
+            list.add(desktops[i].name);
+        }
+        desktopList.clearSelection();
+        desktopList.setModel(new SimpleListModel(list));
+
+        // select active desktop
+        int activeDesktop = display.getActiveDesktopNumber();
+        desktopList.setSelectedIndex(activeDesktop);
+
+        // update window list
+        int activeWindowId = display.getActiveWindow().getID();
+        int activeWindowNumber = -1;
+        X.Window[] windows = display.getWindows();
+        String[] head = new String[]{
+            "ID", "Desktop", "Title",
+            "X", "Y", "Width", "Height"
+        };
+        String[][] data = new String[windows.length][head.length];
+        for (int i = 0; i < windows.length; i++) {
+            X.Window window = windows[i];
+            X.Window.Geometry geo = window.getGeometry();
+            int windowId = window.getID();
+            data[i][0] = String.format("0x%08X", new Object[]{new Integer(windowId)});
+            data[i][1] = "" + window.getDesktop();
+            data[i][2] = window.getTitle();
+            data[i][3] = "" + geo.x;
+            data[i][4] = "" + geo.y;
+            data[i][5] = "" + geo.width;
+            data[i][6] = "" + geo.height;
+            if (windowId == activeWindowId) {
+                activeWindowNumber = i;
+            }
+        }
+        windowTable.setModel(new WindowTableModel(head, data, windows));
+        if (activeWindowNumber >= 0) {
+            windowTable.getSelectionModel().setSelectionInterval(activeWindowNumber, activeWindowNumber);
+        }
+    }
+
+    private void initGui() {
+        JPanel mainPanel = new JPanel();
+        mainPanel.setLayout(new GridBagLayout());
+        final JPanel panel1 = new JPanel();
+        panel1.setLayout(new GridBagLayout());
+        GridBagConstraints gbc;
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.weightx = 0.8;
+        gbc.weighty = 1.0;
+        gbc.fill = GridBagConstraints.BOTH;
+        mainPanel.add(panel1, gbc);
+        panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLoweredBevelBorder(), "Desktops"));
+        desktopList = new JList();
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.weightx = 1.0;
+        gbc.weighty = 1.0;
+        gbc.fill = GridBagConstraints.BOTH;
+        panel1.add(desktopList, gbc);
+        final JPanel panel2 = new JPanel();
+        panel2.setLayout(new GridBagLayout());
+        gbc = new GridBagConstraints();
+        gbc.gridx = 1;
+        gbc.gridy = 0;
+        gbc.weightx = 1.0;
+        gbc.weighty = 1.0;
+        gbc.fill = GridBagConstraints.BOTH;
+        mainPanel.add(panel2, gbc);
+        panel2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLoweredBevelBorder(), "Windows"));
+        final JScrollPane scrollPane1 = new JScrollPane();
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.weightx = 1.0;
+        gbc.weighty = 1.0;
+        gbc.fill = GridBagConstraints.BOTH;
+        panel2.add(scrollPane1, gbc);
+        windowTable = new JTable();
+        windowTable.setEnabled(true);
+        scrollPane1.setViewportView(windowTable);
+        final JPanel panel3 = new JPanel();
+        panel3.setLayout(new GridBagLayout());
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 1;
+        gbc.gridwidth = 2;
+        gbc.weightx = 1.0;
+        gbc.weighty = 1.0;
+        gbc.fill = GridBagConstraints.BOTH;
+        mainPanel.add(panel3, gbc);
+        panel3.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLoweredBevelBorder(), "Actions"));
+        goToDesktopButton = new JButton();
+        goToDesktopButton.setText("go to desktop");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 1;
+        gbc.gridwidth = 1;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(goToDesktopButton, gbc);
+        refreshButton = new JButton();
+        refreshButton.setText("refresh");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(refreshButton, gbc);
+        goToWindowButton = new JButton();
+        goToWindowButton.setText("go to window");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 2;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(goToWindowButton, gbc);
+        moveWindowAndGoToDesktopButton = new JButton();
+        moveWindowAndGoToDesktopButton.setText("move window and go to desktop");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 1;
+        gbc.gridy = 2;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(moveWindowAndGoToDesktopButton, gbc);
+        closeWindowButton = new JButton();
+        closeWindowButton.setText("close window");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 0;
+        gbc.gridy = 3;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(closeWindowButton, gbc);
+        moveWindowToDesktopButton = new JButton();
+        moveWindowToDesktopButton.setText("move window to desktop");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 1;
+        gbc.gridy = 1;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(moveWindowToDesktopButton, gbc);
+        showDesktop = new JButton();
+        showDesktop.setText("show desktop");
+        gbc = new GridBagConstraints();
+        gbc.gridx = 1;
+        gbc.gridy = 0;
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+        panel3.add(showDesktop, gbc);
+
+        // more attributes
+        desktopList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        windowTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+        setContentPane(mainPanel);
+    }
+
+    /**
+     * A simple ListModel managing a list of objects.
+     */
+    public static class SimpleListModel extends AbstractListModel {
+        private ArrayList list;
+
+        public SimpleListModel(ArrayList list) {
+            this.list = list;
+        }
+
+        public int getSize() { return list.size(); }
+        public Object getElementAt(int i) { return list.get(i); }
+    }
+
+    /**
+     * A simple TableModel managing an array of Strings.
+     */
+    public static class WindowTableModel implements TableModel {
+        private String[] head;
+        private String[][] data;
+        private X.Window[] windows;
+
+        public WindowTableModel(String[] head, String[][] data, X.Window[] windows) {
+            this.head = head;
+            this.data = data;
+            this.windows = windows;
+        }
+
+        public int getRowCount() {
+            return data.length;
+        }
+        public int getColumnCount() {
+            return head.length;
+        }
+        public String getColumnName(int columnIndex) {
+            return head[columnIndex];
+        }
+        public Class getColumnClass(int columnIndex) {
+            return String.class;
+        }
+        public boolean isCellEditable(int rowIndex, int columnIndex) {
+            return false;
+        }
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            return data[rowIndex][columnIndex];
+        }
+        public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
+        }
+        public void addTableModelListener(TableModelListener l) {
+        }
+        public void removeTableModelListener(TableModelListener l) {
+        }
+
+        public X.Window getWindow(int rowIndex) {
+            return windows[rowIndex];
+        }
+    }
+}

jnalib/contrib/x11/src/jnacontrib/x11/demos/XTestDemo.java

@@ -0,0 +1,87 @@
+/* Copyright (c) 2008 Stefan Endrullis, All Rights Reserved
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * <p/>
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ */
+package jnacontrib.x11.demos;
+
+import jnacontrib.x11.api.X;
+import com.sun.jna.examples.unix.X11;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.NativeLong;
+
+/**
+ * Demonstration of the X extension XTest.
+ */
+public class XTestDemo {
+    private static final long DELAY = 20;
+
+    public static void main(String[] args) throws InterruptedException {
+        new XTestDemo();
+    }
+
+    private X.Display display = new X.Display();
+
+    public XTestDemo() throws InterruptedException {
+        IntByReference event_basep = new IntByReference();
+        IntByReference error_basep = new IntByReference();
+        IntByReference majorp = new IntByReference();
+        IntByReference minorp = new IntByReference();
+
+        if (X11.XTest.INSTANCE.XTestQueryExtension(
+                display.getX11Display(),
+                event_basep,
+                error_basep,
+                majorp,
+                minorp)) {
+
+            System.out.println("event_basep.getValue() = " + event_basep.getValue());
+            System.out.println("error_basep.getValue() = " + error_basep.getValue());
+            System.out.println("majorp.getValue() = " + majorp.getValue());
+            System.out.println("minorp.getValue() = " + minorp.getValue());
+        }
+
+        Thread.sleep(1000);
+
+        type("hello world");
+//        typeKey("Return");
+//        type("it works!");
+
+        Thread.sleep(1000);
+    }
+
+    private void type(String text) {
+        for (int i = 0; i < text.length(); i++) {
+            char myChar =  text.charAt(i);
+
+            // get keycode from character
+            switch (myChar) {
+                case ' ': typeKey(65); break;
+                default: typeKey("" + myChar);
+            }
+        }
+    }
+
+    private void typeKey(String keyName) {
+        X11.KeySym keysym = X11.INSTANCE.XStringToKeysym(keyName);
+        typeKey(X11.INSTANCE.XKeysymToKeycode(display.getX11Display(), keysym));
+    }
+
+    private void typeKey(int keyCode) {
+        if (keyCode == -1) return;
+
+        // press key
+        X11.XTest.INSTANCE.XTestFakeKeyEvent(display.getX11Display(), keyCode, true, new NativeLong(DELAY));
+        X11.INSTANCE.XFlush(display.getX11Display());
+        // release key
+        X11.XTest.INSTANCE.XTestFakeKeyEvent(display.getX11Display(), keyCode, false, new NativeLong(DELAY));
+        X11.INSTANCE.XFlush(display.getX11Display());
+    }
+}

jnalib/lib/clover.license

@@ -0,0 +1,5 @@
+qRNQnmsMoNMDGXUenVfHVPuFPrNBGUUdBvfgtIdgVQWSbAa
+mj2KW7Oo9ud83ZbEKfK2xx922L04T>gYjDdLjGld4Wa6MPW
+NrqPtxROppqOmmqROMPSTnMmRqNOMnMnoPVSXswPsVXQwXV
+SPVVUtUNQmnmqmUUnopmqsvommmmmUUnopmqsvommmmmUUg
+kXkabskgXsXkkbqUUnmm

jnalib/native/Makefile

@@ -0,0 +1,275 @@
+#
+# Makefile for JNA native bits
+# Copyright (c) 2007 Timothy Wall All Rights Reserved
+#
+# You may need to run 'ant javah' at the root before performing a build from 
+# this directory.
+#
+# To build with debug information, use 'make DEBUG=true'
+#
+# Supported platforms (built and tested):
+#
+#   Windows 2000/XP/2003/Vista (x86)
+#   Darwin/OS X (i386/x86_64/ppc)
+#   Linux (i386/amd64) 
+#   Solaris (i386/amd64/sparc/sparcv9)
+#   FreeBSD (i386/amd64)
+#
+
+# Systems which support POSIX signals may be able to support VM crash
+# protection simply by defining HAVE_PROTECTION.  This has been enabled
+# only for those platforms on which it has been tested successfully.
+
+OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \
+                        -e 's/SunOS.*/solaris/g' \
+                        -e 's/FreeBSD.*/freebsd/g' \
+                        -e 's/OpenBSD.*/openbsd/g' \
+                        -e 's/Darwin.*/darwin/g' \
+                        -e 's/Linux.*/linux/g')
+
+VERSION=3.2.0 # auto-generated by ant
+CHECKSUM=c870290c36c8d3fdf85db7c782febc3f # auto-generated by ant
+
+JAVA_INCLUDES=-I"$(JAVA_HOME)/include" \
+              -I"$(JAVA_HOME)/include/$(OS)"
+
+BUILD=../build/native
+JAVAH=$(BUILD)
+INSTALLDIR=../build/$(OS)
+JNIDISPATCH_OBJS=$(BUILD)/dispatch.o $(BUILD)/callback.o $(EXTRAOBJS)
+RSRC=$(BUILD)/rsrc.o
+ifneq ($(DYNAMIC_LIBFFI),true)
+FFI_SRC=$(shell pwd)/libffi
+FFI_BUILD=$(BUILD)/libffi
+FFI_LIB=$(FFI_BUILD)/.libs/libffi$(ARSFX)
+FFI_ENV=CC="$(CC)" CFLAGS="$(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)"
+FFI_CONFIG=--enable-static --disable-shared --with-pic=yes
+endif
+LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch$(JNISFX)
+TESTLIB=$(BUILD)/$(LIBPFX)testlib$(LIBSFX)
+TESTLIB2=$(BUILD)/$(LIBPFX)testlib2$(LIBSFX)
+
+# Reasonable defaults based on GCC
+LIBPFX=lib
+LIBSFX=.so
+ARSFX=.a
+JNISFX=$(LIBSFX)
+CC=gcc
+LD=gcc
+LIBS=
+# Default to Sun recommendations for JNI compilation
+COPT=-O2 -fno-omit-frame-pointer -fno-strict-aliasing 
+CASM=-S
+ifeq ($(DEBUG),true)
+CDEBUG=-g
+endif
+CFLAGS_EXTRA=
+COUT=-o $@
+CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
+CDEFINES=-D_REENTRANT
+PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
+CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
+       -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
+LDFLAGS=-o $@ -shared 
+ifeq ($(DYNAMIC_LIBFFI),true)
+CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
+LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
+else
+# -static-libgcc avoids gcc library incompatibilities across linux systems
+LDFLAGS += -static-libgcc
+endif
+# Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
+# See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
+#LIBS=-L"$(LIBDIR)" -ljawt 
+STRIP=strip -x
+# end defaults
+
+ifeq ($(OS),win32)
+ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+CDEFINES=-DHAVE_PROTECTION -DPSAPI_VERSION=1
+LIBS=-lpsapi
+WINDRES=windres
+EXTRAOBJS=$(RSRC)
+STRIP=@echo
+LIBPFX=
+LIBSFX=.dll
+
+ifeq ($(CC),gcc)
+CC += -mno-cygwin
+LD += -mno-cygwin -Wl,--add-stdcall-alias
+endif
+
+ifeq ($(ARCH),amd64)
+
+WINDRES=/usr/local/mingw64-cross/bin/x86_64-pc-mingw32-windres
+
+# Uncomment to enable MINGW64 cross compiler
+# Should build properly as of 090601, but lacks SEH, so MSVC build is preferred
+#MINGW = x86_64-pc-mingw32-gcc
+ifneq ($(MINGW),)
+CC = $(MINGW) -m64 -mno-cygwin
+LD = $(CC)
+LDFLAGS=-o $@ -shared
+LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
+FFI_CONFIG += --host=x86_64-pc-mingw32
+else
+# MSVC (wrapper scripts)
+CC=$(FFI_SRC)/../cc.sh -m64
+LD=$(FFI_SRC)/../ld.sh -m64
+COPT=
+LIBS=psapi.lib
+ARSFX=.lib
+FFI_CONFIG += --host=x86_64-pc-mingw32 && rm -f include/ffitarget.h && cp $(FFI_SRC)/include/*.h $(FFI_SRC)/src/x86/ffitarget.h include
+FFI_ENV += LD="$(LD)" CPP=cpp
+endif
+endif
+endif
+
+ifeq ($(OS),linux)
+ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+PCFLAGS+=-fPIC
+CDEFINES+=-DHAVE_PROTECTION
+LDFLAGS+=-Wl,-soname,$@
+endif
+
+ifeq ($(OS),freebsd)
+ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+PCFLAGS+=-fPIC
+CINCLUDES+=-I/usr/X11R6/include
+LDFLAGS=-o $@ -shared 
+CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+endif
+
+ifeq ($(OS),openbsd)
+ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+PCFLAGS+=-fPIC
+CINCLUDES+=-I/usr/X11R6/include
+LDFLAGS=-o $@ -shared 
+CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+endif
+
+ifeq ($(OS),solaris)
+ifeq ($(ARCH),)
+ARCH=$(shell uname -p)
+endif
+PCFLAGS+=-fPIC
+CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
+ifeq ($(ARCH), sparcv9)
+  # alter CC instead of PCFLAGS, since we need to pass it down to libffi 
+  # configure and some of the other settings in PCFLAGS might make the build 
+  # choke
+  CC += -m64  
+  LD += -m64 
+endif
+endif
+
+# Enable 64-bit builds if the arch demands it
+ifeq ($(CC),gcc)
+ifeq ($(ARCH),amd64)
+  CC += -m64
+  LD += -m64
+endif
+endif
+
+ifeq ($(OS),darwin)
+ARCH=$(shell arch)
+ifeq ($(ARCH),ppc)
+ALT_ARCHS=i386
+else
+ALT_ARCHS=ppc
+endif
+LIBSFX=.dylib
+JNISFX=.jnilib
+ifneq ($(SDKROOT),)
+SYSLIBROOT=-Wl,-syslibroot,$(SDKROOT)
+ISYSROOT=-isysroot $(SDKROOT)
+ARCHFLAGS=-arch ppc -arch i386
+ifneq ($(findstring 10.5,$(SDKROOT)),)
+ALT_ARCHS+=x86_64 
+ARCHFLAGS+=-arch x86_64
+endif
+endif
+PCFLAGS+=$(ISYSROOT) -x objective-c
+CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
+LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
+  -compatibility_version $(shell echo ${VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
+  -current_version $(VERSION) \
+  -mmacosx-version-min=10.3 \
+  -install_name ${@F} \
+  $(SYSLIBROOT)
+# JAWT linkage handled by -framework JavaVM
+LIBS=
+endif
+
+# Unfortunately, we have to use different libffi include files depending on 
+# the target, so we can't do a simple universal build on darwin.  Do 
+# separate builds, then merge the results.
+$(BUILD)/%.o : %.c dispatch.h $(FFI_LIB)
+	@mkdir -p $(BUILD)
+ifneq ($(SDKROOT),)
+	$(CC) -arch $(ARCH) $(CFLAGS) -c $< -o $@.$(ARCH)
+	for arch in $(ALT_ARCHS); do \
+	  $(CC) -arch $$arch -I$(BUILD)/libffi.$$arch/include $(CFLAGS) -c $< -o $@.$$arch; \
+	done
+	lipo -create -output $@ $@.*
+else
+	$(CC) $(CFLAGS) -c $< $(COUT)
+endif
+
+all: $(LIBRARY) $(TESTLIB) $(TESTLIB2)
+
+install:
+	mkdir $(INSTALLDIR)
+	cp $(LIBRARY) $(INSTALLDIR)
+
+$(RSRC): $(BUILD)/jnidispatch.rc
+	$(WINDRES) -i $< -o $@ \
+          || (echo > $@.c && $(CC) $(CFLAGS) -c $@.c $(COUT))
+
+$(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB) 
+	$(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS)
+
+$(TESTLIB): $(BUILD)/testlib.o 
+	$(LD) $(LDFLAGS) $<
+
+ifeq ($(ARSFX),.lib)
+TESTDEP=$(TESTLIB:.dll=.lib)
+else
+TESTDEP=$(TESTLIB)
+endif
+$(TESTLIB2): $(BUILD)/testlib2.o 
+	$(LD) $(LDFLAGS) $< $(TESTDEP)
+
+ifneq ($(DYNAMIC_LIBFFI),true)
+$(FFI_LIB):
+	@mkdir -p $(FFI_BUILD)
+	@if [ ! -f $(FFI_BUILD)/Makefile ]; then \
+	  echo "Configuring libffi ($(ARCH))"; \
+	  (cd $(FFI_BUILD) \
+	    && $(FFI_ENV) $(FFI_SRC)/configure $(FFI_CONFIG)); \
+	fi
+	$(MAKE) -C $(FFI_BUILD)
+ifneq ($(SDKROOT),)
+	@for arch in $(ALT_ARCHS); do \
+	  mkdir -p $(BUILD)/libffi.$$arch; \
+	  if [ ! -f $(BUILD)/libffi.$$arch/Makefile ]; then \
+	    echo "Configuring libffi ($$arch)"; \
+	    (cd $(BUILD)/libffi.$$arch \
+	     && CC="$(CC)" CFLAGS="-arch $$arch $(ISYSROOT) $(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" \
+                LDFLAGS="-arch $$arch" \
+               $(FFI_SRC)/configure $(FFI_CONFIG) --host=$$arch-apple-darwin --disable-dependency-tracking); \
+	  fi; \
+	  $(MAKE) -C $(BUILD)/libffi.$$arch; \
+	done
+	/usr/bin/libtool -static -o $@.tmp $(FFI_BUILD)/.libs/${@F} $(BUILD)/libffi.*/.libs/${@F}
+	mv $@.tmp $@
+endif
+endif
+
+clean:
+	$(RM) -rf $(BUILD) 
+
+version:
+	@echo version=$(VERSION)
+
+#EOF

jnalib/native/README.libffi

@@ -0,0 +1,19 @@
+--- libffi notes ---
+libffi has been copied from GCC (originally 4.2.0, since updated to match the
+trunk). 
+libffi last synched: 071126 by twall
+
+Files required for standalone configure:
+config-ml.in (from root)
+config.guess (from root)
+config.sub (from root)
+depcomp (from root)
+install-sh (from root) 
+ltcf-c.sh (from ???)
+ltconfig (from ???)
+ltmain.sh (from root)
+missing (from root)
+
+Wayne Meissner did the original work to integrate libffi into JNA and to get
+it working on half a dozen different platforms.
+

jnalib/native/callback.c

@@ -0,0 +1,439 @@
+/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
+ * Copyright (c) 2007 Wayne Meissner, All Rights Reserved
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * <p/>
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.  
+ */
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <jni.h>
+
+#if defined(_WIN32)
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+#else
+#  include <sys/types.h>
+#  include <sys/param.h>
+#endif
+#include "dispatch.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static void callback_dispatch(ffi_cif*, void*, void**, void*);
+
+static jclass classObject;
+
+callback*
+create_callback(JNIEnv* env, jobject obj, jobject method,
+                jobjectArray param_types, jclass return_type,
+                callconv_t calling_convention, jboolean direct) {
+  callback* cb;
+  ffi_abi abi = FFI_DEFAULT_ABI;
+  ffi_abi java_abi = FFI_DEFAULT_ABI;
+  ffi_type* ffi_rtype;
+  ffi_status status;
+  jsize argc;
+  JavaVM* vm;
+  int rtype;
+  char msg[64];
+  int i;
+  int cvt = 0;
+  const char* throw_type = NULL;
+  const char* throw_msg = NULL;
+
+  if ((*env)->GetJavaVM(env, &vm) != JNI_OK) {
+    throwByName(env, EUnsatisfiedLink, "Can't get Java VM");
+    return NULL;
+  }
+  argc = (*env)->GetArrayLength(env, param_types);
+
+  cb = (callback *)malloc(sizeof(callback));
+  cb->closure = ffi_closure_alloc(sizeof(ffi_closure), &cb->x_closure);
+  cb->object = (*env)->NewWeakGlobalRef(env, obj);
+  cb->methodID = (*env)->FromReflectedMethod(env, method);
+  cb->vm = vm;
+  cb->arg_types = (ffi_type**)malloc(sizeof(ffi_type*) * argc);
+  cb->java_arg_types = (ffi_type**)malloc(sizeof(ffi_type*) * (argc + 3));
+  cb->arg_jtypes = (char*)malloc(sizeof(char) * argc);
+  cb->flags = (int *)malloc(sizeof(int) * argc);
+  cb->rflag = CVT_DEFAULT;
+  cb->arg_classes = (jobject*)malloc(sizeof(jobject) * argc);
+ 
+  cb->direct = direct;
+  cb->java_arg_types[0] = cb->java_arg_types[1] = cb->java_arg_types[2] = &ffi_type_pointer;
+
+  for (i=0;i < argc;i++) {
+    int jtype;
+    jclass cls = (*env)->GetObjectArrayElement(env, param_types, i);
+    if ((cb->flags[i] = get_conversion_flag(env, cls)) != CVT_DEFAULT) {
+      cb->arg_classes[i] = (*env)->NewWeakGlobalRef(env, cls);
+      cvt = 1;
+    }
+
+    jtype = get_jtype(env, cls);
+    if (jtype == -1) {
+      snprintf(msg, sizeof(msg), "Unsupported argument at index %d", i);
+      throw_type = EIllegalArgument;
+      throw_msg = msg;
+      goto failure_cleanup;
+    }
+    cb->arg_jtypes[i] = (char)jtype;
+    cb->java_arg_types[i+3] = cb->arg_types[i] = get_ffi_type(env, cls, cb->arg_jtypes[i]);
+    if (cb->flags[i] == CVT_NATIVE_MAPPED
+        || cb->flags[i] == CVT_POINTER_TYPE
+        || cb->flags[i] == CVT_INTEGER_TYPE) {
+      jclass ncls;
+      ncls = getNativeType(env, cls);
+      jtype = get_jtype(env, ncls);
+      if (jtype == -1) {
+        snprintf(msg, sizeof(msg), "Unsupported NativeMapped argument native type at argument %d", i);
+        throw_type = EIllegalArgument;
+        throw_msg = msg;
+        goto failure_cleanup;
+      }
+      cb->arg_jtypes[i] = (char)jtype;
+      cb->java_arg_types[i+3] = &ffi_type_pointer;
+      cb->arg_types[i] = get_ffi_type(env, ncls, cb->arg_jtypes[i]);
+    }
+
+    if (cb->arg_types[i]->type == FFI_TYPE_FLOAT) {
+      // Java method is varargs, so promote floats to double
+      cb->java_arg_types[i+3] = &ffi_type_double;
+      cb->flags[i] = CVT_FLOAT;
+      cvt = 1;
+    }
+    else if (cb->java_arg_types[i+3]->type == FFI_TYPE_STRUCT) {
+      // All callback structure arguments are passed as a jobject
+      cb->java_arg_types[i+3] = &ffi_type_pointer;
+    }
+  }
+  if (!direct || !cvt) {
+    free(cb->flags);
+    cb->flags = NULL;
+    free(cb->arg_classes);
+    cb->arg_classes = NULL;
+  }
+  if (direct) {
+    cb->rflag = get_conversion_flag(env, return_type);
+    if (cb->rflag == CVT_NATIVE_MAPPED
+        || cb->rflag == CVT_INTEGER_TYPE
+        || cb->rflag == CVT_POINTER_TYPE) {
+      return_type = getNativeType(env, return_type);
+    }
+  }
+
+#if defined(_WIN32) && !defined(_WIN64)
+  if (calling_convention == CALLCONV_STDCALL) {
+    abi = FFI_STDCALL;
+  }
+  java_abi = FFI_STDCALL;
+#endif // _WIN32
+
+  rtype = get_jtype(env, return_type);
+  if (rtype == -1) {
+    throw_type = EIllegalArgument;
+    throw_msg = "Unsupported return type";
+    goto failure_cleanup;
+  }
+  ffi_rtype = get_ffi_rtype(env, return_type, (char)rtype);
+  if (!ffi_rtype) {
+    throw_type = EIllegalArgument;
+    throw_msg = "Error in return type";
+    goto failure_cleanup;
+  }
+  status = ffi_prep_cif(&cb->cif, abi, argc, ffi_rtype, cb->arg_types);
+  if (!ffi_error(env, "callback setup", status)) {
+    ffi_type* java_ffi_rtype = ffi_rtype;
+
+    if (cb->rflag == CVT_STRUCTURE_BYVAL
+        || cb->rflag == CVT_NATIVE_MAPPED
+        || cb->rflag == CVT_POINTER_TYPE
+        || cb->rflag == CVT_INTEGER_TYPE) {
+      // Java method returns a jobject, not a struct
+      java_ffi_rtype = &ffi_type_pointer;
+      rtype = '*';
+    }
+    switch(rtype) {
+    case 'V': cb->fptr = (*env)->CallVoidMethod; break;
+    case 'Z': cb->fptr = (*env)->CallBooleanMethod; break;
+    case 'B': cb->fptr = (*env)->CallByteMethod; break;
+    case 'S': cb->fptr = (*env)->CallShortMethod; break;
+    case 'C': cb->fptr = (*env)->CallCharMethod; break;
+    case 'I': cb->fptr = (*env)->CallIntMethod; break;
+    case 'J': cb->fptr = (*env)->CallLongMethod; break;
+    case 'F': cb->fptr = (*env)->CallFloatMethod; break;
+    case 'D': cb->fptr = (*env)->CallDoubleMethod; break;
+    default: cb->fptr = (*env)->CallObjectMethod; break;
+    }
+    status = ffi_prep_cif(&cb->java_cif, java_abi, argc+3, java_ffi_rtype, cb->java_arg_types);
+    if (!ffi_error(env, "callback setup (2)", status)) {
+      ffi_prep_closure_loc(cb->closure, &cb->cif, callback_dispatch, cb,
+                           cb->x_closure);
+      return cb;
+    }
+  }
+
+ failure_cleanup:
+  free_callback(env, cb);
+  if (throw_type) {
+    throwByName(env, throw_type, msg);
+  }
+
+  return NULL;
+}
+void 
+free_callback(JNIEnv* env, callback *cb) {
+  (*env)->DeleteWeakGlobalRef(env, cb->object);
+  ffi_closure_free(cb->closure);
+  free(cb->arg_types);
+  if (cb->arg_classes) {
+    unsigned i;
+    for (i=0;i < cb->cif.nargs;i++) {
+      (*env)->DeleteWeakGlobalRef(env, cb->arg_classes[i]);
+    }
+    free(cb->arg_classes);
+  }
+  free(cb->java_arg_types);
+  if (cb->flags)
+    free(cb->flags);
+  free(cb->arg_jtypes);
+  free(cb);
+}
+
+static int
+handle_exception(JNIEnv* env, jobject cb, jthrowable throwable) {
+#define HANDLER_TYPE "com/sun/jna/Callback$UncaughtExceptionHandler"
+#define HANDLER_SIG "Lcom/sun/jna/Callback$UncaughtExceptionHandler;"
+  jclass classHandler = (*env)->FindClass(env, HANDLER_TYPE);
+  if (classHandler) {
+    jclass classNative = (*env)->FindClass(env, "com/sun/jna/Native");
+    if (classNative) {
+      jfieldID fid = (*env)->GetStaticFieldID(env, classNative, "callbackExceptionHandler", HANDLER_SIG);
+      if (fid) {
+        jobject handler = (*env)->GetStaticObjectField(env, classNative, fid);
+        if (handler) {
+          jmethodID mid = (*env)->GetMethodID(env, classHandler, "uncaughtException", "(Lcom/sun/jna/Callback;Ljava/lang/Throwable;)V");
+          if (mid) {
+            if (!(*env)->IsSameObject(env, handler, NULL)) {
+              (*env)->CallVoidMethod(env, handler, mid, cb, throwable);
+            }
+            if ((*env)->ExceptionCheck(env) == 0) {
+              return 1;
+            }
+          }
+        }
+      }
+    }
+  }
+  (*env)->ExceptionDescribe(env);
+  (*env)->ExceptionClear(env);
+  return 0;
+}
+
+static void
+callback_invoke(JNIEnv* env, callback *cb, ffi_cif* cif, void *resp, void **cbargs) {
+  jobject self;
+  void *oldresp = resp;
+
+  self = (*env)->NewLocalRef(env, cb->object);
+  // Avoid calling back to a GC'd object
+  if ((*env)->IsSameObject(env, self, NULL)) {
+    fprintf(stderr, "JNA: callback object has been garbage collected\n");
+    if (cif->rtype->type != FFI_TYPE_VOID)
+      memset(resp, 0, cif->rtype->size); 
+  }
+  else if (cb->direct) {
+    unsigned int i;
+    void **args = alloca((cif->nargs + 3) * sizeof(void *));
+    args[0] = (void *)&env;
+    args[1] = &self;
+    args[2] = &cb->methodID;
+    memcpy(&args[3], cbargs, cif->nargs * sizeof(void *));
+
+    if (cb->flags) {
+      for (i=0;i < cif->nargs;i++) {
+        switch(cb->flags[i]) {
+        case CVT_INTEGER_TYPE:
+        case CVT_POINTER_TYPE:
+        case CVT_NATIVE_MAPPED:
+          *((void **)args[i+3]) = fromNative(env, cb->arg_classes[i], cif->arg_types[i], args[i+3], JNI_FALSE);
+          break;
+        case CVT_POINTER:
+          *((void **)args[i+3]) = newJavaPointer(env, *(void **)args[i+3]);
+          break;
+        case CVT_STRING:
+          *((void **)args[i+3]) = newJavaString(env, *(void **)args[i+3], JNI_FALSE);
+          break;
+        case CVT_WSTRING:
+          *((void **)args[i+3]) = newJavaWString(env, *(void **)args[i+3]);
+          break;
+        case CVT_STRUCTURE:
+          *((void **)args[i+3]) = newJavaStructure(env, *(void **)args[i+3], cb->arg_classes[i], JNI_FALSE);
+          break;
+        case CVT_STRUCTURE_BYVAL:
+          { 
+            void *ptr = args[i+3];
+            args[i+3] = alloca(sizeof(void *));
+            *((void **)args[i+3]) = newJavaStructure(env, ptr, cb->arg_classes[i], JNI_TRUE);
+          }
+          break;
+        case CVT_CALLBACK:
+          *((void **)args[i+3]) = newJavaCallback(env, *(void **)args[i+3], cb->arg_classes[i]);
+          break;
+        case CVT_FLOAT:
+          {
+            void *ptr = alloca(sizeof(double));
+            *(double *)ptr = *(float*)args[i+3];
+            args[i+3] = ptr;
+          }
+          break;
+        }
+      }
+    }
+
+    if (cb->rflag == CVT_STRUCTURE_BYVAL) {
+      resp = alloca(sizeof(jobject));
+    }
+    else if (cb->cif.rtype->size > cif->rtype->size) {
+      resp = alloca(cb->cif.rtype->size);
+    }
+    ffi_call(&cb->java_cif, FFI_FN(cb->fptr), resp, args);
+    if ((*env)->ExceptionCheck(env)) {
+      jthrowable throwable = (*env)->ExceptionOccurred(env);
+      (*env)->ExceptionClear(env);
+      if (!handle_exception(env, self, throwable)) {
+        fprintf(stderr, "JNA: error handling callback exception, continuing\n");
+      }
+      if (cif->rtype->type != FFI_TYPE_VOID)
+        memset(oldresp, 0, cif->rtype->size);
+    }
+    else switch(cb->rflag) {
+    case CVT_INTEGER_TYPE:
+      if (cb->cif.rtype->size > sizeof(ffi_arg)) {
+        *(jlong *)oldresp = getIntegerTypeValue(env, *(void **)resp);
+      }
+      else {
+        *(ffi_arg *)oldresp = (ffi_arg)getIntegerTypeValue(env, *(void **)resp);
+      }
+      break;
+    case CVT_POINTER_TYPE:
+      *(void **)resp = getPointerTypeAddress(env, *(void **)resp);
+      break;
+    case CVT_NATIVE_MAPPED:
+      toNative(env, *(void **)resp, oldresp, cb->cif.rtype->size, JNI_TRUE);
+      break;
+    case CVT_POINTER:
+      *(void **)resp = getNativeAddress(env, *(void **)resp);
+      break;
+    case CVT_STRING: 
+      *(void **)resp = getNativeString(env, *(void **)resp, JNI_FALSE);
+      break;
+    case CVT_WSTRING: 
+      *(void **)resp = getNativeString(env, *(void **)resp, JNI_TRUE);
+      break;
+    case CVT_STRUCTURE:
+      writeStructure(env, *(void **)resp);
+      *(void **)resp = getStructureAddress(env, *(void **)resp);
+      break;
+    case CVT_STRUCTURE_BYVAL:
+      writeStructure(env, *(void **)resp);
+      memcpy(oldresp, getStructureAddress(env, *(void **)resp), cb->cif.rtype->size);
+      break;
+    case CVT_CALLBACK: 
+      *(void **)resp = getCallbackAddress(env, *(void **)resp);
+      break;
+    default: break;
+    }
+    if (cb->flags) {
+      for (i=0;i < cif->nargs;i++) {
+        if (cb->flags[i] == CVT_STRUCTURE) {
+          writeStructure(env, *(void **)args[i+3]);
+        }
+      }
+    }
+  }
+  else {
+    jobject result;
+    jobjectArray array =
+      (*env)->NewObjectArray(env, cif->nargs, classObject, NULL);
+    unsigned int i;
+
+    for (i=0;i < cif->nargs;i++) {
+      jobject arg = new_object(env, cb->arg_jtypes[i], cbargs[i], JNI_FALSE);
+      (*env)->SetObjectArrayElement(env, array, i, arg);
+    }
+    result = (*env)->CallObjectMethod(env, self, cb->methodID, array);
+    if ((*env)->ExceptionCheck(env)) {
+      jthrowable throwable = (*env)->ExceptionOccurred(env);
+      (*env)->ExceptionClear(env);
+      if (!handle_exception(env, self, throwable)) {
+        fprintf(stderr, "JNA: error handling callback exception, continuing\n");
+      }
+      if (cif->rtype->type != FFI_TYPE_VOID)
+        memset(resp, 0, cif->rtype->size);
+    }
+    else {
+      extract_value(env, result, resp, cif->rtype->size, JNI_TRUE);
+    }
+  }
+}
+
+static void
+callback_dispatch(ffi_cif* cif, void* resp, void** cbargs, void* user_data) {
+  JavaVM* jvm = ((callback *)user_data)->vm;
+  JNIEnv* env;
+  int attached;
+  
+  attached = (*jvm)->GetEnv(jvm, (void *)&env, JNI_VERSION_1_4) == JNI_OK;
+  if (!attached) {
+    if ((*jvm)->AttachCurrentThread(jvm, (void *)&env, NULL) != JNI_OK) {
+      fprintf(stderr, "JNA: Can't attach to current thread\n");
+      return;
+    }
+  }
+  
+  // Give the callback its own local frame to ensure all local references
+  // are properly disposed
+  if ((*env)->PushLocalFrame(env, 16) < 0) {
+    fprintf(stderr, "JNA: Out of memory: Can't allocate local frame");
+  }
+  else {
+    callback_invoke(env, (callback *)user_data, cif, resp, cbargs);
+    (*env)->PopLocalFrame(env, NULL);
+  }
+  
+  if (!attached) {
+    (*jvm)->DetachCurrentThread(jvm);
+  }
+}
+
+const char* 
+jnidispatch_callback_init(JNIEnv* env) {
+
+  if (!LOAD_CREF(env, Object, "java/lang/Object")) return "java.lang.Object";
+
+  return NULL;
+}
+  
+void
+jnidispatch_callback_dispose(JNIEnv* env) {
+  if (classObject) {
+    (*env)->DeleteWeakGlobalRef(env, classObject);
+    classObject = NULL;
+  }
+}
+
+#ifdef __cplusplus
+}
+#endif

jnalib/native/cc.sh

@@ -0,0 +1,147 @@
+#!/bin/sh
+#
+# GCC-compatible wrapper for cl.exe
+#
+MSVC="/c/Program Files (x86)/Microsoft Visual Studio 9.0/vc/bin"
+nowarn="/wd4127 /wd4820 /wd4706 /wd4100 /wd4255 /wd4668"
+args="/nologo /EHac /W3 /LD $nowarn" # /WX
+# FIXME is this equivalent to --static-libgcc? links to msvcrt.lib
+# I've forgotten why it was originally added
+# /MD causes link problems
+#md=/MD
+cl="$MSVC/cl"
+ml="$MSVC/ml"
+output=
+while [ $# -gt 0 ]
+do
+  case $1
+  in
+    -fexceptions)
+      shift 1
+    ;;
+    -fno-omit-frame-pointer)
+      # TODO: does this have an equivalent?
+      shift 1
+    ;;
+    -fno-strict-aliasing)
+      # TODO: does this have an equivalent?
+      shift 1
+    ;;
+    -mno-cygwin) 
+      shift 1
+    ;;
+    -m32)
+      cl="$MSVC/cl"
+      ml="$MSVC/ml"
+      shift 1
+    ;;
+    -m64)
+      cl="$MSVC/x86_amd64/cl"
+      ml="$MSVC/x86_amd64/ml64"
+      shift 1
+    ;;
+    -O*)
+      args="$args $i"
+      shift 1
+    ;;
+    -g)
+      # using /RTC1 instead of /GZ
+      args="$args /Od /D_DEBUG /RTC1 /Zi"
+      md=/MDd
+      shift 1
+    ;;
+    -c)
+      args="$args /c"
+      args="$(echo $args | sed 's%/Fe%/Fo%g')"
+      single="/c"
+      shift 1
+    ;;
+    -D*=*)
+      name="$(echo $1|sed 's/-D\([^=][^=]*\)=.*/\1/g')"
+      value="$(echo $1|sed 's/-D[^=][^=]*=//g')"
+      args="$args -D${name}='$value'"
+      defines="$defines -D${name}='$value'"
+      shift 1
+    ;;
+    -D*)
+      args="$args $1"
+      defines="$defines $1"
+      shift 1
+    ;;
+    -I)
+      args="$args /I\"$2\""
+      includes="$includes /I\"$2\""
+      shift 2
+    ;;
+    -I*)
+      args="$args /I\"$(echo $1|sed -e 's/-I//g')\""
+      includes="$includes /I\"$(echo $1|sed -e 's/-I//g')\""
+      shift 1
+    ;;
+    -W|-Wextra)
+      # TODO map extra warnings
+      shift 1
+    ;;
+    -Wall)
+      args="$args /Wall"
+      shift 1
+    ;;
+    -Werror)
+      args="$args /WX"
+      shift 1
+    ;;
+    -W*)
+      # TODO map specific warnings
+      shift 1
+    ;;
+    -S)
+      args="$args /FAs"
+      shift 1
+    ;;
+    -o)
+      outdir="$(dirname $2)"
+      base="$(basename $2|sed 's/\.[^.]*//g')"
+      if [ -n "$single" ]; then 
+        output="/Fo$2"
+      else
+        output="/Fe$2"
+      fi
+      if [ -n "$assembly" ]; then
+        args="$args $output"
+      else
+        args="$args $output /Fd$outdir/$base /Fp$outdir/$base /Fa$outdir/$base"
+      fi
+      shift 2
+    ;;
+    *.S)
+      src="$(echo $1|sed -e 's/.S$/.asm/g' -e 's%\\%/%g')"
+      echo "$cl /EP $includes $defines $1 > $src"
+      "$cl" /nologo /EP $includes $defines $1 > $src || exit $?
+      md=""
+      cl="$ml"
+      output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')"
+      args="/nologo $single $src $output"
+      assembly="true"
+      shift 1
+    ;;
+    *.c)
+      args="$args $(echo $1|sed -e 's%\\%/%g')"
+      shift 1
+    ;;
+    *)
+      echo "Unsupported argument '$1'"
+      exit 1
+    ;;
+  esac
+done
+
+args="$md $args"
+echo "$cl $args"
+eval "\"$cl\" $args"
+result=$?
+# @#!%@!# ml64 broken output
+if [ -n "$assembly" ]; then
+    mv $src $outdir
+    mv *.obj $outdir
+fi
+exit $result

jnalib/native/dispatch.h

@@ -0,0 +1,183 @@
+/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * <p/>
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.  
+ */
+#ifndef DISPATCH_H
+#define DISPATCH_H
+
+#include "ffi.h"
+#include "com_sun_jna_Function.h"
+#include "com_sun_jna_Native.h"
+#ifdef sun
+#  include <alloca.h>
+#endif
+#ifdef _WIN32
+#ifdef _MSC_VER
+#define alloca _alloca
+#pragma warning( disable : 4152 ) /* function/data conversion */
+#pragma warning( disable : 4054 ) /* cast function pointer to data pointer */
+#pragma warning( disable : 4055 ) /* cast data pointer to function pointer */
+#pragma warning( disable : 4204 ) /* structure initializer */
+#pragma warning( disable : 4710 ) /* swprintf not inlined */
+#else
+#include <malloc.h>
+#endif /* _MSC_VER */
+#endif /* _WIN32 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* These are the calling conventions an invocation can handle. */
+typedef enum _callconv {
+    CALLCONV_C = com_sun_jna_Function_C_CONVENTION,
+#ifdef _WIN32
+    CALLCONV_STDCALL = com_sun_jna_Function_ALT_CONVENTION,
+#endif
+} callconv_t;
+
+/* Maximum number of allowed arguments in libffi. */
+#define MAX_NARGS com_sun_jna_Function_MAX_NARGS
+
+enum {
+  CVT_DEFAULT = com_sun_jna_Native_CVT_DEFAULT,
+  CVT_POINTER = com_sun_jna_Native_CVT_POINTER,
+  CVT_STRING = com_sun_jna_Native_CVT_STRING,
+  CVT_STRUCTURE = com_sun_jna_Native_CVT_STRUCTURE,
+  CVT_STRUCTURE_BYVAL = com_sun_jna_Native_CVT_STRUCTURE_BYVAL,
+  CVT_BUFFER = com_sun_jna_Native_CVT_BUFFER,
+  CVT_ARRAY_BYTE = com_sun_jna_Native_CVT_ARRAY_BYTE,
+  CVT_ARRAY_SHORT = com_sun_jna_Native_CVT_ARRAY_SHORT,
+  CVT_ARRAY_CHAR = com_sun_jna_Native_CVT_ARRAY_CHAR,
+  CVT_ARRAY_INT = com_sun_jna_Native_CVT_ARRAY_INT,
+  CVT_ARRAY_LONG = com_sun_jna_Native_CVT_ARRAY_LONG,
+  CVT_ARRAY_FLOAT = com_sun_jna_Native_CVT_ARRAY_FLOAT,
+  CVT_ARRAY_DOUBLE = com_sun_jna_Native_CVT_ARRAY_DOUBLE,
+  CVT_ARRAY_BOOLEAN = com_sun_jna_Native_CVT_ARRAY_BOOLEAN,
+  CVT_BOOLEAN = com_sun_jna_Native_CVT_BOOLEAN,
+  CVT_CALLBACK = com_sun_jna_Native_CVT_CALLBACK,
+  CVT_FLOAT = com_sun_jna_Native_CVT_FLOAT,
+  CVT_NATIVE_MAPPED = com_sun_jna_Native_CVT_NATIVE_MAPPED,
+  CVT_WSTRING = com_sun_jna_Native_CVT_WSTRING,
+  CVT_INTEGER_TYPE = com_sun_jna_Native_CVT_INTEGER_TYPE,
+  CVT_POINTER_TYPE = com_sun_jna_Native_CVT_POINTER_TYPE,
+  CVT_TYPE_MAPPER = com_sun_jna_Native_CVT_TYPE_MAPPER,
+};
+
+typedef struct _callback {
+  // Location of this field must agree with CallbackReference.getTrampoline()
+  void* x_closure;
+  ffi_closure* closure;
+  ffi_cif cif;
+  ffi_cif java_cif;
+  ffi_type** arg_types;
+  ffi_type** java_arg_types;
+  jobject* arg_classes;
+  int* flags;
+  int rflag;
+  JavaVM* vm;
+  jobject object;
+  jmethodID methodID;
+  char* arg_jtypes;
+  jboolean direct;
+  void* fptr;
+} callback;
+
+#if defined(SOLARIS2) || defined(__GNUC__)
+#if defined(_WIN64)
+#define L2A(X) ((void *)(long long)(X))
+#define A2L(X) ((jlong)(long long)(X))
+#else
+#define L2A(X) ((void *)(unsigned long)(X))
+#define A2L(X) ((jlong)(unsigned long)(X))
+#endif
+#endif
+
+#if defined(_MSC_VER)
+#define L2A(X) ((void *)(X))
+#define A2L(X) ((jlong)(X))
+#define snprintf sprintf_s
+#endif
+
+/* Convenience macros */
+#define LOAD_WEAKREF(ENV,VAR) \
+  ((VAR == 0) \
+   ? 0 : ((VAR = (*ENV)->NewWeakGlobalRef(ENV, VAR)) == 0 ? 0 : VAR))
+#define FIND_CLASS(ENV,SIMPLE,NAME) \
+  (class ## SIMPLE = (*ENV)->FindClass(ENV, NAME))
+#define FIND_PRIMITIVE_CLASS(ENV,SIMPLE) \
+  (classPrimitive ## SIMPLE = (*ENV)->GetStaticObjectField(ENV,class ## SIMPLE,(*ENV)->GetStaticFieldID(ENV,class ## SIMPLE,"TYPE","Ljava/lang/Class;")))
+#define LOAD_CREF(ENV,SIMPLE,NAME) \
+  (FIND_CLASS(ENV,SIMPLE,NAME) && LOAD_WEAKREF(ENV,class ## SIMPLE))
+#define LOAD_PCREF(ENV,SIMPLE,NAME) \
+  (LOAD_CREF(ENV,SIMPLE,NAME) \
+   && FIND_PRIMITIVE_CLASS(ENV,SIMPLE) \
+   && LOAD_WEAKREF(ENV,classPrimitive ## SIMPLE))
+#define LOAD_MID(ENV,VAR,CLASS,NAME,SIG) \
+   ((VAR = (*ENV)->GetMethodID(ENV, CLASS, NAME, SIG)) ? VAR : 0)
+#define LOAD_FID(ENV,VAR,CLASS,NAME,SIG) \
+   ((VAR = (*ENV)->GetFieldID(ENV, CLASS, NAME, SIG)) ? VAR : 0)
+
+// Avoid typos in class names
+#define EIllegalArgument "java/lang/IllegalArgumentException"
+#define EOutOfMemory "java/lang/OutOfMemoryError"
+#define EUnsatisfiedLink "java/lang/UnsatisfiedLinkError"
+#define EIllegalState "java/lang/IllegalStateException"
+#define EUnsupportedOperation "java/lang/UnsupportedOperationException"
+#define ERuntime "java/lang/RuntimeException"
+#define EError "java/lang/Error"
+#define ELastError "com/sun/jna/LastErrorException"
+
+extern void throwByName(JNIEnv *env, const char *name, const char *msg);
+extern int get_jtype(JNIEnv*, jclass);
+extern ffi_type* get_ffi_type(JNIEnv*, jclass, char);
+extern ffi_type* get_ffi_rtype(JNIEnv*, jclass, char);
+extern const char* jnidispatch_callback_init(JNIEnv*);
+extern void jnidispatch_callback_dispose(JNIEnv*);
+extern callback* create_callback(JNIEnv*, jobject, jobject,
+                                 jobjectArray, jclass, 
+                                 callconv_t, jboolean);
+extern void free_callback(JNIEnv*, callback*);
+extern void extract_value(JNIEnv*, jobject, void*, size_t, jboolean);
+extern jobject new_object(JNIEnv*, char, void*, jboolean);
+extern jboolean is_protected();
+extern int get_conversion_flag(JNIEnv*, jclass);
+extern jboolean ffi_error(JNIEnv*,const char*,ffi_status);
+
+extern jobject newJavaPointer(JNIEnv*, void*);
+extern jstring newJavaString(JNIEnv*, const char*, jboolean);
+extern jobject newJavaWString(JNIEnv*, const wchar_t*);
+extern jobject newJavaStructure(JNIEnv*, void*, jclass, jboolean);
+extern jobject newJavaCallback(JNIEnv*, void*, jclass);
+extern void* getNativeString(JNIEnv*, jstring, jboolean);
+extern void* getNativeAddress(JNIEnv*, jobject);
+extern void* getStructureAddress(JNIEnv*, jobject);
+extern void* getCallbackAddress(JNIEnv*, jobject);
+extern jlong getIntegerTypeValue(JNIEnv*, jobject);
+extern void* getPointerTypeAddress(JNIEnv*, jobject);
+extern void writeStructure(JNIEnv*, jobject);
+extern jclass getNativeType(JNIEnv*, jclass);
+extern void toNative(JNIEnv*, jobject, void*, size_t, jboolean);
+extern jclass fromNative(JNIEnv*, jclass, ffi_type*, void*, jboolean);
+
+/* Native memory fault protection */
+#ifdef HAVE_PROTECTION
+#define PROTECT is_protected()
+#endif
+#include "protect.h"
+#define ON_ERROR() throwByName(env, EError, "Invalid memory access")
+#define PSTART() PROTECTED_START()
+#define PEND() PROTECTED_END(ON_ERROR())
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* DISPATCH_H */

jnalib/native/jnidispatch.rc

@@ -0,0 +1,34 @@
+// Resource file to generate version information for jnidispatch.dll
+// Copyright (c) 2008 Timothy Wall
+// Type: version
+
+// Name: 1
+LANGUAGE 0, 0
+
+1 VERSIONINFO
+ FILEVERSION 3,0,0,0
+ PRODUCTVERSION 3,0,1,0
+ FILEFLAGSMASK 0x3f
+ FILEOS 0x4
+ FILETYPE 0x2
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "000004b0"
+    BEGIN
+      VALUE "CompanyName", "Java(TM) Native Access (JNA)"
+      VALUE "FileDescription", "JNA native library"
+      VALUE "FileVersion","3.0.0"
+      VALUE "Full Version","3.0.0 b0"
+      VALUE "InternalName", "jnidispatch"
+      VALUE "LegalCopyright", "Copyright \251 2008 Timothy Wall"
+      VALUE "OriginalFilename", "jnidispatch.dll"
+      VALUE "ProductName", "Java(TM) Native Access"
+      VALUE "ProductVersion","3"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0, 1200
+  END
+END

jnalib/native/ld.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# ld-compatible wrapper for link.exe
+#
+#args="/pdbtype:sept"
+MSVC="/c/Program Files (x86)/Microsoft Visual Studio 9.0/vc/bin"
+args="/nologo /opt:REF /incremental:no /subsystem:console /nodefaultlib:msvcrtd"
+link="$MSVC/link"
+while [ $# -gt 0 ]
+do
+  case $1
+  in
+    -m32)
+      link="$MSVC/link"
+      args="$args /machine:X86"
+      shift 1
+    ;;
+    -m64)
+      link="$MSVC/x86_amd64/link"
+      args="$args /machine:X64"
+      shift 1
+    ;;
+    -g)
+      args="$args /debug"
+      shift 1
+    ;;
+    -o)
+      dir="$(dirname $2)"
+      base="$(basename $2|sed 's/\.[^.]*//g')"
+      args="$args /out:\"$2\" /pdb:$dir/$base.pdb /implib:$dir/$base.lib"
+      shift 2
+    ;;
+    -shared)
+      args="$args /DLL"
+      shift 1
+    ;;
+    -static-libgcc)
+      shift 1
+    ;;
+    *.dll)
+      args="$args $(echo $1|sed -e 's/.dll/.lib/g')"
+      shift 1
+    ;;
+    *.o|*.lib|*.a)
+      args="$args $(echo $1|sed -e 's%\\%/%g')"
+      shift 1
+    ;;
+    *)
+      echo "Unsupported argument '$1'"
+      exit 1
+    ;;
+  esac
+done
+
+echo "\"$link\" $args"
+eval "\"$link\" $args"

jnalib/native/libffi/ChangeLog.libffi

@@ -1,38 +1,4 @@
-2011-02-08  Andreas Tobler  <andreast@fgznet.ch>
-
-	* testsuite/lib/libffi.exp: Tweak for stand-alone mode.
-
-2009-12-25  Samuli Suominen  <ssuominen@gentoo.org>
-
-	* configure.ac: Undefine _AC_ARG_VAR_PRECIOUS for autoconf 2.64.
-	* configure: Rebuilt.
-	* fficonfig.h.in: Rebuilt.
-
-2009-06-16  Andrew Haley  <aph@redhat.com>
-
-	* testsuite/libffi.call/cls_align_sint64.c,
-	testsuite/libffi.call/cls_align_uint64.c,
-	testsuite/libffi.call/cls_longdouble_va.c,
-	testsuite/libffi.call/cls_ulonglong.c,
-	testsuite/libffi.call/return_ll1.c,
-	testsuite/libffi.call/stret_medium2.c: Fix printf format
-	specifiers.
-	* testsuite/libffi.call/huge_struct.c: Ad x86 XFAILs.
-	* testsuite/libffi.call/float2.c: Fix dg-excess-errors.
-	* testsuite/libffi.call/ffitest.h,
-	testsuite/libffi.special/ffitestcxx.h (PRIdLL, PRIuLL): Define.
-
-2009-06-12  Andrew Haley  <aph@redhat.com>
-
-	* testsuite/libffi.call/cls_align_sint64.c,
-	testsuite/libffi.call/cls_align_uint64.c,
-	testsuite/libffi.call/cls_ulonglong.c,
-	testsuite/libffi.call/return_ll1.c,
-	testsuite/libffi.call/stret_medium2.c: Fix printf format
-	specifiers.
-	testsuite/libffi.special/unwindtest.cc: include stdint.h.
-
-2009-06-11  Timothy Wall  <twall@users.sf.net>
+2009-05-12  Timothy Wall  <twall@users.sf.net>
 
 	* Makefile.am,
         configure.ac,
@@ -53,8 +19,8 @@
         * ltcf-c.sh: properly escape cygwin/w32 path
         * man/ffi_call.3: Clarify size requirements for return value.
         * src/x86/ffi64.c: Fix filename in comment.
-        * src/x86/win32.S: Remove unused extern.
-
+        * src/x86/win32.S: Remove global reference which causes undefined
+        symbol warning.
         * testsuite/libffi.call/closure_fn0.c,
         testsuite/libffi.call/closure_fn1.c,
         testsuite/libffi.call/closure_fn2.c,
@@ -145,32 +111,6 @@
         testsuite/libffi.special/unwindtest.cc: use ffi_closure_alloc instead
         of checking for MMAP.  Use intptr_t instead of long casts.
 
-2009-06-04  Andrew Haley  <aph@redhat.com>
-
-	* src/powerpc/ffitarget.h: Fix misapplied merge from gcc.
-
-2009-06-04  Andrew Haley  <aph@redhat.com>
-
-	* src/mips/o32.S,
-	src/mips/n32.S: Fix licence formatting.
-
-2009-06-04  Andrew Haley  <aph@redhat.com>
-
-	* src/x86/darwin.S: Fix licence formatting.
-	src/x86/win32.S: Likewise.
-	src/sh64/sysv.S: Likewise.
-	src/sh/sysv.S: Likewise.
-
-2009-06-04  Andrew Haley  <aph@redhat.com>
-
-	* src/sh64/ffi.c: Remove lint directives.  Was missing from merge
-	of Andreas Tobler's patch from 2006-04-22.
-	
-2009-06-04  Andrew Haley  <aph@redhat.com>
-
-	* src/sh/ffi.c: Apply missing hunk from Alexandre Oliva's patch of
-	2007-03-07.
-
 2008-12-26  Timothy Wall  <twall@users.sf.net>
 
 	* testsuite/libffi.call/cls_longdouble.c,
@@ -574,8 +514,8 @@
 	* Makefile.am, include/Makefile.am: Move headers to
 	libffi_la_SOURCES for new automake.
 	* Makefile.in, include/Makefile.in: Rebuilt.
-
-	* testsuite/lib/wrapper.exp: Copied from gcc tree to allow for
+	
+	* testsuite/lib/wrapper.exp: Copied from gcc tree to allow for 
 	execution outside of gcc tree.
 	* testsuite/lib/target-libpath.exp: Ditto.
 

jnalib/native/libffi/LICENSE

@@ -1,4 +1,4 @@
-libffi - Copyright (c) 1996-2012  Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2008  Red Hat, Inc and others.  
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -9,8 +9,8 @@ distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

jnalib/native/libffi/Makefile.am

@@ -2,49 +2,35 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-ACLOCAL_AMFLAGS = -I m4
-
 SUBDIRS = include testsuite man
 
-EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host	\
-	 src/aarch64/ffi.c src/aarch64/ffitarget.h			\
-	 src/aarch64/sysv.S build-ios.sh				\
-	 src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h		\
-	 src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h		\
-	 src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h		\
-	 src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h		\
-	 src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h	\
-	 src/ia64/unix.S src/mips/ffi.c src/mips/n32.S src/mips/o32.S	\
-	 src/mips/ffitarget.h src/m32r/ffi.c src/m32r/sysv.S		\
-	 src/m32r/ffitarget.h src/m68k/ffi.c src/m68k/sysv.S		\
-	 src/m68k/ffitarget.h src/microblaze/ffi.c			\
-	 src/microblaze/sysv.S src/microblaze/ffitarget.h		\
-	 src/powerpc/ffi.c src/powerpc/sysv.S				\
-	 src/powerpc/linux64.S src/powerpc/linux64_closure.S		\
-	 src/powerpc/ppc_closure.S src/powerpc/asm.h			\
-	src/powerpc/aix.S src/powerpc/darwin.S				\
-	src/powerpc/aix_closure.S src/powerpc/darwin_closure.S		\
-	src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h		\
-	src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h		\
-	src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c	\
-	src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S		\
-	src/sparc/v9.S src/sparc/ffitarget.h src/sparc/ffi.c		\
-	src/x86/darwin64.S src/x86/ffi.c src/x86/sysv.S			\
-	src/x86/win32.S src/x86/darwin.S src/x86/win64.S		\
-	src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S		\
-	src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c		\
-	src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/bfin/ffi.c	\
-	src/bfin/ffitarget.h src/bfin/sysv.S src/frv/eabi.S		\
-	src/frv/ffitarget.h src/dlmalloc.c src/tile/ffi.c		\
-	src/tile/ffitarget.h src/tile/tile.S libtool-version		\
-	src/xtensa/ffitarget.h src/xtensa/ffi.c src/xtensa/sysv.S	\
-	 ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4		\
-	 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4			\
-	 m4/ltversion.m4 src/arm/gentramp.sh src/debug.c msvcc.sh	\
-	generate-ios-source-and-headers.py				\
-	 generate-osx-source-and-headers.py				\
-	 libffi.xcodeproj/project.pbxproj src/arm/trampoline.S          \
-        libtool-ldflags
+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
+	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
+	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
+	src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
+	src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
+	src/ia64/unix.S \
+	src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
+	src/mips/ffitarget.h \
+	src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
+	src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
+	src/powerpc/ffi.c src/powerpc/sysv.S \
+	src/powerpc/linux64.S src/powerpc/linux64_closure.S \
+	src/powerpc/ppc_closure.S src/powerpc/asm.h \
+	src/powerpc/aix.S src/powerpc/darwin.S \
+	src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
+	src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h \
+	src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h \
+	src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h \
+	src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \
+	src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \
+	src/sparc/ffi.c src/x86/darwin64.S \
+	src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/win64.S \
+	src/x86/darwin.S src/x86/freebsd.S \
+	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
+	src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
+	src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
+	libtool-version ChangeLog.libffi
 
 info_TEXINFOS = doc/libffi.texi
 
@@ -81,7 +67,6 @@ AM_MAKEFLAGS = \
 	"exec_prefix=$(exec_prefix)" \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
-	"mandir=$(mandir)" \
 	"prefix=$(prefix)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \
@@ -92,15 +77,12 @@ AM_MAKEFLAGS = \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
-# Subdir rules rely on $(FLAGS_TO_PASS)
-FLAGS_TO_PASS = $(AM_MAKEFLAGS)
-
 MAKEOVERRIDES=
 
-toolexeclib_LTLIBRARIES = libffi.la
+lib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la
 
-libffi_la_SOURCES = src/prep_cif.c src/types.c \
+libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c \
 		src/raw_api.c src/java_raw_api.c src/closures.c
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -108,16 +90,9 @@ pkgconfig_DATA = libffi.pc
 
 nodist_libffi_la_SOURCES =
 
-if FFI_DEBUG
-nodist_libffi_la_SOURCES += src/debug.c
-endif
-
 if MIPS
 nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
 endif
-if BFIN
-nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
-endif
 if X86
 nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
 endif
@@ -148,12 +123,6 @@ endif
 if M68K
 nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
 endif
-if MOXIE
-nodist_libffi_la_SOURCES += src/moxie/ffi.c src/moxie/eabi.S
-endif
-if MICROBLAZE
-nodist_libffi_la_SOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
-endif
 if POWERPC
 nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
 endif
@@ -166,17 +135,8 @@ endif
 if POWERPC_FREEBSD
 nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
 endif
-if AARCH64
-nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
-endif
 if ARM
 nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
-if FFI_EXEC_TRAMPOLINE_TABLE
-nodist_libffi_la_SOURCES += src/arm/trampoline.S
-endif
-endif
-if AVR32
-nodist_libffi_la_SOURCES += src/avr32/sysv.S src/avr32/ffi.c
 endif
 if LIBFFI_CRIS
 nodist_libffi_la_SOURCES += src/cris/sysv.S src/cris/ffi.c
@@ -202,20 +162,19 @@ endif
 if PA_HPUX
 nodist_libffi_la_SOURCES += src/pa/hpux32.S src/pa/ffi.c
 endif
-if TILE
-nodist_libffi_la_SOURCES += src/tile/tile.S src/tile/ffi.c
-endif
-if XTENSA
-nodist_libffi_la_SOURCES += src/xtensa/sysv.S src/xtensa/ffi.c
-endif
 
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 
-LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS))
+AM_CFLAGS = -Wall -g -fexceptions
 
-libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
+libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
+# No install-html or install-pdf support in automake yet
+.PHONY: install-html install-pdf
+install-html:
+install-pdf:
+

jnalib/native/libffi/README

@@ -0,0 +1,337 @@
+Status
+======
+
+libffi-3.0.8 was released on December 19, 2008. Check the libffi web
+page for updates: <URL:http://sourceware.org/libffi/>.
+
+
+What is libffi?
+===============
+
+Compilers for high level languages generate code that follow certain
+conventions.  These conventions are necessary, in part, for separate
+compilation to work.  One such convention is the "calling convention".
+The "calling convention" is a set of assumptions made by the compiler
+about where function arguments will be found on entry to a function.
+A "calling convention" also specifies where the return value for a
+function is found.
+
+Some programs may not know at the time of compilation what arguments
+are to be passed to a function.  For instance, an interpreter may be
+told at run-time about the number and types of arguments used to call
+a given function.  Libffi can be used in such programs to provide a
+bridge from the interpreter program to compiled code.
+
+The libffi library provides a portable, high level programming
+interface to various calling conventions.  This allows a programmer to
+call any function specified by a call interface description at run
+time.
+
+FFI stands for Foreign Function Interface.  A foreign function
+interface is the popular name for the interface that allows code
+written in one language to call code written in another language.  The
+libffi library really only provides the lowest, machine dependent
+layer of a fully featured foreign function interface. A layer must
+exist above libffi that handles type conversions for values passed
+between the two languages.
+
+
+Supported Platforms
+===================
+
+Libffi has been ported to many different platforms, although this
+release was only tested on:
+
+     arm oabi linux
+     arm eabi linux
+     hppa linux
+     mips o32 linux (little endian)
+     powerpc darwin
+     powerpc freebsd
+     powerpc64 linux
+     sparc solaris
+     sparc64 freebsd
+     sparc64 solaris
+     x86 cygwin
+     x86 darwin
+     x86 freebsd
+     x86 linux
+     x86 openbsd
+     x86 solaris
+     x86-64 mingw
+     x86-64 darwin
+     x86-64 linux
+     x86-64 OS X
+     x86-64 freebsd
+     x86-64 solaris
+     
+Please send additional platform test results to
+libffi-discuss@sourceware.org.
+
+Installing libffi
+=================
+
+[Note: before actually performing any of these installation steps,
+ you may wish to read the "Platform Specific Notes" below.]
+
+First you must configure the distribution for your particular
+system. Go to the directory you wish to build libffi in and run the
+"configure" program found in the root directory of the libffi source
+distribution.
+
+You may want to tell configure where to install the libffi library and
+header files. To do that, use the --prefix configure switch.  Libffi
+will install under /usr/local by default. 
+
+If you want to enable extra run-time debugging checks use the the
+--enable-debug configure switch. This is useful when your program dies
+mysteriously while using libffi. 
+
+Another useful configure switch is --enable-purify-safety. Using this
+will add some extra code which will suppress certain warnings when you
+are using Purify with libffi. Only use this switch when using 
+Purify, as it will slow down the library.
+
+Configure has many other options. Use "configure --help" to see them all.
+
+Once configure has finished, type "make". Note that you must be using
+GNU make.  You can ftp GNU make from prep.ai.mit.edu:/pub/gnu.
+
+To ensure that libffi is working as advertised, type "make check".
+This will require that you have DejaGNU installed.
+
+To install the library and header files, type "make install".
+
+
+Platform Specific Notes
+=======================
+
+	MIPS - Irix 5.3 & 6.x
+	---------------------
+
+Irix 6.2 and better supports three different calling conventions: o32,
+n32 and n64. Currently, libffi only supports both o32 and n32 under
+Irix 6.x, but only o32 under Irix 5.3. Libffi will automatically be
+configured for whichever calling convention it was built for.
+
+By default, the configure script will try to build libffi with the GNU
+development tools. To build libffi with the SGI development tools, set
+the environment variable CC to either "cc -32" or "cc -n32" before
+running configure under Irix 6.x (depending on whether you want an o32
+or n32 library), or just "cc" for Irix 5.3.
+
+With the n32 calling convention, when returning structures smaller
+than 16 bytes, be sure to provide an RVALUE that is 8 byte aligned.
+Here's one way of forcing this:
+
+	double struct_storage[2];
+	my_small_struct *s = (my_small_struct *) struct_storage;  
+	/* Use s for RVALUE */
+
+If you don't do this you are liable to get spurious bus errors. 
+
+"long long" values are not supported yet.
+
+You must use GNU Make to build libffi on SGI platforms.
+
+
+	PowerPC System V ABI
+	--------------------
+
+There are two `System V ABI's which libffi implements for PowerPC.
+They differ only in how small structures are returned from functions.
+
+In the FFI_SYSV version, structures that are 8 bytes or smaller are
+returned in registers.  This is what GCC does when it is configured
+for solaris, and is what the System V ABI I have (dated September
+1995) says.
+
+In the FFI_GCC_SYSV version, all structures are returned the same way:
+by passing a pointer as the first argument to the function.  This is
+what GCC does when it is configured for linux or a generic sysv
+target.
+
+EGCS 1.0.1 (and probably other versions of EGCS/GCC) also has a
+inconsistency with the SysV ABI: When a procedure is called with many
+floating-point arguments, some of them get put on the stack.  They are
+all supposed to be stored in double-precision format, even if they are
+only single-precision, but EGCS stores single-precision arguments as
+single-precision anyway.  This causes one test to fail (the `many
+arguments' test).
+
+
+History
+=======
+
+3.0.7 Nov-11-08
+        Fix for ppc FreeBSD.
+	(thanks to Andreas Tobler)
+
+3.0.6 Jul-17-08
+        Fix for closures on sh.
+	Mark the sh/sh64 stack as non-executable.
+	(both thanks to Kaz Kojima)
+
+3.0.5 Apr-3-08
+        Fix libffi.pc file.
+	Fix #define ARM for IcedTea users.
+	Fix x86 closure bug.
+
+3.0.4 Feb-24-08
+        Fix x86 OpenBSD configury.
+
+3.0.3 Feb-22-08
+        Enable x86 OpenBSD thanks to Thomas Heller, and
+	x86-64 FreeBSD thanks to Björn König and Andreas Tobler.
+	Clean up test instruction in README.
+
+3.0.2 Feb-21-08
+        Improved x86 FreeBSD support.
+	Thanks to Björn König.
+
+3.0.1 Feb-15-08
+        Fix instruction cache flushing bug on MIPS.
+	Thanks to David Daney.
+
+3.0.0 Feb-15-08
+        Many changes, mostly thanks to the GCC project.
+	Cygnus Solutions is now Red Hat.
+
+  [10 years go by...]
+
+1.20 Oct-5-98
+	Raffaele Sena produces ARM port.
+
+1.19 Oct-5-98
+	Fixed x86 long double and long long return support.
+	m68k bug fixes from Andreas Schwab.
+	Patch for DU assembler compatibility for the Alpha from Richard
+	Henderson.
+
+1.18 Apr-17-98
+	Bug fixes and MIPS configuration changes.
+
+1.17 Feb-24-98
+	Bug fixes and m68k port from Andreas Schwab. PowerPC port from
+	Geoffrey Keating. Various bug x86, Sparc and MIPS bug fixes.
+
+1.16 Feb-11-98
+	Richard Henderson produces Alpha port.
+
+1.15 Dec-4-97
+	Fixed an n32 ABI bug. New libtool, auto* support.
+
+1.14 May-13-97
+	libtool is now used to generate shared and static libraries.
+	Fixed a minor portability problem reported by Russ McManus
+	<mcmanr@eq.gs.com>.
+
+1.13 Dec-2-96
+	Added --enable-purify-safety to keep Purify from complaining
+	about certain low level code.
+	Sparc fix for calling functions with < 6 args.
+	Linux x86 a.out fix.
+
+1.12 Nov-22-96
+	Added missing ffi_type_void, needed for supporting void return 
+	types. Fixed test case for non MIPS machines. Cygnus Support 
+	is now Cygnus Solutions. 
+
+1.11 Oct-30-96
+	Added notes about GNU make.
+
+1.10 Oct-29-96
+	Added configuration fix for non GNU compilers.
+
+1.09 Oct-29-96
+	Added --enable-debug configure switch. Clean-ups based on LCLint 
+	feedback. ffi_mips.h is always installed. Many configuration 
+	fixes. Fixed ffitest.c for sparc builds.
+
+1.08 Oct-15-96
+	Fixed n32 problem. Many clean-ups.
+
+1.07 Oct-14-96
+	Gordon Irlam rewrites v8.S again. Bug fixes.
+
+1.06 Oct-14-96
+	Gordon Irlam improved the sparc port. 
+
+1.05 Oct-14-96
+	Interface changes based on feedback.
+
+1.04 Oct-11-96
+	Sparc port complete (modulo struct passing bug).
+
+1.03 Oct-10-96
+	Passing struct args, and returning struct values works for
+	all architectures/calling conventions. Expanded tests.
+
+1.02 Oct-9-96
+	Added SGI n32 support. Fixed bugs in both o32 and Linux support.
+	Added "make test".
+
+1.01 Oct-8-96
+	Fixed float passing bug in mips version. Restructured some
+	of the code. Builds cleanly with SGI tools.
+
+1.00 Oct-7-96
+	First release. No public announcement.
+
+
+Authors & Credits
+=================
+
+libffi was originally written by Anthony Green <green@redhat.com>.
+
+The developers of the GNU Compiler Collection project have made
+innumerable valuable contributions.  See the ChangeLog file for
+details.
+
+Some of the ideas behind libffi were inspired by Gianni Mariani's free
+gencall library for Silicon Graphics machines.
+
+The closure mechanism was designed and implemented by Kresten Krab
+Thorup.
+
+Major processor architecture ports were contributed by the following
+developers:
+
+alpha		Richard Henderson
+arm		Raffaele Sena
+cris		Simon Posnjak, Hans-Peter Nilsson
+frv		Anthony Green
+ia64		Hans Boehm
+m32r		Kazuhiro Inaoka
+m68k		Andreas Schwab
+mips		Anthony Green, Casey Marshall
+mips64		David Daney
+pa		Randolph Chung, Dave Anglin, Andreas Tobler
+powerpc		Geoffrey Keating, Andreas Tobler, 
+			 David Edelsohn, John Hornkvist
+powerpc64	Jakub Jelinek
+s390		Gerhard Tonn, Ulrich Weigand
+sh		Kaz Kojima
+sh64		Kaz Kojima
+sparc		Anthony Green, Gordon Irlam
+x86		Anthony Green, Jon Beniston
+x86-64		Bo Thorsen
+
+Jesper Skov and Andrew Haley both did more than their fair share of
+stepping through the code and tracking down bugs.
+
+Thanks also to Tom Tromey for bug fixes, documentation and
+configuration help.
+
+Thanks to Jim Blandy, who provided some useful feedback on the libffi
+interface.
+
+Andreas Tobler has done a tremendous amount of work on the testsuite.
+
+Alex Oliva solved the executable page problem for SElinux.
+
+The list above is almost certainly incomplete and inaccurate.  I'm
+happy to make corrections or additions upon request.
+
+If you have a problem, or have found a bug, please send a note to
+green@redhat.com.

jnalib/native/libffi/README.jna

@@ -0,0 +1,3 @@
+To run the testsuite on win64, make your mingw compiler available in the path
+as "gcc".  This could probably be avoided via additional dejagnu configuration,
+but I haven't figured out how.

jnalib/native/libffi/compile

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2005-05-14.22
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +17,8 @@ scriptversion=2009-10-06.20; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
 while true; do
   if mkdir "$lockdir" >/dev/null 2>&1; then
     break
@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
 ret=$?
 
 if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+  mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
@@ -138,6 +138,5 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
 # End:

jnalib/native/libffi/config-ml.in

@@ -0,0 +1,911 @@
+# Configure fragment invoked in the post-target section for subdirs
+# wanting multilib support.
+#
+# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+#
+# Please report bugs to <gcc-bugs@gnu.org>
+# and send patches to <gcc-patches@gnu.org>.
+
+# It is advisable to support a few --enable/--disable options to let the
+# user select which libraries s/he really wants.
+#
+# Subdirectories wishing to use multilib should put the following lines
+# in the "post-target" section of configure.in.
+#
+# if [ "${srcdir}" = "." ] ; then
+#   if [ "${with_target_subdir}" != "." ] ; then
+#     . ${with_multisrctop}../../config-ml.in
+#   else
+#     . ${with_multisrctop}../config-ml.in
+#   fi
+# else
+#   . ${srcdir}/../config-ml.in
+# fi
+#
+#
+# Things are complicated because 6 separate cases must be handled:
+# 2 (native, cross) x 3 (absolute-path, relative-not-dot, dot) = 6.
+#
+# srcdir=. is special.  It must handle make programs that don't handle VPATH.
+# To implement this, a symlink tree is built for each library and for each
+# multilib subdir.
+#
+# The build tree is layed out as
+#
+# ./
+#   newlib
+#   m68020/
+#          newlib
+#          m68881/
+#                 newlib
+#
+# The nice feature about this arrangement is that inter-library references
+# in the build tree work without having to care where you are.  Note that
+# inter-library references also work in the source tree because symlink trees
+# are built when srcdir=.
+#
+# Unfortunately, trying to access the libraries in the build tree requires
+# the user to manually choose which library to use as GCC won't be able to
+# find the right one.  This is viewed as the lesser of two evils.
+#
+# Configure variables:
+# ${with_target_subdir} = "." for native, or ${target_alias} for cross.
+# Set by top level Makefile.
+# ${with_multisrctop} = how many levels of multilibs there are in the source
+# tree.  It exists to handle the case of configuring in the source tree:
+# ${srcdir} is not constant.
+# ${with_multisubdir} = name of multilib subdirectory (eg: m68020/m68881).
+#
+# Makefile variables:
+# MULTISRCTOP = number of multilib levels in source tree (+1 if cross)
+# (FIXME: note that this is different than ${with_multisrctop}.  Check out.).
+# MULTIBUILDTOP = number of multilib levels in build tree
+# MULTIDIRS = list of multilib subdirs (eg: m68000 m68020 ...)
+# (only defined in each library's main Makefile).
+# MULTISUBDIR = installed subdirectory name with leading '/' (eg: /m68000)
+# (only defined in each multilib subdir).
+
+# FIXME: Multilib is currently disabled by default for everything other than
+# newlib.  It is up to each target to turn on multilib support for the other
+# libraries as desired.
+
+# Autoconf incoming variables:
+# srcdir, host, ac_configure_args
+#
+# We *could* figure srcdir and host out, but we'd have to do work that
+# our caller has already done to figure them out and requiring these two
+# seems reasonable.
+# Note that `host' in this case is GCC's `target'.  Target libraries are
+# configured for a particular host.
+
+Makefile=${ac_file-Makefile}
+ml_config_shell=${CONFIG_SHELL-/bin/sh}
+ml_realsrcdir=${srcdir}
+
+# Scan all the arguments and set all the ones we need.
+
+ml_verbose=--verbose
+for option in ${ac_configure_args}
+do
+  # strip single quotes surrounding individual options
+  case $option in
+  \'*\') eval option=$option ;;
+  esac
+
+  case $option in
+  --*) ;;
+  -*) option=-$option ;;
+  esac
+
+  case $option in
+  --*=*)
+	optarg=`echo $option | sed -e 's/^[^=]*=//'`
+	;;
+  esac
+
+  case $option in
+  --disable-*)
+	enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
+	eval $enableopt=no
+	;;
+  --enable-*)
+	case "$option" in
+	*=*)	;;
+	*)	optarg=yes ;;
+	esac
+	enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+	eval $enableopt="$optarg"
+	;;
+  --norecursion | --no-recursion)
+	ml_norecursion=yes
+	;;
+  --silent | --sil* | --quiet | --q*)
+	ml_verbose=--silent
+	;;
+  --verbose | --v | --verb*)
+	ml_verbose=--verbose
+	;;
+  --with-*)
+	case "$option" in
+	*=*)	;;
+	*)	optarg=yes ;;
+	esac
+	withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+	eval $withopt="$optarg"
+	;;
+  --without-*)
+	withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
+	eval $withopt=no
+	;;
+  esac
+done
+
+# Only do this if --enable-multilib.
+if [ "${enable_multilib}" = yes ]; then
+
+# Compute whether this is the library's top level directory
+# (ie: not a multilib subdirectory, and not a subdirectory like newlib/src).
+# ${with_multisubdir} tells us we're in the right branch, but we could be
+# in a subdir of that.
+# ??? The previous version could void this test by separating the process into
+# two files: one that only the library's toplevel configure.in ran (to
+# configure the multilib subdirs), and another that all configure.in's ran to
+# update the Makefile.  It seemed reasonable to collapse all multilib support
+# into one file, but it does leave us with having to perform this test.
+ml_toplevel_p=no
+if [ -z "${with_multisubdir}" ]; then
+  if [ "${srcdir}" = "." ]; then
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    # ${with_target_subdir} = "." for native, otherwise target alias.
+    if [ "${with_target_subdir}" = "." ]; then
+      if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
+	ml_toplevel_p=yes
+      fi
+    else
+      if [ -f ${ml_realsrcdir}/../../config-ml.in ]; then
+	ml_toplevel_p=yes
+      fi
+    fi
+  else
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
+      ml_toplevel_p=yes
+    fi
+  fi
+fi
+
+# If this is the library's top level directory, set multidirs to the
+# multilib subdirs to support.  This lives at the top because we need
+# `multidirs' set right away.
+
+if [ "${ml_toplevel_p}" = yes ]; then
+
+multidirs=
+for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+  dir=`echo $i | sed -e 's/;.*$//'`
+  if [ "${dir}" = "." ]; then
+    true
+  else
+    if [ -z "${multidirs}" ]; then
+      multidirs="${dir}"
+    else
+      multidirs="${multidirs} ${dir}"
+    fi
+  fi
+done
+
+# Target libraries are configured for the host they run on, so we check
+# $host here, not $target.
+
+case "${host}" in
+arc-*-elf*)
+	if [ x$enable_biendian != xyes ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *be*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+arm-*-*)
+	if [ x"$enable_fpu" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *fpu*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_26bit" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *26bit*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_underscore" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *under*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_interwork" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *interwork*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_biendian = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *le* ) : ;;
+	      *be* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x"$enable_nofmult" = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *nofmult* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+m68*-*-*)
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68881 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68881* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68000 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68000* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_m68020 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *m68020* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+mips*-*-*)
+	if [ x$enable_single_float = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *single* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_biendian = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *el* ) : ;;
+	      *eb* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	case " $multidirs " in
+	*" mabi=64 "*)
+	  # We will not be able to create libraries with -mabi=64 if
+	  # we cannot even link a trivial program.  It usually
+	  # indicates the 64bit libraries are missing.
+	  if echo 'main() {}' > conftest.c &&
+	     ${CC-gcc} -mabi=64 conftest.c -o conftest; then
+	    :
+	  else
+	    echo Could not link program with -mabi=64, disabling it.
+	    old_multidirs="${multidirs}"
+	    multidirs=""
+	    for x in ${old_multidirs}; do
+	      case "$x" in
+	      *mabi=64* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	      esac
+	    done
+	  fi
+	  rm -f conftest.c conftest
+	  ;;
+	esac
+	;;
+powerpc*-*-* | rs6000*-*-*)
+	if [ x$enable_aix64 = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *ppc64* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_pthread = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *pthread* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_softfloat = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_powercpu = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      power | */power | */power/* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_powerpccpu = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *powerpc* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_powerpcos = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mcall-linux* | *mcall-solaris* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_biendian = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mlittle* | *mbig* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	if [ x$enable_sysv = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mcall-sysv* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
+	;;
+sparc*-*-*)
+	case " $multidirs " in
+	*" m64 "*)
+	  # We will not be able to create libraries with -m64 if
+	  # we cannot even link a trivial program.  It usually
+	  # indicates the 64bit libraries are missing.
+	  if echo 'main() {}' > conftest.c &&
+	     ${CC-gcc} -m64 conftest.c -o conftest; then
+	    :
+	  else
+	    echo Could not link program with -m64, disabling it.
+	    old_multidirs="${multidirs}"
+	    multidirs=""
+	    for x in ${old_multidirs}; do
+	      case "$x" in
+	      *m64* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	      esac
+	    done
+	  fi
+	  rm -f conftest.c conftest
+	  ;;
+	esac
+	;;
+esac
+
+# Remove extraneous blanks from multidirs.
+# Tests like `if [ -n "$multidirs" ]' require it.
+multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
+
+# Add code to library's top level makefile to handle building the multilib
+# subdirs.
+
+cat > Multi.tem <<\EOF
+
+PWD_COMMAND=$${PWDCMD-pwd}
+
+# FIXME: There should be an @-sign in front of the `if'.
+# Leave out until this is tested a bit more.
+multi-do:
+	if [ -z "$(MULTIDIRS)" ]; then \
+	  true; \
+	else \
+	  rootpre=`${PWD_COMMAND}`/; export rootpre; \
+	  srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
+	  lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
+	  compiler="$(CC)"; \
+	  for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
+	    dir=`echo $$i | sed -e 's/;.*$$//'`; \
+	    if [ "$${dir}" = "." ]; then \
+	      true; \
+	    else \
+	      if [ -d ../$${dir}/$${lib} ]; then \
+		flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
+		if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
+				CFLAGS="$(CFLAGS) $${flags}" \
+				FCFLAGS="$(FCFLAGS) $${flags}" \
+				FFLAGS="$(FFLAGS) $${flags}" \
+				ADAFLAGS="$(ADAFLAGS) $${flags}" \
+				prefix="$(prefix)" \
+				exec_prefix="$(exec_prefix)" \
+				GCJFLAGS="$(GCJFLAGS) $${flags}" \
+				CXXFLAGS="$(CXXFLAGS) $${flags}" \
+				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
+				LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
+				LDFLAGS="$(LDFLAGS) $${flags}" \
+				MULTIFLAGS="$${flags}" \
+				DESTDIR="$(DESTDIR)" \
+				INSTALL="$(INSTALL)" \
+				INSTALL_DATA="$(INSTALL_DATA)" \
+				INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+				INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
+				$(DO)); then \
+		  true; \
+		else \
+		  exit 1; \
+		fi; \
+	      else true; \
+	      fi; \
+	    fi; \
+	  done; \
+	fi
+
+# FIXME: There should be an @-sign in front of the `if'.
+# Leave out until this is tested a bit more.
+multi-clean:
+	if [ -z "$(MULTIDIRS)" ]; then \
+	  true; \
+	else \
+	  lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+	  for dir in Makefile $(MULTIDIRS); do \
+	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
+	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
+	      then true; \
+	      else exit 1; \
+	      fi; \
+	    else true; \
+	    fi; \
+	  done; \
+	fi
+EOF
+
+cat ${Makefile} Multi.tem > Makefile.tem
+rm -f ${Makefile} Multi.tem
+mv Makefile.tem ${Makefile}
+
+fi # ${ml_toplevel_p} = yes
+
+if [ "${ml_verbose}" = --verbose ]; then
+  echo "Adding multilib support to Makefile in ${ml_realsrcdir}"
+  if [ "${ml_toplevel_p}" = yes ]; then
+    echo "multidirs=${multidirs}"
+  fi
+  echo "with_multisubdir=${with_multisubdir}"
+fi
+
+if [ "${srcdir}" = "." ]; then
+  if [ "${with_target_subdir}" != "." ]; then
+    ml_srcdotdot="../"
+  else
+    ml_srcdotdot=""
+  fi
+else
+  ml_srcdotdot=""
+fi
+
+if [ -z "${with_multisubdir}" ]; then
+  ml_subdir=
+  ml_builddotdot=
+  : # ml_srcdotdot= # already set
+else
+  ml_subdir="/${with_multisubdir}"
+  # The '[^/][^/]*' appears that way to work around a SunOS sed bug.
+  ml_builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`/
+  if [ "$srcdir" = "." ]; then
+    ml_srcdotdot=${ml_srcdotdot}${ml_builddotdot}
+  else
+    : # ml_srcdotdot= # already set
+  fi
+fi
+
+if [ "${ml_toplevel_p}" = yes ]; then
+  ml_do='$(MAKE)'
+  ml_clean='$(MAKE)'
+else
+  ml_do=true
+  ml_clean=true
+fi
+
+# TOP is used by newlib and should not be used elsewhere for this purpose.
+# MULTI{SRC,BUILD}TOP are the proper ones to use.  MULTISRCTOP is empty
+# when srcdir != builddir.  MULTIBUILDTOP is always some number of ../'s.
+# FIXME: newlib needs to be updated to use MULTI{SRC,BUILD}TOP so we can
+# delete TOP.  Newlib may wish to continue to use TOP for its own purposes
+# of course.
+# MULTIDIRS is non-empty for the cpu top level Makefile (eg: newlib/Makefile)
+# and lists the subdirectories to recurse into.
+# MULTISUBDIR is non-empty in each cpu subdirectory's Makefile
+# (eg: newlib/h8300h/Makefile) and is the installed subdirectory name with
+# a leading '/'.
+# MULTIDO is used for targets like all, install, and check where
+# $(FLAGS_TO_PASS) augmented with the subdir's compiler option is needed.
+# MULTICLEAN is used for the *clean targets.
+#
+# ??? It is possible to merge MULTIDO and MULTICLEAN into one.  They are
+# currently kept separate because we don't want the *clean targets to require
+# the existence of the compiler (which MULTIDO currently requires) and
+# therefore we'd have to record the directory options as well as names
+# (currently we just record the names and use --print-multi-lib to get the
+# options).
+
+sed -e "s:^TOP[ 	]*=[ 	]*\([./]*\)[ 	]*$:TOP = ${ml_builddotdot}\1:" \
+    -e "s:^MULTISRCTOP[ 	]*=.*$:MULTISRCTOP = ${ml_srcdotdot}:" \
+    -e "s:^MULTIBUILDTOP[ 	]*=.*$:MULTIBUILDTOP = ${ml_builddotdot}:" \
+    -e "s:^MULTIDIRS[ 	]*=.*$:MULTIDIRS = ${multidirs}:" \
+    -e "s:^MULTISUBDIR[ 	]*=.*$:MULTISUBDIR = ${ml_subdir}:" \
+    -e "s:^MULTIDO[ 	]*=.*$:MULTIDO = $ml_do:" \
+    -e "s:^MULTICLEAN[ 	]*=.*$:MULTICLEAN = $ml_clean:" \
+	${Makefile} > Makefile.tem
+rm -f ${Makefile}
+mv Makefile.tem ${Makefile}
+
+# If this is the library's top level, configure each multilib subdir.
+# This is done at the end because this is the loop that runs configure
+# in each multilib subdir and it seemed reasonable to finish updating the
+# Makefile before going on to configure the subdirs.
+
+if [ "${ml_toplevel_p}" = yes ]; then
+
+# We must freshly configure each subdirectory.  This bit of code is
+# actually partially stolen from the main configure script.  FIXME.
+
+if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
+
+  if [ "${ml_verbose}" = --verbose ]; then
+    echo "Running configure in multilib subdirs ${multidirs}"
+    echo "pwd: `${PWDCMD-pwd}`"
+  fi
+
+  ml_origdir=`${PWDCMD-pwd}`
+  ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
+  # cd to top-level-build-dir/${with_target_subdir}
+  cd ..
+
+  for ml_dir in ${multidirs}; do
+
+    if [ "${ml_verbose}" = --verbose ]; then
+      echo "Running configure in multilib subdir ${ml_dir}"
+      echo "pwd: `${PWDCMD-pwd}`"
+    fi
+
+    if [ -d ${ml_dir} ]; then true; else
+      # ``mkdir -p ${ml_dir}'' See also mkinstalldirs.
+      pathcomp=""
+      for d in `echo ":${ml_dir}" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`; do
+        pathcomp="$pathcomp$d"
+        case "$pathcomp" in
+          -* ) pathcomp=./$pathcomp ;;
+        esac
+        if test ! -d "$pathcomp"; then
+           echo "mkdir $pathcomp" 1>&2
+           mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
+        fi
+        if test ! -d "$pathcomp"; then
+	   exit $lasterr
+        fi
+        pathcomp="$pathcomp/"
+      done
+    fi
+    if [ -d ${ml_dir}/${ml_libdir} ]; then true; else mkdir ${ml_dir}/${ml_libdir}; fi
+
+    # Eg: if ${ml_dir} = m68000/m68881, dotdot = ../../
+    dotdot=../`echo ${ml_dir} | sed -e 's|[^/]||g' -e 's|/|../|g'`
+
+    case ${srcdir} in
+    ".")
+      echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
+      if [ "${with_target_subdir}" != "." ]; then
+	ml_unsubdir="../"
+      else
+	ml_unsubdir=""
+      fi
+      (cd ${ml_dir}/${ml_libdir};
+       ../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
+      if [ -f ${ml_dir}/${ml_libdir}/Makefile ]; then
+	if [ x"${MAKE}" = x ]; then
+	  (cd ${ml_dir}/${ml_libdir}; make distclean)
+	else
+	  (cd ${ml_dir}/${ml_libdir}; ${MAKE} distclean)
+	fi
+      fi
+      ml_newsrcdir="."
+      ml_srcdiroption=
+      multisrctop=${dotdot}
+      ;;
+    *)
+      case "${srcdir}" in
+      /* | [A-Za-z]:[\\/]* ) # absolute path
+        ml_newsrcdir=${srcdir}
+        ;;
+      *) # otherwise relative
+        ml_newsrcdir=${dotdot}${srcdir}
+        ;;
+      esac
+      ml_srcdiroption="-srcdir=${ml_newsrcdir}"
+      multisrctop=
+      ;;
+    esac
+
+    case "${progname}" in
+    /* | [A-Za-z]:[\\/]* )     ml_recprog=${progname} ;;
+    *)      ml_recprog=${dotdot}${progname} ;;
+    esac
+
+    # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
+    ML_POPDIR=`${PWDCMD-pwd}`
+    cd ${ml_dir}/${ml_libdir}
+
+    if [ -f ${ml_newsrcdir}/configure ]; then
+      ml_recprog="${ml_newsrcdir}/configure"
+    fi
+
+    # find compiler flag corresponding to ${ml_dir}
+    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+      dir=`echo $i | sed -e 's/;.*$//'`
+      if [ "${dir}" = "${ml_dir}" ]; then
+        flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
+        break
+      fi
+    done
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
+
+    if [ "${with_target_subdir}" = "." ]; then
+	CC_=$CC' '
+	CXX_=$CXX' '
+	F77_=$F77' '
+	GCJ_=$GCJ' '
+	GFORTRAN_=$GFORTRAN' '
+    else
+	# Create a regular expression that matches any string as long
+	# as ML_POPDIR.
+	popdir_rx=`echo ${ML_POPDIR} | sed 's,.,.,g'`
+	CC_=
+	for arg in ${CC}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    CC_="${CC_}${arg} " ;;
+	  esac
+	done
+
+	CXX_=
+	for arg in ${CXX}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    CXX_="${CXX_}${arg} " ;;
+	  esac
+	done
+
+	F77_=
+	for arg in ${F77}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    F77_="${F77_}${arg} " ;;
+	  esac
+	done
+
+	GCJ_=
+	for arg in ${GCJ}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    GCJ_="${GCJ_}${arg} " ;;
+	  esac
+	done
+
+	GFORTRAN_=
+	for arg in ${GFORTRAN}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    GFORTRAN_="${GFORTRAN_}${arg} " ;;
+	  esac
+	done
+
+	if test "x${LD_LIBRARY_PATH+set}" = xset; then
+	  LD_LIBRARY_PATH_=
+	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
+	    case "$arg" in
+	    "${ML_POPDIR}"/*)
+	      arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+	      ;;
+	    esac
+	    if test "x$LD_LIBRARY_PATH_" != x; then
+	      LD_LIBRARY_PATH_=$LD_LIBRARY_PATH_:$arg
+	    else
+	      LD_LIBRARY_PATH_=$arg
+	    fi
+          done
+	  ml_config_env="$ml_config_env LD_LIBRARY_PATH=$LD_LIBRARY_PATH_"
+	fi
+
+	if test "x${SHLIB_PATH+set}" = xset; then
+	  SHLIB_PATH_=
+	  for arg in `echo "$SHLIB_PATH" | tr ':' ' '`; do
+	    case "$arg" in
+	    "${ML_POPDIR}"/*)
+	      arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+	      ;;
+	    esac
+	    if test "x$SHLIB_PATH_" != x; then
+	      SHLIB_PATH_=$SHLIB_PATH_:$arg
+	    else
+	      SHLIB_PATH_=$arg
+	    fi
+          done
+	  ml_config_env="$ml_config_env SHLIB_PATH=$SHLIB_PATH_"
+	fi
+    fi
+
+    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
+	--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+	${ac_configure_args} ${ml_srcdiroption} ; then
+      true
+    else
+      exit 1
+    fi
+
+    cd ${ML_POPDIR}
+
+  done
+
+  cd ${ml_origdir}
+fi
+
+fi # ${ml_toplevel_p} = yes
+fi # ${enable_multilib} = yes

jnalib/native/libffi/config.guess

@@ -1,14 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2012-12-29'
+timestamp='2007-05-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,23 +17,27 @@ timestamp='2012-12-29'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner. 
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# the same distribution terms that you use for the rest of that program.
 
 
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -52,9 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -141,7 +144,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -167,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
+			| grep __ELF__ >/dev/null
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -177,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-		os=netbsd
+	        os=netbsd
 		;;
 	esac
 	# The OS release
@@ -198,10 +201,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -224,7 +223,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,10 +269,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -299,12 +295,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
+    arm:riscos:*:*|arm:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -328,33 +324,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -398,23 +375,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -484,8 +461,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -498,7 +475,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-	exit ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -555,7 +532,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[4567])
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -598,52 +575,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
+                        esac ;;
+                    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
+		    sed 's/^              //' << EOF >$dummy.c
 
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
 
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
 
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -663,7 +640,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -734,22 +711,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -773,14 +750,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -792,51 +769,40 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
     i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    authenticamd | genuineintel | EM64T)
+	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -866,68 +832,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -938,33 +856,74 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
+    mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	CPU=mipsel
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	CPU=mips
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo or32-unknown-linux-gnu
 	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
@@ -974,17 +933,14 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -992,18 +948,78 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1011,11 +1027,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1032,7 +1048,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1047,7 +1063,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1075,13 +1091,10 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1116,18 +1129,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1140,7 +1143,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1160,10 +1163,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1189,11 +1192,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1203,12 +1206,6 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1236,16 +1233,6 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1261,10 +1248,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
+    NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1309,13 +1293,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1330,14 +1314,11 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
 esac
 
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1355,11 +1336,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-	"4"
+          "4"
 #else
-	""
+	  ""
 #endif
-	); exit (0);
+         ); exit (0);
 #endif
 #endif
 
@@ -1493,9 +1474,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be