update OSX native reference

Updated link to Windows Development Environment.

.gitignore

@@ -0,0 +1,10 @@
+build
+build-d64
+build.eclipse
+build.number
+.metadata
+.DS_Store
+bin
+contrib/ntservice/dist
+contrib/platform/dist
+doc

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jnalib</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>

CHANGES.md

@@ -0,0 +1,568 @@
+Release 3.4.2
+=============
+
+Features
+--------
+* Add `platform.win32.Kernel32.GetEnvironmentVariable` and `platform.win32.Kernel32Util.getEnvironmentVaraible` - [@dblock](https://github.com/dblock).
+* Moved `Kernel32.dll` function definitions from `WinNT.java` into `Kernel32.java` - [@dblock](https://github.com/dblock).
+* Provide `toPointer()` methods on all `_PTR` types (platform win32) - [@twall](https://github.com/twall).
+* Provide ant -Dskip-native to skip platform native build.
+* Provide ant -Dheadless=true to run unit tests headless.
+* Added windows dev environment instructions.
+
+Bug Fixes
+---------
+* Ensure platform win32 classes use unsigned where appropriate (`ULONG_PTR`, `UINT_PTR`, `ULONGLONG`, `WORD`, `DWORDLONG`) - [@twall](https://github.com/twall).
+* [#71](https://github.com/twall/jna/issues/71), [#73](https://github.com/twall/jna/issues/73): Fix OSGI entries in manifest - [@twall](https://github.com/twall).
+* [#78](https://github.com/twall/jna/issues/78): Fix NPE in `platform.win32.Netapi32Util.getDomainTrusts` - [@dblock](https://github.com/dblock).
+* Fix: auto-sync memory for `struct**` arguments (array of struct pointers) - [@twall](https://github.com/twall).
+* Fix: `platform.win32.Secur32.AcquireCredentialsHandle`, `InitializeSecurityContext` and `AcceptSecurityContext` on Win32 64-bit - [@dblock](https://github.com/dblock).
+* Fix: avoid overwriting native `char *` or `wchar_t *` fields within structures when unmodified (similar to current operation with pointers) - [@twall](https://github.com/twall).
+* Fix: `platform.win32.DsGetDC.DS_DOMAIN_TRUSTS` and `DsEnumerateDomainTrusts` on Win32 64-bit - [@trejkaz](https://github.com/trejkaz).
+* Fix: Crash freeing the wrong pointer in `Netapi32Util.getDomainTrusts` - [@trejkaz](https://github.com/trejkaz).
+* [#100](https://github.com/twall/jna/issues/100): Fix `platform.win32.W32FileMonitor` - [@dblock](https://github.com/dblock).
+* Return INT_PTR from `platform.win32.Shell32.ShellExecute`, since returning
+`HINSTANCE` is useless.
+* Fix runtime error in some instances where Structure.setFieldOrder is used (never return self when sharing AutoAllocated memory).
+* [#107](https://github.com/twall/jna/issues/107): `Structure.clear()` always calls `ensureAllocated()` to avoid NPE.
+* Ensure internal memory pointer is *always* allocated when calling `Structure.useMemory()`, even if layout is not yet determined.
+ 
+Release 3.4.1
+=============
+
+Features
+--------
+* Add 'unsigned' modifier to IntegerType.
+* Add to `platform.win32.User32`: `GetLastInputInfo`.
+* Add `platform.win32.WinNT.GetFileType` and `platform.win32.Kernel32Util.getFileType`.
+* Add to `platform.win32.Kernel32Util`: `getFileType`.
+
+Bug Fixes
+---------
+* Re-build linux-amd and linux-i386 against older versions of glibc (2.2.5 and
+2.1.3 respectively).
+* Properly initialize first printer info struct in winspool library.
+* Properly support getting and setting zero-array-length `REG_MULTI_SZ` values on Win32.
+* Fixed SID in Win32 `USER_INFO_23` and `GROUP_INFO_3`.
+* Fixed passing domain name into Win32 `Netapi32Util.getUserInfo`.
+
+Release 3.4.0
+=============
+
+Features
+--------
+* Provide `jna.nosys=true` to avoid loading any system-provided JNA (useful for local build/development).
+* Allow override of default jnidispatch library name with `jna.boot.library.name` system property.
+* Throw an Error if a system install of JNA is incompatible or if JNA's JNI library does not match.
+* Disable automatic jnidispatch unpacking with `jna.nounpack=true`.
+* Automatically look up system error messages for LastErrorException.
+* Improved callback thread-mapping support; re-use, rename, and group callback
+threads.
+* Cache structure layout results, improving performance of structure creation.
+* linux/arm 32-bit support (hardware provided by Alex Lam).
+* linux/ppc 32-bit support (hardware provided by Fritiof Hedman).
+* Preliminary linux/ia64, linux/ppc64 support (thanks to Laurent Guerby and the GCC compile farm).
+* Windows CE/Mobile support (w32ce-arm) (resources provided by andrea antonello and Hydrologis SRL).  
+* linux multi-arch support (kohsuke).
+* Added REG_QWORD registry type support
+* Add to `platform.unix.x11`: `XGrabKey`, `XUngrabKey`, `XSetErrorHandler`.
+* Add to `platform.mac.Carbon`: `GetEventDispatcherTarget`, `InstallEventHandler`, `RegisterEventHotKey`, `GetEventParameter`, `RemoveEventHandler`, `UnregisterEventHotKey`.
+* Add to `platform.win32.Kernel32`: `CopyFile`, `MoveFile`, `MoveFileEx`, `CreateProcess`, `SetEnvironmentVariables`, `GetFileTime`, `SetFileTime`, `SetFileAttributes`, `DeviceIoControl`, `GetDiskFreeSpaceEx`, `CreateToolhelp32Snapshot`, `Process32First`, `Process32Next`.
+* Add to `platform.win32.Msi`: `MsiGetComponentPath`, `MsiLocateComponent`, `MsiGetProductCode`, `MsiEnumComponents`.
+* Add to `platform.win32.User32`: `RegisterHotKey`, `UnregisterHotKey`
+* Add to `platform.win32.SetupApi`: `SetupDiGetClassDevs`, `SetupDiDestroyDeviceInfoList`, `SetupDiEnumDeviceInterfaces`, `SetupDiGetDeviceInterfaceDetail`, `SetupDiGetDeviceRegistryProperty`.
+* Add `platform.win32.Shell32.ShellExecute`.
+* Add to `platform.win32.User32`: `SetParent`, `IsWindowVisible`, `MoveWindow`, `SetWindowPos`, `AttachInputThread`, `SetForegroundWindow`, `GetForegroundWindow`, `SetFocus`, `SendInput`, `WaitForInputIdle`, `InvalidateRect`, `RedrawWindow`, `GetWindow`, `UpdateWindow`, `ShowWindow`, `CloseWindow`.
+* Add to `platform.win32.Version`: `GetFileVersionInfoSize`, `GetFileVersionInfo`, `VerQueryValue`.
+* Add to `platform.win32.Advapi32`: `GetFileSecurity`, `RegQueryValueEx(...Long...)`.
+* Add to `platform.win32.Netapi32`: `NetUserGetInfo`.
+
+Bug Fixes
+--------
+* Revise cleanup of in-use temporary files on win32 (issue 6).
+* Fix structure alignment issues on linux/ppc.
+* Fix structure alignment issues on linux/arm.
+* Account for NIO Buffer position (JIRA issue 185).
+* Avoid crash with very long Strings (> 150k in length).
+* Fix bug tracking Memory with an associated direct ByteBuffer.
+* Fix bug handling structs by value when type mappers are in effect (JIRA issue 188).
+
+Release 3.3.0
+=============
+
+Features
+--------
+
+* Facilitate `Memory` subclasses (jbellis).
+* Allow multiple fields of the same type in Unions (Francis Barber).
+* Add `platform.win32.Advapi32.AdjustTokenPrivileges`, `platform.win32.Advapi32.LookupPrivilegeName`, `platform.win32.Advapi32.LookupPrivilegeValue`, `platform.win32.Advapi32.ImpersonateSelf`.
+* Add `platform.win32.Advapi32.DuplicateTokenEx`, `platform.win32.Advapi32.CreateProcessAsUser`, `platform.win32.Kernel32.GetExitCodeProcess`, `platform.win32.Kernel32.TerminateProcess`, `platform.win32.Kernel32.ReadFile`, `platform.win32.Kernel32.CreatePipe`, `platform.win32.Kernel32.SetHandleInformation` and related constants / structures in `platform.win32.WinBase` and `platform.win32.WinNT`. Please note that the `SECURITY_ATTRIBUTES` structure has been moved from `platform.win32.WinNT` to `platform.win32.WinBase`.
+* Add `platform.win32.Kernel32.DeleteFile` and `platform.win32.Kernel32Util.deleteFile`.
+* Add `platform.win32.Kernel32.GetFileAttributes` and `platform.win32.Kernel32Util.getFileAttributes`.
+* Add `platform.win32.Kernel32.GetTickCount`.
+* Add Win32 Service functions to `platform.win32.Advapi32`.
+* Add `platform.win32.W32ServiceManager` and `W32Service`.
+* Add Win32 Event Logging functions to `platform.win32.Advapi32` and `platform.win32.Advapi32Util.EventLogIterator`.
+* `platform.win32.Advapi32Util.registryCreateKey` returns `true` if key was created, `false` if it already exists.
+* Add `REG_BINARY`, `REG_EXPAND_SZ` and `REG_MULTI_SZ` support to `platform.win32.Advapi32Util` registry functions.
+* Reduce JNI crossings in a number of native methods, moving object creation out into pure Java code.
+
+Bug Fixes
+---------
+
+* Move all native functions into `com.sun.jna.Native`, to ensure that all dependent classes must be disposed before the `Native` class is unloaded.  Note that this change is incompatible with all previous JNA native libraries.
+* Fix `platform.win32.Kernel32.GetNativeSystemInfo` and `GetSystemInfo` AV on Win64.
+* Fix several potential minor bugs as reported by TvT.
+* Fix bug in Structure.StructureSet.toString (Blair Zajac), exposed by Tomcat ThreadLocal cleanup.
+* Fix several bugs when using Structure(Pointer) ctor and array fields (Samuel Audet).
+
+Release 3.2.7
+=============
+
+Features
+--------
+
+* Add native peer value accessors for Pointer
+* The `jna.library.path` property is now re-evaluated whenever a native library is loaded.  Previously this value was cached when the JNA classes loaded.
+* `Native.loadLibrary` can now load `.drv` files.
+* Refactor `com.sun.jna.platform.win32.WINBASE` into `WinDef`, `WinNT` and `BaseTSD`, matching Windows SDK headers.
+* Refactor constants from `com.sun.jna.platform.win32.GDI32` into `WinGDI`, matching Windows SDK headers.
+* Refactor constants from `com.sun.jna.platform.win32.User32` into `WinUser`, matching Windows SDK headers.
+* Refactor `platform.win32.WinNT.LARGE_INTEGER` into a union.
+* Add `platform.win32.ObjBase`, `com.sun.jna.platform.win32.Ole32.CoInitializeEx`, `CoUninitialize`, and `CoCreateInstance`.
+* Add `platform.win32.Oleaut32.SysAllocString` and `SysFreeString`.
+* Add `platform.win32.Secur32.ImpersonateSecurityContext` and `RevertSecurityContext`.
+* Add `platform.win32.WinNT.WELL_KNOWN_SID_TYPE`, `SECURITY_MAX_SID_SIZE` and other related SID-related constants.
+* Add `platform.win32.Advapi32.CreateWellKnownSid` and `IsWellKnownSid` and `com.sun.jna.platform.win32.Advapi32Util.isWellKnownSid`.
+* Add `platform.win32.Kernel32.GetVersion`, `GetVersionEx`, `GetSystemInfo`, `GetNativeSystemInfo`, `GlobalMemoryStatusEx`, `GetLogicalDriveStrings` and `IsWow64Process`.
+* Add `platform.win32.Kernel32Util.getLogicalDriveStrings`.
+* Add `platform.win32.User32.GetSystemMetrics`.
+* Add `platform.win32.BaseTSD.DWORD_PTR`.
+* Add `platform.win32.WinBase.SYSTEM_INFO` and `MEMORYSTATUSEX`.
+* Add `platform.win32.WinNT.OSVERSIONINFOEX`, `VER` constants.
+* Add `platform.win32.WinDef.ULONGLONG` and `DWORDLONG`.
+* Add `platform.win32.Shell32.SHGetDesktopFolder` (prep work for Com4JNA).
+* Add `platform.win32.Winspool.GetPrinterInfo`.
+* Add `platform.win32.WinspoolUtil.getPrinterInfo1`.
+* Add `platform.win32.GDI32.GetDeviceCaps`.
+* Add `platform.win32.GDI32.GetDIBits`.
+
+Bug Fixes
+---------
+
+* Fix `ClassCastException` in `Structure.equals` (issue 152).
+* Fix bug initializing a structure object from existing memory when the structure has initialized fields (issue 133).
+* Fix NPE reading an array of string from a pointer when an element of the array is `NULL` (issue 151).
+* Avoid calling `UnregisterNatives` in native code (issue 154).
+* Compare unpacked library path against canonical (long) filename (issue 156).
+* Fix `read()` of uninitialized memory in `platform.win32.Advapi32Util.getTokenGroups` and `getTokenAccount`.
+* Fix `com.sun.jna.platform.win32.Secur32.QuerySecurityContextToken` to take a `CtxtHandle` instead of `PSecHandle`.
+* Fix definition of BITMAPINFO (platform/win32).
+
+Release 3.2.5
+=============
+
+Features
+--------
+
+* Split code in examples.jar into a contrib platform.jar package and individual packages for demos.
+* Fix Eclipse build and added Eclipse projects for all contrib samples, import projects from jnalib and contrib.
+* Ensure Structure fields correctly ordered when inherited.
+* Use explicit Structure field whenever provided, regardless of whether the VM requires it.
+* Add Win32 mappings for two dozen functions from Kernel32.dll, Advapi32.dll, Netapi32.dll, Secur32.dll, NtDll.dll, Ole32.dll, Shell32.dll and Crypt32.dll to com.sun.jna.platform.win32.
+* Port parts of WinError.h, WinNT.h, LMAccess.h, LMCons.h, LMErr.h, LMJoin.h, NTStatus.h, ShlObj.h, WinDef.h, ShellApi.h, Wdm.h, WinReg.h, WinCrypt.h, Sspi.h, Guid.h, NtSecApi.h and DsGetDc.h.
+* Add Win32 simplified utility interfaces Kernel32Util, Advapi32Util, Netapi32Util, Crypt32Util, NtDllUtil, Shell32Util, Ole32Util and Secur32Util to com.sun.jna.platform.win32.
+* Support unicode paths in W32FileUtils.
+* Fix exception during dispose in W32FileMonitor.
+
+Bug Fixes
+---------
+
+* Provide String.replace for 1.4 compatibility.
+* Avoid allocating memory when Structure is provided a pointer in the ctor.
+* Ensure proper value returned in Pointer.getValue() for non-null, unchanged NIO Buffer values.
+* Use 1.4-compatible URI generation (issue 149).
+
+Release 3.2.4
+=============
+
+Features
+--------
+
+* Make Pointer ctor public.
+* Provide access to Function objects for arbitrary Pointer values.
+* Add linux/ia64 binaries (bpiwowar).  See issue 134 patch.
+
+Bug Fixes
+---------
+
+* Use a more robust method to decode a file-based URL (issue 135).
+
+Release 3.2.3
+=============
+
+Features
+--------
+
+* Include version information in code in case package information lost.
+
+Bug Fixes
+---------
+
+* Fix WindowUtils exception on mouse over TrayIcon.
+* Fix bug toggling windows transparent/opaque (win32/OSX).
+* Avoid overwriting unchanged Pointer values in arrays (function calls with Pointer[] and Structure.read). 
+* Ensure Structure fields marked `final` are never written.
+* Fix bug preventing proper population Structure.ByReference fields on Structure read.
+* Ensure double buffering is disabled in components added to a transparent window.
+* Fix UnsatisfiedLinkError attempting to load system libraries under Web Start.
+* Fix loading Web Start-provided libraries on OSX (libraries must have a .jnilib suffix under Web Start).
+* Properly include sources in Maven zip file (Issue 129).
+
+Release 3.2.2
+=============
+
+Features
+--------
+
+* Provide length-specified Pointer.getStringArray()
+
+Bug Fixes
+---------
+
+* Fix crash with direct mapping if NULL struct* used (Issue 125).
+* Fix case where null-valued Structure fields would get non-null values on write. 
+* Synch callback Structure/Structure[] arguments on callback return.
+* Fix NPE when mapping an interface to the current process.
+* Automatically load proper C library version from current process on Linux (avoids crashing bug on Ubuntu with libc-i686 packages active).
+* Avoid scanning structure contents in Structure.toString if contents aren't actually used.
+
+Release 3.2.1
+==========
+
+Features
+--------
+
+* Add HRESULT, LONG mapping to W32API (marc strapetz).
+
+
+Bug Fixes
+---------
+
+* Fix definition of HWND_BROADCAST in W32API.
+* Fix memory alignment checking (Issue 121).
+* Fix Structure equals/hashCode implementation, based on current Java fields rather than strictly native memory contents.  Avoid using equals/hashCode when avoiding recursive reads/writes.
+
+Release 3.2.0
+=============
+
+Features
+--------
+
+* Handle String, Structure, Callback, Buffer, and primitive arrays in direct mappings.  Handle NativeMapped and TypeMapper, with optimized paths for IntegerType and PointerType.
+* Optionally throw errno/GetLastError as an exception.  This is preferred to (and more efficient than) calling Native.getLastError().
+* Unload/delete native library unpacked from jna.jar if Native class is garbage collected.  Only install shutdown hook if using the system class loader. 
+* Auto-write contiguous Structure arrays when first element is written.
+* Support NativeMapped[] as function arguments for interface-mapped libraries (Issue 90).
+* Enable function lookup within current process on Windows.
+
+Bug Fixes
+---------
+
+* Restrict recursive structure reads/writes by thread instead of globally. This avoids potentially missed reads/writes with concurrent access (Issue 120).
+* Ensure Memory is not GC'd and freed if direct NIO buffers mapped to it are extant.
+* Allow types derived from java.nio.Buffer as Structure fields.
+
+Release 3.1.0
+=============
+
+Features
+--------
+
+* Add raw JNI mapping of static Java methods.  Performance is about 10X that of traditional JNA interface mapping, although with less type conversion functionality. 
+* Add library option to allow passing/return of Java Objects.
+* Allow handling of uncaught callback exceptions (Issue 63).
+* Object oriented interface to X server (see contrib/x11)
+* Make Memory class more accessible.
+* Provide Structure ctor with Pointer argument (issue 102).
+* Allow implicit library access to current process on linux (issue 98).
+* Open all shared libraries with RTLD_GLOBAL, if applicable.  This was the default behavior on OSX and changes the default behavior on linux.
+* Allow NIO Buffer as Structure field (with limitations) (Issue 57)
+* Add `size_t` size.
+
+Bug Fixes
+---------
+
+* Run tests with libjsig.so, if available, which fixes some crashes when running tests on 64-bit platforms. 
+* Fix Issue 104.
+* Fix Issue 94 (Java 1.6 update 10 regression).
+* Fix Issue 51 (Java 1.6 update 10 regression).
+* Fix Issue 95.
+* Fix Issue 101.
+* Fix Issue 111, memory leak with String-returning Callback.
+* Fix missing storage of union type information (affects usage of struct/union by value as argument and return type).
+* Remove non-functional Structure ctors requiring explicit size.
+
+Release 3.0.9
+=============
+
+Bug Fixes
+---------
+
+*  Fix issue 93 by only manually searching jna.library.path, then falling back to passing the mapped library name to dlopen/LoadLibrary.  This fixes an issue in JRUBY where the incorrect libc.so.6 was being loaded.
+
+Release 3.0.8
+==========
+
+Features
+--------
+
+* Auto-map Pointer[]/String[]/WString[] return values.
+* Provide utility functions to convert String to primitive array.
+* Add jna.library.boot.path property to define the directory that the native stub library is loaded from
+
+Release 3.0.7
+==========
+
+Features
+--------
+
+* Improve Win32 loading of libraries with dependencies.
+
+Bug Fixes
+---------
+
+* Fix bug reading structures with PointerType fields, introduced with Pointer field preservation fix.
+
+Release 3.0.6
+=============
+
+Features
+--------
+
+* Allow arbitrary callback method names if only one method is defined in the class which implements Callback (colinwalters).
+* Allow specification of callback type mappers by using a TYPE_MAPPER field (colinwalters).
+* Allow uninitialized (null-valued) boxed primitives in Structures (colinwalters).
+* Add convenience methods to set active Union field and value simultaneously (xylo).
+* Augment Union read/writeField to set the active field.
+* Allow Structure auto-synch across native calls to be disabled.
+* Win64 support.
+
+Bug Fixes
+---------
+
+* Avoid overwriting unchanged Structure fields of type Pointer.
+* Avoid more content dragging on OSX or warn if it's too late.
+* Fix UnsatisfiedLinkError using transparent window on Win2K.
+* Fix memory leak with callbacks called from native threads with no Java context (johnwallace).  
+* Defer structure size calculation if type mapper not yet set, allowing type mapper to be set in derived constructors (colinwalters).
+* Ensure structure memory is allocated in Structure.read/writeField.
+
+Release 3.0.5
+=============
+
+Features
+--------
+
+* Allow explicit declaration of field order for VMs which have an unpredictable field order.
+* Check for w32 libraries with a "lib" prefix in addition to normal lookup.
+* Allow String[]/WString[] as callback argument/return value (assume NULL-terminated array).
+* Add Solaris8 compatibility to sunos-sparc build (Corey Puffalt).
+* Look up libraries using web start library path, if appropriate (Corey Puffalt).
+* Use constants to return integer boolean values.
+
+Bug Fixes
+---------
+
+* Properly track cursor on alpha-masked windows.
+* Avoid searching /lib or /usr/lib on 64-bit Linux.
+* Avoid using incorrect version of a library when both 32- and 64-bit versions are found.
+* Avoid transparent window events always dragging window bug on OSX.
+* Fix division by zero error calculating structure size on OSX/ppc.
+* Avoid overwriting initialized NativeMapped Structure fields when calculating structure size.
+* Fix NPE reading back into StringArray.
+
+Release 3.0.4
+=============
+
+Features
+--------
+
+* Automatically write contents of Structure.ByReference fields on Structure.write().
+* Use the actual parameter type in Function invocations if no parameter type information is available (whether method is missing or untyped varargs).
+* Augmented X11 library mappings (xylo).
+* Support read/write of NativeMapped arrays within Structure (notably NativeLong).
+
+Bug Fixes
+---------
+
+* Fix library load error when /usr/lib32 and /usr/lib both exist (linux) (Marek Slama).
+* Avoid incorrect matches against libraries named with the same prefix (e.g. libc-client.so vs libc.so) (xylo).
+* Properly handle arrays of NativeMapped (e.g. NativeLong) as a Structure field (stefan endrullis).
+* Ensure structure size calculated prior to setting union active type.
+* XID is 64-bits on 64-bit X clients (xylo).
+* Ensure proper arch name is used on Debian (amd64 instead of x86_64).
+
+Release 3.0.3
+=============
+
+Features
+--------
+
+* Enable build/run using IBM's J9 VM (leonardo).
+* Make StdCallFunctionMapper attempt a leading underscore if the simpler mapping doesn't work.
+* Allow Structure.read to overwrite final fields (may not work on some 1.4 VMs). 
+
+Bug Fixes
+---------
+
+* Fix NPE when passing an array of Structure.ByReference.
+* Compare entire linux library version when finding a match.
+* Don't pass struct by value unless the method signature declares it.
+* Restrict custom first element structure alignment to OSX/ppc.
+* Improve performance and reduce memory footprint for window masks. Optimize polygon-based masks on w32.  Use XFillRectangles on X11.
+* Fix linkage settings on sunos-amd64 to avoid relocation errors.
+* Fix callback allocation code on w32, solaris, freebsd, darwin (libffi was misconfigured).
+* Fix bug when NativeMapped fields are used in a Structure.ByValue instance.
+* Fix NPE calling Structure.read() before memory is initialized.
+* Fix NPE calling Structure.read/write with uninitialized NativeMapped fields. 
+
+Release 3.0.2
+=============
+
+Features
+--------
+
+* Attempt to force unload of jnidispatch library prior to deleting it (w32).
+* Added amd64 targets for OSX, FreeBSD, and Solaris.
+
+Bug Fixes
+---------
+
+* Reduce space allocated for invocation arguments.
+* Fix NPE when NativeMapped type is used in a Structure.
+* Fix some X11 type mappings for 64-bit.
+* Fix OSX Leopard/JRE1.5+ window transparency.
+* Fix window alpha compositing on X11.
+* Fix loading of libraries with unicode names on OSX.
+
+Release 3.0.1
+=============
+
+Features
+--------
+
+* Improve transparent window drawing performance on w32
+* Use closure allocation from libffi
+
+Bug Fixes
+---------
+
+* Ensure nested structure arrays initialized with Structure.toArray use the appropriate native memory.
+* Ensure structure size is calculated prior to converting to array
+* Avoid creating new windows when setting a window mask
+* Fix bug in Pointer.setChar.
+
+Release 3.0
+===========
+
+Features
+--------
+
+* More supported platforms, via GCC's libffi (wmeissner)
+* Support struct by value as parameter and return value (duncan)
+* Support struct by reference within structures
+* Provide access to native peer for java.awt.Component 
+* Provide access to native peer on OS X.
+* Support MINGW32 builds (fullung)
+* Allow per-field Structure read/write by field name
+* Avoid writing Structure fields marked 'volatile'
+* Read and wrap function pointers in Structure fields when read with a Java proxy to allow easy Java-side invocation (Ken Larson)
+* Support array-backed Buffers as arguments (wmeissner)
+* Auto-conversion of custom types (wmeissner)
+* Allow pointer type-safety
+* Optional VM crash protection, via Native.setProtected(boolean)
+* Auto-convert WString[]
+* Provide library synchronization wrapper similar to Collections.synchronizedX
+* Support lookup of OSX framework libraries by name
+* Explicit access to shared library global data
+* Invocation interception to facilitate translation of C preprocessor macros and inline functions
+* Provide utility to determine Web Start native library cache location; auto-include this path if jnidispatch is included as a <nativelib> (robertengels) 
+* Provide access to aligned memory
+* Versioning information embedded in jna.jar and native library
+
+Bug Fixes
+---------
+
+* Avoid attempts to free native library if it failed to load (wmeissner)
+* Explicitly check method signatures for varargs instead of heuristically guessing (wmeissner)
+* Disallow declaring Pointer-derived fields in Structures (Function, Memory)
+* Ensure Object.toString/hashCode/equals methods are intercepted on proxyied interfaces
+* Update X11 library for 64-bit use (wmeissner)
+* Properly map arrays of char*/wchar_t* under w32
+* Allow Pointer[] as a Structure field and Function argument
+* Fix some misleading Structure error messages
+* Properly preserve/return GetLastError/errno after native calls
+* Allocate executable memory on w32 to avoid errors with hardware-enforced data execution protection (DEP)
+* Fix VM crash on w32 stdcall callbacks
+* Use long offsets and sizes rather than ints (64-bit safe)
+* Properly clean up references and release closure memory on JNI_Unload
+* Use simpler AWT/JAWT library loading workaround
+* Avoid changing array references within a Structure on read
+
+Release 2.5
+===========
+
+Features
+--------
+
+* Unions
+* Optimized shaped windows (chris deckers & olivier chafik); instantiation time improved by about 2-3 orders of magnitude for large, mostly contiguous shapes
+* Provide type mapping in callback arguments/results
+* Provide access to ByteBuffer direct address as a Pointer
+* Provide customization of native string encoding with jna.encoding system property 
+
+Bug Fixes
+---------
+
+* Properly handle VMs with reversed Structure member storage
+* Avoid making window undecorated when clearing window mask on X11
+* Fix structure alignment bug on OSX/PPC when first element is > 4 bytes in size
+* Clearing OSX window mask by setting to MASK_NONE now works properly
+* Avoid index exceptions if native buffers are not NUL-terminated on string conversions
+* Write initialized Structure[] argument memory prior to function calls
+* Fix IllegalArgumentException reading WString into a Structure
+* Clear memory when allocating a structure block (fixes VM crash)
+* Remove versioned JAWT dependency on OSX, allowing use on 10.3/JRE1.4.
+
+Release 2.4
+===========
+
+Features
+--------
+
+* Explicitly support unaligned structures
+* Auto-reallocate structure arrays
+* Automatic handling of w32 UNICODE/ASCII variants
+* Automatic mapping of decorated w32 stdcall function names
+* Customizable, automatic type conversion of arguments and results (wmeissner)
+* Support char*[] arguments as Java String[] 
+* Structure supports Callback members (wmeissner)
+* getByteBuffer from Pointer/Memory (wmeissner)
+* Allow GC of native libraries
+* Facilitate use from non-Java contexts (JRuby et al.) (wmeissner)
+* Improve library path searching (wmeissner)
+* Handle Structure[] arguments
+* Handle native long arguments and return values
+* Handle direct and array-based ByteBuffer arguments (wmeissner)
+* Change default w32 build to use GCC (it's free, yo)
+
+Bug Fixes
+---------
+
+* Structure.toArray failed to initialize members
+* Disallow explicit free of Structure/Memory
+* Ensure native libraries are only loaded once until released
+* Properly handle NULL when the return value is a Structure
+* Proper conversion to wchar_t on linux
+* Copy full length of Java strings to C strings instead of stopping when a NUL character is encountered

README.md

@@ -0,0 +1,110 @@
+![Java Native Access - JNA](https://github.com/twall/jna/raw/master/www/images/jnalogo.jpg "Java Native Access - JNA")
+
+Java Native Access (JNA)
+========================
+
+The definitive JNA reference (including an overview and usage details) is in the [JavaDoc](http://twall.github.com/jna/3.4.2/javadoc/).  Please read the [overview](http://twall.github.com/jna/3.4.2/javadoc/overview-summary.html#overview_description).
+
+JNA provides Java programs easy access to native shared libraries (DLLs on Windows) without writing anything but Java code—no JNI or native code is required. This functionality is comparable to Windows' Platform/Invoke and Python's ctypes. Access is dynamic at runtime without code generation.
+
+JNA allows you to call directly into native functions using natural Java method invocation. The Java call looks just like it does in native code. Most calls require no special handling or configuration; no boilerplate or generated code is required.
+
+The JNA library uses a small native library stub to dynamically invoke native code. The developer uses a Java interface to describe functions and structures in the target native library. This makes it quite easy to take advantage of native platform features without incurring the high overhead of configuring and building JNI code for multiple platforms.
+
+While some attention is paid to performance, correctness and ease of use take priority.
+
+JNA includes a platform library with many native functions already mapped as well as a set of utility interfaces that simplify native access.
+
+Download
+========
+
+Version 3.4.2
+
+* [jna.jar](jna/blob/3.4.2/dist/jna.jar?raw=true)
+* [platform.jar](jna/blob/3.4.2/dist/platform.jar?raw=true)
+
+Version 3.4.1
+
+* [jna.jar](jna/blob/3.4.1/dist/jna.jar?raw=true)
+* [platform.jar](jna/blob/3.4.1/dist/platform.jar?raw=true)
+
+Features
+========
+
+* Automatic mapping from Java to native functions, with simple mappings for all primitive data types
+* Runs on most platforms which support Java
+* Automatic conversion between C and Java strings, with customizable encoding/decoding
+* Structure and Union arguments/return values, by reference and by value
+* Function Pointers, (callbacks from native code to Java) as arguments and/or members of a struct
+* Auto-generated Java proxies for native function pointers
+* By-reference (pointer-to-type) arguments
+* Java array and NIO Buffer arguments (primitive types and pointers) as pointer-to-buffer
+* Nested structures and arrays
+* Wide (wchar_t-based) strings
+* Native long support (32- or 64-bit as appropriate)
+* Demo applications
+* Supported on 1.4 or later JVMs, including JavaME (earlier VMs may work with stubbed NIO support)
+* Customizable marshalling/unmarshalling (argument and return value conversions)
+* Customizable mapping from Java method to native function name, and customizable invocation to simulate C preprocessor function macros
+* Support for automatic Windows ASCII/UNICODE function mappings
+* Varargs support
+* Type-safety for native pointers
+* VM crash protection (optional)
+* Optimized direct mapping for high-performance applications.
+
+Community and Support
+=====================
+
+All questions should be posted ot the [jna-users Google group](http://groups.google.com/group/jna-users). Issues can be submitted [here on Github](https://github.com/twall/jna/issues).
+
+When posting to the mailing list, please include the following:
+
+* What OS/CPU/architecture you're using (e.g. Windows 7 64-bit)
+* Reference to your native interface definitions (i.e. C headers), if available
+* The JNA mapping you're trying to use
+* VM crash logs, if any
+* Example native usage, and your attempted Java usage
+
+It's nearly impossible to indicate proper Java usage when there's no native
+reference to work from.
+
+For commercial support, please contact twalljava [at] java [dot] net.
+
+Using the Library
+=================
+
+* [Getting Started](jna/tree/master/www/GettingStarted.md)
+* [Mapping between Java and Native](jna/tree/master/www/Mappings.md)
+* [Using Pointers and Arrays](jna/tree/master/www/PointersAndArrays.md)
+* [Using Structures and Unions](jna/tree/master/www/StructuresAndUnions.md)
+* [Using By-Reference Arguments](jna/tree/master/www/ByRefArguments.md)
+* [Customization of Type Mapping](jna/tree/master/www/CustomMappings.md)
+* [Callbacks/Function Pointers/Closures](jna/tree/master/www/CallbacksAndClosures.md)
+* [Dynamically Typed Languages (JRuby/Jython)](jna/tree/master/www/DynamicallyTypedLanguages.md)
+* [Platform Library](jna/tree/master/www/PlatformLibrary.md)
+* [Direct Method Mapping](jna/tree/master/www/DirectMapping.md) (Optimization)
+* [Frequently Asked Questions (FAQ)](jna/tree/master/www/FrequentlyAskedQuestions.md)
+* [Setting up a Windows Development Environment](jna/tree/master/www/WindowsDevelopmentEnvironment.md)
+* [Avoiding Crashes](http://twall.github.com/jna/3.4.2/javadoc/overview-summary.html#crash-protection)
+
+Primary Documentation (JavaDoc)
+===============================
+
+The definitive JNA reference is in the [JavaDoc](http://twall.github.com/jna/3.4.2/javadoc/).
+
+Contributing 
+============
+
+You're encouraged to contribute to JNA. Fork the code from [github.com/twall/jna](https://github.com/twall/jna) and submit pull requests.
+
+For more informationon setting up a development environment see [Contributing to JNA](jna/tree/master/www/Contributing.md).
+
+If you are interested in paid support, feel free to say so on the [jna-users mailing list](http://groups.google.com/group/jna-users). Most simple questions will be answered on the list, but more complicated work, new features or target platforms can be negotiated with any of the JNA developers (this is how several of JNA's features came into being). You may even encounter other users with the same need and be able to cost share the new development.
+
+License
+=======
+
+This library is provided under the LGPL, version 2.1 or later.  Alternative license arrangements are negotiable.
+
+*NOTE: Oracle is not sponsoring this project, even though the package name (com.sun.jna) might imply otherwise.*
+

RELEASE.md

@@ -0,0 +1,20 @@
+JNA release process (does not yet include maven deployment)
+
+* Bump version in CHANGES.md and build.xml.  Change JNI version in build.xml *only* if
+  JNA's native API has been changed (i.e. md5 changed).  Bump JNA minor version if its Java API
+  has changed significantly or incompatibly.
+
+* If native changes have been made, run `ant dist` target on each target
+  platform, pushing the resulting target-specific jar file to master.
+
+* Run `ant dist` target.  Commit and push generated jar files in dist.
+
+* Update Javadoc
+  Check out gh-pages branch, copy latest doc/javadoc into <version>/javadoc,
+  commit and push.
+
+* Update README.md, commit and push
+  * download links
+  * javadoc links
+
+* Tag as <version>, push new tag to origin

TODO

@@ -18,43 +18,35 @@
 * 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
+* dispose memory/callbacks in Native finalizer to ensure they run first
+  (use referencequeue to run them when they become unreachable)
 
-* pointer.setValue(), to handle NativeMapped types and move read/writeValue
-  methods out of Structure, to be used by Function w/NativeMapped[] parameter
+* 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 multiple times).  This also makes it easer to perform conversions
+  (no native changes required).  
 
+* use libffi java raw?
+
+* 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
+* Callback.PostCallWrite.write() cf PostCallRead
 * 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.  
-
+* 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.
@@ -93,6 +85,28 @@
   "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.
+* 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
+* cache structure information per-class
+* fix setFieldOrder to *always* apply if used
+* 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)
+* check Structure "final" fields; should never write back to native memory
+* OSX ObjC access (see rococoa)
+* do Structure.write for any callback args
+* pointer.setValue(), to handle NativeMapped types and move read/writeValue
+  methods out of Structure, to be used by Function w/NativeMapped[] parameter
+
 * 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)
@@ -104,15 +118,6 @@
     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)?
@@ -255,11 +260,6 @@ int findNativeWindow(Window w);
     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

build.xml

@@ -0,0 +1,987 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="JNA" default="default" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+  <description>Builds and tests JNA</description>
+
+  <!-- Default build compiles all platform-independent stuff as well
+       as the JNI bits for the current platform, using the arch model
+       of the current Java VM to determine whether 32- or 64-bit
+       binaries are built (ANT_OPTS=-d32/-d64 to switch on platforms that
+       support it).
+
+       Cross-compile by specifying -Dos.prefix={name-arch} to ant
+       (cross-compile currently only configured/tested on w32ce-arm)
+
+       Use -Dskip-native to skip building native parts.
+       Use -Dheadless to run tests headless
+    -->
+
+  <!--
+  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="platform.src" location="contrib/platform/src"/>
+  <property name="contrib" location="contrib"/>
+  <property name="dist" location="dist"/>
+  <property name="lib.native" location="lib/native"/>
+  <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-2012 Timothy Wall. All Rights Reserved."/>
+  <buildnumber/>
+  <!-- JNA library release version -->
+  <property name="jna.major" value="3"/>
+  <property name="jna.minor" value="4"/>
+  <property name="jna.revision" value="2"/>
+  <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="4"/>
+  <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="4c69bcf40b30785215211b5a5dad211e"/>
+  <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})"/>
+
+  <!-- Set up restrictions for w32ce, based on JavaME/CDC -->
+  <property name="compatibility" value="1.4"/>
+  <property name="platform.compatibility" value="1.5"/>
+  <condition property="test.compatibility" value="1.4">
+    <equals arg1="${os.prefix}" arg2="w32ce-arm"/>
+  </condition>
+  <condition property="tests.exclude-patterns" value="**/VarArgsTest.java,**/AnnotatedLibraryTest.java,**/WebStartTest.java,**/PointerBufferTest.java,**/HeadlessLoadLibraryTest.java,**/StructureBufferFieldTest.java,**/PerformanceTest.java,**/*BufferArgumentsMarshalTest.java">
+    <equals arg1="${os.prefix}" arg2="w32ce-arm"/>
+  </condition>
+  <property name="test.compatibility" value="1.5"/>
+  <property name="dist-jar" value="${dist}/jna.jar"/>
+
+  <!-- Maven -->
+  <!-- define Maven coordinates -->
+  <property name="groupId" value="net.java.dev.jna" />
+  <property name="artifactId" value="jna" />
+  <property name="version" value="${jna.major}.${jna.minor}.${jna.revision}" />
+
+  <property name="maven-javadoc-jar" value="${dist}/${artifactId}-${version}-javadoc.jar" />
+  <property name="maven-sources-jar" value="${dist}/src-mvn.zip" />
+
+  <property name="platform-jar" value="${dist}/platform.jar"/>
+  <property name="platform-javadoc-jar" value="${dist}/platforms-javadoc.jar" />
+  <property name="platform-sources-jar" value="${dist}/platforms-sources.jar" />
+  <property name="pom" value="pom-jna.xml" />
+
+  <!-- defined maven snapshots and staging repository id and url -->
+  <property name="maven-snapshots-repository-id" value="snapshots.java.net" />
+  <property name="maven-snapshots-repository-url" value="https://maven.java.net/content/repositories/snapshots" />
+  <property name="maven-staging-repository-id" value="staging.java.net" />
+  <property name="maven-staging-repository-url" value="https://maven.java.net/service/local/staging/deploy/maven2" />
+
+  <!-- Miscellaneous -->
+  <property name="build.compiler.emacs" value="true"/>
+
+  <target name="default" depends="test" description="Build and Test."/>
+
+  <target name="init" depends="-setup"/>
+  <target name="compile-test-single" depends="compile-tests"/>
+  <target name="compile-single" depends="compile"/>
+
+  <target name="-dynamic-properties">
+
+    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
+                   replace="\1${jna.version}\2"
+                   file="${pom}"/>
+    <replaceregexp match='VERSION = ".*";'
+                   replace='VERSION = "${jna.version}";'
+                   file="src/com/sun/jna/Native.java"/>
+    <replaceregexp match='VERSION_NATIVE = ".*";'
+                   replace='VERSION_NATIVE = "${jni.version}";'
+                   file="src/com/sun/jna/Native.java"/>
+
+    <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="amd64"/>
+        <os arch="sparcv9"/>
+        <os arch="ppc64"/>
+        <os arch="ia64"/>
+      </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="aix-${jre.arch}">
+      <os name="AIX"/>
+    </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>
+    <condition property="jdk.home" value="/System/Library/Frameworks/JavaVM.framework/Home">
+      <available file="/System/Library/Frameworks/JavaVM.framework/Headers"/>
+    </condition>
+    <fail unless="jdk.home" message="Can't find JNI headers (java.home=${java.home})"/>
+    <condition property="libjsig"
+               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
+      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
+    </condition>
+    <condition property="ld.preload.name" value="${ld.preload}" else="IGNORE">
+      <not><equals arg1="${libjsig}" arg2=""/></not>
+    </condition>
+    <property name="native.jar" value="${os.prefix}.jar"/>
+    <property name="build.native" location="${build}/native"/>
+    <property name="md5.file" location="${build.native}/jni.checksum"/>
+
+    <mkdir dir="${build}"/>
+    <mkdir dir="${build.native}"/>
+    <mkdir dir="${classes}"/>
+    <mkdir dir="${test.classes}"/>
+    <mkdir dir="${reports}"/>
+    <mkdir dir="${doc}"/>
+
+    <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>
+    <echo>os.prefix=${os.prefix}</echo>
+
+  </target>
+
+  <target name="-setup" depends="-dynamic-properties">
+    <path id="compile-test.path">
+      <path id="test.libs">
+        <fileset dir="lib">
+          <include name="junit.jar"/>
+        </fileset>
+        <pathelement path="${classes}"/>
+      </path>
+    </path>
+    <path id="compile.path"/>
+    <path id="src.path">
+      <pathelement location="${src}"/>
+    </path>
+    <path id="test.runpath">
+      <pathelement path="${build}/${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}"
+           includeantruntime="false"
+           deprecation="on" debug="${debug}">
+      <src refid="src.path"/>
+    </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/**/*"/>
+        </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"/>
+        <attribute name="Manifest-Version" value="1.0"/>
+        <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}"/>
+      </manifest>
+      <fileset dir="${classes}" excludes="${jar.omitted}">
+        <patternset refid="jar-compiled"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="platform-jar" depends="jar">
+    <subant target="jar" failonerror="true">
+      <property name="file.reference.jna.build" location="${build}"/>
+      <property name="file.reference.jna.jar" location="${build}/${jar}"/>
+      <property name="libs.junit.classpath" location="lib/junit.jar"/>
+      <property name="javac.source" value="${platform.compatibility}"/>
+      <property name="javac.target" value="${platform.compatibility}"/>
+      <fileset dir="${contrib}" includes="platform/build.xml" />
+    </subant>
+    <!-- Sources package as required by maven -->
+    <zip zipfile="${platform-sources-jar}">
+      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
+      <zipfileset dir="${contrib}/platform" includes="**/*.java"/>
+    </zip>
+    <jar jarfile="${platform-javadoc-jar}">
+        <fileset dir="${javadoc}" />
+    </jar>
+  </target>
+
+  <target name="contrib-jars" depends="platform-jar" description="Build contrib jars">
+    <subant target="jar" failonerror="true">
+      <property name="file.reference.jna.build" location="${build}"/>
+      <property name="file.reference.jna.jar" location="${build}/${jar}"/>
+      <property name="libs.junit.classpath" location="lib/junit.jar"/>
+      <fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
+    </subant>
+  </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.Native"/>
+    </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"/>
+    <!-- args are based on GNU grep, other versions may differ -->
+    <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>
+    <!-- Clean up gcj javah output to match that of Sun's javah -->
+    <replaceregexp match="^((.*\.h):JNIEXPORT[^(]+)( +\(.*)"
+                   replace="\1&#xa;\2- \3&#xa;--"
+		   byline="true"
+                   file="${md5.file}"/>
+    <replaceregexp match="(JNIEnv *\*) *env"
+                   replace="\1"
+		   byline="true"
+                   file="${md5.file}"/>
+    <replaceregexp match="&#xa;--&#xa;.*\.h-$"
+                   replace=""
+		   flags="m"
+                   file="${md5.file}"/>
+    <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="${lib.native}/out-of-date.jar" tofile="${lib.native}/darwin.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/win32-x86.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/win32-amd64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/w32ce-arm.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-i386.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-amd64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-arm.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ia64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ppc.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/linux-ppc64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-i386.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-amd64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-i386.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-x86.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-amd64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-sparc.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/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, or javah output is inconsistent.  Re-run this build after checking ${md5.file} or updating jni.version and jni.md5 in build.xml</fail>
+  </target>
+
+  <target name=":rsrc">
+    <condition property="-rsrc">
+      <and>
+        <not><os family="windows"/></not>
+        <not><equals arg1="${os.prefix}" arg2="w32ce-arm"/></not>
+      </and>
+    </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" unless="skip-native"
+          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="^JNA_JNI_VERSION=.*"
+                   replace="JNA_JNI_VERSION=${jni.version} ${comment}"
+                   file="native/Makefile" byline="true"/>
+    <replaceregexp match="^CHECKSUM=.*"
+                   replace="CHECKSUM=${jni.md5} ${comment}"
+                   file="native/Makefile" byline="true"/>
+    <!-- Handle cross-compilation -->
+    <condition property="make.OS" value="OS=w32ce" else="IGNORE=">
+      <equals arg1="${os.prefix}" arg2="w32ce-arm"/>
+    </condition>
+    <condition property="ARCH" value="arm">
+      <equals arg1="${os.prefix}" arg2="w32ce-arm"/>
+    </condition>
+    <condition property="ARCH" value="ppc">
+      <equals arg1="${os.prefix}" arg2="aix-ppc"/>
+    </condition>
+    <condition property="ARCH" value="ppc64">
+      <equals arg1="${os.prefix}" arg2="aix-ppc64"/>
+    </condition>
+    <!-- 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.6.sdk">
+      <available file="/Developer/SDKs/MacOSX10.6.sdk"/>
+    </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=/opt/csw/bin:/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
+      <os name="SunOS"/>
+    </condition>
+    <condition property="make" value="/usr/sfw/bin/gmake">
+      <and>
+        <os name="SunOS"/>
+        <available file="/usr/sfw/bin/gmake"/>
+      </and>
+    </condition>
+    <condition property="make" value="gmake">
+      <or>
+        <os name="FreeBSD"/>
+        <os name="OpenBSD"/>
+        <os name="SunOS"/>
+        <os name="AIX"/>
+      </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="${make.OS}"/>
+      <arg value="JNA_JNI_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>
+    <copy todir="${lib.native}">
+      <fileset dir="${build}" includes="${native.jar}"/>
+    </copy>
+  </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}"
+           includeantruntime="false"
+           excludes="${tests.exclude-patterns}"
+           deprecation="on" debug="${debug}">
+      <src path="${test.src}"/>
+      <exclude name="${tests.exclude}"/>
+    </javac>
+    <!-- Create a jar for easy movement of tests -->
+    <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>
+
+  <target name="wince-test-setup" depends="compile-tests"
+          description="Configure tests for running on a Windows Mobile device">
+    <!-- 'shared' should be the path to a folder mounted as the mobile
+         device/simulator storage card. -->
+    <property name="shared" value="shared"/>
+    <!-- w32ce arm testing -->
+    <jar jarfile="${shared}/test.jar">
+      <zipfileset src="${build}/jna.jar"/>
+      <zipfileset src="${build}/jna-test.jar"/>
+    </jar>
+    <copy todir="${shared}" file="${build}/jna.jar"/>
+    <copy todir="${shared}" file="${build}/native/jnidispatch.dll"/>
+    <copy todir="${shared}" file="${build}/native/testlib.dll"/>
+    <copy todir="${shared}" file="${build}/native/testlib2.dll"/>
+    <copy todir="${shared}" file="w32ce-test.lnk"/>
+    <chmod file="${shared}/*.dll" perm="+x"/>
+  </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,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=""/>
+    <property name="tests.exclude-patterns" value=""/>
+    <property name="headless" value="false"/>
+    <junit fork="${test.fork}" failureproperty="testfailure" tempdir="${build}">
+      <!-- optionally run headless -->
+      <sysproperty key="java.awt.headless" value="${headless}"/>
+      <!-- avoid VM conflicts with JNA protected mode -->
+      <env key="${ld.preload.name}" file="${libjsig}"/>
+      <sysproperty key="jna.library.path" file="${build.native}"/>
+      <!-- Ignore any system install of JNA -->
+      <sysproperty key="jna.nosys" value="true"/>
+      <!-- Avoid VM crashes, if possible -->
+      <sysproperty key="jna.protected" value="true"/>
+      <sysproperty key="jna.builddir" file="${build}"/>
+      <jvmarg value="${vmopt.arch}"/>
+      <classpath><path refid="test.runpath"/></classpath>
+      <formatter type="brief" usefile="false"/>
+      <formatter type="xml"/>
+      <batchtest todir="${results.junit}">
+        <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
+          <include name="com/sun/jna/*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="contrib-test" depends="contrib-jars,compile-tests">
+    <subant target="test" failonerror="true">
+      <property name="file.reference.jna.build" location="${build}"/>
+      <property name="file.reference.jna.jar" location="${build}/${jar}"/>
+      <property name="libs.junit.classpath" location="lib/junit.jar"/>
+      <property name="javac.source" value="${test.compatibility}"/>
+      <property name="javac.target" value="${test.compatibility}"/>
+      <fileset dir="${contrib}" includes="platform/build.xml"/>
+    </subant>
+  </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" />
+        <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">
+    <path id="javadoc.src.path">
+      <path refid="src.path"/>
+      <pathelement location="${platform.src}"/>
+    </path>
+    <path id="javadoc.compile.path">
+      <path refid="compile.path"/>
+      <pathelement location="${classes}"/>
+    </path>
+    <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="javadoc.src.path"
+             classpathref="javadoc.compile.path"
+             maxmemory="256m"
+             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.platform,com.sun.jna.platform.win32"
+             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://download.oracle.com/javase/1.4.2/docs/api/"/>
+
+      <packageset dir="${src}" defaultexcludes="yes">
+        <patternset>
+          <include name="com/sun/jna/**/*"/>
+        </patternset>
+      </packageset>
+      <packageset dir="${platform.src}" defaultexcludes="yes">
+        <patternset>
+          <include name="com/sun/jna/platform/**/*"/>
+        </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="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/>
+      <group title="Platform Specific" packages="com.sun.jna.platform.*"/>
+
+      <arg value="-notimestamp"/>
+    </javadoc>
+  </target>
+
+  <target name="dist" depends="jar,javadoc,contrib-jars,compile-tests,native"
+          description="Build distribution files">
+    <copy todir="${dist}">
+      <fileset dir="${build}">
+        <include name="${native.jar}"/>
+      </fileset>
+      <fileset dir="${lib.native}">
+        <include name="*.jar"/>
+      </fileset>
+    </copy>
+    <jar jarfile="${dist-jar}" duplicate="preserve">
+      <manifest>
+        <attribute name="Main-Class" value="com.sun.jna.Native"/>
+        <attribute name="Manifest-Version" value="1.0"/>
+        <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}"/>
+        <!--
+            OSGi Bundle attributes
+            See http://www.osgi.org/Specifications/Reference
+          -->
+        <attribute name="Bundle-Category" value="jni"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="jna"/>
+        <attribute name="Bundle-Description" value="JNA Library"/>
+        <attribute name="Bundle-SymbolicName" value="com.sun.jna"/>
+        <attribute name="Bundle-Version" value="${spec.version}"/>
+        <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
+        <attribute name="Bundle-Vendor" value="${vendor}"/>
+        <attribute name="Bundle-ActivationPolicy" value="lazy"/>
+        <attribute name="Export-Package" value="com.sun.jna,com.sun.jna.ptr,com.sun.jna.win32"/>
+        <!-- Note that no terminal "*" is included in this list,
+             which will force failure on unsupported platforms.
+          -->
+        <attribute name="Bundle-NativeCode"
+                   value="
+com/sun/jna/win32-x86/jnidispatch.dll;
+processor=x86;osname=win32,
+com/sun/jna/win32-amd64/jnidispatch.dll;
+processor=x86-64;osname=win32,
+com/sun/jna/w32ce-arm/jnidispatch.dll;
+processor=arm;osname=wince,
+
+com/sun/jna/sunos-x86/libjnidispatch.so;
+processor=x86;osname=sunos,
+com/sun/jna/sunos-amd64/libjnidispatch.so;
+processor=x86-64;osname=sunos,
+com/sun/jna/sunos-sparc/libjnidispatch.so;
+processor=sparc;osname=sunos,
+com/sun/jna/sunos-sparcv9/libjnidispatch.so;
+processor=sparcv9;osname=sunos,
+
+com/sun/jna/aix-ppc/libjnidispatch.a;
+processor=ppc;osname=aix,
+com/sun/jna/aix-ppc64/libjnidispatch.a;
+processor=ppc64;osname=aix,
+
+com/sun/jna/linux-ppc/libjnidispatch.so;
+processor=ppc;osname=linux,
+com/sun/jna/linux-ppc64/libjnidispatch.so;
+processor=ppc64;osname=linux,
+com/sun/jna/linux-i386/libjnidispatch.so;
+processor=x86;osname=linux,
+com/sun/jna/linux-amd64/libjnidispatch.so;
+processor=x86-64;osname=linux,
+com/sun/jna/linux-arm/libjnidispatch.so;
+processor=arm;osname=linux,
+com/sun/jna/linux-ia64/libjnidispatch.so;
+processor=ia64;osname=linux,
+
+com/sun/jna/openbsd-i386/libjnidispatch.so;
+processor=x86;osname=openbsd,
+com/sun/jna/freebsd-i386/libjnidispatch.so;
+processor=x86;osname=freebsd,
+com/sun/jna/freebsd-amd64/libjnidispatch.so;
+processor=x86-64;osname=freebsd,
+
+com/sun/jna/darwin/libjnidispatch.jnilib;
+osname=macos
+"/>
+      </manifest>
+      <zipfileset src="${build}/${jar}"/>
+      <zipfileset src="${lib.native}/win32-x86.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/win32-x86"/>
+      <zipfileset src="${lib.native}/aix-ppc.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/aix-ppc"/>
+      <zipfileset src="${lib.native}/aix-ppc64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/aix-ppc64"/>
+      <zipfileset src="${lib.native}/darwin.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/darwin"/>
+      <zipfileset src="${lib.native}/linux-i386.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-i386"/>
+      <zipfileset src="${lib.native}/linux-amd64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-amd64"/>
+      <zipfileset src="${lib.native}/linux-arm.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-arm"/>
+      <zipfileset src="${lib.native}/linux-ia64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-ia64"/>
+      <zipfileset src="${lib.native}/linux-ppc.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-ppc"/>
+      <zipfileset src="${lib.native}/linux-ppc64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/linux-ppc64"/>
+      <zipfileset src="${lib.native}/sunos-x86.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-x86"/>
+      <zipfileset src="${lib.native}/sunos-amd64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-amd64"/>
+      <zipfileset src="${lib.native}/sunos-sparc.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-sparc"/>
+      <zipfileset src="${lib.native}/sunos-sparcv9.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/sunos-sparcv9"/>
+      <zipfileset src="${lib.native}/freebsd-i386.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/freebsd-i386"/>
+      <zipfileset src="${lib.native}/freebsd-amd64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/freebsd-amd64"/>
+      <zipfileset src="${lib.native}/openbsd-i386.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/openbsd-i386"/>
+      <zipfileset src="${lib.native}/win32-amd64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/win32-amd64"/>
+      <zipfileset src="${lib.native}/w32ce-arm.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/w32ce-arm"/>
+    </jar>
+    <copy todir="${dist}">
+      <fileset dir="${contrib}/platform/dist">
+  	<include name="platform.jar" />
+      </fileset>
+    </copy>
+    <copy todir="${dist}/jnacontrib" flatten="true">
+      <fileset dir="${contrib}">
+	<include name="**/build/demo-*.jar" />
+      </fileset>
+    </copy>
+    <jar jarfile="${maven-javadoc-jar}">
+        <fileset dir="${javadoc}" />
+    </jar>
+
+    <zip zipfile="${dist}/doc.zip">
+      <zipfileset dir="${javadoc}" prefix="javadoc"/>
+    </zip>
+    <!-- Javadoc -->
+    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
+    <zip zipfile="${dist}/src.zip">
+      <zipfileset dir="." includes="build.xml,${pom},LICENSE.txt"/>
+      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
+      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
+      <zipfileset dir="${native}" excludes="libffi,libffi/**/*,build,build/**/*" prefix="native"/>
+      <zipfileset dir="${contrib}/platform" includes="**/*.java" prefix="contrib/platform"/>
+    </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,clover.jar" prefix="lib"/>
+      <zipfileset dir="." includes=".classpath,.project"/>
+      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
+    </zip>
+    <!-- Sources package as required by maven -->
+    <zip zipfile="${maven-sources-jar}">
+      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
+      <zipfileset dir="${contrib}/platform" includes="**/*.java"/>
+    </zip>
+  </target>
+
+  <target name="clean" depends="-dynamic-properties">
+    <delete failOnError="false" includeEmptyDirs="true">
+      <fileset dir="${build}"/>
+    </delete>
+    <delete quiet="true" includeEmptyDirs="true">
+      <fileset dir=".clover"/>
+      <fileset dir="${javadoc}"/>
+      <fileset dir="." includes="*~,**/*~"/>
+    </delete>
+    <subant target="clean" failonerror="true">
+      <fileset dir="${contrib}" includes="*/build.xml"/>
+    </subant>
+  </target>
+
+  <target name="deploy" depends="dist,platform-jar" description="deploy snapshot version to Maven snapshot repository">
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy-file"/>
+      <arg value="-Durl=${maven-snapshots-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
+      <arg value="-DpomFile=${pom}"/>
+      <arg value="-Dfile=${dist-jar}"/>
+    </artifact:mvn>
+  </target>
+
+  <!-- before this, update project version (both build.xml and ${pom}) from SNAPSHOT to RELEASE -->
+  <target name="stage" depends="dist" description="deploy release version to Maven staging repository">
+    <!-- sign and deploy the main artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=${pom}"/>
+      <arg value="-Dfile=${dist-jar}"/>
+      <arg value="-Pgpg"/>
+    </artifact:mvn>
+
+    <!-- sign and deploy the sources artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=${pom}"/>
+      <arg value="-Dfile=${maven-sources-jar}"/>
+      <arg value="-Dclassifier=sources"/>
+      <arg value="-Pgpg"/>
+    </artifact:mvn>
+
+    <!-- sign and deploy the javadoc artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=${pom}"/>
+      <arg value="-Dfile=${maven-javadoc-jar}"/>
+      <arg value="-Dclassifier=javadoc"/>
+      <arg value="-Pgpg"/>
+    </artifact:mvn>
+
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=pom-platform.xml"/>
+      <arg value="-Dfile=${platform-jar}"/>
+      <arg value="-Pgpg"/>
+    </artifact:mvn>
+
+    <!-- sign and deploy the sources artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=pom-platform.xml"/>
+      <arg value="-Dfile=${platform-sources-jar}"/>
+      <arg value="-Dclassifier=sources"/>
+      <arg value="-Pgpg"/>
+    </artifact:mvn>
+
+    <!-- sign and deploy the javadoc artifact -->
+    <artifact:mvn>
+      <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file"/>
+      <arg value="-Durl=${maven-staging-repository-url}"/>
+      <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
+      <arg value="-DpomFile=pom-platform.xml"/>
+      <arg value="-Dfile=${platform-javadoc-jar}"/>
+      <arg value="-Dclassifier=javadoc"/>
+      <arg value="-Pgpg"/>
+    </artifact:mvn>
+
+  </target>
+</project>
+
+

contrib/alphamaskdemo/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
+	<classpathentry kind="src" path="/platform"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/alphamaskdemo/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>alphamaskdemo</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>

contrib/alphamaskdemo/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jnacontrib.alphamaskdemo" default="jar" basedir=".">
+    <description>Builds, tests, and runs the project jnacontrib.alphamaskdemo.</description>
+    <!-- Locations -->
+    <property name="src"                location="."/>
+    <property name="build"              location="build"/>
+    <property name="jna-dist"           location="../../dist"/>
+
+    <property name="classes"       location="${build}/classes"/>
+    <property name="jar"           location="${build}/demo-alphamask.jar"/>
+    <property name="file.reference.jna.build" location="../../build"/>
+    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
+    <property name="main-class"			value="com.sun.jna.contrib.demo.AlphaMaskDemo" />
+
+    <path id="classpath">
+        <fileset file="${file.reference.jna.jar}"/>
+        <fileset dir="../platform/dist" includes="platform.jar"/>
+    </path>
+
+    <!-- Run Demo. -->
+    <target name="run" depends="compile">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <pathelement location="${classes}" />
+                <path refid="classpath"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- Delete class and jar files. -->
+    <target name="clean">
+        <delete dir="${classes}"/>
+        <delete file="${jar}"/>
+        <delete dir="${build}"/>
+    </target>
+
+    <!-- Compile all classes. -->
+    <target name="compile">
+        <mkdir dir="${classes}"/>
+
+        <!-- Compile the project. -->
+        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
+               encoding="UTF-8" debug="on" includeantruntime="false">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
+
+        <!-- Copy all non-java files to classes. -->
+        <copy todir="${classes}/com">
+            <fileset dir="${src}/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- platform -->
+            <fileset dir="../platform/build/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- jna -->
+            <fileset dir="${file.reference.jna.build}/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
+        <jar jarfile="${jar}" basedir="${classes}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+</project>

contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.java

@@ -10,9 +10,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples;
 
-import java.awt.event.*;
+package com.sun.jna.contrib.demo;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Graphics;
@@ -26,6 +26,7 @@ import java.awt.Window;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
@@ -38,6 +39,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -52,23 +54,26 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.MouseInputAdapter;
+
 import com.sun.jna.Native;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
-import com.sun.jna.examples.unix.X11;
-import com.sun.jna.examples.unix.X11.Display;
-import com.sun.jna.examples.unix.X11.GC;
-import com.sun.jna.examples.unix.X11.XSetWindowAttributes;
-import com.sun.jna.examples.win32.GDI32;
-import com.sun.jna.examples.win32.User32;
-import com.sun.jna.examples.win32.GDI32.BITMAPINFO;
-import com.sun.jna.examples.win32.User32.BLENDFUNCTION;
-import com.sun.jna.examples.win32.User32.POINT;
-import com.sun.jna.examples.win32.User32.SIZE;
-import com.sun.jna.examples.win32.W32API.HANDLE;
-import com.sun.jna.examples.win32.W32API.HBITMAP;
-import com.sun.jna.examples.win32.W32API.HDC;
-import com.sun.jna.examples.win32.W32API.HWND;
+import com.sun.jna.platform.WindowUtils;
+import com.sun.jna.platform.unix.X11;
+import com.sun.jna.platform.unix.X11.Display;
+import com.sun.jna.platform.unix.X11.GC;
+import com.sun.jna.platform.win32.GDI32;
+import com.sun.jna.platform.win32.User32;
+import com.sun.jna.platform.win32.WinGDI;
+import com.sun.jna.platform.win32.WinUser;
+import com.sun.jna.platform.win32.WinDef.HBITMAP;
+import com.sun.jna.platform.win32.WinDef.HDC;
+import com.sun.jna.platform.win32.WinDef.HWND;
+import com.sun.jna.platform.win32.WinGDI.BITMAPINFO;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinUser.BLENDFUNCTION;
+import com.sun.jna.platform.win32.WinUser.POINT;
+import com.sun.jna.platform.win32.WinUser.SIZE;
 import com.sun.jna.ptr.PointerByReference;
 
 // TODO: put this into a reasonable API; right now this is pretty much
@@ -124,7 +129,7 @@ public class AlphaMaskDemo implements Runnable {
 
     private com.sun.jna.Memory buffer;
     private int[] pixels;
-    private void updateX11(boolean a, boolean i) {
+	private void updateX11(boolean a, boolean i) {
         X11 x11 = X11.INSTANCE;
         X11.Window win = X11.Window.None;
         Display dpy = x11.XOpenDisplay(null);
@@ -227,9 +232,9 @@ public class AlphaMaskDemo implements Runnable {
         if (!alphaWindow.isDisplayable()) {
             alphaWindow.pack();
             hWnd = getHwnd(alphaWindow);
-            int flags = user.GetWindowLong(hWnd, User32.GWL_EXSTYLE);
-            flags |= User32.WS_EX_LAYERED;
-            user.SetWindowLong(hWnd, User32.GWL_EXSTYLE, flags);
+            int flags = user.GetWindowLong(hWnd, WinUser.GWL_EXSTYLE);
+            flags |= WinUser.WS_EX_LAYERED;
+            user.SetWindowLong(hWnd, WinUser.GWL_EXSTYLE, flags);
             Window parent = alphaWindow.getOwner();
             Point where = parent.getLocationOnScreen();
             where.translate(parent.getWidth(), 0);
@@ -257,11 +262,11 @@ public class AlphaMaskDemo implements Runnable {
                 bmi.bmiHeader.biHeight = h;
                 bmi.bmiHeader.biPlanes = 1;
                 bmi.bmiHeader.biBitCount = 32;
-                bmi.bmiHeader.biCompression = GDI32.BI_RGB;
+                bmi.bmiHeader.biCompression = WinGDI.BI_RGB;
                 bmi.bmiHeader.biSizeImage = w * h * 4;
                 
                 PointerByReference ppbits = new PointerByReference();
-                hBitmap = gdi.CreateDIBSection(memDC, bmi, GDI32.DIB_RGB_COLORS,
+                hBitmap = gdi.CreateDIBSection(memDC, bmi, WinGDI.DIB_RGB_COLORS,
                                                ppbits, null, 0);
                 oldBitmap = gdi.SelectObject(memDC, hBitmap);
                 Pointer pbits = ppbits.getValue();
@@ -290,9 +295,9 @@ public class AlphaMaskDemo implements Runnable {
                 POINT srcLoc = new POINT();
                 BLENDFUNCTION blend = new BLENDFUNCTION();
                 blend.SourceConstantAlpha = (byte)(alpha * 255);
-                blend.AlphaFormat = User32.AC_SRC_ALPHA;
+                blend.AlphaFormat = WinUser.AC_SRC_ALPHA;
                 user.UpdateLayeredWindow(hWnd, screenDC, loc, size, memDC, srcLoc, 
-                                         0, blend, User32.ULW_ALPHA);
+                                         0, blend, WinUser.ULW_ALPHA);
             }
             finally {
                 user.ReleaseDC(null, screenDC);
@@ -306,9 +311,9 @@ public class AlphaMaskDemo implements Runnable {
         else if (a) {
             BLENDFUNCTION blend = new BLENDFUNCTION();
             blend.SourceConstantAlpha = (byte)(alpha * 255);
-            blend.AlphaFormat = User32.AC_SRC_ALPHA;
+            blend.AlphaFormat = WinUser.AC_SRC_ALPHA;
             user.UpdateLayeredWindow(hWnd, null, null, null, null, null, 
-                                     0, blend, User32.ULW_ALPHA);
+                                     0, blend, WinUser.ULW_ALPHA);
         }
         
         if (!alphaWindow.isVisible()) {
@@ -383,8 +388,9 @@ public class AlphaMaskDemo implements Runnable {
         JPanel p = new JPanel(new BorderLayout(8, 8));
         p.setBorder(new EmptyBorder(8, 8, 8, 8));
         p.setTransferHandler(new TransferHandler() {
+    		private static final long serialVersionUID = 1L;
             public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
-                List list = Arrays.asList(transferFlavors);
+                List<DataFlavor> list = Arrays.asList(transferFlavors);
                 if (list.contains(URL_FLAVOR)
                     || list.contains(URI_LIST_FLAVOR)
                     || list.contains(DataFlavor.imageFlavor)
@@ -421,8 +427,8 @@ public class AlphaMaskDemo implements Runnable {
                         return true;
                     }
                     if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)){
-                        List files = (List)t.getTransferData(DataFlavor.javaFileListFlavor);
-                        File f = (File)files.get(0);
+                        List<File> files = (List<File>) t.getTransferData(DataFlavor.javaFileListFlavor);
+                        File f = files.get(0);
                         URL url = new URL("file://" + f.toURI().toURL().getPath());
                         Image image = Toolkit.getDefaultToolkit().getImage(url);
                         setImage(image);

contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo2.java

@@ -8,10 +8,10 @@
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  * PURPOSE. See the GNU Lesser General Public License for more details.
  */
-package com.sun.jna.examples;
+package com.sun.jna.contrib.demo;
 
-import java.awt.Cursor;
 import java.awt.BorderLayout;
+import java.awt.Cursor;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.Image;
@@ -52,6 +52,8 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.MouseInputAdapter;
 
+import com.sun.jna.platform.WindowUtils;
+
 public class AlphaMaskDemo2 implements Runnable {
     private static final DataFlavor URL_FLAVOR =
         new DataFlavor("application/x-java-url; class=java.net.URL", "URL");
@@ -143,9 +145,10 @@ public class AlphaMaskDemo2 implements Runnable {
         JPanel p = new JPanel(new BorderLayout(8, 8));
         p.setBorder(new EmptyBorder(8, 8, 8, 8));
         p.setTransferHandler(new TransferHandler() {
-            public boolean canImport(JComponent comp,
+			private static final long serialVersionUID = 1L;
+			public boolean canImport(JComponent comp,
                                      DataFlavor[] transferFlavors) {
-                List list = Arrays.asList(transferFlavors);
+                List<DataFlavor> list = Arrays.asList(transferFlavors);
                 if (list.contains(URL_FLAVOR) || list.contains(URI_LIST_FLAVOR)
                     || list.contains(DataFlavor.imageFlavor)
                     || list.contains(DataFlavor.javaFileListFlavor)) {
@@ -183,9 +186,8 @@ public class AlphaMaskDemo2 implements Runnable {
                         return true;
                     }
                     if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
-                        List files = (List)t
-                                            .getTransferData(DataFlavor.javaFileListFlavor);
-                        File f = (File)files.get(0);
+                        List<File> files = (List<File>) t.getTransferData(DataFlavor.javaFileListFlavor);
+                        File f = files.get(0);
                         URL url = new URL("file://"
                             + f.toURI().toURL().getPath());
                         Image image = Toolkit.getDefaultToolkit().getImage(url);

contrib/balloonmanagerdemo/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/platform"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/balloonmanagerdemo/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>balloonmanagerdemo</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>

contrib/balloonmanagerdemo/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jnacontrib.balloonmanagerdemo" default="jar" basedir=".">
+    <description>Builds, tests, and runs the project jnacontrib.balloonmanagerdemo.</description>
+    <!-- Locations -->
+    <property name="src"                location="."/>
+    <property name="build"              location="build"/>
+    <property name="jna-dist"           location="../../dist"/>
+
+    <property name="classes"       location="${build}/classes"/>
+    <property name="jar"           location="${build}/demo-balloonmanager.jar"/>
+    <property name="file.reference.jna.build" location="../../build"/>
+    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
+    <property name="main-class"			value="com.sun.jna.contrib.demo.BalloonManagerDemo" />
+
+    <path id="classpath">
+        <fileset file="${file.reference.jna.jar}"/>
+        <fileset dir="../platform/dist" includes="platform.jar"/>
+    </path>
+
+    <!-- Run Demo. -->
+    <target name="run" depends="compile">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <pathelement location="${classes}" />
+                <path refid="classpath"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- Delete class and jar files. -->
+    <target name="clean">
+        <delete dir="${classes}"/>
+        <delete file="${jar}"/>
+        <delete dir="${build}"/>
+    </target>
+
+    <!-- Compile all classes. -->
+    <target name="compile">
+        <mkdir dir="${classes}"/>
+
+        <!-- Compile the project. -->
+        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
+               encoding="UTF-8" debug="on" includeantruntime="false">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
+
+        <!-- Copy all non-java files to classes. -->
+        <copy todir="${classes}/com">
+            <fileset dir="${src}/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- platform -->
+            <fileset dir="../platform/build/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- jna -->
+            <fileset dir="${file.reference.jna.build}/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
+        <jar jarfile="${jar}" basedir="${classes}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+</project>

contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManager.java

@@ -10,7 +10,7 @@
  * PARTICULAR PURPOSE. See the GNU Lesser General Public License for
  * more details.
  */
-package com.sun.jna.examples;
+package com.sun.jna.contrib.demo;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -31,11 +31,14 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Area;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.RoundRectangle2D;
+
 import javax.swing.Box;
 import javax.swing.JWindow;
 import javax.swing.Popup;
 import javax.swing.SwingUtilities;
 
+import com.sun.jna.platform.WindowUtils;
+
 /**
  * Provides a popup balloon containing an arbitrary component.  This provides
  * a form of content-specific decoration less transient than a tooltip, and less
@@ -54,6 +57,7 @@ public class BalloonManager {
     }
     
     private static class DropShadow extends JWindow {
+		private static final long serialVersionUID = 1L;
         private static final float SHADOW_ALPHA = .25f;
         private static final float YSCALE = .80f;
         private static final double ANGLE = 2*Math.PI/24;
@@ -146,6 +150,7 @@ public class BalloonManager {
     }
     
     private static final class BubbleWindow extends JWindow {
+		private static final long serialVersionUID = 1L;
         private static final int Y_OFFSET = 50;
         private static final int ARC = 25;
 

contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManagerDemo.java

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples;
+package com.sun.jna.contrib.demo;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -24,6 +24,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
+
 import javax.swing.Icon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -35,6 +36,8 @@ import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 
+import com.sun.jna.platform.WindowUtils;
+
 /** Demonstration of BalloonManager. */
 public class BalloonManagerDemo {
     private static final int ICON_SIZE = 48;

contrib/balloontips/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/platform"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/balloontips/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>balloontips</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>

contrib/balloontips/README

@@ -1,3 +1,5 @@
+An implementation of balloon tips.
+
 Compile the two classes in this directory.  Requires Java 1.5+.
 
 javac -cp examples.jar *.java

contrib/balloontips/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jnacontrib.balloontipsdemo" default="jar" basedir=".">
+    <description>Builds, tests, and runs the project jnacontrib.balloontipsdemo.</description>
+    <!-- Locations -->
+    <property name="src"                location="."/>
+    <property name="build"              location="build"/>
+    <property name="jna-dist"           location="../../dist"/>
+
+    <property name="classes"       location="${build}/classes"/>
+    <property name="jar"           location="${build}/demo-balloontips.jar"/>
+    <property name="file.reference.jna.build" location="../../build"/>
+    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
+    <property name="main-class"		value="com.sun.jna.contrib.demo.FilteredTextField" />
+
+    <path id="classpath">
+        <fileset file="${file.reference.jna.jar}"/>
+        <fileset dir="../platform/dist" includes="platform.jar"/>
+    </path>
+
+    <!-- Run Demo. -->
+    <target name="run" depends="compile">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <pathelement location="${classes}" />
+                <path refid="classpath"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- Delete class and jar files. -->
+    <target name="clean">
+        <delete dir="${classes}"/>
+        <delete file="${jar}"/>
+        <delete dir="${build}"/>
+    </target>
+
+    <!-- Compile all classes. -->
+    <target name="compile">
+        <mkdir dir="${classes}"/>
+
+        <!-- Compile the project. -->
+        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
+               encoding="UTF-8" debug="on" includeantruntime="false"> 
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
+
+        <!-- Copy all non-java files to classes. -->
+        <copy todir="${classes}/com">
+            <fileset dir="${src}/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- platform -->
+            <fileset dir="../platform/build/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- jna -->
+            <fileset dir="${file.reference.jna.build}/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
+        <jar jarfile="${jar}" basedir="${classes}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+</project>

contrib/balloontips/com/sun/jna/contrib/demo/BalloonTipManager.java

@@ -1,4 +1,4 @@
-//package bms.ui.widgets;
+package com.sun.jna.contrib.demo;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -30,7 +30,7 @@ import javax.swing.Popup;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import com.sun.jna.examples.WindowUtils;
+import com.sun.jna.platform.WindowUtils;
 
 /**
  * The BalloonTipManager class handles creation and disposal of balloon style 
@@ -61,8 +61,8 @@ public class BalloonTipManager {
   /*
    * The BalloonTip class defines the look of the BalloonTip object.
    */
-  @SuppressWarnings("serial")
   private static final class BalloonTip extends JWindow {
+		private static final long serialVersionUID = 1L;
     private static final Integer HMARGIN = 10;
     private static final Integer VMARGIN = 6;
     private static final Integer VSPACER = 4;
@@ -476,7 +476,6 @@ public class BalloonTipManager {
       /*
        * This class handles events spawned from moving the component.
        */
-      @SuppressWarnings("serial")
       final class ComponentEar extends ComponentAdapter {
         /*
          * (non-Javadoc)
@@ -491,7 +490,6 @@ public class BalloonTipManager {
       /*
        * This class handles events spawned when a mouse button is pressed.
        */
-      @SuppressWarnings("serial")
       final class MouseEar extends MouseAdapter {
         /*
          * (non-Javadoc)
@@ -506,7 +504,6 @@ public class BalloonTipManager {
       /*
        * This class handles events spawned when the component loses focus.
        */
-      @SuppressWarnings("serial")
       final class FocusEar extends FocusAdapter {
         /*
          * (non-Javadoc)

contrib/balloontips/com/sun/jna/contrib/demo/FilteredTextField.java

@@ -1,4 +1,4 @@
-//package bms.ui.widgets;
+package com.sun.jna.contrib.demo;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 
 import javax.swing.BorderFactory;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.Popup;
@@ -398,7 +399,7 @@ public class FilteredTextField extends JTextField {
     catch (Exception e) {
       e.printStackTrace();
     }
-    JFrame jframe = new JFrame("FilteredTextField Test");
+    JFrame jframe = new JFrame("Balloon Tips on FilteredTextField");
     jframe.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     jframe.setSize(400, 75);
     jframe.setLocation(400, 400);
@@ -414,6 +415,7 @@ public class FilteredTextField extends JTextField {
       "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(new JLabel("Type some text into either field"), BorderLayout.NORTH);
     jpanel.add(ftfield, BorderLayout.CENTER);
     jpanel.add(new FilteredTextField(10), BorderLayout.SOUTH);
     jframe.getContentPane().add(jpanel);

contrib/dnddemo/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
+	<classpathentry kind="src" path="/platform"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/dnddemo/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dnddemo</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>

contrib/dnddemo/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="jnacontrib.dnddemo" default="jar" basedir=".">
+    <description>Builds, tests, and runs the project jnacontrib.dnddemo.</description>
+    <!-- Locations -->
+    <property name="src"                location="."/>
+    <property name="build"              location="build"/>
+    <property name="jna-dist"           location="../../dist"/>
+
+    <property name="classes"       location="${build}/classes"/>
+    <property name="jar"           location="${build}/demo-dnd.jar"/>
+    <property name="file.reference.jna.build" location="../../build"/>
+    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
+    <property name="main-class"			value="com.sun.jna.contrib.demo.GhostedDragImageDemo" />
+
+    <path id="classpath">
+        <fileset file="${file.reference.jna.jar}"/>
+        <fileset dir="../platform/dist" includes="platform.jar"/>
+    </path>
+
+    <!-- Run Demo. -->
+    <target name="run" depends="compile">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <pathelement location="${classes}" />
+                <path refid="classpath"/>
+            </classpath>
+        </java>
+    </target>
+
+    <!-- Delete class and jar files. -->
+    <target name="clean">
+        <delete dir="${classes}"/>
+        <delete file="${jar}"/>
+        <delete dir="${build}"/>
+    </target>
+
+    <!-- Compile all classes. -->
+    <target name="compile">
+        <mkdir dir="${classes}"/>
+
+        <!-- Compile the project. -->
+        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
+               encoding="UTF-8" debug="on" includeantruntime="false">
+            <classpath>
+                <path refid="classpath"/>
+            </classpath>
+        </javac>
+
+        <!-- Copy all non-java files to classes. -->
+        <copy todir="${classes}/com">
+            <fileset dir="${src}/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- platform -->
+            <fileset dir="../platform/build/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        	<!-- jna -->
+            <fileset dir="${file.reference.jna.build}/classes/com">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
+        <jar jarfile="${jar}" basedir="${classes}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+</project>

contrib/dnddemo/com/sun/jna/contrib/demo/GhostedDragImageDemo.java

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples.dnd;
+package com.sun.jna.contrib.demo;
 
 import java.awt.Image;
 import java.awt.Point;
@@ -32,6 +32,10 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.UIManager;
 
+import com.sun.jna.platform.dnd.DragHandler;
+import com.sun.jna.platform.dnd.DropHandler;
+
+
 /** Demonstrate ghosted drag images.  Unfortunately, Swing drag support hides
  * the hooks we need to move the drag image around, so we don't use it and
  * roll our own.  
@@ -59,7 +63,8 @@ public class GhostedDragImageDemo {
     }
 
     public static class DragLabel extends JLabel {
-        private boolean dragging;
+		private static final long serialVersionUID = 1L;
+		private boolean dragging;
         public DragLabel(Icon icon) {
             super(icon);
             new DragHandler(this, DnDConstants.ACTION_COPY_OR_MOVE) {

contrib/ntservice/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="build.eclipse/contrib-test-classes" path="test"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jnalib"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/ntservice/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ntservice</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>

contrib/ntservice/nbproject/build-impl.xml

@@ -19,7 +19,7 @@ is divided into following sections:
   - 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">
+<project name="ntservice-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."/>
     <!-- 
     ======================

contrib/ntservice/nbproject/project.properties

@@ -14,17 +14,18 @@ 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.jar=${dist.dir}/contrib-ntservice.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.jna.jar=lib/jna.jar
+file.reference.jna.jar=../../build/jna.jar
+libs.junit.classpath=../../lib/junit.jar
 jar.compress=false
 javac.classpath=\
-    ${file.reference.jna.jar}
+    ${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.source=1.5
+javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

contrib/ntservice/nbproject/project.xml

@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>JnaContrib</name>
+            <name>ntservice</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
                 <root id="src.dir"/>

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

@@ -18,49 +18,8 @@ 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);
+  Advapi32 INSTANCE = (Advapi32) Native.loadLibrary("Advapi32", Advapi32.class, 
+		  W32APIOptions.UNICODE_OPTIONS);  
   
 /*
 SC_HANDLE WINAPI OpenSCManager(
@@ -163,88 +122,6 @@ BOOL WINAPI ChangeServiceConfig2(
 );*/
   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,

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

@@ -0,0 +1,36 @@
+/*
+ * 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;
+}

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

@@ -9,11 +9,6 @@
 
 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;
-
 
 /**
  *

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

@@ -180,7 +180,6 @@ public abstract class Win32Service {
    */
   public void init() {
     Advapi32 advapi32;
-    Advapi32.SERVICE_TABLE_ENTRY[] entries = new Advapi32.SERVICE_TABLE_ENTRY[2];
     Advapi32.SERVICE_TABLE_ENTRY entry;
     
     serviceMain = new ServiceMain();

contrib/ntservice/test/placeholder.txt

@@ -0,0 +1,2 @@
+# placeholder
+

contrib/platform/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="build.eclipse/contrib-test-classes" path="test"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jnalib"/>
+	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

contrib/platform/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>platform</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>

contrib/platform/build.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="platform" default="default" basedir=".">
+    <description>Builds, tests, and runs the project platform.</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. 
+
+    -->
+    <condition property="tests.platform" value="test-win32">
+      <os family="windows"/>
+    </condition>
+    <condition property="tests.platform" value="test-osx">
+      <os family="mac"/>
+    </condition>
+    <target name="test" depends="init,compile-test" description="Run unit tests." if="tests.platform">
+    	<antcall target="${tests.platform}" />
+    </target>
+    <target name="test-report">
+      <junitreport todir="${build.test.results.dir}">
+	<fileset dir="${build.test.results.dir}">
+	  <include name="TEST-*.xml"/>
+	</fileset>
+	<report todir="${build.test.results.dir}"/>
+      </junitreport>
+      <property name="build.test.results.dir.abs" location="${build.test.results.dir}"/>
+      <echo message="View test report in file://${build.test.results.dir.abs}/index.html" />
+    </target>
+    <target name="test-osx">
+      <echo>No platform tests yet for OSX</echo>
+    </target>
+    <target name="test-win32" depends="-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" />
+</project>

contrib/platform/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="platform-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>

contrib/platform/nbproject/project.properties

@@ -1,6 +1,6 @@
 application.args=
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
@@ -14,22 +14,22 @@ debug.test.classpath=\
     ${run.test.classpath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/jna.jar
+dist.jar=${dist.dir}/platform.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.jnalib-src=src
-includes=**
+file.reference.jna.jar=../../build/jna.jar
+libs.junit.classpath=../../lib/junit.jar
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${file.reference.jna.jar};
 # Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
+javac.compilerargs=
 javac.deprecation=false
 javac.source=1.5
 javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}}
+    ${libs.junit.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=
@@ -42,6 +42,7 @@ 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=\
@@ -50,9 +51,9 @@ run.classpath=\
 # 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=-Djava.library.path=./native/testlib/Debug;./native/jnidispatch/Debug
+run.jvmargs=
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
-src.dir=${file.reference.jnalib-src}
+src.dir=src
 test.src.dir=test

contrib/platform/nbproject/project.xml

@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>JNA Library</name>
+            <name>platform</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
                 <root id="src.dir"/>

contrib/platform/src/com/sun/jna/platform/FileMonitor.java

@@ -0,0 +1,135 @@
+/* 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.  
+ */
+package com.sun.jna.platform;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.jna.platform.win32.W32FileMonitor;
+
+/** Provides notification of file system changes.  Actual capabilities may
+ * vary slightly by platform.
+ * <p>
+ * Watched files which are removed from the filesystem are no longer watched.
+ * @author twall
+ */
+
+@SuppressWarnings("serial")
+public abstract class FileMonitor {
+
+    public static final int FILE_CREATED = 0x1;
+    public static final int FILE_DELETED = 0x2;
+    public static final int FILE_MODIFIED = 0x4;
+    public static final int FILE_ACCESSED = 0x8;
+    public static final int FILE_NAME_CHANGED_OLD = 0x10;
+    public static final int FILE_NAME_CHANGED_NEW = 0x20;
+    public static final int FILE_RENAMED = FILE_NAME_CHANGED_OLD|FILE_NAME_CHANGED_NEW;
+    public static final int FILE_SIZE_CHANGED = 0x40;
+    public static final int FILE_ATTRIBUTES_CHANGED = 0x80;
+    public static final int FILE_SECURITY_CHANGED = 0x100;
+    public static final int FILE_ANY = 0x1FF;
+
+    public interface FileListener {
+        public void fileChanged(FileEvent e);
+    }
+    
+	public class FileEvent extends EventObject {
+        private final File file;
+        private final int type;
+        public FileEvent(File file, int type) {
+            super(FileMonitor.this);
+            this.file = file;
+            this.type = type;
+        }
+        public File getFile() { return file; }
+        public int getType() { return type; }
+        public String toString() {
+            return "FileEvent: " + file + ":" + type;
+        }
+    }
+    
+    private final Map<File, Integer> watched = new HashMap<File, Integer>();
+    private List<FileListener> listeners = new ArrayList<FileListener>();
+    
+    protected abstract void watch(File file, int mask, boolean recursive) throws IOException ;
+    protected abstract void unwatch(File file);
+    public abstract void dispose();
+
+    public void addWatch(File dir) throws IOException {
+        addWatch(dir, FILE_ANY);
+    }
+    
+    public void addWatch(File dir, int mask) throws IOException {
+        addWatch(dir, mask, dir.isDirectory());
+    }
+    
+    public void addWatch(File dir, int mask, boolean recursive) throws IOException {
+        watched.put(dir, new Integer(mask));
+        watch(dir, mask, recursive);
+    }
+
+    public void removeWatch(File file) {
+        if (watched.remove(file) != null) {
+            unwatch(file);
+        }
+    }
+    
+    protected void notify(FileEvent e) {
+    	for (FileListener listener : listeners) {
+    		listener.fileChanged(e);
+    	}
+    }
+    
+    public synchronized void addFileListener(FileListener listener) {
+        List<FileListener> list = new ArrayList<FileListener>(listeners);
+        list.add(listener);
+        listeners = list;
+    }
+    
+    public synchronized void removeFileListener(FileListener x) {
+        List<FileListener> list = new ArrayList<FileListener>(listeners);
+        list.remove(x);
+        listeners = list;
+    }
+    
+    protected void finalize() {
+    	for (File watchedFile : watched.keySet()) {
+    		removeWatch(watchedFile);
+    	}
+    	
+        dispose();
+    }
+    
+    /** Canonical lazy loading of a singleton. */
+    private static class Holder {
+        public static final FileMonitor INSTANCE;
+        static {
+            String os = System.getProperty("os.name");
+            if (os.startsWith("Windows")) {
+                INSTANCE = new W32FileMonitor();
+            }
+            else {
+                throw new Error("FileMonitor not implemented for " + os);
+            }
+        }
+    }
+    
+    public static FileMonitor getInstance() {
+        return Holder.INSTANCE;
+    }
+ }

contrib/platform/src/com/sun/jna/platform/FileUtils.java

@@ -10,14 +10,15 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples;
+package com.sun.jna.platform;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
-import com.sun.jna.examples.win32.Shell32;
-import com.sun.jna.examples.win32.Shell32.SHFILEOPSTRUCT;
+import java.util.List;
+
+import com.sun.jna.platform.mac.MacFileUtils;
+import com.sun.jna.platform.win32.W32FileUtils;
 
 /** Miscellaneous file utils not provided for by Java. */
 public abstract class FileUtils {
@@ -50,56 +51,7 @@ public abstract class FileUtils {
     
     public static FileUtils getInstance() {
         return Holder.INSTANCE;
-    }
-    
-    private static class W32FileUtils extends FileUtils {
-
-        public boolean hasTrash() { return true; }
-
-        public void moveToTrash(File[] files) throws IOException {
-            Shell32 shell = Shell32.INSTANCE;
-            SHFILEOPSTRUCT fileop = new SHFILEOPSTRUCT();
-            fileop.wFunc = Shell32.FO_DELETE;
-            String[] paths = new String[files.length];
-            for (int i=0;i < paths.length;i++) {
-                paths[i] = files[i].getAbsolutePath();
-            }
-            fileop.pFrom = fileop.encodePaths(paths);
-            fileop.fFlags = Shell32.FOF_ALLOWUNDO|Shell32.FOF_NOCONFIRMATION|Shell32.FOF_SILENT;
-            int ret = shell.SHFileOperation(fileop);
-            if (ret != 0) {
-                throw new IOException("Move to trash failed: " + ret);
-            }
-            if (fileop.fAnyOperationsAborted) {
-                throw new IOException("Move to trash aborted");
-            }
-        }
-    }
-
-    private static class MacFileUtils extends FileUtils {
-
-        public boolean hasTrash() { return true; }
-
-        public void moveToTrash(File[] files) throws IOException {
-            // TODO: use native API for moving to trash (if any)
-            File home = new File(System.getProperty("user.home"));
-            File trash = new File(home, ".Trash");
-            if (!trash.exists()) {
-                throw new IOException("The Trash was not found in its expected location (" + trash + ")");
-            }
-            List failed = new ArrayList();
-            for (int i=0;i < files.length;i++) {
-                File src = files[i];
-                File target = new File(trash, src.getName());
-                if (!src.renameTo(target)) {
-                    failed.add(src);
-                }
-            }
-            if (failed.size() > 0) {
-                throw new IOException("The following files could not be trashed: " + failed);
-            }
-        }
-    }
+    }    
     
     private static class DefaultFileUtils extends FileUtils {
 
@@ -138,7 +90,7 @@ public abstract class FileUtils {
             if (!trash.exists()) {
                 throw new IOException("No trash location found (define fileutils.trash to be the path to the trash)");
             }
-            List failed = new ArrayList();
+            List<File> failed = new ArrayList<File>();
             for (int i=0;i < files.length;i++) {
                 File src = files[i];
                 File target = new File(trash, src.getName());

contrib/platform/src/com/sun/jna/platform/KeyboardUtils.java

@@ -10,16 +10,17 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples;
+package com.sun.jna.platform;
 
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
 import java.awt.event.KeyEvent;
 
 import com.sun.jna.Platform;
-import com.sun.jna.examples.unix.X11;
-import com.sun.jna.examples.unix.X11.Display;
-import com.sun.jna.examples.win32.User32;
+import com.sun.jna.platform.unix.X11;
+import com.sun.jna.platform.unix.X11.Display;
+import com.sun.jna.platform.win32.User32;
+import com.sun.jna.platform.win32.WinUser;
 
 /** Provide access to the local keyboard state.  Note that this is meaningless
  * on a headless system and some VNC setups.
@@ -71,30 +72,30 @@ public class KeyboardUtils {
             }
             if (code == KeyEvent.VK_SHIFT) {
                 if ((loc & KeyEvent.KEY_LOCATION_RIGHT) != 0) {
-                    return User32.VK_RSHIFT; 
+                    return WinUser.VK_RSHIFT; 
                 }
                 if ((loc & KeyEvent.KEY_LOCATION_LEFT) != 0) {
-                    return User32.VK_LSHIFT; 
+                    return WinUser.VK_LSHIFT; 
                 }
-                return User32.VK_SHIFT;
+                return WinUser.VK_SHIFT;
             }
             if (code == KeyEvent.VK_CONTROL) {
                 if ((loc & KeyEvent.KEY_LOCATION_RIGHT) != 0) {
-                    return User32.VK_RCONTROL; 
+                    return WinUser.VK_RCONTROL; 
                 }
                 if ((loc & KeyEvent.KEY_LOCATION_LEFT) != 0) {
-                    return User32.VK_LCONTROL; 
+                    return WinUser.VK_LCONTROL; 
                 }
-                return User32.VK_CONTROL;
+                return WinUser.VK_CONTROL;
             }
             if (code == KeyEvent.VK_ALT) {
                 if ((loc & KeyEvent.KEY_LOCATION_RIGHT) != 0) {
-                    return User32.VK_RMENU; 
+                    return WinUser.VK_RMENU; 
                 }
                 if ((loc & KeyEvent.KEY_LOCATION_LEFT) != 0) {
-                    return User32.VK_LMENU; 
+                    return WinUser.VK_LMENU; 
                 }
-                return User32.VK_MENU;
+                return WinUser.VK_MENU;
             }
             return 0;
         }

contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java

@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  */
-package com.sun.jna.examples;
+package com.sun.jna.platform;
 
 import java.awt.Rectangle;
 import java.awt.image.DataBuffer;
@@ -44,7 +44,7 @@ public class RasterRangesUtils {
         0x0008, 0x0004, 0x0002, 0x0001
     };
 
-    private static final Comparator COMPARATOR = new Comparator() {
+    private static final Comparator<Object> COMPARATOR = new Comparator<Object>() {
         public int compare(Object o1, Object o2) {
             return ((Rectangle)o1).x - ((Rectangle)o2).x;
         }
@@ -116,11 +116,11 @@ public class RasterRangesUtils {
      * @return true if the output succeeded, false otherwise
      */
     public static boolean outputOccupiedRangesOfBinaryPixels(byte[] binaryBits, int w, int h, RangesOutput out) {
-        Set rects = new HashSet();
-        Set prevLine = Collections.EMPTY_SET;
+        Set<Rectangle> rects = new HashSet<Rectangle>();
+        Set<Rectangle> prevLine = Collections.EMPTY_SET;
         int scanlineBytes = binaryBits.length / h;
         for (int row = 0; row < h; row++) {
-            Set curLine = new TreeSet(COMPARATOR);
+            Set<Rectangle> curLine = new TreeSet<Rectangle>(COMPARATOR);
             int rowOffsetBytes = row * scanlineBytes;
             int startCol = -1;
             // Look at each batch of 8 columns in this row
@@ -163,14 +163,14 @@ public class RasterRangesUtils {
                 // end of last region
                 curLine.add(new Rectangle(startCol, row, w - startCol, 1));
             }
-            Set unmerged = mergeRects(prevLine, curLine);
+            Set<Rectangle> unmerged = mergeRects(prevLine, curLine);
             rects.addAll(unmerged);
             prevLine = curLine;
         }
         // Add anything left over
         rects.addAll(prevLine);
-        for (Iterator i=rects.iterator();i.hasNext();) {
-            Rectangle r = (Rectangle)i.next();
+        for (Iterator<Rectangle> i=rects.iterator();i.hasNext();) {
+            Rectangle r = i.next();
             if (!out.outputRange(r.x, r.y, r.width, r.height)) {
                 return false;
             }
@@ -189,10 +189,10 @@ public class RasterRangesUtils {
      * @return true if the output succeeded, false otherwise
      */
     public static boolean outputOccupiedRanges(int[] pixels, int w, int h, int occupationMask, RangesOutput out) {
-        Set rects = new HashSet();
-        Set prevLine = Collections.EMPTY_SET;
+        Set<Rectangle> rects = new HashSet<Rectangle>();
+        Set<Rectangle> prevLine = Collections.EMPTY_SET;
         for (int row = 0; row < h; row++) {
-            Set curLine = new TreeSet(COMPARATOR);
+            Set<Rectangle> curLine = new TreeSet<Rectangle>(COMPARATOR);
             int idxOffset = row * w;
             int startCol = -1;
 
@@ -213,14 +213,14 @@ public class RasterRangesUtils {
                 // end of last region of current row
                 curLine.add(new Rectangle(startCol, row, w-startCol, 1));
             }
-            Set unmerged = mergeRects(prevLine, curLine);
+            Set<Rectangle> unmerged = mergeRects(prevLine, curLine);
             rects.addAll(unmerged);
             prevLine = curLine;
         }
         // Add anything left over
         rects.addAll(prevLine);
-        for (Iterator i=rects.iterator();i.hasNext();) {
-            Rectangle r = (Rectangle)i.next();
+        for (Iterator<Rectangle> i=rects.iterator();i.hasNext();) {
+            Rectangle r = i.next();
             if (!out.outputRange(r.x, r.y, r.width, r.height)) {
                 return false;
             }
@@ -228,11 +228,11 @@ public class RasterRangesUtils {
         return true;
     }
 
-    private static Set mergeRects(Set prev, Set current) {
-        Set unmerged = new HashSet(prev);
+    private static Set<Rectangle> mergeRects(Set<Rectangle> prev, Set<Rectangle> current) {
+        Set<Rectangle> unmerged = new HashSet<Rectangle>(prev);
         if (!prev.isEmpty() && !current.isEmpty()) {
-            Rectangle[] pr = (Rectangle[])prev.toArray(new Rectangle[prev.size()]);
-            Rectangle[] cr = (Rectangle[])current.toArray(new Rectangle[current.size()]);
+            Rectangle[] pr = prev.toArray(new Rectangle[prev.size()]);
+            Rectangle[] cr = current.toArray(new Rectangle[current.size()]);
             int ipr = 0;
             int icr = 0;
             while (ipr < pr.length && icr < cr.length) {

contrib/platform/src/com/sun/jna/platform/WindowUtils.java

@@ -11,12 +11,12 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  */
-package com.sun.jna.examples;
+package com.sun.jna.platform;
 
+import java.awt.AWTEvent;
 import java.awt.AlphaComposite;
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Cursor;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dialog;
@@ -31,14 +31,14 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.Toolkit;
-import java.awt.event.AWTEventListener;
-import java.awt.event.MouseEvent;
-import java.awt.AWTEvent;
 import java.awt.Window;
+import java.awt.event.AWTEventListener;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
+import java.awt.event.ContainerEvent;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
+import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.geom.Area;
@@ -62,24 +62,26 @@ import com.sun.jna.Native;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Platform;
 import com.sun.jna.Pointer;
-import com.sun.jna.examples.unix.X11;
-import com.sun.jna.examples.unix.X11.Display;
-import com.sun.jna.examples.unix.X11.GC;
-import com.sun.jna.examples.unix.X11.Pixmap;
-import com.sun.jna.examples.unix.X11.XVisualInfo;
-import com.sun.jna.examples.unix.X11.Xext;
-import com.sun.jna.examples.unix.X11.Xrender.XRenderPictFormat;
-import com.sun.jna.examples.win32.GDI32;
-import com.sun.jna.examples.win32.User32;
-import com.sun.jna.examples.win32.GDI32.BITMAPINFO;
-import com.sun.jna.examples.win32.User32.BLENDFUNCTION;
-import com.sun.jna.examples.win32.User32.POINT;
-import com.sun.jna.examples.win32.User32.SIZE;
-import com.sun.jna.examples.win32.W32API.HANDLE;
-import com.sun.jna.examples.win32.W32API.HBITMAP;
-import com.sun.jna.examples.win32.W32API.HDC;
-import com.sun.jna.examples.win32.W32API.HRGN;
-import com.sun.jna.examples.win32.W32API.HWND;
+import com.sun.jna.platform.unix.X11;
+import com.sun.jna.platform.unix.X11.Display;
+import com.sun.jna.platform.unix.X11.GC;
+import com.sun.jna.platform.unix.X11.Pixmap;
+import com.sun.jna.platform.unix.X11.XVisualInfo;
+import com.sun.jna.platform.unix.X11.Xext;
+import com.sun.jna.platform.unix.X11.Xrender.XRenderPictFormat;
+import com.sun.jna.platform.win32.GDI32;
+import com.sun.jna.platform.win32.User32;
+import com.sun.jna.platform.win32.WinDef.HBITMAP;
+import com.sun.jna.platform.win32.WinDef.HDC;
+import com.sun.jna.platform.win32.WinDef.HRGN;
+import com.sun.jna.platform.win32.WinDef.HWND;
+import com.sun.jna.platform.win32.WinGDI;
+import com.sun.jna.platform.win32.WinGDI.BITMAPINFO;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinUser;
+import com.sun.jna.platform.win32.WinUser.BLENDFUNCTION;
+import com.sun.jna.platform.win32.WinUser.POINT;
+import com.sun.jna.platform.win32.WinUser.SIZE;
 import com.sun.jna.ptr.ByteByReference;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
@@ -149,6 +151,7 @@ public class WindowUtils {
      * </pre></code>
      */
     private static class HeavyweightForcer extends Window {
+		private static final long serialVersionUID = 1L;
         private final boolean packed;
 
         public HeavyweightForcer(Window parent) {
@@ -174,6 +177,7 @@ public class WindowUtils {
      * invoked whenever any part of the ancestor window is repainted.
      */
     protected static class RepaintTrigger extends JComponent {
+		private static final long serialVersionUID = 1L;
 
         protected class Listener
             extends WindowAdapter
@@ -200,13 +204,18 @@ public class WindowUtils {
             }
 
             public void eventDispatched(AWTEvent e) {
-                Component src = (Component)e.getSource();
-                MouseEvent me = SwingUtilities.convertMouseEvent(src, (MouseEvent)e, content);
-                Component c = SwingUtilities.getDeepestComponentAt(content, me.getX(), me.getY());
-                if (c != null) {
-                    setCursor(c.getCursor());
+                if (e instanceof MouseEvent) {
+                    Component src = ((MouseEvent)e).getComponent();
+                    if (src != null
+                        && SwingUtilities.isDescendingFrom(src, content)) {
+                        MouseEvent me = SwingUtilities.convertMouseEvent(src, (MouseEvent)e, content);
+                        Component c = SwingUtilities.getDeepestComponentAt(content, me.getX(), me.getY());
+                        if (c != null) {
+                            setCursor(c.getCursor());
+                        }
+                    }
                 }
-            };
+            }
         }
 
         private final Listener listener = createListener();
@@ -257,9 +266,11 @@ public class WindowUtils {
 
     /** Window utilities with differing native implementations. */
     public static abstract class NativeWindowUtils {
-        protected abstract class TransparentContent extends JPanel {
+        protected abstract class TransparentContentPane
+            extends JPanel implements AWTEventListener {
+    		private static final long serialVersionUID = 1L;
             private boolean transparent;
-            public TransparentContent(Container oldContent) {
+            public TransparentContentPane(Container oldContent) {
                 super(new BorderLayout());
                 add(oldContent, BorderLayout.CENTER);
                 setTransparent(true);
@@ -267,12 +278,27 @@ public class WindowUtils {
                     ((JComponent)oldContent).setOpaque(false);
                 }
             }
+            public void addNotify() {
+                super.addNotify();
+                Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.CONTAINER_EVENT_MASK);
+            }
+            public void removeNotify() {
+                Toolkit.getDefaultToolkit().removeAWTEventListener(this);
+                super.removeNotify();
+            }
             public void setTransparent(boolean transparent) {
                 this.transparent = transparent;
                 setOpaque(!transparent);
                 setDoubleBuffered(!transparent);
                 repaint();
             }
+            public void eventDispatched(AWTEvent e) {
+                if (e.getID() == ContainerEvent.COMPONENT_ADDED
+                    && SwingUtilities.isDescendingFrom(((ContainerEvent)e).getChild(), this)) {
+                    Component child = ((ContainerEvent)e).getChild();
+                    NativeWindowUtils.this.setDoubleBuffered(child, false);
+                }
+            }
             public void paint(Graphics gr) {
                 if (transparent) {
                     Rectangle r = gr.getClipBounds();
@@ -438,6 +464,7 @@ public class WindowUtils {
         }
 
         protected void setLayersTransparent(Window w, boolean transparent) {
+
             Color bg = transparent ? new Color(0, 0, 0, 0) : null;
             if (w instanceof RootPaneContainer) {
                 RootPaneContainer rpc = (RootPaneContainer)w;
@@ -463,11 +490,15 @@ public class WindowUtils {
                 }
                 else {
                     lp.setOpaque(Boolean.TRUE.equals(lp.getClientProperty(TRANSPARENT_OLD_OPAQUE)));
+                    lp.putClientProperty(TRANSPARENT_OLD_OPAQUE, null);
                     root.setOpaque(Boolean.TRUE.equals(root.getClientProperty(TRANSPARENT_OLD_OPAQUE)));
+                    root.putClientProperty(TRANSPARENT_OLD_OPAQUE, null);
                     if (content != null) {
                         content.setOpaque(Boolean.TRUE.equals(content.getClientProperty(TRANSPARENT_OLD_OPAQUE)));
+                        content.putClientProperty(TRANSPARENT_OLD_OPAQUE, null);
                     }
                     bg = (Color)root.getClientProperty(TRANSPARENT_OLD_BG);
+                    root.putClientProperty(TRANSPARENT_OLD_BG, null);
                 }
             }
             w.setBackground(bg);
@@ -613,27 +644,27 @@ public class WindowUtils {
                 public void run() {
                     HWND hWnd = getHWnd(w);
                     User32 user = User32.INSTANCE;
-                    int flags = user.GetWindowLong(hWnd, User32.GWL_EXSTYLE);
+                    int flags = user.GetWindowLong(hWnd, WinUser.GWL_EXSTYLE);
                     byte level = (byte)((int)(255 * alpha) & 0xFF);
                     if (usingUpdateLayeredWindow(w)) {
                         // If already using UpdateLayeredWindow, continue to
                         // do so
                         BLENDFUNCTION blend = new BLENDFUNCTION();
                         blend.SourceConstantAlpha = level;
-                        blend.AlphaFormat = User32.AC_SRC_ALPHA;
+                        blend.AlphaFormat = WinUser.AC_SRC_ALPHA;
                         user.UpdateLayeredWindow(hWnd, null, null, null, null,
                                                  null, 0, blend,
-                                                 User32.ULW_ALPHA);
+                                                 WinUser.ULW_ALPHA);
                     }
                     else if (alpha == 1f) {
-                        flags &= ~User32.WS_EX_LAYERED;
-                        user.SetWindowLong(hWnd, User32.GWL_EXSTYLE, flags);
+                        flags &= ~WinUser.WS_EX_LAYERED;
+                        user.SetWindowLong(hWnd, WinUser.GWL_EXSTYLE, flags);
                     }
                     else {
-                        flags |= User32.WS_EX_LAYERED;
-                        user.SetWindowLong(hWnd, User32.GWL_EXSTYLE, flags);
+                        flags |= WinUser.WS_EX_LAYERED;
+                        user.SetWindowLong(hWnd, WinUser.GWL_EXSTYLE, flags);
                         user.SetLayeredWindowAttributes(hWnd, 0, level,
-                                                        User32.LWA_ALPHA);
+                        		WinUser.LWA_ALPHA);
                     }
                     setForceHeavyweightPopups(w, alpha != 1f);
                     storeAlpha(w, level);
@@ -645,12 +676,13 @@ public class WindowUtils {
          * window on any change.  It also does not paint window decorations
          * when the window is transparent.
          */
-        private class W32TransparentContent extends TransparentContent {
+        private class W32TransparentContentPane extends TransparentContentPane {
+    		private static final long serialVersionUID = 1L;
             private HDC memDC;
             private HBITMAP hBitmap;
             private Pointer pbits;
             private Dimension bitmapSize;
-            public W32TransparentContent(Container content) {
+            public W32TransparentContentPane(Container content) {
                 super(content);
             }
             private void disposeBackingStore() {
@@ -702,12 +734,12 @@ public class WindowUtils {
                         bmi.bmiHeader.biHeight = wh;
                         bmi.bmiHeader.biPlanes = 1;
                         bmi.bmiHeader.biBitCount = 32;
-                        bmi.bmiHeader.biCompression = GDI32.BI_RGB;
+                        bmi.bmiHeader.biCompression = WinGDI.BI_RGB;
                         bmi.bmiHeader.biSizeImage = ww * wh * 4;
                         PointerByReference ppbits = new PointerByReference();
                         hBitmap = gdi.CreateDIBSection(memDC, bmi,
-                                                       GDI32.DIB_RGB_COLORS,
-                                                       ppbits, null, 0);
+                        		WinGDI.DIB_RGB_COLORS,
+                        		ppbits, null, 0);
                         pbits = ppbits.getValue();
                         bitmapSize = new Dimension(ww, wh);
                     }
@@ -743,18 +775,17 @@ public class WindowUtils {
                     try {
                         // GetLayeredwindowAttributes supported WinXP and later
                         if (user.GetLayeredWindowAttributes(hWnd, null, bref, iref)
-                            && (iref.getValue() & User32.LWA_ALPHA) != 0) {
+                            && (iref.getValue() & WinUser.LWA_ALPHA) != 0) {
                             level = bref.getValue();
                         }
                     }
                     catch(UnsatisfiedLinkError e) {
                     }
                     blend.SourceConstantAlpha = level;
-                    blend.AlphaFormat = User32.AC_SRC_ALPHA;
+                    blend.AlphaFormat = WinUser.AC_SRC_ALPHA;
                     user.UpdateLayeredWindow(hWnd, screenDC, winLoc, winSize, memDC,
-                                             srcLoc, 0, blend, User32.ULW_ALPHA);
-                }
-                finally {
+                                             srcLoc, 0, blend, WinUser.ULW_ALPHA);
+                } finally {
                     user.ReleaseDC(null, screenDC);
                     if (memDC != null && oldBitmap != null) {
                         gdi.SelectObject(memDC, oldBitmap);
@@ -782,27 +813,27 @@ public class WindowUtils {
                 public void run() {
                     User32 user = User32.INSTANCE;
                     HWND hWnd = getHWnd(w);
-                    int flags = user.GetWindowLong(hWnd, User32.GWL_EXSTYLE);
+                    int flags = user.GetWindowLong(hWnd, WinUser.GWL_EXSTYLE);
                     JRootPane root = ((RootPaneContainer)w).getRootPane();
                     JLayeredPane lp = root.getLayeredPane();
                     Container content = root.getContentPane();
-                    if (content instanceof W32TransparentContent) {
-                        ((W32TransparentContent)content).setTransparent(transparent);
+                    if (content instanceof W32TransparentContentPane) {
+                        ((W32TransparentContentPane)content).setTransparent(transparent);
                     }
                     else if (transparent) {
-                        W32TransparentContent w32content =
-                            new W32TransparentContent(content);
+                        W32TransparentContentPane w32content =
+                            new W32TransparentContentPane(content);
                         root.setContentPane(w32content);
                         lp.add(new RepaintTrigger(w32content),
                                JLayeredPane.DRAG_LAYER);
                     }
                     if (transparent && !usingUpdateLayeredWindow(w)) {
-                        flags |= User32.WS_EX_LAYERED;
-                        user.SetWindowLong(hWnd, User32.GWL_EXSTYLE, flags);
+                        flags |= WinUser.WS_EX_LAYERED;
+                        user.SetWindowLong(hWnd, WinUser.GWL_EXSTYLE, flags);
                     }
                     else if (!transparent && usingUpdateLayeredWindow(w)) {
-                        flags &= ~User32.WS_EX_LAYERED;
-                        user.SetWindowLong(hWnd, User32.GWL_EXSTYLE, flags);
+                        flags &= ~WinUser.WS_EX_LAYERED;
+                        user.SetWindowLong(hWnd, WinUser.GWL_EXSTYLE, flags);
                     }
                     setLayersTransparent(w, transparent);
                     setForceHeavyweightPopups(w, transparent);
@@ -843,11 +874,11 @@ public class WindowUtils {
             GDI32 gdi = GDI32.INSTANCE;
             PathIterator pi = area.getPathIterator(null);
             int mode = pi.getWindingRule() == PathIterator.WIND_NON_ZERO
-                ? GDI32.WINDING: GDI32.ALTERNATE;
+                ? WinGDI.WINDING: WinGDI.ALTERNATE;
             float[] coords = new float[6];
-            List points = new ArrayList();
+            List<POINT> points = new ArrayList<POINT>();
             int size = 0;
-            List sizes = new ArrayList();
+            List<Integer> sizes = new ArrayList<Integer>();
             while (!pi.isDone()) {
                 int type = pi.currentSegment(coords);
                 if (type == PathIterator.SEG_MOVETO) {
@@ -867,14 +898,14 @@ public class WindowUtils {
                 pi.next();
             }
             POINT[] lppt = (POINT[])new POINT().toArray(points.size());
-            POINT[] pts = (POINT[])points.toArray(new POINT[points.size()]);
+            POINT[] pts = points.toArray(new POINT[points.size()]);
             for (int i=0;i < lppt.length;i++) {
                 lppt[i].x = pts[i].x;
                 lppt[i].y = pts[i].y;
             }
             int[] counts = new int[sizes.size()];
             for (int i=0;i < counts.length;i++) {
-                counts[i] = ((Integer)sizes.get(i)).intValue();
+                counts[i] = sizes.get(i).intValue();
             }
             HRGN hrgn = gdi.CreatePolyPolygonRgn(lppt, counts, counts.length, mode);
             setWindowRegion(w, hrgn);
@@ -891,7 +922,7 @@ public class WindowUtils {
                         public boolean outputRange(int x, int y, int w, int h) {
                             GDI32 gdi = GDI32.INSTANCE;
                             gdi.SetRectRgn(tempRgn, x, y, x + w, y + h);
-                            return gdi.CombineRgn(region, region, tempRgn, GDI32.RGN_OR) != GDI32.ERROR;
+                            return gdi.CombineRgn(region, region, tempRgn, WinGDI.RGN_OR) != WinGDI.ERROR;
                         }
                     });
                 }
@@ -908,28 +939,28 @@ public class WindowUtils {
             return true;
         }
 
-        private OSXTransparentContent installTransparentContent(Window w) {
-            OSXTransparentContent content;
+        private OSXMaskingContentPane installMaskingPane(Window w) {
+            OSXMaskingContentPane content;
             if (w instanceof RootPaneContainer) {
                 // TODO: replace layered pane instead?
                 final RootPaneContainer rpc = (RootPaneContainer)w;
                 Container oldContent = rpc.getContentPane();
-                if (oldContent instanceof OSXTransparentContent) {
-                    content = (OSXTransparentContent)oldContent;
+                if (oldContent instanceof OSXMaskingContentPane) {
+                    content = (OSXMaskingContentPane)oldContent;
                 }
                 else {
-                    content = new OSXTransparentContent(oldContent);
+                    content = new OSXMaskingContentPane(oldContent);
                     // TODO: listen for content pane changes
                     rpc.setContentPane(content);
                 }
             }
             else {
                 Component oldContent = w.getComponentCount() > 0 ? w.getComponent(0) : null;
-                if (oldContent instanceof OSXTransparentContent) {
-                    content = (OSXTransparentContent)oldContent;
+                if (oldContent instanceof OSXMaskingContentPane) {
+                    content = (OSXMaskingContentPane)oldContent;
                 }
                 else {
-                    content = new OSXTransparentContent(oldContent);
+                    content = new OSXMaskingContentPane(oldContent);
                     w.add(content);
                 }
             }
@@ -948,9 +979,7 @@ public class WindowUtils {
             boolean isTransparent = w.getBackground() != null
                 && w.getBackground().getAlpha() == 0;
             if (transparent != isTransparent) {
-                installTransparentContent(w);
                 setBackgroundTransparent(w, transparent, "setWindowTransparent");
-                setLayersTransparent(w, transparent);
             }
         }
 
@@ -984,7 +1013,7 @@ public class WindowUtils {
                 fixWindowDragging(w, "setWindowAlpha");
             }
             whenDisplayable(w, new Runnable() {
-                public void run() {
+				public void run() {
                     Object peer = w.getPeer();
                     try {
                         peer.getClass().getMethod("setAlpha", new Class[]{
@@ -1012,7 +1041,7 @@ public class WindowUtils {
         public void setWindowMask(Component c, final Shape shape) {
             if (c instanceof Window) {
                 Window w = (Window)c;
-                OSXTransparentContent content = installTransparentContent(w);
+                OSXMaskingContentPane content = installMaskingPane(w);
                 content.setMask(shape);
                 setBackgroundTransparent(w, shape != MASK_NONE, "setWindowMask");
             }
@@ -1024,10 +1053,11 @@ public class WindowUtils {
         /** Mask out unwanted pixels and ensure background gets cleared.
          * @author Olivier Chafik
          */
-        private static class OSXTransparentContent extends JPanel {
+        private static class OSXMaskingContentPane extends JPanel {
+    		private static final long serialVersionUID = 1L;
             private Shape shape;
 
-            public OSXTransparentContent(Component oldContent) {
+            public OSXMaskingContentPane(Component oldContent) {
                 super(new BorderLayout());
                 if (oldContent != null) {
                     add(oldContent, BorderLayout.CENTER);
@@ -1061,13 +1091,21 @@ public class WindowUtils {
                 ? ((RootPaneContainer)w).getRootPane() : null;
             if (transparent) {
                 if (rp != null) {
-                    rp.putClientProperty("bg.old", w.getBackground());
+                    rp.putClientProperty(TRANSPARENT_OLD_BG, w.getBackground());
                 }
                 w.setBackground(new Color(0,0,0,0));
             }
             else {
                 if (rp != null) {
-                    w.setBackground((Color)rp.getClientProperty("bg.old"));
+                    Color bg = (Color)rp.getClientProperty(TRANSPARENT_OLD_BG);
+                    // If the old bg is a
+                    // apple.laf.CColorPaintUIResource, the window's
+                    // transparent state will not change
+                    if (bg != null) {
+                        bg = new Color(bg.getRed(), bg.getGreen(), bg.getBlue(), bg.getAlpha());
+                    }
+                    w.setBackground(bg);
+                    rp.putClientProperty(TRANSPARENT_OLD_BG, null);
                 }
                 else {
                     w.setBackground(null);
@@ -1091,7 +1129,7 @@ public class WindowUtils {
             }
             x11.XSetForeground(dpy, gc, new NativeLong(0));
             x11.XFillRectangle(dpy, pm, gc, 0, 0, width, height);
-            final List rlist = new ArrayList();
+            final List<Rectangle> rlist = new ArrayList<Rectangle>();
             try {
                 RasterRangesUtils.outputOccupiedRanges(raster, new RasterRangesUtils.RangesOutput() {
                     public boolean outputRange(int x, int y, int w, int h) {
@@ -1102,7 +1140,7 @@ public class WindowUtils {
                 X11.XRectangle[] rects = (X11.XRectangle[])
                     new X11.XRectangle().toArray(rlist.size());
                 for (int i=0;i < rects.length;i++) {
-                    Rectangle r = (Rectangle)rlist.get(i);
+                    Rectangle r = rlist.get(i);
                     rects[i].x = (short)r.x;
                     rects[i].y = (short)r.y;
                     rects[i].width = (short)r.width;
@@ -1197,7 +1235,7 @@ public class WindowUtils {
                 IntByReference pcount = new IntByReference();
                 info = x11.XGetVisualInfo(dpy, mask, template, pcount);
                 if (info != null) {
-                    List list = new ArrayList();
+                    List<X11.VisualID> list = new ArrayList<X11.VisualID>();
                     XVisualInfo[] infos =
                         (XVisualInfo[])info.toArray(pcount.getValue());
                     for (int i = 0; i < infos.length; i++) {
@@ -1237,9 +1275,9 @@ public class WindowUtils {
                 x11.XQueryTree(dpy, win, rootp, parentp, childrenp, countp);
                 Pointer p = childrenp.getValue();
                 int[] ids = p.getIntArray(0, countp.getValue());
-                for (int i=0;i < ids.length;i++) {
+                for (int id : ids) {
                     // TODO: more verification of correct window?
-                    X11.Window child = new X11.Window(ids[i]);
+                    X11.Window child = new X11.Window(id);
                     X11.XWindowAttributes xwa = new X11.XWindowAttributes();
                     x11.XGetWindowAttributes(dpy, child, xwa);
                     offset.x = -xwa.x;
@@ -1300,9 +1338,10 @@ public class WindowUtils {
             whenDisplayable(w, action);
         }
 
-        private class X11TransparentContent extends TransparentContent {
+        private class X11TransparentContentPane extends TransparentContentPane {
+    		private static final long serialVersionUID = 1L;
 
-            public X11TransparentContent(Container oldContent) {
+            public X11TransparentContentPane(Container oldContent) {
                 super(oldContent);
             }
 
@@ -1312,7 +1351,7 @@ public class WindowUtils {
             // Painting directly to the original Graphics
             // fails to properly composite unless the destination
             // is pure black.  Too bad.
-            protected void paintDirect(BufferedImage buf, Rectangle bounds) {
+			protected void paintDirect(BufferedImage buf, Rectangle bounds) {
                 Window window = SwingUtilities.getWindowAncestor(this);
                 X11 x11 = X11.INSTANCE;
                 X11.Display dpy = x11.XOpenDisplay(null);
@@ -1324,7 +1363,7 @@ public class WindowUtils {
                 Raster raster = buf.getData();
                 int w = bounds.width;
                 int h = bounds.height;
-                if (buffer == null || buffer.getSize() != w*h*4) {
+                if (buffer == null || buffer.size() != w*h*4) {
                     buffer = new Memory(w*h*4);
                     pixels = new int[w*h];
                 }
@@ -1377,12 +1416,12 @@ public class WindowUtils {
                     JRootPane root = ((RootPaneContainer)w).getRootPane();
                     JLayeredPane lp = root.getLayeredPane();
                     Container content = root.getContentPane();
-                    if (content instanceof X11TransparentContent) {
-                        ((X11TransparentContent)content).setTransparent(transparent);
+                    if (content instanceof X11TransparentContentPane) {
+                        ((X11TransparentContentPane)content).setTransparent(transparent);
                     }
                     else if (transparent) {
-                        X11TransparentContent x11content =
-                            new X11TransparentContent(content);
+                        X11TransparentContentPane x11content =
+                            new X11TransparentContentPane(content);
                         root.setContentPane(x11content);
                         lp.add(new RepaintTrigger(x11content),
                                JLayeredPane.DRAG_LAYER);

contrib/platform/src/com/sun/jna/platform/dnd/DragHandler.java

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples.dnd;
+package com.sun.jna.platform.dnd;
 
 import java.awt.AlphaComposite;
 import java.awt.Component;
@@ -38,6 +38,7 @@ import java.awt.dnd.DropTargetEvent;
 import java.awt.dnd.InvalidDnDOperationException;
 import java.awt.event.InputEvent;
 import java.awt.image.BufferedImage;
+
 import javax.swing.Icon;
 import javax.swing.JColorChooser;
 import javax.swing.JFileChooser;
@@ -179,7 +180,7 @@ public abstract class DragHandler
     private Component dragSource;
     private GhostedDragImage ghost;
     private Point imageOffset;
-    private Dimension maxGhostSize = MAX_GHOST_SIZE;
+	private Dimension maxGhostSize = MAX_GHOST_SIZE;
     private float ghostAlpha = DEFAULT_GHOST_ALPHA;
 
     /** Enable drags from the given component, supporting the actions in
@@ -529,4 +530,4 @@ public abstract class DragHandler
         }
         updateCursor(e);
     }
-}
+}

contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples.dnd;
+package com.sun.jna.platform.dnd;
 
 import java.awt.Component;
 import java.awt.Point;
@@ -88,7 +88,7 @@ import java.util.Set;
 public abstract class DropHandler implements DropTargetListener {
 
     private int acceptedActions;
-    private List acceptedFlavors;
+    private List<DataFlavor> acceptedFlavors;
     private DropTarget dropTarget;
     private boolean active = true;
     private DropTargetPainter painter;
@@ -347,7 +347,7 @@ public abstract class DropHandler implements DropTargetListener {
      * constructor.
      */
     protected boolean isSupported(DataFlavor[] flavors) {
-        Set set = new HashSet(Arrays.asList(flavors));
+        Set<DataFlavor> set = new HashSet<DataFlavor>(Arrays.asList(flavors));
         set.retainAll(acceptedFlavors);
         return !set.isEmpty();
     }

contrib/platform/src/com/sun/jna/platform/dnd/DropTargetPainter.java

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples.dnd;
+package com.sun.jna.platform.dnd;
 
 import java.awt.Point;
 import java.awt.dnd.DropTargetEvent;

contrib/platform/src/com/sun/jna/platform/dnd/GhostedDragImage.java

@@ -10,7 +10,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.examples.dnd;
+package com.sun.jna.platform.dnd;
 
 import java.awt.Component;
 import java.awt.Dimension;
@@ -29,7 +29,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import com.sun.jna.examples.WindowUtils;
+import com.sun.jna.platform.WindowUtils;
 
 /** Provide a ghosted drag image for use during drags where 
  * {@link DragSource#isDragImageSupported} returns false.<p>
@@ -56,6 +56,7 @@ public class GhostedDragImage {
         // FIXME ensure gc is compatible (X11)
         GraphicsConfiguration gc = parent.getGraphicsConfiguration();
         dragImage = new Window(JOptionPane.getRootFrame(), gc) {
+    		private static final long serialVersionUID = 1L;
             public void paint(Graphics g) {
                 icon.paintIcon(this, g, 0, 0);
             }

contrib/platform/src/com/sun/jna/platform/dnd/package.html

@@ -0,0 +1,14 @@
+<html>
+<head>
+<!-- 
+  Copyright (c) 2010 Timothy Wall
+-->
+</head>
+<body bgcolor="white">
+
+<!-- One sentence summary -->
+Provides integrated, extended drag and drop functionality,
+allowing ghosted drag images to be used on all platforms.
+
+</body>
+</html>

contrib/platform/src/com/sun/jna/platform/mac/Carbon.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2011 Denis Tulskiy
+ *
+ * This program 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 3 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sun.jna.platform.mac;
+
+import com.sun.jna.Callback;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.ptr.PointerByReference;
+
+import java.nio.IntBuffer;
+
+/**
+ * Author: Denis Tulskiy
+ * Date: 7/25/11
+ */
+public interface Carbon {
+    public static Carbon INSTANCE = (Carbon) Native.loadLibrary("Carbon", Carbon.class);
+
+    public static final int cmdKey = 0x0100;
+    public static final int shiftKey = 0x0200;
+    public static final int optionKey = 0x0800;
+    public static final int controlKey = 0x1000;
+
+    /**
+     * Obtains the event target reference for the standard toolbox dispatcher
+     */
+    public Pointer GetEventDispatcherTarget();
+
+    /**
+     * Installs an event handler on a specified event target.
+     */
+    public int InstallEventHandler(Pointer inTarget, EventHandlerProcPtr inHandler, int inNumTypes, EventTypeSpec[] inList, Pointer inUserData, PointerByReference outRef);
+
+    /**
+     * Registers a global hot key.
+     */
+    public int RegisterEventHotKey(int inHotKeyCode, int inHotKeyModifiers, EventHotKeyID.ByValue inHotKeyID, Pointer inTarget, int inOptions, PointerByReference outRef);
+
+    /**
+     * Obtains a parameter from the specified event.
+     */
+    public int GetEventParameter(Pointer inEvent, int inName, int inDesiredType, Pointer outActualType, int inBufferSize, IntBuffer outActualSize, EventHotKeyID outData);
+
+    /**
+     * Removes the specified event handler
+     */
+    public int RemoveEventHandler(Pointer inHandlerRef);
+
+    /**
+     * Unregisters a global hot key.
+     */
+    public int UnregisterEventHotKey(Pointer inHotKey);
+
+    public class EventTypeSpec extends Structure {
+        public int eventClass;
+        public int eventKind;
+        { setFieldOrder(new String[] { "eventClass", "eventKind" }); }
+    }
+
+    public static class EventHotKeyID extends Structure {
+        public int signature;
+        public int id;
+
+        public static class ByValue extends EventHotKeyID implements Structure.ByValue { }
+        { setFieldOrder(new String[] { "signature", "id" }); }
+    }
+
+    public static interface EventHandlerProcPtr extends Callback {
+        public int callback(Pointer inHandlerCallRef, Pointer inEvent, Pointer inUserData);
+    }
+}

contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java

@@ -0,0 +1,57 @@
+/* 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.
+ * 
+ * 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 com.sun.jna.platform.mac;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.platform.FileUtils;
+
+public class MacFileUtils extends FileUtils {
+
+    public boolean hasTrash() { return true; }
+
+    public interface FileManager extends Library {
+        int kFSFileOperationDefaultOptions = 0;
+        int kFSFileOperationsOverwrite = 0x01;
+        int kFSFileOperationsSkipSourcePermissionErrors = 0x02;
+        int kFSFileOperationsDoNotMoveAcrossVolumes = 0x04;
+        int kFSFileOperationsSkipPreflight = 0x08;
+
+        public FileManager INSTANCE = (FileManager)Native.loadLibrary("CoreServices", FileManager.class);
+        int FSPathMoveObjectToTrashSync(String src, PointerByReference target, int options);
+    }
+
+    public void moveToTrash(File[] files) throws IOException {
+        File home = new File(System.getProperty("user.home"));
+        File trash = new File(home, ".Trash");
+        if (!trash.exists()) {
+            throw new IOException("The Trash was not found in its expected location (" + trash + ")");
+        }
+        List<File> failed = new ArrayList<File>();
+        for (int i=0;i < files.length;i++) {
+            File src = files[i];
+            if (FileManager.INSTANCE.FSPathMoveObjectToTrashSync(src.getAbsolutePath(), null, 0) != 0) {
+                failed.add(src);
+            }
+        }
+        if (failed.size() > 0) {
+            throw new IOException("The following files could not be trashed: " + failed);
+        }
+    }
+}

contrib/platform/src/com/sun/jna/platform/mac/package.html

@@ -1,13 +1,13 @@
 <html>
 <head>
 <!-- 
-  Copyright (c) 2007 Timothy Wall
+  Copyright (c) 2010 Timothy Wall
 -->
 </head>
 <body bgcolor="white">
 
 <!-- One sentence summary -->
-Provides examples of w32 library mappings.
+Provides common library mappings for the OS X platform.
 
 </body>
 </html>

contrib/platform/src/com/sun/jna/platform/package.html

@@ -0,0 +1,13 @@
+<html>
+<head>
+<!-- 
+  Copyright (c) 2010 Timothy Wall
+-->
+</head>
+<body bgcolor="white">
+
+<!-- One sentence summary -->
+Provides cross-platform utilities based on platform-specific libraries.
+
+</body>
+</html>

contrib/platform/src/com/sun/jna/platform/unix/X11.java

@@ -10,21 +10,34 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  */
-package com.sun.jna.examples.unix;
+package com.sun.jna.platform.unix;
 
-import com.sun.jna.*;
-import com.sun.jna.ptr.*;
+import com.sun.jna.Callback;
+import com.sun.jna.FromNativeContext;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLong;
+import com.sun.jna.Pointer;
+import com.sun.jna.PointerType;
+import com.sun.jna.Structure;
+import com.sun.jna.Union;
+import com.sun.jna.ptr.ByReference;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.NativeLongByReference;
+import com.sun.jna.ptr.PointerByReference;
 
 /** Definition (incomplete) of the X library. */
 public interface X11 extends Library {
 
     class VisualID extends NativeLong {
-        public VisualID() { }
+		private static final long serialVersionUID = 1L;
+		public VisualID() { }
         public VisualID(long value) { super(value); }
     }
 
     class XID extends NativeLong {
-        public static final XID None = null;
+		private static final long serialVersionUID = 1L;
+		public static final XID None = null;
         public XID() { this(0); }
         public XID(long id) { super(id); }
         protected boolean isNone(Object o) {
@@ -42,6 +55,7 @@ public interface X11 extends Library {
         }
     }
     class Atom extends XID {
+		private static final long serialVersionUID = 1L;
         public static final Atom None = null;
         public Atom() { }
         public Atom(long id) { super(id); }
@@ -133,6 +147,7 @@ public interface X11 extends Library {
         }
     }
     class Colormap extends XID {
+		private static final long serialVersionUID = 1L;
         public static final Colormap None = null;
         public Colormap() { }
         public Colormap(long id) { super(id); }
@@ -143,6 +158,7 @@ public interface X11 extends Library {
         }
     }
     class Font extends XID {
+		private static final long serialVersionUID = 1L;
         public static final Font None = null;
         public Font() { }
         public Font(long id) { super(id); }
@@ -153,6 +169,7 @@ public interface X11 extends Library {
         }
     }
     class Cursor extends XID {
+		private static final long serialVersionUID = 1L;
         public static final Cursor None = null;
         public Cursor() { }
         public Cursor(long id) { super(id); }
@@ -163,6 +180,7 @@ public interface X11 extends Library {
         }
     }
     class KeySym extends XID {
+		private static final long serialVersionUID = 1L;
         public static final KeySym None = null;
         public KeySym() { }
         public KeySym(long id) { super(id); }
@@ -173,6 +191,7 @@ public interface X11 extends Library {
         }
     }
     class Drawable extends XID {
+		private static final long serialVersionUID = 1L;
         public static final Drawable None = null;
         public Drawable() { }
         public Drawable(long id) { super(id); }
@@ -183,7 +202,8 @@ public interface X11 extends Library {
         }
     }
     class Window extends Drawable {
-        public static final Window None = null;
+		private static final long serialVersionUID = 1L;
+		public static final Window None = null;
         public Window() { }
         public Window(long id) { super(id); }
         public Object fromNative(Object nativeValue, FromNativeContext context) {
@@ -201,7 +221,8 @@ public interface X11 extends Library {
         }
     }
     class Pixmap extends Drawable {
-        public static final Pixmap None = null;
+		private static final long serialVersionUID = 1L;
+		public static final Pixmap None = null;
         public Pixmap() { }
         public Pixmap(long id) { super(id); }
         public Object fromNative(Object nativeValue, FromNativeContext context) {
@@ -256,8 +277,10 @@ public interface X11 extends Library {
             public short green, greenMask;
             public short blue, blueMask;
             public short alpha, alphaMask;
+            { setFieldOrder(new String[] { "red", "redMask", "green", "greenMask", "blue", "blueMask", "alpha", "alphaMask" }); }
         }
         class PictFormat extends NativeLong {
+            private static final long serialVersionUID = 1L;
             public PictFormat(long value) { super(value); }
             public PictFormat() { }
         }
@@ -267,6 +290,7 @@ public interface X11 extends Library {
             public int depth;
             public XRenderDirectFormat direct;
             public Colormap colormap;
+            { setFieldOrder(new String[] { "id", "type", "depth", "direct", "colormap" }); }
         }
         int PictTypeIndexed = 0x0;
         int PictTypeDirect = 0x1;
@@ -315,12 +339,14 @@ public interface X11 extends Library {
     class XInputClassInfoByReference extends Structure implements Structure.ByReference {
         public byte input_class;
         public byte event_type_base;
+        { setFieldOrder(new String[] { "input_class", "event_type_base" }); }
     }
 
     class XDeviceByReference extends Structure implements Structure.ByReference {
         public XID device_id;
         public int num_classes;
         public XInputClassInfoByReference classes;
+        { setFieldOrder(new String[] { "device_id", "num_classes", "classes" }); }
     }
 
     X11 INSTANCE = (X11)Native.loadLibrary("X11", X11.class);
@@ -348,6 +374,7 @@ public interface X11 extends Library {
         public int icon_x, icon_y;
         public Pixmap icon_mask;
         public XID window_group;
+        { setFieldOrder(new String[] { "flags", "input", "initial_state", "icon_pixmap", "icon_window", "icon_x", "icon_y", "icon_mask", "window_group" }); }
     }
 
     /*
@@ -363,6 +390,7 @@ public interface X11 extends Library {
         public Atom encoding;
         public int format;
         public NativeLong nitems;
+        { setFieldOrder(new String[] { "value", "encoding", "format", "nitems" }); }
     }
 
     /*
@@ -391,10 +419,12 @@ public interface X11 extends Library {
         public static class Aspect extends Structure {
             public int x; // numerator
             public int y; // denominator
+            { setFieldOrder(new String[] { "x", "y" }); }
         }
         public Aspect min_aspect, max_aspect;
         public int base_width, base_height;
         public int win_gravity;
+        { setFieldOrder(new String[] { "flags", "x", "y", "width", "height", "min_width", "min_height", "max_width", "max_height", "width_inc", "height_inc", "min_aspect", "max_aspect", "base_width", "base_height", "win_gravity" }); }
     }
 
     /*
@@ -448,6 +478,7 @@ public interface X11 extends Library {
         public NativeLong do_not_propagate_mask;
         public boolean override_redirect;
         public Screen screen;
+        { setFieldOrder(new String[] { "x", "y", "width", "height", "border_width", "depth", "visual", "root", "c_class", "bit_gravity", "win_gravity", "backing_store", "backing_planes", "backing_pixel", "save_under", "colormap", "map_installed", "map_state", "all_event_masks", "your_event_mask", "do_not_propagate_mask", "override_redirect", "screen" }); }
     }
 
     /*
@@ -485,6 +516,7 @@ public interface X11 extends Library {
         public boolean override_redirect;
         public Colormap colormap;
         public Cursor cursor;
+        { setFieldOrder(new String[] { "background_pixmap", "background_pixel", "border_pixmap", "border_pixel", "bit_gravity", "win_gravity", "backing_store", "backing_planes", "backing_pixel", "save_under", "event_mask", "do_not_propagate_mask", "override_redirect", "colormap", "cursor" }); }
     }
 
     int XK_0 = 0x30;
@@ -527,22 +559,25 @@ public interface X11 extends Library {
         public NativeLong blue_mask;
         public int colormap_size;
         public int bits_per_rgb;
+        { setFieldOrder(new String[] { "visual", "visualid", "screen", "depth", "c_class", "red_mask", "green_mask", "blue_mask", "colormap_size", "bits_per_rgb" }); }
     }
     class XPoint extends Structure {
         public short x, y;
-        public XPoint() { }
+        public XPoint() { this((short)0, (short)0); }
         public XPoint(short x, short y) {
             this.x = x;
             this.y = y;
+            setFieldOrder(new String[] { "x", "y" });
         }
     }
     class XRectangle extends Structure {
         public short x, y;
         public short width, height;
-        public XRectangle() { }
+        public XRectangle() { this((short)0, (short)0, (short)0, (short)0); }
         public XRectangle(short x, short y, short width, short height) {
             this.x = x; this.y = y;
             this.width = width; this.height = height;
+            setFieldOrder(new String[] { "x", "y", "width", "height" });
         }
     }
 
@@ -683,6 +718,7 @@ public interface X11 extends Library {
         public Pixmap clip_mask;        /* bitmap clipping; other calls for rects */
         public int dash_offset;         /* patterned/dashed line information */
         public byte dashes;
+        { setFieldOrder(new String[] { "function", "plane_mask", "foreground", "background", "line_width", "line_style", "cap_style", "join_style", "fill_style", "fill_rule", "arc_mode", "tile", "stipple", "ts_x_origin", "ts_y_origin", "font", "subwindow_mode", "graphics_exposures", "clip_x_origin", "clip_y_origin", "clip_mask", "dash_offset", "dashes" }); }
     }
     GC XCreateGC(Display display, Drawable drawable, NativeLong mask, XGCValues values);
     int XSetFillRule(Display display, GC gc, int fill_rule);
@@ -921,8 +957,8 @@ public interface X11 extends Library {
     int SyncBoth = 7;
 
     /* Used in SetInputFocus, GetInputFocus */
-    int RevertToNone = (int)None;
-    int RevertToPointerRoot = (int)PointerRoot;
+    int RevertToNone = None;
+    int RevertToPointerRoot = PointerRoot;
     int RevertToParent = 2;
 
     /*****************************************************************
@@ -1308,6 +1344,7 @@ public interface X11 extends Library {
         public int send_event;      // true if this came from a SendEvent request
         public Display display;     // Display the event was read from
         public Window window;       // window on which event was requested in event mask
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window" }); }
     }
 
     class XKeyEvent extends Structure {
@@ -1324,6 +1361,7 @@ public interface X11 extends Library {
         public int state;           // key or button mask
         public int keycode;         // detail
         public int same_screen;     // same screen flag
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "root", "subwindow", "time", "x", "y", "x_root", "y_root", "state", "keycode", "same_screen" }); }
     }
 
     class XButtonEvent extends Structure {
@@ -1340,6 +1378,7 @@ public interface X11 extends Library {
         public int state;           // key or button mask
         public int button;          // detail
         public int same_screen;     // same screen flag
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "root", "subwindow", "time", "x", "y", "x_root", "y_root", "state", "button", "same_screen" }); }
     }
 
     class XButtonPressedEvent extends XButtonEvent {
@@ -1357,6 +1396,7 @@ public interface X11 extends Library {
         public Atom message_type;
         public int format;
         public Data data;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "message_type", "format", "data" }); }
 
         public static class Data extends Union {
             public byte b[] = new byte[20];
@@ -1379,6 +1419,7 @@ public interface X11 extends Library {
         public int state;           // key or button mask
         public byte is_hint;        // detail
         public int same_screen;     // same screen flag
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "root", "subwindow", "time", "x", "y", "x_root", "y_root", "state", "is_hint", "same_screen" }); }
     }
 
     class XPointerMovedEvent extends XMotionEvent {
@@ -1402,8 +1443,9 @@ public interface X11 extends Library {
         * NotifyNonlinear,NotifyNonlinearVirtual
         */
         public int same_screen;     // same screen flag
-        public int focus;           // intean focus
+        public int focus;           // boolean focus
         public int state;           // key or button mask
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "root", "subwindow", "time", "x", "y", "x_root", "y_root", "mode", "detail", "same_screen", "focus", "state" }); }
     }
 
     class XEnterWindowEvent extends XCrossingEvent {
@@ -1425,6 +1467,7 @@ public interface X11 extends Library {
         * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
         * NotifyPointerRoot, NotifyDetailNone
         */
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "mode", "detail" }); }
     }
 
     class XFocusInEvent extends XFocusChangeEvent {
@@ -1442,6 +1485,7 @@ public interface X11 extends Library {
         public int x, y;
         public int width, height;
         public int count;           // if non-zero, at least this many more
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "width", "height", "count" }); }
     }
 
     class XGraphicsExposeEvent extends Structure {
@@ -1455,6 +1499,7 @@ public interface X11 extends Library {
         public int count;           // if non-zero, at least this many more
         public int major_code;      // core is CopyArea or CopyPlane
         public int minor_code;      // not defined in the core
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "drawable", "x", "y", "width", "height", "count", "major_code", "minor_code" }); }
     }
 
     class XNoExposeEvent extends Structure {
@@ -1465,6 +1510,7 @@ public interface X11 extends Library {
         public Drawable drawable;
         public int major_code;      // core is CopyArea or CopyPlane
         public int minor_code;      // not defined in the core
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "drawable", "major_code", "minor_code" }); }
     }
 
     class XVisibilityEvent extends Structure {
@@ -1474,6 +1520,7 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window window;
         public int state;           // Visibility state
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "state" }); }
     }
 
     class XCreateWindowEvent extends Structure {
@@ -1487,6 +1534,7 @@ public interface X11 extends Library {
         public int width, height;   // size of window
         public int border_width;    // border width
         public int override_redirect; // creation should be overridden
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "parent", "window", "x", "y", "width", "height", "border_width", "override_redirect" }); }
     }
 
     class XDestroyWindowEvent extends Structure {
@@ -1496,6 +1544,7 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window event;
         public Window window;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window" }); }
     }
 
     class XUnmapEvent extends Structure {
@@ -1506,6 +1555,7 @@ public interface X11 extends Library {
         public Window event;
         public Window window;
         public int from_configure;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "from_configure" }); }
     }
 
     class XMapEvent extends Structure {
@@ -1515,7 +1565,8 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window event;
         public Window window;
-        public int override_redirect; // intean, is override set...
+        public int override_redirect; // boolean, is override set...
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "override_redirect" }); }
     }
 
     class XMapRequestEvent extends Structure {
@@ -1525,6 +1576,7 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window parent;
         public Window window;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window" }); }
     }
 
     class XReparentEvent extends Structure {
@@ -1537,6 +1589,7 @@ public interface X11 extends Library {
         public Window parent;
         public int x, y;
         public int override_redirect;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "override_redirect" }); }
     }
 
     class XConfigureEvent extends Structure {
@@ -1551,6 +1604,7 @@ public interface X11 extends Library {
         public int border_width;
         public Window above;
         public int override_redirect;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "width", "height", "border_width", "above", "override_redirect" }); }
     }
 
     class XGravityEvent extends Structure {
@@ -1561,6 +1615,7 @@ public interface X11 extends Library {
         public Window event;
         public Window window;
         public int x, y;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "x", "y" }); }
     }
 
     class XResizeRequestEvent extends Structure {
@@ -1570,6 +1625,7 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window window;
         public int width, height;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "width", "height" }); }
     }
 
     class XConfigureRequestEvent extends Structure {
@@ -1585,6 +1641,7 @@ public interface X11 extends Library {
         public Window above;
         public int detail;          // Above, Below, TopIf, BottomIf, Opposite
         public NativeLong value_mask;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "width", "height", "above", "detail", "value_mask" }); }
     }
 
     class XCirculateEvent extends Structure {
@@ -1595,6 +1652,7 @@ public interface X11 extends Library {
         public Window event;
         public Window window;
         public int place;           // PlaceOnTop, PlaceOnBottom
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "event", "window", "place" }); }
     }
 
     class XCirculateRequestEvent extends Structure {
@@ -1605,6 +1663,7 @@ public interface X11 extends Library {
         public Window parent;
         public Window window;
         public int place;           // PlaceOnTop, PlaceOnBottom
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "parent", "window", "place" }); }
     }
 
     class XPropertyEvent extends Structure {
@@ -1616,6 +1675,7 @@ public interface X11 extends Library {
         public Atom atom;
         public NativeLong time;
         public int state;           // NewValue, Deleted
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "atom", "time", "state" }); }
     }
 
     class XSelectionClearEvent extends Structure {
@@ -1626,6 +1686,7 @@ public interface X11 extends Library {
         public Window window;
         public Atom selection;
         public NativeLong time;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "selection", "time" }); }
     }
 
     class XSelectionRequestEvent extends Structure {
@@ -1637,8 +1698,9 @@ public interface X11 extends Library {
         public Window requestor;
         public Atom selection;
         public Atom target;
-        Atom property;
+        public Atom property;
         public NativeLong time;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "owner", "requestor", "selection", "target", "property", "time" }); }
     }
 
     class XSelectionEvent extends Structure {
@@ -1651,6 +1713,7 @@ public interface X11 extends Library {
         public Atom target;
         public Atom property;       // ATOM or None
         public NativeLong time;
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "requestor", "selection", "target", "property", "time" }); }
     }
 
     class XColormapEvent extends Structure {
@@ -1662,6 +1725,7 @@ public interface X11 extends Library {
         public Colormap colormap;   // COLORMAP or None
         public int c_new;           // C++
         public int state;           // ColormapInstalled, ColormapUninstalled
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "colormap", "c_new", "state" }); }
     }
 
     class XMappingEvent extends Structure {
@@ -1673,16 +1737,18 @@ public interface X11 extends Library {
         public int request;         // one of MappingModifier, MappingKeyboard, MappingPointer
         public int first_keycode;   // first keycode
         public int count;           // defines range of change w. first_keycode*/
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "request", "first_keycode", "count" }); }
     }
 
     class XErrorEvent extends Structure {
         public int type;
         public Display display;     // Display the event was read from
-        public XID resourceid;      // resource id
         public NativeLong serial;   // serial number of failed request
         public byte error_code;     // error code of failed request
         public byte request_code;   // Major op-code of failed request
         public byte minor_code;     // Minor op-code of failed request
+        public XID resourceid;      // resource id
+        { setFieldOrder(new String[] { "type", "display", "serial", "error_code", "request_code", "minor_code", "resourceid" }); }
     }
 
     // generated on EnterWindow and FocusIn  when KeyMapState selected
@@ -1693,6 +1759,7 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window window;
         public byte key_vector[] = new byte[32];
+        { setFieldOrder(new String[] { "type", "serial", "send_event", "display", "window", "key_vector" }); }
     }
 
     int XSelectInput(Display display, Window window, NativeLong eventMask);
@@ -1747,6 +1814,18 @@ public interface X11 extends Library {
                   int width, int height);
     int XDestroyImage(XImage image);
 
+    /**
+     * Installs an error handler
+     *
+     * @param handler Specifies the program's supplied error handler
+     * @return The previous error handler
+     */
+    XErrorHandler XSetErrorHandler(XErrorHandler handler);
+
+    public interface XErrorHandler extends Callback {
+        public int apply(Display display, XErrorEvent errorEvent);
+    }
+
 
     /*****************************************************************
      * KeySyms, Keycodes, Keymaps
@@ -1757,6 +1836,33 @@ public interface X11 extends Library {
     byte XKeysymToKeycode(Display display, KeySym keysym);
     KeySym XKeycodeToKeysym(Display display, byte keycode, int index);
 
+    /**
+     * Establishes a passive grab on the keyboard
+     *
+     * @param display Specifies the connection to the X server.
+     * @param keyCode Specifies the KeyCode or {@link #AnyKey}.
+     * @param modifiers Specifies the set of keymasks or {@link #AnyModifier}.
+     *      The mask is the bitwise inclusive OR of the valid keymask bits.
+     * @param grab_window Specifies the grab window.
+     * @param ownerEvents Specifies a Boolean value that indicates whether the keyboard events are to be reported as usual.
+     * @param pointerMode Specifies further processing of pointer events. You can pass {@link #GrabModeSync} or {@link #GrabModeAsync}.
+     * @param keyBoardMode Specifies further processing of keyboard events. You can pass {@link #GrabModeSync} or {@link #GrabModeAsync}.
+     * @return nothing
+     */
+    int XGrabKey(Display display, int keyCode, int modifiers, Window grab_window, int ownerEvents, int pointerMode, int keyBoardMode);
+
+    /**
+     * The XUngrabKey() function releases the key combination on the specified window if it was grabbed by this client.
+     *
+     * @param display Specifies the connection to the X server.
+     * @param keyCode Specifies the KeyCode or {@link #AnyKey}.
+     * @param modifiers Specifies the set of keymasks or {@link #AnyModifier}.
+     *      The mask is the bitwise inclusive OR of the valid keymask bits
+     * @param grab_window Specifies the grab window.
+     * @return nothing
+     */
+    int XUngrabKey(Display display, int keyCode, int modifiers, Window grab_window);
+
     //int XChangeKeyboardMapping(Display display, int first_keycode, int keysyms_per_keycode, KeySym *keysyms, int num_codes);
     /** Defines the symbols for the specified number of KeyCodes starting with first_keycode. The symbols for KeyCodes outside this range remain unchanged. The number of elements in keysyms must be: num_codes * keysyms_per_keycode. The specified first_keycode must be greater than or equal to min_keycode returned by XDisplayKeycodes, or a BadValue error results. In addition, the following expression must be less than or equal to max_keycode as returned by XDisplayKeycodes, or a BadValue error results: first_keycode + num_codes - 1. */
     int XChangeKeyboardMapping(Display display, int first_keycode, int keysyms_per_keycode, KeySym[] keysyms, int num_codes);
@@ -1798,6 +1904,7 @@ public interface X11 extends Library {
     class XModifierKeymapRef extends Structure implements Structure.ByReference{
         public int max_keypermod;   /* The server's max # of keys per modifier */
         public Pointer modifiermap;   /* An 8 by max_keypermod array of modifiers */
+        { setFieldOrder(new String[] { "max_keypermod", "modifiermap" }); }
     }
     
     class XKeyboardControlRef extends Structure implements Structure.ByReference {
@@ -1818,6 +1925,8 @@ public interface X11 extends Library {
         /** AutoRepeatModeOff, AutoRepeatModeOn, AutoRepeatModeDefault. */
         public int auto_repeat_mode;
 
+        { setFieldOrder(new String[] { "key_click_percent", "bell_percent", "bell_pitch", "bell_duration", "led", "led_mode", "key", "auto_repeat_mode" }); }
+
         public String toString() {
             return "XKeyboardControlByReference{" +
                     "key_click_percent=" + key_click_percent +
@@ -1848,6 +1957,8 @@ public interface X11 extends Library {
         /** Bit vector. Each bit set to 1 indicates that auto-repeat is enabled for the corresponding key. The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7 with the least significant bit in the byte representing key 8N. */
         public byte auto_repeats[] = new byte[32];
 
+        { setFieldOrder(new String[] { "key_click_percent", "bell_percent", "bell_pitch", "bell_duration", "led_mask", "global_auto_repeat", "auto_repeats" }); }
+
         public String toString() {
             return "XKeyboardStateByReference{" +
                     "key_click_percent=" + key_click_percent +

contrib/platform/src/com/sun/jna/platform/unix/package.html

@@ -0,0 +1,13 @@
+<html>
+<head>
+<!-- 
+  Copyright (c) 2010 Timothy Wall
+-->
+</head>
+<body bgcolor="white">
+
+<!-- One sentence summary -->
+Provides common library mappings for Unix and X11-based platforms.
+
+</body>
+</html>

contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java

@@ -0,0 +1,127 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.IntegerType;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.ByReference;
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ * Based on basetsd.h (various types)
+ * @author dblock[at]dblock[dot]org
+ */
+@SuppressWarnings("serial")
+public interface BaseTSD extends StdCallLibrary {
+    /**
+     * Signed long type for pointer precision. 
+     * Use when casting a pointer to a long to perform pointer arithmetic. 
+     */
+    public static class LONG_PTR extends IntegerType {
+        public LONG_PTR() {
+            this(0);
+        }
+
+        public LONG_PTR(long value) {
+            super(Pointer.SIZE, value);
+        }
+
+        public Pointer toPointer() {
+            return Pointer.createConstant(longValue());
+        }
+    }
+	
+    /**
+     * Signed SIZE_T. 
+     */
+    public static class SSIZE_T extends LONG_PTR {
+        public SSIZE_T() {
+            this(0);
+        }
+
+        public SSIZE_T(long value) {
+            super(value);
+        }
+    }
+
+    /**
+     * Unsigned LONG_PTR. 
+     */
+    public static class ULONG_PTR extends IntegerType {
+        public ULONG_PTR() {
+            this(0);
+        }
+
+        public ULONG_PTR(long value) {
+            super(Pointer.SIZE, value, true);
+        }
+
+        public Pointer toPointer() {
+            return Pointer.createConstant(longValue());
+        }
+    }
+
+    /**
+     * PULONG_PTR
+     */
+    public static class ULONG_PTRByReference extends ByReference {
+        public ULONG_PTRByReference() {
+            this(new ULONG_PTR(0));
+        }
+        public ULONG_PTRByReference(ULONG_PTR value) {
+            super(Pointer.SIZE);
+            setValue(value);
+        }
+        public void setValue(ULONG_PTR value) {
+            if (Pointer.SIZE == 4) {
+                getPointer().setInt(0, value.intValue());
+            }
+            else {
+                getPointer().setLong(0, value.longValue());
+            }
+        }
+        public ULONG_PTR getValue() {
+            return new ULONG_PTR(Pointer.SIZE == 4
+                                 ? getPointer().getInt(0)
+                                 : getPointer().getLong(0));
+        }
+    }
+
+
+    /**
+     * Unsigned DWORD_PTR. 
+     */
+    public static class DWORD_PTR extends IntegerType {
+        public DWORD_PTR() {
+            this(0);
+        }
+
+        public DWORD_PTR(long value) {
+            super(Pointer.SIZE, value);
+        }
+    }
+
+    /**
+     * The maximum number of bytes to which a pointer can point. 
+     * Use for a count that must span the full range of a pointer. 
+     */
+    public static class SIZE_T extends ULONG_PTR {
+        public SIZE_T() {
+            this(0);
+        }
+
+        public SIZE_T(long value) {
+            super(value);
+        }
+    }
+}

contrib/platform/src/com/sun/jna/platform/win32/Crypt32.java

@@ -0,0 +1,112 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.win32.WinCrypt.CRYPTPROTECT_PROMPTSTRUCT;
+import com.sun.jna.platform.win32.WinCrypt.DATA_BLOB;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * Crypt32.dll Interface.
+ * @author dblock[at]dblock.org
+ */
+public interface Crypt32 extends StdCallLibrary {
+	
+	Crypt32 INSTANCE = (Crypt32) Native.loadLibrary("Crypt32",
+			Crypt32.class, W32APIOptions.UNICODE_OPTIONS);
+	
+	/**
+	 * The CryptProtectData function performs encryption on the data in a DATA_BLOB
+	 * structure. Typically, only a user with the same logon credential as the encrypter 
+	 * can decrypt the data. In addition, the encryption and decryption usually must be
+	 * done on the same computer.
+	 * @param pDataIn
+	 *  Pointer to a DATA_BLOB structure that contains the plaintext to be encrypted. 
+	 * @param szDataDescr
+	 *  String with a readable description of the data to be encrypted. This description 
+	 *  string is included with the encrypted data. This parameter is optional and can 
+	 *  be set to NULL, except on Windows 2000.
+	 * @param pOptionalEntropy
+	 *  Pointer to a DATA_BLOB structure that contains a password or other additional 
+	 *  entropy used to encrypt the data. The DATA_BLOB structure used in the encryption 
+	 *  phase must also be used in the decryption phase. This parameter can be set to NULL
+	 *  for no additional entropy.
+	 * @param pvReserved
+	 *  Reserved for future use and must be set to NULL. 
+	 * @param pPromptStruct
+	 *  Pointer to a CRYPTPROTECT_PROMPTSTRUCT structure that provides information about 
+	 *  where and when prompts are to be displayed and what the content of those prompts 
+	 *  should be. This parameter can be set to NULL in both the encryption and decryption
+	 *  phases.
+	 * @param dwFlags
+	 *  One of CRYPTPROTECT_LOCAL_MACHINE, CRYPTPROTECT_UI_FORBIDDEN, CRYPTPROTECT_AUDIT, 
+	 *  CRYPTPROTECT_VERIFY_PROTECTION.
+	 * @param pDataOut
+	 *  Pointer to a DATA_BLOB structure that receives the encrypted data. When you have 
+	 *  finished using the DATA_BLOB structure, free its pbData member by calling the 
+	 *  LocalFree function. 
+	 * @return
+	 *  If the function succeeds, the function returns TRUE. If the function fails, 
+	 *  it returns FALSE. For extended error information, call GetLastError.
+	 */
+	public boolean CryptProtectData(DATA_BLOB pDataIn, String szDataDescr,
+			DATA_BLOB pOptionalEntropy, Pointer pvReserved, 
+			CRYPTPROTECT_PROMPTSTRUCT pPromptStruct,
+			int dwFlags,
+			DATA_BLOB pDataOut);
+	
+	/**
+	 * The CryptUnprotectData function decrypts and does an integrity check of the data in
+	 * a DATA_BLOB structure. Usually, only a user with the same logon credentials as the
+	 * encrypter can decrypt the data. In addition, the encryption and decryption must be
+	 * done on the same computer.  
+	 * @param pDataIn
+	 *  Pointer to a DATA_BLOB structure that holds the encrypted data. The DATA_BLOB 
+	 *  structure's cbData member holds the length of the pbData member's byte string that 
+	 *  contains the text to be encrypted.  
+	 * @param szDataDescr
+	 *  Pointer to a string-readable description of the encrypted data included with the 
+	 *  encrypted data. This parameter can be set to NULL. When you have finished using 
+	 *  ppszDataDescr, free it by calling the LocalFree function. 
+	 * @param pOptionalEntropy
+	 *  Pointer to a DATA_BLOB structure that contains a password or other additional 
+	 *  entropy used when the data was encrypted. This parameter can be set to NULL; 
+	 *  however, if an optional entropy DATA_BLOB structure was used in the encryption 
+	 *  phase, that same DATA_BLOB structure must be used for the decryption phase.
+	 * @param pvReserved
+	 *  Reserved for future use; must be set to NULL. 
+	 * @param pPromptStruct
+	 *  Pointer to a CRYPTPROTECT_PROMPTSTRUCT structure that provides information about 
+	 *  where and when prompts are to be displayed and what the content of those prompts 
+	 *  should be. This parameter can be set to NULL. 
+ 	 * @param dwFlags
+	 *  DWORD value that specifies options for this function. This parameter can be zero, 
+	 *  in which case no option is set, or CRYPTPROTECT_UI_FORBIDDEN. 
+	 * @param pDataOut
+	 *  Pointer to a DATA_BLOB structure where the function stores the decrypted data. 
+	 *  When you have finished using the DATA_BLOB structure, free its pbData member by
+	 *  calling the LocalFree function. 
+	 * @return
+	 *  If the function succeeds, the return value is TRUE. If the function fails, the 
+	 *  return value is FALSE.
+	 */
+	public boolean CryptUnprotectData(DATA_BLOB pDataIn, PointerByReference szDataDescr,
+			DATA_BLOB pOptionalEntropy, Pointer pvReserved, 
+			CRYPTPROTECT_PROMPTSTRUCT pPromptStruct,
+			int dwFlags,
+			DATA_BLOB pDataOut);
+}

contrib/platform/src/com/sun/jna/platform/win32/Crypt32Util.java

@@ -0,0 +1,140 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.platform.win32.WinCrypt.CRYPTPROTECT_PROMPTSTRUCT;
+import com.sun.jna.platform.win32.WinCrypt.DATA_BLOB;
+import com.sun.jna.ptr.PointerByReference;
+
+/**
+ * Crypt32 utility API.
+ * @author dblock[at]dblock.org
+ */
+public abstract class Crypt32Util {
+
+	/**
+	 * Protect a blob of data.
+	 * @param data
+	 *  Data to protect.
+	 * @return
+	 *  Protected data.
+	 */
+	public static byte[] cryptProtectData(byte[] data) {
+		return cryptProtectData(data, 0);
+	}
+
+	/**
+	 * Protect a blob of data with optional flags.
+	 * @param data
+	 *  Data to protect.
+	 * @param flags
+	 *  Optional flags, eg. CRYPTPROTECT_LOCAL_MACHINE | CRYPTPROTECT_UI_FORBIDDEN.
+	 * @return
+	 *  Protected data.
+	 */
+	public static byte[] cryptProtectData(byte[] data, int flags) {
+		return cryptProtectData(data, null, flags, "", null);
+	}
+	
+	/**
+	 * Protect a blob of data.
+	 * @param data
+	 *  Data to protect.
+	 * @param entropy
+	 *  Optional entropy.
+	 * @param flags
+	 *  Optional flags.
+	 * @param description
+	 *  Optional description.
+	 * @param prompt
+	 *  Prompt structure.
+	 * @return
+	 *  Protected bytes.
+	 */
+	public static byte[] cryptProtectData(byte[] data, byte[] entropy, int flags, 
+			String description, CRYPTPROTECT_PROMPTSTRUCT prompt) {
+    	DATA_BLOB pDataIn = new DATA_BLOB(data);
+    	DATA_BLOB pDataProtected = new DATA_BLOB();
+    	DATA_BLOB pEntropy = (entropy == null) ? null : new DATA_BLOB(entropy);
+    	try {
+	    	if (! Crypt32.INSTANCE.CryptProtectData(pDataIn, description, 
+	    			pEntropy, null, prompt, flags, pDataProtected)) {
+	    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+	    	}
+	    	return pDataProtected.getData();
+    	} finally {
+    		if (pDataProtected.pbData != null) {
+    			Kernel32.INSTANCE.LocalFree(pDataProtected.pbData);
+    		}
+    	}
+	}
+	
+	/**
+	 * Unprotect a blob of data.
+	 * @param data
+	 *  Data to unprotect.
+	 * @return
+	 *  Unprotected blob of data.
+	 */
+	public static byte[] cryptUnprotectData(byte[] data) {
+		return cryptUnprotectData(data, 0);
+	}
+
+	/**
+	 * Unprotect a blob of data.
+	 * @param data
+	 *  Data to unprotect.
+	 * @param flags
+	 *  Optional flags, eg. CRYPTPROTECT_UI_FORBIDDEN.
+	 * @return
+	 *  Unprotected blob of data.
+	 */
+	public static byte[] cryptUnprotectData(byte[] data, int flags) {
+		return cryptUnprotectData(data, null, flags, null);
+	}
+	
+	/**
+	 * Unprotect a blob of data.
+	 * @param data
+	 *  Data to unprotect.
+	 * @param entropy
+	 *  Optional entropy.
+	 * @param flags
+	 *  Optional flags.
+	 * @param prompt
+	 *  Optional prompt structure.
+	 * @return
+	 *  Unprotected blob of data.
+	 */
+	public static byte[] cryptUnprotectData(byte[] data, byte[] entropy, int flags, 
+			CRYPTPROTECT_PROMPTSTRUCT prompt) {
+    	DATA_BLOB pDataIn = new DATA_BLOB(data);
+    	DATA_BLOB pDataUnprotected = new DATA_BLOB();
+    	DATA_BLOB pEntropy = (entropy == null) ? null : new DATA_BLOB(entropy);
+    	PointerByReference pDescription = new PointerByReference();
+    	try {
+	    	if (! Crypt32.INSTANCE.CryptUnprotectData(pDataIn, pDescription, 
+	    			pEntropy, null, prompt, flags, pDataUnprotected)) {
+	    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+	    	}
+	    	return pDataUnprotected.getData();
+    	} finally {
+    		if (pDataUnprotected.pbData != null) {
+    			Kernel32.INSTANCE.LocalFree(pDataUnprotected.pbData);
+    		}
+    		if (pDescription.getValue() != null) {
+    			Kernel32.INSTANCE.LocalFree(pDescription.getValue());
+    		}
+    	}
+	}
+}

contrib/platform/src/com/sun/jna/platform/win32/DsGetDC.java

@@ -0,0 +1,227 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Guid.GUID;
+import com.sun.jna.platform.win32.WinNT.PSID;
+import com.sun.jna.win32.StdCallLibrary;
+
+
+/**
+ * Ported from DsGetDC.h.
+ * Windows SDK 6.0a
+ * @author dblock[at]dblock.org 
+ */
+public interface DsGetDC extends StdCallLibrary {
+	
+    /**
+     * The DOMAIN_CONTROLLER_INFO structure is used with the DsGetDcName 
+     * function to receive data about a domain controller.
+     */
+    public static class DOMAIN_CONTROLLER_INFO extends Structure {
+	    
+        public static class ByReference extends DOMAIN_CONTROLLER_INFO implements Structure.ByReference { }
+		
+        public DOMAIN_CONTROLLER_INFO() { }
+
+        public DOMAIN_CONTROLLER_INFO(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a null-terminated WString that specifies the computer name 
+         * of the discovered domain controller. The returned computer name is 
+         * prefixed with "\\". The DNS-style name, for example, "\\phoenix.fabrikam.com", 
+         * is returned, if available. If the DNS-style name is not available, the 
+         * flat-style name (for example, "\\phoenix") is returned. This example would apply 
+         * if the domain is a Windows NT 4.0 domain or if the domain does not support the 
+         * IP family of protocols.
+         */
+        public WString DomainControllerName;
+        /**
+         * Pointer to a null-terminated WString that specifies the address of the discovered 
+         * domain controller. The address is prefixed with "\\". This WString is one of the
+         * types defined by the DomainControllerAddressType member.
+         */
+        public WString DomainControllerAddress;
+        /**
+         * Indicates the type of WString that is contained in the DomainControllerAddress member.
+         */
+        public int DomainControllerAddressType;
+        /**
+         * The GUID of the domain. This member is zero if the domain controller does not have 
+         * a Domain GUID; for example, the domain controller is not a Windows 2000 domain 
+         * controller.
+         */
+        public GUID DomainGuid;
+        /**
+         * Pointer to a null-terminated WString that specifies the name of the domain. The 
+         * DNS-style name, for example, "fabrikam.com", is returned if available. Otherwise, 
+         * the flat-style name, for example, "fabrikam", is returned. This name may be different 
+         * than the requested domain name if the domain has been renamed.
+         */
+        public WString DomainName;
+        /**
+         * Pointer to a null-terminated WString that specifies the name of the domain at the root 
+         * of the DS tree. The DNS-style name, for example, "fabrikam.com", is returned if 
+         * available. Otherwise, the flat-style name, for example, "fabrikam" is returned.
+         */
+        public WString DnsForestName;
+        /**
+         * Contains a set of flags that describe the domain controller. 
+         */
+        public int Flags;
+        /**
+         * Pointer to a null-terminated WString that specifies the name of the site where the 
+         * domain controller is located. This member may be NULL if the domain controller is 
+         * not in a site; for example, the domain controller is a Windows NT 4.0 domain 
+         * controller.
+         */
+        public WString DcSiteName;
+        /**
+         * Pointer to a null-terminated WString that specifies the name of the site that the 
+         * computer belongs to. The computer is specified in the ComputerName parameter passed 
+         * to DsGetDcName. This member may be NULL if the site that contains the computer 
+         * cannot be found; for example, if the DS administrator has not associated the 
+         * subnet that the computer is in with a valid site.
+         */
+        public WString ClientSiteName;
+    }	
+	
+    /**
+     * Pointer to DOMAIN_CONTROLLER_INFO.
+     */
+    public static class PDOMAIN_CONTROLLER_INFO extends Structure {
+
+        public static class ByReference extends PDOMAIN_CONTROLLER_INFO implements Structure.ByReference {
+
+        }
+
+        public DOMAIN_CONTROLLER_INFO.ByReference dci;
+    }
+	
+    /**
+     * Domain is a member of the forest.
+     */
+    int DS_DOMAIN_IN_FOREST = 0x0001;
+    /**
+     * Domain is directly trusted.
+     */
+    int DS_DOMAIN_DIRECT_OUTBOUND = 0x0002;
+    /**
+     * Domain is root of a tree in the forest.
+     */
+    int DS_DOMAIN_TREE_ROOT = 0x0004; 
+    /**
+     * Domain is the primary domain of queried server.
+     */
+    int DS_DOMAIN_PRIMARY = 0x0008;
+    /**
+     * Primary domain is running in native mode.
+     */
+    int DS_DOMAIN_NATIVE_MODE = 0x0010;
+    /**
+     * Domain is directly trusting.
+     */
+    int DS_DOMAIN_DIRECT_INBOUND = 0x0020;
+    /**
+     * Valid domain flags.
+     */
+    int DS_DOMAIN_VALID_FLAGS = 
+        DS_DOMAIN_IN_FOREST       |
+        DS_DOMAIN_DIRECT_OUTBOUND |
+        DS_DOMAIN_TREE_ROOT       |
+        DS_DOMAIN_PRIMARY         |
+        DS_DOMAIN_NATIVE_MODE     |
+        DS_DOMAIN_DIRECT_INBOUND;
+
+    /**
+     * The DS_DOMAIN_TRUSTS structure is used with the DsEnumerateDomainTrusts function to 
+     * contain trust data for a domain.
+     */
+    public static class DS_DOMAIN_TRUSTS extends Structure {
+			
+        public static class ByReference extends DS_DOMAIN_TRUSTS implements Structure.ByReference {
+
+        }
+		
+        /**
+         * Pointer to a null-terminated string that contains the NetBIOS name of the domain.
+         */
+        public WString NetbiosDomainName;
+        /**
+         * Pointer to a null-terminated string that contains the DNS name of the domain. This member may be NULL.
+         */
+        public WString DnsDomainName;
+        /**
+         * Contains a set of flags that specify more data about the domain trust.
+         */	    
+        public int Flags;
+        /**
+         * Contains the index in the Domains array returned by the DsEnumerateDomainTrusts function that 
+         * corresponds to the parent domain of the domain represented by this structure.
+         */
+        public int ParentIndex;
+        /**
+         * Contains a value that indicates the type of trust represented by this structure.
+         */
+        public int TrustType;	    
+        /**
+         * Contains a value that indicates the attributes of the trust represented by this structure.
+         */
+        public int TrustAttributes;
+	    
+        /**
+         * Contains the security identifier of the domain represented by this structure.
+         */
+        public PSID.ByReference DomainSid;
+
+        /**
+         * Contains the GUID of the domain represented by this structure.
+         */
+        public GUID DomainGuid;
+
+        public DS_DOMAIN_TRUSTS() {
+        }
+
+        public DS_DOMAIN_TRUSTS(Pointer p) {
+            super(p);
+        }
+    };
+	
+    /**
+     * A pointer to an array of DS_DOMAIN_TRUSTS.
+     */
+    public static class PDS_DOMAIN_TRUSTS extends Structure {
+        public static class ByReference extends PDS_DOMAIN_TRUSTS implements Structure.ByReference {
+
+        }
+		
+        public DS_DOMAIN_TRUSTS.ByReference t;
+
+        /**
+         * Returns domain trusts.
+         * @param count
+         *  Number of domain trusts.
+         * @return
+         *  An array of domain trusts.
+         */
+        public DS_DOMAIN_TRUSTS[] getTrusts(int count) {
+            return (DS_DOMAIN_TRUSTS[]) t.toArray(count);
+        }
+    }
+}

contrib/platform/src/com/sun/jna/platform/win32/GDI32.java

@@ -0,0 +1,316 @@
+/* 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.
+ */
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.win32.WinDef.HBITMAP;
+import com.sun.jna.platform.win32.WinDef.HDC;
+import com.sun.jna.platform.win32.WinDef.HRGN;
+import com.sun.jna.platform.win32.WinGDI.BITMAPINFO;
+import com.sun.jna.platform.win32.WinGDI.BITMAPINFOHEADER;
+import com.sun.jna.platform.win32.WinGDI.RGNDATA;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/** Definition (incomplete) of <code>gdi32.dll</code>. */
+public interface GDI32 extends StdCallLibrary {
+
+    GDI32 INSTANCE = (GDI32) Native.loadLibrary("gdi32", GDI32.class,
+                                                W32APIOptions.DEFAULT_OPTIONS);
+
+    /**
+     * The ExtCreateRegion function creates a region from the specified region and transformation data.
+     * @param lpXform
+     *  Pointer to an XFORM structure that defines the transformation to be performed on the region. If this pointer is NULL, 
+     *  the identity transformation is used. 
+     * @param nCount
+     *  Specifies the number of bytes pointed to by lpRgnData.
+     * @param lpRgnData
+     *  Pointer to a RGNDATA structure that contains the region data in logical units.
+     * @return
+     *  If the function succeeds, the return value is the value of the region.
+     *  If the function fails, the return value is NULL. 
+     *  To get extended error information, call GetLastError.
+     */
+    public HRGN ExtCreateRegion(Pointer lpXform, int nCount, RGNDATA lpRgnData);
+
+    /**
+     * The CombineRgn function combines two regions and stores the result in a third region. 
+     * The two regions are combined according to the specified mode.
+     * @param hrgnDest
+     *  Handle to a new region with dimensions defined by combining two other regions.
+     * @param hrgnSrc1
+     *  Handle to the first of two regions to be combined. 
+     * @param hrgnSrc2
+     *  Handle to the second of two regions to be combined. 
+     * @param fnCombineMode
+     *  Specifies a mode indicating how the two regions will be combined.
+     * @return
+     *  The return value specifies the type of the resulting region.
+     */
+    int CombineRgn(HRGN hrgnDest, HRGN hrgnSrc1, HRGN hrgnSrc2,
+                   int fnCombineMode);
+
+    /**
+     * The CreateRectRgn function creates a rectangular region. 
+     * @param nLeftRect
+     *  Specifies the x-coordinate of the upper-left corner of the region in logical units.
+     * @param nTopRect
+     *  Specifies the y-coordinate of the upper-left corner of the region in logical units.
+     * @param nRightRect
+     *  Specifies the x-coordinate of the lower-right corner of the region in logical units. 
+     * @param nBottomRect
+     *  Specifies the y-coordinate of the lower-right corner of the region in logical units.
+     * @return
+     *  If the function succeeds, the return value is the handle to the region.
+     *  If the function fails, the return value is NULL. 
+     *  To get extended error information, call GetLastError.
+     */
+    HRGN CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect,
+                       int nBottomRect);
+
+    /**
+     * The CreateRoundRectRgn function creates a rectangular region with rounded corners. 
+     * @param nLeftRect
+     *  Specifies the x-coordinate of the upper-left corner of the region in logical units. 
+     * @param nTopRect
+     *  Specifies the y-coordinate of the upper-left corner of the region in logical units.
+     * @param nRightRect
+     *  Specifies the x-coordinate of the lower-right corner of the region in logical units.
+     * @param nBottomRect
+     *  Specifies the y-coordinate of the lower-right corner of the region in logical units.
+     * @param nWidthEllipse
+     *  Specifies the width of the ellipse used to create the rounded corners in logical units.
+     * @param nHeightEllipse
+     *  Specifies the height of the ellipse used to create the rounded corners in logical units.
+     * @return
+     *  If the function succeeds, the return value is the handle to the region.
+     *  If the function fails, the return value is NULL. 
+     *  To get extended error information, call GetLastError.
+     */
+    HRGN CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect,
+                            int nBottomRect, int nWidthEllipse, int nHeightEllipse);
+
+    /**
+     * The CreatePolyPolygonRgn function creates a region consisting of a series 
+     * of polygons. The polygons can overlap. 
+     * @param lppt
+     *  Pointer to an array of POINT structures that define the vertices of the polygons in logical units. 
+     *  The polygons are specified consecutively. Each polygon is presumed closed and each vertex is 
+     *  specified only once.
+     * @param lpPolyCounts
+     *  Pointer to an array of integers, each of which specifies the number of points in one of the polygons 
+     *  in the array pointed to by lppt. 
+     * @param nCount
+     *  Specifies the total number of integers in the array pointed to by lpPolyCounts. 
+     * @param fnPolyFillMode
+     *  Specifies the fill mode used to determine which pixels are in the region.
+     * @return
+     *  If the function succeeds, the return value is the handle to the region.
+     *  If the function fails, the return value is zero. 
+     *  To get extended error information, call GetLastError.
+     */
+    HRGN CreatePolyPolygonRgn(WinUser.POINT[] lppt, int[] lpPolyCounts,
+                              int nCount, int fnPolyFillMode);
+
+    /**
+     * The SetRectRgn function converts a region into a rectangular region with the specified coordinates. 
+     * @param hrgn
+     *  Handle to the region.
+     * @param nLeftRect
+     *  Specifies the x-coordinate of the upper-left corner of the rectangular region in logical units.
+     * @param nTopRect
+     *  Specifies the y-coordinate of the upper-left corner of the rectangular region in logical units.
+     * @param nRightRect
+     *  Specifies the x-coordinate of the lower-right corner of the rectangular region in logical units. 
+     * @param nBottomRect
+     *  Specifies the y-coordinate of the lower-right corner of the rectangular region in logical units. 
+     * @return
+     *  If the function succeeds, the return value is nonzero.
+     *  If the function fails, the return value is zero. 
+     *  To get extended error information, call GetLastError.
+     */
+    boolean SetRectRgn(HRGN hrgn, int nLeftRect, int nTopRect, int nRightRect,
+                       int nBottomRect);
+
+    /**
+     * The SetPixel function sets the pixel at the specified coordinates to the specified color. 
+     * @param hDC
+     *  Handle to the device context.
+     * @param x
+     *  Specifies the x-coordinate, in logical units, of the point to be set. 
+     * @param y
+     *  Specifies the y-coordinate, in logical units, of the point to be set. 
+     * @param crColor
+     *  Specifies the color to be used to paint the point. To create a COLORREF color value, use the RGB macro.
+     * @return
+     *  If the function succeeds, the return value is the RGB value that the function sets the pixel to. 
+     *  This value may differ from the color specified by crColor; that occurs when an exact match for the 
+     *  specified color cannot be found. If the function fails, the return value is 1. To get extended error 
+     *  information, call GetLastError. This can be the following value.
+     */
+    int SetPixel(HDC hDC, int x, int y, int crColor);
+
+    /**
+     * The CreateCompatibleDC function creates a memory device context (DC) compatible with the specified device. 
+     * @param hDC
+     *  Handle to an existing DC. If this handle is NULL, the function creates a memory DC compatible with the 
+     *  application's current screen.
+     * @return
+     *  If the function succeeds, the return value is the handle to a memory DC.
+     *  If the function fails, the return value is NULL. 
+     *  To get extended error information, call GetLastError.
+     */
+    HDC CreateCompatibleDC(HDC hDC);
+
+    /**
+     * The DeleteDC function deletes the specified device context (DC).
+     * @param hDC
+     *  Handle to the device context. 
+     * @return
+     *  If the function succeeds, the return value is nonzero.
+     *  If the function fails, the return value is zero. 
+     *  To get extended error information, call GetLastError.
+     */
+    boolean DeleteDC(HDC hDC);
+
+    /**
+     * The CreateDIBitmap function creates a compatible bitmap (DDB) from a DIB and, optionally,
+     * sets the bitmap bits. 
+     * @param hDC
+     *  Handle to a device context. 
+     * @param lpbmih
+     *  Pointer to a bitmap information header structure, which may be one of those shown in the following table.
+     * @param fdwInit
+     *  Specifies how the system initializes the bitmap bits.
+     * @param lpbInit
+     *  Pointer to an array of bytes containing the initial bitmap data.
+     * @param lpbmi
+     *  Pointer to a BITMAPINFO structure that describes the dimensions and color format of 
+     *  the array pointed to by the lpbInit parameter.
+     * @param fuUsage
+     *  Specifies whether the bmiColors member of the BITMAPINFO structure was initialized and, if so,
+     *  whether bmiColors contains explicit red, green, blue (RGB) values or palette indexes. The 
+     *  fuUsage parameter must be one of the following values. 
+     * @return
+     *  If the function succeeds, the return value is a handle to the compatible bitmap. 
+     *  If the function fails, the return value is NULL. 
+     *  To get extended error information, call GetLastError.
+     */
+    HBITMAP CreateDIBitmap(HDC hDC, BITMAPINFOHEADER lpbmih, int fdwInit,
+                           Pointer lpbInit, BITMAPINFO lpbmi, int fuUsage);
+
+    /**
+     * The CreateDIBSection function creates a DIB that applications can write to directly. 
+     * The function gives you a pointer to the location of the bitmap bit values. You can supply
+     * a handle to a file-mapping object that the function will use to create the bitmap, or you
+     * can let the system allocate the memory for the bitmap.
+     * @param hDC
+     *  Handle to a device context. If the value of iUsage is DIB_PAL_COLORS, the function uses this
+     *  device context's logical palette to initialize the DIB colors.
+     * @param pbmi
+     *  Pointer to a BITMAPINFO structure that specifies various attributes of the DIB, including 
+     *  the bitmap dimensions and colors. 
+     * @param iUsage
+     *  Specifies the type of data contained in the bmiColors array member of the BITMAPINFO structure 
+     *  pointed to by pbmi (either logical palette indexes or literal RGB values). 
+     * @param ppvBits
+     *  Pointer to a variable that receives a pointer to the location of the DIB bit values.
+     * @param hSection
+     *  Handle to a file-mapping object that the function will use to create the DIB. This parameter can be NULL.
+     * @param dwOffset
+     *  Specifies the offset from the beginning of the file-mapping object referenced by hSection where storage 
+     *  for the bitmap bit values is to begin.
+     * @return
+     *  Specifies the offset from the beginning of the file-mapping object referenced by hSection where storage 
+     *  for the bitmap bit values is to begin.
+     */
+    HBITMAP CreateDIBSection(HDC hDC, BITMAPINFO pbmi, int iUsage,
+                             PointerByReference ppvBits, Pointer hSection, int dwOffset);
+
+    /**
+     * The CreateCompatibleBitmap function creates a bitmap compatible with the device that is
+     * associated with the specified device context. 
+     * @param hDC
+     *  Handle to a device context. 
+     * @param width
+     *  Specifies the bitmap width, in pixels. 
+     * @param height
+     *  Specifies the bitmap height, in pixels. 
+     * @return
+     *  If the function succeeds, the return value is a handle to the compatible bitmap (DDB).
+     *  If the function fails, the return value is NULL. 
+     *  To get extended error information, call GetLastError.
+     */
+    HBITMAP CreateCompatibleBitmap(HDC hDC, int width, int height);
+
+    /**
+     * The SelectObject function selects an object into the specified device context (DC). 
+     * The new object replaces the previous object of the same type. 
+     * @param hDC
+     *  Handle to the DC. 
+     * @param hGDIObj
+     *  Handle to the object to be selected.
+     * @return
+     *  If the selected object is not a region and the function succeeds, the return value 
+     *  is a handle to the object being replaced. If the selected object is a region and the 
+     *  function succeeds, the return value is one of the REGION values. 
+     */
+    HANDLE SelectObject(HDC hDC, HANDLE hGDIObj);
+
+    /**
+     * The DeleteObject function deletes a logical pen, brush, font, bitmap, region, or palette, 
+     * freeing all system resources associated with the object. After the object is deleted, the 
+     * specified handle is no longer valid.
+     * @param hObject
+     *  Handle to a logical pen, brush, font, bitmap, region, or palette. 
+     * @return
+     *  If the function succeeds, the return value is nonzero.
+     *  If the specified handle is not valid or is currently selected into a DC, the return value is zero. 
+     *  To get extended error information, call GetLastError.
+     */
+    boolean DeleteObject(HANDLE hObject);
+
+    /** The GetDeviceCaps function retrieves device-specific information for
+     * the specified device.
+     * @param hdc A handle to the DC.
+     * @param nIndex The item to be returned.  
+     * @return
+     *  The return value specifies the value of the desired item.  When
+     *  <i>nIndex</i> is <code>BITSPIXEL</code> and the device has 15bpp or
+     *  16bpp, the return value is 16.
+     */
+    int GetDeviceCaps(HDC hdc, int nIndex);
+
+    /** The GetDIBits function retrieves the bits fo the specified compatible
+     * bitmap and copies them into a buffer as a DIB using the specified
+     * format. 
+     * @param hdc A handle to the device context.
+     * @param hbmp A handle to the bitmap.  This must be a compatible bitmap
+     * (DDB). 
+     * @param uStartScan The first scan line to retrieve
+     * @param cScanLines The number of scan lines to retrieve.
+     * @param lpvBits A pointer to a buffer to receive the bitmap data.  If
+     * this parameter is <code>null</code>, the function passes the dimensions
+     * and format of the bitmap to the {@link BITMAPINFO} structure pointed to
+     * by the <i>lpbi</i> parameter.
+     * @param lpbi A pointer to a {@link BITMAPINFO} structure that specifies
+     * the desired format for the DIB data.
+     * @param uUsage The format of the bmiColors member of the {@link
+     * BITMAPINFO} structure.  
+     */
+    int GetDIBits(HDC hdc, HBITMAP hbmp, int uStartScan, int cScanLines, Pointer lpvBits, BITMAPINFO lpbi, int uUsage);
+}

contrib/platform/src/com/sun/jna/platform/win32/Guid.java

@@ -0,0 +1,93 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+
+/**
+ * Ported from Guid.h.
+ * Microsoft Windows SDK 6.0A.
+ * @author dblock[at]dblock.org
+ */
+public interface Guid {
+    
+    public static class GUID extends Structure {
+        
+        public static class ByReference extends GUID implements Structure.ByReference {
+            public ByReference() {                
+            }
+
+            public ByReference(GUID guid) {
+                super(guid.getPointer());
+
+                Data1 = guid.Data1;
+                Data2 = guid.Data2;
+                Data3 = guid.Data3;
+                Data4 = guid.Data4;
+            }
+            
+            public ByReference(Pointer memory) {
+                super(memory);
+            }
+        }
+        
+        public GUID() {
+            
+        }
+            
+        public GUID(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        public GUID(byte[] data) {
+            if (data.length != 16) {
+                throw new IllegalArgumentException("Invalid data length: " + data.length);
+            }
+
+            long data1Temp = data[3] & 0xff;
+            data1Temp <<= 8;
+            data1Temp |= data[2] & 0xff;
+            data1Temp <<= 8;
+            data1Temp |= data[1] & 0xff;
+            data1Temp <<= 8;
+            data1Temp |= data[0] & 0xff;
+            Data1 = (int) data1Temp;
+
+            int data2Temp = data[5] & 0xff;
+            data2Temp <<= 8;
+            data2Temp |= data[4] & 0xff;
+            Data2 = (short) data2Temp;
+
+            int data3Temp = data[7] & 0xff;
+            data3Temp <<= 8;
+            data3Temp |= data[6] & 0xff;
+            Data3 = (short) data3Temp;
+
+            Data4[0] = data[8];
+            Data4[1] = data[9];
+            Data4[2] = data[10];
+            Data4[3] = data[11];
+            Data4[4] = data[12];
+            Data4[5] = data[13];
+            Data4[6] = data[14];
+            Data4[7] = data[15];
+        }
+
+        public int Data1;
+        public short Data2;
+        public short Data3;
+        public byte[] Data4 = new byte[8];
+    }    
+}

contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java

@@ -0,0 +1,228 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinNT.HANDLEByReference;
+import com.sun.jna.platform.win32.WinNT.HRESULT;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+
+/**
+ * Kernel32 utility API.
+ * @author dblock[at]dblock.org
+ */
+public abstract class Kernel32Util implements WinDef {
+	
+	/**
+	 * Get current computer NetBIOS name.
+	 * @return 
+	 *  Netbios name.
+	 */
+	public static String getComputerName() {
+    	char buffer[] = new char[WinBase.MAX_COMPUTERNAME_LENGTH + 1];
+    	IntByReference lpnSize = new IntByReference(buffer.length);
+    	if (! Kernel32.INSTANCE.GetComputerName(buffer, lpnSize)) {
+    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    	}
+    	return Native.toString(buffer);
+	}
+	
+	/**
+	 * Format a message from an HRESULT.
+	 * @param code
+	 *  HRESULT
+	 * @return
+	 *  Formatted message.
+	 */
+	public static String formatMessageFromHR(HRESULT code) {
+		PointerByReference buffer = new PointerByReference();        
+        if (0 == Kernel32.INSTANCE.FormatMessage(
+        		WinBase.FORMAT_MESSAGE_ALLOCATE_BUFFER
+        		| WinBase.FORMAT_MESSAGE_FROM_SYSTEM 
+        		| WinBase.FORMAT_MESSAGE_IGNORE_INSERTS, 
+                null,
+                code.intValue(), 
+                0, // TODO: MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)
+                buffer, 
+                0, 
+                null)) {
+        	throw new LastErrorException(Kernel32.INSTANCE.GetLastError());
+        }	       
+    	String s = buffer.getValue().getString(0, ! Boolean.getBoolean("w32.ascii"));
+    	Kernel32.INSTANCE.LocalFree(buffer.getValue());
+    	return s.trim();		
+	}
+	
+	/**
+	 * Format a system message from an error code.
+	 * @param code
+	 *  Error code, typically a result of GetLastError.
+	 * @return
+	 *  Formatted message.
+	 */
+	public static String formatMessageFromLastErrorCode(int code) {
+		return formatMessageFromHR(W32Errors.HRESULT_FROM_WIN32(code));
+	}
+	
+	/**
+	 * Return the path designated for temporary files.
+	 * @return
+	 *  Path.
+	 */
+	public static String getTempPath() {
+		DWORD nBufferLength = new DWORD(WinDef.MAX_PATH);
+    	char[] buffer = new char[nBufferLength.intValue()]; 
+    	if (Kernel32.INSTANCE.GetTempPath(nBufferLength, buffer).intValue() == 0) {
+    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    	}
+    	return Native.toString(buffer);
+	}
+	
+	public static void deleteFile(String filename) {
+    	if (! Kernel32.INSTANCE.DeleteFile(filename)) {
+    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    	}
+	}
+	
+	/**
+	 * Returns valid drives in the system.
+	 * @return
+	 *  An array of valid drives.
+	 */
+	public static String[] getLogicalDriveStrings() {
+    	DWORD dwSize = Kernel32.INSTANCE.GetLogicalDriveStrings(new DWORD(0), null);
+    	if (dwSize.intValue() <= 0) {
+    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    	}
+    	
+    	char buf[] = new char[dwSize.intValue()];
+    	dwSize = Kernel32.INSTANCE.GetLogicalDriveStrings(dwSize, buf);
+    	if (dwSize.intValue() <= 0) {
+    		throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+    	}
+
+    	List<String> drives = new ArrayList<String>();    	
+    	String drive = "";
+    	// the buffer is double-null-terminated
+    	for(int i = 0; i < buf.length - 1; i++) {
+    		if (buf[i] == 0) {
+    			drives.add(drive);
+    			drive = "";
+    		} else {
+    			drive += buf[i];
+    		}
+    	}
+    	return drives.toArray(new String[0]);
+	}	
+	
+	/**
+	 * Retrieves file system attributes for a specified file or directory.
+	 * @param fileName
+	 * 	The name of the file or directory.
+	 * @return
+	 *  The attributes of the specified file or directory.
+	 */
+	public static int getFileAttributes(String fileName) {
+		int fileAttributes = Kernel32.INSTANCE.GetFileAttributes(fileName);
+		if (fileAttributes == WinBase.INVALID_FILE_ATTRIBUTES) {
+			throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+		}
+		return fileAttributes;
+	}
+
+	/**
+	 * Retrieves the result of GetFileType, provided the file exists.
+	 */
+	public static int getFileType(String fileName) throws FileNotFoundException {
+	    File f = new File(fileName);
+	    if (!f.exists()) {
+		throw new FileNotFoundException(fileName);
+	    }
+
+	    HANDLE hFile = null;
+	    try {
+		 hFile = Kernel32.INSTANCE.CreateFile(fileName,
+						      WinNT.GENERIC_READ,
+						      WinNT.FILE_SHARE_READ,
+						      new WinBase.SECURITY_ATTRIBUTES(),
+						      WinNT.OPEN_EXISTING,
+						      WinNT.FILE_ATTRIBUTE_NORMAL,
+						      new HANDLEByReference().getValue());
+
+		if (WinBase.INVALID_HANDLE_VALUE.equals(hFile)) {
+		    throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+		}
+
+		int type = Kernel32.INSTANCE.GetFileType(hFile);
+		switch(type) {
+		  case WinNT.FILE_TYPE_UNKNOWN:
+		    int err = Kernel32.INSTANCE.GetLastError();
+		    switch(err) {
+		      case W32Errors.NO_ERROR:
+			break;
+		      default:
+			throw new Win32Exception(err);
+		    }
+		    // fall-thru
+
+		  default:
+		    return type;
+		}
+	    } finally {
+		if (hFile != null) {
+		    if (! Kernel32.INSTANCE.CloseHandle(hFile)) {
+			throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+		    }
+		}
+	    }
+	}
+
+	/**
+	 * @return One of the WinBase.DRIVE_* constants.
+	 */
+	public static int getDriveType(String rootName) {
+	    return Kernel32.INSTANCE.GetDriveType(rootName);
+	}
+	
+	/**
+	 * Get the value of an environment variable.
+	 * @param name
+	 * 	Name of the environment variable.
+	 * @return 
+	 *  Value of an environment variable.
+	 */
+	public static String getEnvironmentVariable(String name) {
+		// obtain the buffer size
+		int size = Kernel32.INSTANCE.GetEnvironmentVariable(name, null, 0);
+		if (size == 0) {
+			return null;
+		} else if (size < 0) {
+			throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+		}
+		// obtain the value
+		char[] buffer = new char[size];
+		size = Kernel32.INSTANCE.GetEnvironmentVariable(name, buffer, buffer.length);
+		if (size <= 0) {
+			throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+		}
+    	return Native.toString(buffer);
+	}	
+}

contrib/platform/src/com/sun/jna/platform/win32/LMAccess.java

@@ -0,0 +1,381 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.WinNT.PSID;
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ * Ported from LMAccess.h.
+ * Windows SDK 6.0A.
+ * @author dblock[at]dblock.org
+ */
+public interface LMAccess extends StdCallLibrary {
+	
+    public static class LOCALGROUP_INFO_0 extends Structure {
+        public LOCALGROUP_INFO_0() {
+            super();
+        }
+                
+        public LOCALGROUP_INFO_0(Pointer memory) {
+            super(memory);
+            read();
+        }
+                    
+        public WString lgrui0_name;
+    }
+
+    public static class LOCALGROUP_INFO_1 extends Structure {
+        public LOCALGROUP_INFO_1() {
+            super();
+        }
+
+        public LOCALGROUP_INFO_1(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        public WString lgrui1_name;
+        public WString lgrui1_comment;
+    }
+	
+    //
+    // bit masks for the NetUserEnum filter parameter.
+    //
+                
+    int FILTER_TEMP_DUPLICATE_ACCOUNT = 0x0001;
+    int FILTER_NORMAL_ACCOUNT = 0x0002;
+    // int FILTER_PROXY_ACCOUNT = 0x0004;
+    int FILTER_INTERDOMAIN_TRUST_ACCOUNT = 0x0008;
+    int FILTER_WORKSTATION_TRUST_ACCOUNT = 0x0010;
+    int FILTER_SERVER_TRUST_ACCOUNT = 0x0020;	
+	
+    /**
+     * The USER_INFO_0 structure contains a user account name.
+     */
+    public static class USER_INFO_0 extends Structure {
+        public USER_INFO_0() {
+            super();
+        }
+
+        public USER_INFO_0(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a Unicode string that specifies the name of the user account. 
+         */
+        public WString usri0_name;
+    }
+	
+    /**
+     * The USER_INFO_1 structure contains information about a user account, including 
+     * account name, password data, privilege level, and the path to the user's home 
+     * directory.
+     */
+    public static class USER_INFO_1 extends Structure {
+        public USER_INFO_1() {
+            super();
+        }
+
+        public USER_INFO_1(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a Unicode string that specifies the name of the user 
+         * account.
+         */
+        public WString usri1_name;
+        /**
+         * Pointer to a Unicode string that specifies the password of the user
+         * indicated by the usri1_name member. 
+         */
+        public WString usri1_password;
+        /**
+         * Specifies a DWORD value that indicates the number of seconds that have 
+         * elapsed since the usri1_password member was last changed.
+         */
+        public int usri1_password_age;
+        /**
+         * Specifies a DWORD value that indicates the level of privilege assigned 
+         * to the usri1_name member.
+         */
+        public int usri1_priv;
+        /**
+         * Pointer to a Unicode string specifying the path of the home directory 
+         * for the user specified in the usri1_name member. 
+         */
+        public WString usri1_home_dir;
+        /**
+         * Pointer to a Unicode string that contains a comment to associate with 
+         * the user account.
+         */
+        public WString usri1_comment;
+        /**
+         * Specifies a DWORD value that determines several features.
+         */
+        public int usri1_flags;
+        /**
+         * Pointer to a Unicode string specifying the path for the user's 
+         * logon script file. 
+         */
+        public WString usri1_script_path;
+    }
+	
+    /**
+     * The USER_INFO_23 structure contains information about a user account, 
+     * including the account name, the user's full name, a comment associated with the account, 
+     * and the user's security identifier (SID).
+     *
+     * Note : 
+     * The USER_INFO_23 structure supersedes the USER_INFO_20 structure. 
+     * It is recommended that applications use the USER_INFO_23 structure instead of the USER_INFO_20 structure.
+     */
+    public static class USER_INFO_23 extends Structure {
+        public USER_INFO_23() {
+            super();
+        }
+
+        public USER_INFO_23(Pointer memory) {
+            useMemory(memory);
+            read();
+        }
+		
+        /** 
+         * A pointer to a Unicode string that specifies the name of the user account. 
+         * Calls to the NetUserSetInfo function ignore this member.
+         */
+        public WString usri23_name;
+        /** 
+         * A pointer to a Unicode string that contains the full name of the user. 
+         * This string can be a null string, or it can have any number of characters before the terminating null character.
+         */
+        public WString usri23_full_name;
+        /** 
+         * A pointer to a Unicode string that contains a comment associated with the user account. 
+         * This string can be a null string, or it can have any number of characters before the terminating null character.
+         */
+        public WString usri23_comment;
+        /** 
+         * This member can be one or more of the following values. 
+         * Note that setting user account control flags may require certain privileges and control access rights. 
+         * For more information, see the Remarks section of the NetUserSetInfo function.
+         * Value	         Meaning
+         * UF_SCRIPT         The logon script executed. This value must be set.
+         * UF_ACCOUNTDISABLE The user's account is disabled.
+         * UF_HOMEDIR_REQUIRED The home directory is required. This value is ignored.
+         * UF_PASSWD_NOTREQD No password is required.
+         * UF_PASSWD_CANT_CHANGE The user cannot change the password.
+         * UF_LOCKOUT        The account is currently locked out. You can call the NetUserSetInfo function to clear this value and unlock a previously locked account. You cannot use this value to lock a previously unlocked account.
+         * UF_DONT_EXPIRE_PASSWD The password should never expire on the account.
+         * UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED The user's password is stored under reversible encryption in the Active Directory.
+         * UF_NOT_DELEGATED Marks the account as "sensitive"; other users cannot act as delegates of this user account.
+         * UF_SMARTCARD_REQUIRED Requires the user to log on to the user account with a smart card.
+         * UF_USE_DES_KEY_ONLY Restrict this principal to use only Data Encryption Standard (DES) encryption types for keys.
+         * UF_DONT_REQUIRE_PREAUTH This account does not require Kerberos preauthentication for logon.
+         * UF_TRUSTED_FOR_DELEGATION The account is enabled for delegation. This is a security-sensitive setting; accounts with this option enabled should be tightly controlled. This setting allows a service running under the account to assume a client's identity and authenticate as that user to other remote servers on the network.
+         * UF_PASSWORD_EXPIRED The user's password has expired. Windows 2000:  This value is not supported.
+         * UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION The account is trusted to authenticate a user outside of the Kerberos security package and delegate that user through constrained delegation. This is a security-sensitive setting; accounts with this option enabled should be tightly controlled. This setting allows a service running under the account to assert a client's identity and authenticate as that user to specifically configured services on the network. Windows XP/2000:  This value is not supported.
+         * 
+         * The following values describe the account type. Only one value can be set. You cannot change the account type using the NetUserSetInfo function.
+         * Value	             Meaning
+         * UF_NORMAL_ACCOUNT     This is a default account type that represents a typical user.
+         * UF_TEMP_DUPLICATE_ACCOUNT This is an account for users whose primary account is in another domain. This account provides user access to this domain, but not to any domain that trusts this domain. The User Manager refers to this account type as a local user account.
+         * UF_WORKSTATION_TRUST_ACCOUNT This is a computer account for a computer that is a member of this domain.
+         * UF_SERVER_TRUST_ACCOUNT This is a computer account for a backup domain controller that is a member of this domain.
+         * UF_INTERDOMAIN_TRUST_ACCOUNT This is a permit to trust account for a domain that trusts other domains.
+         */
+        public int  usri23_flags;
+        /** 
+         * A pointer to a SID structure that contains the security identifier (SID) 
+         * that uniquely identifies the user. The NetUserAdd and NetUserSetInfo functions ignore this member.
+         */
+        public PSID.ByReference   usri23_user_sid;		
+    }	
+	
+    /**
+     * The GROUP_USERS_INFO_0 structure contains global group member information.
+     */
+    public static class GROUP_USERS_INFO_0 extends Structure {
+        public GROUP_USERS_INFO_0() {
+            super();
+        }
+
+        public GROUP_USERS_INFO_0(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a null-terminated Unicode character string that specifies a name. 
+         */
+        public WString grui0_name;
+    }
+	
+    /**
+     * The LOCALGROUP_USERS_INFO_0 structure contains local group member information.
+     */
+    public static class LOCALGROUP_USERS_INFO_0 extends Structure {
+        public LOCALGROUP_USERS_INFO_0() {
+            super();
+        }
+
+        public LOCALGROUP_USERS_INFO_0(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a Unicode string specifying the name of a local group to which the user belongs. 
+         */
+        public WString lgrui0_name;
+    }
+	
+    /**
+     * The GROUP_INFO_0 structure contains the name of a global group in the security
+     * database, which is the security accounts manager (SAM) database or, in the case
+     * of domain controllers, the Active Directory.
+     */
+    public static class GROUP_INFO_0  extends Structure {
+        public GROUP_INFO_0() {
+            super();
+        }
+
+        public GROUP_INFO_0(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a null-terminated Unicode character string that specifies 
+         * the name of the global group.
+         */
+        public WString grpi0_name;
+    }
+
+    /**
+     * The GROUP_INFO_1 structure contains a global group name and a comment to 
+     * associate with the group.
+     */
+    public static class GROUP_INFO_1  extends Structure {
+        public GROUP_INFO_1() {
+            super();
+        }
+
+        public GROUP_INFO_1(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a null-terminated Unicode character string that specifies 
+         * the name of the global group. 
+         */
+        public WString grpi1_name;
+        /**
+         * Pointer to a null-terminated Unicode character string that specifies 
+         * a remark associated with the global group. This member can be a null 
+         * string. The comment can contain MAXCOMMENTSZ characters. 
+         */
+        public WString grpi1_comment;
+    }
+
+    /**
+     * The GROUP_INFO_2 structure contains information about a global group, including
+     * name, identifier, and resource attributes.
+     */
+    public static class GROUP_INFO_2  extends Structure {
+        public GROUP_INFO_2() {
+            super();
+        }
+
+        public GROUP_INFO_2(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a null-terminated Unicode character string that 
+         * specifies the name of the global group.
+         */
+        public WString grpi2_name;
+        /**
+         * Pointer to a null-terminated Unicode character string that contains a 
+         * remark associated with the global group. This member can be a null string. 
+         * The comment can contain MAXCOMMENTSZ characters. 
+         */
+        public WString grpi2_comment;
+        /**
+         * Specifies a DWORD value that contains the relative identifier (RID) of 
+         * the global group.
+         */
+        public int grpi2_group_id;
+        /**
+         * These attributes are hard-coded to SE_GROUP_MANDATORY, SE_GROUP_ENABLED, 
+         * and SE_GROUP_ENABLED_BY_DEFAULT. 
+         */
+        public int grpi2_attributes;
+    }
+
+    /**
+     * The GROUP_INFO_3 structure contains information about a global group, including 
+     * name, security identifier (SID), and resource attributes.
+     */
+    public static class GROUP_INFO_3  extends Structure {
+        public GROUP_INFO_3() {
+            super();
+        }
+
+        public GROUP_INFO_3(Pointer memory) {
+            super(memory);
+            read();
+        }
+
+        /**
+         * Pointer to a null-terminated Unicode character string that 
+         * specifies the name of the global group. 
+         */
+        public WString grpi3_name;
+        /**
+         * Pointer to a null-terminated Unicode character string that 
+         * contains a remark associated with the global group. This member can be 
+         * a null string. The comment can contain MAXCOMMENTSZ characters. 
+         */
+        public WString grpi3_comment;
+        /**
+         * Pointer to a SID structure that contains the security identifier (SID) that 
+         * uniquely identifies the global group.
+         */
+        public PSID.ByReference grpi3_group_sid;
+        /**
+         * These attributes are hard-coded to SE_GROUP_MANDATORY, SE_GROUP_ENABLED, and 
+         * SE_GROUP_ENABLED_BY_DEFAULT.
+         */
+        public int grpi3_attributes;
+    }
+	
+    //
+    // Privilege levels (USER_INFO_X field usriX_priv (X = 0/1)).
+    //
+
+    int USER_PRIV_MASK = 3;
+    int USER_PRIV_GUEST = 0;
+    int USER_PRIV_USER = 1;
+    int USER_PRIV_ADMIN = 2;	
+}

contrib/platform/src/com/sun/jna/platform/win32/LMCons.java

@@ -0,0 +1,30 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ * Ported from LMCons.h.
+ * @author dblock[at]dblock.org
+ * Windows SDK 6.0A
+ */
+public interface LMCons extends StdCallLibrary {
+    int  NETBIOS_NAME_LEN = 16;            // NetBIOS net name (bytes)
+
+    /**
+     * Value to be used with APIs which have a "preferred maximum length" parameter.
+     * This value indicates that the API should just allocate "as much as it takes."
+     */
+    int  MAX_PREFERRED_LENGTH = -1;
+}

contrib/platform/src/com/sun/jna/platform/win32/LMErr.java

@@ -0,0 +1,567 @@
+/* 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ * Ported from LMErr.h.
+ * @author dblock[at]dblock.org
+ * Windows SDK 6.0A
+ */
+public interface LMErr extends StdCallLibrary {
+    int NERR_Success =  0;
+    int NERR_BASE =  2100;
+    
+    int NERR_NetNotStarted = NERR_BASE + 2;   /* The workstation driver is not installed. */
+    int NERR_UnknownServer = NERR_BASE + 3;   /* The server could not be located. */
+    int NERR_ShareMem = NERR_BASE + 4;   /* An internal error occurred.  The network cannot access a shared memory segment. */
+
+    int NERR_NoNetworkResource = NERR_BASE + 5;   /* A network resource shortage occurred . */
+    int NERR_RemoteOnly = NERR_BASE + 6;   /* This operation is not supported on workstations. */
+    int NERR_DevNotRedirected = NERR_BASE + 7;   /* The device is not connected. */
+    /* NERR_BASE + 8 is used for ERROR_CONNECTED_OTHER_PASSWORD */
+    /* NERR_BASE + 9 is used for ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT */
+    /* UNUSED BASE + 10 */
+    /* UNUSED BASE + 11 */
+    /* UNUSED BASE + 12 */
+    /* UNUSED BASE + 13 */
+    int NERR_ServerNotStarted = NERR_BASE + 14;  /* The Server service is not started. */
+    int NERR_ItemNotFound = NERR_BASE + 15;  /* The queue is empty. */
+    int NERR_UnknownDevDir = NERR_BASE + 16;  /* The device or directory does not exist. */
+    int NERR_RedirectedPath = NERR_BASE + 17;  /* The operation is invalid on a redirected resource. */
+    int NERR_DuplicateShare = NERR_BASE + 18;  /* The name has already been shared. */
+    int NERR_NoRoom = NERR_BASE + 19;  /* The server is currently out of the requested resource. */
+    /* UNUSED BASE + 20 */
+    int NERR_TooManyItems = NERR_BASE + 21;  /* Requested addition of items exceeds the maximum allowed. */
+    int NERR_InvalidMaxUsers = NERR_BASE + 22;  /* The Peer service supports only two simultaneous users. */
+    int NERR_BufTooSmall = NERR_BASE + 23;  /* The API return buffer is too small. */
+    /* UNUSED BASE + 24 */
+    /* UNUSED BASE + 25 */
+    /* UNUSED BASE + 26 */
+    int NERR_RemoteErr = NERR_BASE + 27;  /* A remote API error occurred.  */
+    /* UNUSED BASE + 28 */
+    /* UNUSED BASE + 29 */
+    /* UNUSED BASE + 30 */
+    int NERR_LanmanIniError = NERR_BASE + 31;  /* An error occurred when opening or reading the configuration file. */
+    /* UNUSED BASE + 32 */
+    /* UNUSED BASE + 33 */
+    /* UNUSED BASE + 34 */
+    /* UNUSED BASE + 35 */
+    int NERR_NetworkError = NERR_BASE + 36;  /* A general network error occurred. */
+    int NERR_WkstaInconsistentState = NERR_BASE + 37;
+        /* The Workstation service is in an inconsistent state. Restart the computer before restarting the Workstation service. */
+    int NERR_WkstaNotStarted = NERR_BASE + 38;  /* The Workstation service has not been started. */
+    int NERR_BrowserNotStarted = NERR_BASE + 39;  /* The requested information is not available. */
+    int NERR_InternalError = NERR_BASE + 40;  /* An internal Windows error occurred.*/
+    int NERR_BadTransactConfig = NERR_BASE + 41;  /* The server is not configured for transactions. */
+    int NERR_InvalidAPI = NERR_BASE + 42;  /* The requested API is not supported on the remote server. */
+    int NERR_BadEventName = NERR_BASE + 43;  /* The event name is invalid. */
+    int NERR_DupNameReboot = NERR_BASE + 44;  /* The computer name already exists on the network. Change it and restart the computer. */
+    /*
+     *      Config API related
+     *              Error codes from BASE + 45 to BASE + 49
+     */
+
+    /* UNUSED BASE + 45 */
+    int NERR_CfgCompNotFound = NERR_BASE + 46;  /* The specified component could not be found in the configuration information. */
+    int NERR_CfgParamNotFound = NERR_BASE + 47;  /* The specified parameter could not be found in the configuration information. */
+    int NERR_LineTooLong = NERR_BASE + 49;  /* A line in the configuration file is too long. */
+
+    /*
+     *      Spooler API related
+     *              Error codes from BASE + 50 to BASE + 79
+     */
+
+    int NERR_QNotFound = NERR_BASE + 50;  /* The printer does not exist. */
+    int NERR_JobNotFound = NERR_BASE + 51;  /* The print job does not exist. */
+    int NERR_DestNotFound = NERR_BASE + 52;  /* The printer destination cannot be found. */
+    int NERR_DestExists = NERR_BASE + 53;  /* The printer destination already exists. */
+    int NERR_QExists = NERR_BASE + 54;  /* The printer queue already exists. */
+    int NERR_QNoRoom = NERR_BASE + 55;  /* No more printers can be added. */
+    int NERR_JobNoRoom = NERR_BASE + 56;  /* No more print jobs can be added.  */
+    int NERR_DestNoRoom = NERR_BASE + 57;  /* No more printer destinations can be added. */
+    int NERR_DestIdle = NERR_BASE + 58;  /* This printer destination is idle and cannot accept control operations. */
+    int NERR_DestInvalidOp = NERR_BASE + 59;  /* This printer destination request contains an invalid control function. */
+    int NERR_ProcNoRespond = NERR_BASE + 60;  /* The print processor is not responding. */
+    int NERR_SpoolerNotLoaded = NERR_BASE + 61;  /* The spooler is not running. */
+    int NERR_DestInvalidState = NERR_BASE + 62;  /* This operation cannot be performed on the print destination in its current state. */
+    int NERR_QInvalidState = NERR_BASE + 63;  /* This operation cannot be performed on the printer queue in its current state. */
+    int NERR_JobInvalidState = NERR_BASE + 64;  /* This operation cannot be performed on the print job in its current state. */
+    int NERR_SpoolNoMemory = NERR_BASE + 65;  /* A spooler memory allocation failure occurred. */
+    int NERR_DriverNotFound = NERR_BASE + 66;  /* The device driver does not exist. */
+    int NERR_DataTypeInvalid = NERR_BASE + 67;  /* The data type is not supported by the print processor. */
+    int NERR_ProcNotFound = NERR_BASE + 68;  /* The print processor is not installed. */
+
+    /*
+     *      Service API related
+     *              Error codes from BASE + 80 to BASE + 99
+     */
+
+    int NERR_ServiceTableLocked = NERR_BASE + 80;  /* The service database is locked. */
+    int NERR_ServiceTableFull = NERR_BASE + 81;  /* The service table is full. */
+    int NERR_ServiceInstalled = NERR_BASE + 82;  /* The requested service has already been started. */
+    int NERR_ServiceEntryLocked = NERR_BASE + 83;  /* The service does not respond to control actions. */
+    int NERR_ServiceNotInstalled = NERR_BASE + 84; /* The service has not been started. */
+    int NERR_BadServiceName = NERR_BASE + 85;  /* The service name is invalid. */
+    int NERR_ServiceCtlTimeout = NERR_BASE + 86;  /* The service is not responding to the control function. */
+    int NERR_ServiceCtlBusy = NERR_BASE + 87;  /* The service control is busy. */
+    int NERR_BadServiceProgName = NERR_BASE + 88;  /* The configuration file contains an invalid service program name. */
+    int NERR_ServiceNotCtrl = NERR_BASE + 89;  /* The service could not be controlled in its present state. */
+    int NERR_ServiceKillProc = NERR_BASE + 90;  /* The service ended abnormally. */
+    int NERR_ServiceCtlNotValid = NERR_BASE + 91;  /* The requested pause, continue, or stop is not valid for this service. */
+    int NERR_NotInDispatchTbl = NERR_BASE + 92;  /* The service control dispatcher could not find the service name in the dispatch table. */
+    int NERR_BadControlRecv = NERR_BASE + 93;  /* The service control dispatcher pipe read failed. */
+    int NERR_ServiceNotStarting = NERR_BASE + 94;  /* A thread for the new service could not be created. */
+
+    /*
+     *      Wksta and Logon API related
+     *              Error codes from BASE + 100 to BASE + 118
+     */
+
+    int NERR_AlreadyLoggedOn = NERR_BASE + 100; /* This workstation is already logged on to the local-area network. */
+    int NERR_NotLoggedOn = NERR_BASE + 101; /* The workstation is not logged on to the local-area network. */
+    int NERR_BadUsername = NERR_BASE + 102; /* The user name or group name parameter is invalid.  */
+    int NERR_BadPassword = NERR_BASE + 103; /* The password parameter is invalid. */
+    int NERR_UnableToAddName_W = NERR_BASE + 104; /* @W The logon processor did not add the message alias. */
+    int NERR_UnableToAddName_F = NERR_BASE + 105; /* The logon processor did not add the message alias. */
+    int NERR_UnableToDelName_W = NERR_BASE + 106; /* @W The logoff processor did not delete the message alias. */
+    int NERR_UnableToDelName_F = NERR_BASE + 107; /* The logoff processor did not delete the message alias. */
+    /* UNUSED BASE + 108 */
+    int NERR_LogonsPaused = NERR_BASE + 109; /* Network logons are paused. */
+    int NERR_LogonServerConflict = NERR_BASE + 110;/* A centralized logon-server conflict occurred. */
+    int NERR_LogonNoUserPath = NERR_BASE + 111; /* The server is configured without a valid user path. */
+    int NERR_LogonScriptError = NERR_BASE + 112; /* An error occurred while loading or running the logon script. */
+    /* UNUSED BASE + 113 */
+    int NERR_StandaloneLogon = NERR_BASE + 114; /* The logon server was not specified.  Your computer will be logged on as STANDALONE. */
+    int NERR_LogonServerNotFound = NERR_BASE + 115; /* The logon server could not be found.  */
+    int NERR_LogonDomainExists = NERR_BASE + 116; /* There is already a logon domain for this computer.  */
+    int NERR_NonValidatedLogon = NERR_BASE + 117; /* The logon server could not validate the logon. */
+
+    /*
+     *      ACF API related = access, user, group;
+     *              Error codes from BASE + 119 to BASE + 149
+     */
+
+    int NERR_ACFNotFound = NERR_BASE + 119; /* The security database could not be found. */
+    int NERR_GroupNotFound = NERR_BASE + 120; /* The group name could not be found. */
+    int NERR_UserNotFound = NERR_BASE + 121; /* The user name could not be found. */
+    int NERR_ResourceNotFound = NERR_BASE + 122; /* The resource name could not be found.  */
+    int NERR_GroupExists = NERR_BASE + 123; /* The group already exists. */
+    int NERR_UserExists = NERR_BASE + 124; /* The account already exists. */
+    int NERR_ResourceExists = NERR_BASE + 125; /* The resource permission list already exists. */
+    int NERR_NotPrimary = NERR_BASE + 126; /* This operation is only allowed on the primary domain controller of the domain. */
+    int NERR_ACFNotLoaded = NERR_BASE + 127; /* The security database has not been started. */
+    int NERR_ACFNoRoom = NERR_BASE + 128; /* There are too many names in the user accounts database. */
+    int NERR_ACFFileIOFail = NERR_BASE + 129; /* A disk I/O failure occurred.*/
+    int NERR_ACFTooManyLists = NERR_BASE + 130; /* The limit of 64 entries per resource was exceeded. */
+    int NERR_UserLogon = NERR_BASE + 131; /* Deleting a user with a session is not allowed. */
+    int NERR_ACFNoParent = NERR_BASE + 132; /* The parent directory could not be located. */
+    int NERR_CanNotGrowSegment = NERR_BASE + 133; /* Unable to add to the security database session cache segment. */
+    int NERR_SpeGroupOp = NERR_BASE + 134; /* This operation is not allowed on this special group. */
+    int NERR_NotInCache = NERR_BASE + 135; /* This user is not cached in user accounts database session cache. */
+    int NERR_UserInGroup = NERR_BASE + 136; /* The user already belongs to this group. */
+    int NERR_UserNotInGroup = NERR_BASE + 137; /* The user does not belong to this group. */
+    int NERR_AccountUndefined = NERR_BASE + 138; /* This user account is undefined. */
+    int NERR_AccountExpired = NERR_BASE + 139; /* This user account has expired. */
+    int NERR_InvalidWorkstation = NERR_BASE + 140; /* The user is not allowed to log on from this workstation. */
+    int NERR_InvalidLogonHours = NERR_BASE + 141; /* The user is not allowed to log on at this time.  */
+    int NERR_PasswordExpired = NERR_BASE + 142; /* The password of this user has expired. */
+    int NERR_PasswordCantChange = NERR_BASE + 143; /* The password of this user cannot change. */
+    int NERR_PasswordHistConflict = NERR_BASE + 144; /* This password cannot be used now. */
+    int NERR_PasswordTooShort = NERR_BASE + 145; /* The password does not meet the password policy requirements. Check the minimum password length, password complexity and password history requirements. */
+    int NERR_PasswordTooRecent = NERR_BASE + 146; /* The password of this user is too recent to change.  */
+    int NERR_InvalidDatabase = NERR_BASE + 147; /* The security database is corrupted. */
+    int NERR_DatabaseUpToDate = NERR_BASE + 148; /* No updates are necessary to this replicant network/local security database. */
+    int NERR_SyncRequired = NERR_BASE + 149; /* This replicant database is outdated; synchronization is required. */
+
+    /*
+     *      Use API related
+     *              Error codes from BASE + 150 to BASE + 169
+     */
+
+    int NERR_UseNotFound = NERR_BASE + 150; /* The network connection could not be found. */
+    int NERR_BadAsgType = NERR_BASE + 151; /* This asg_type is invalid. */
+    int NERR_DeviceIsShared = NERR_BASE + 152; /* This device is currently being shared. */
+    int NERR_SameAsComputerName = NERR_BASE + 153; /* The user name may not be same as computer name. */
+
+
+    /*
+     *      Message Server related
+     *              Error codes BASE + 170 to BASE + 209
+     */
+
+    int NERR_NoComputerName = NERR_BASE + 170; /* The computer name could not be added as a message alias.  The name may already exist on the network. */
+    int NERR_MsgAlreadyStarted = NERR_BASE + 171; /* The Messenger service is already started. */
+    int NERR_MsgInitFailed = NERR_BASE + 172; /* The Messenger service failed to start.  */
+    int NERR_NameNotFound = NERR_BASE + 173; /* The message alias could not be found on the network. */
+    int NERR_AlreadyForwarded = NERR_BASE + 174; /* This message alias has already been forwarded. */
+    int NERR_AddForwarded = NERR_BASE + 175; /* This message alias has been added but is still forwarded. */
+    int NERR_AlreadyExists = NERR_BASE + 176; /* This message alias already exists locally. */
+    int NERR_TooManyNames = NERR_BASE + 177; /* The maximum number of added message aliases has been exceeded. */
+    int NERR_DelComputerName = NERR_BASE + 178; /* The computer name could not be deleted.*/
+    int NERR_LocalForward = NERR_BASE + 179; /* Messages cannot be forwarded back to the same workstation. */
+    int NERR_GrpMsgProcessor = NERR_BASE + 180; /* An error occurred in the domain message processor. */
+    int NERR_PausedRemote = NERR_BASE + 181; /* The message was sent, but the recipient has paused the Messenger service. */
+    int NERR_BadReceive = NERR_BASE + 182; /* The message was sent but not received. */
+    int NERR_NameInUse = NERR_BASE + 183; /* The message alias is currently in use. Try again later. */
+    int NERR_MsgNotStarted = NERR_BASE + 184; /* The Messenger service has not been started. */
+    int NERR_NotLocalName = NERR_BASE + 185; /* The name is not on the local computer. */
+    int NERR_NoForwardName = NERR_BASE + 186; /* The forwarded message alias could not be found on the network. */
+    int NERR_RemoteFull = NERR_BASE + 187; /* The message alias table on the remote station is full. */
+    int NERR_NameNotForwarded = NERR_BASE + 188; /* Messages for this alias are not currently being forwarded. */
+    int NERR_TruncatedBroadcast = NERR_BASE + 189; /* The broadcast message was truncated. */
+    int NERR_InvalidDevice = NERR_BASE + 194; /* This is an invalid device name. */
+    int NERR_WriteFault = NERR_BASE + 195; /* A write fault occurred. */
+    /* UNUSED BASE + 196 */
+    int NERR_DuplicateName = NERR_BASE + 197; /* A duplicate message alias exists on the network. */
+    int NERR_DeleteLater = NERR_BASE + 198; /* @W This message alias will be deleted later. */
+    int NERR_IncompleteDel = NERR_BASE + 199; /* The message alias was not successfully deleted from all networks. */
+    int NERR_MultipleNets = NERR_BASE + 200; /* This operation is not supported on computers with multiple networks. */
+
+    /*
+     *      Server API related
+     *              Error codes BASE + 210 to BASE + 229
+     */
+
+    int NERR_NetNameNotFound = NERR_BASE + 210; /* This shared resource does not exist.*/
+    int NERR_DeviceNotShared = NERR_BASE + 211; /* This device is not shared. */
+    int NERR_ClientNameNotFound = NERR_BASE + 212; /* A session does not exist with that computer name. */
+    int NERR_FileIdNotFound = NERR_BASE + 214; /* There is not an open file with that identification number. */
+    int NERR_ExecFailure = NERR_BASE + 215; /* A failure occurred when executing a remote administration command. */
+    int NERR_TmpFile = NERR_BASE + 216; /* A failure occurred when opening a remote temporary file. */
+    int NERR_TooMuchData = NERR_BASE + 217; /* The data returned from a remote administration command has been truncated to 64K. */
+    int NERR_DeviceShareConflict = NERR_BASE + 218; /* This device cannot be shared as both a spooled and a non-spooled resource. */
+    int NERR_BrowserTableIncomplete = NERR_BASE + 219;  /* The information in the list of servers may be incorrect. */
+    int NERR_NotLocalDomain = NERR_BASE + 220; /* The computer is not active in this domain. */
+    int NERR_IsDfsShare = NERR_BASE + 221; /* The share must be removed from the Distributed File System before it can be deleted. */
+
+    /*
+     *      CharDev API related
+     *              Error codes BASE + 230 to BASE + 249
+     */
+
+    /* UNUSED BASE + 230 */
+    int NERR_DevInvalidOpCode = NERR_BASE + 231; /* The operation is invalid for this device. */
+    int NERR_DevNotFound = NERR_BASE + 232; /* This device cannot be shared. */
+    int NERR_DevNotOpen = NERR_BASE + 233; /* This device was not open. */
+    int NERR_BadQueueDevString = NERR_BASE + 234; /* This device name list is invalid. */
+    int NERR_BadQueuePriority = NERR_BASE + 235; /* The queue priority is invalid. */
+    int NERR_NoCommDevs = NERR_BASE + 237; /* There are no shared communication devices. */
+    int NERR_QueueNotFound = NERR_BASE + 238; /* The queue you specified does not exist. */
+    int NERR_BadDevString = NERR_BASE + 240; /* This list of devices is invalid. */
+    int NERR_BadDev = NERR_BASE + 241; /* The requested device is invalid. */
+    int NERR_InUseBySpooler = NERR_BASE + 242; /* This device is already in use by the spooler. */
+    int NERR_CommDevInUse = NERR_BASE + 243; /* This device is already in use as a communication device. */
+
+    /*
+     *      NetICanonicalize and NetIType and NetIMakeLMFileName
+     *      NetIListCanon and NetINameCheck
+     *              Error codes BASE + 250 to BASE + 269
+     */
+
+    int NERR_InvalidComputer = NERR_BASE + 251; /* This computer name is invalid. */
+    /* UNUSED BASE + 252 */
+    /* UNUSED BASE + 253 */
+    int NERR_MaxLenExceeded = NERR_BASE + 254; /* The string and prefix specified are too long. */
+    /* UNUSED BASE + 255 */
+    int NERR_BadComponent = NERR_BASE + 256; /* This path component is invalid. */
+    int NERR_CantType = NERR_BASE + 257; /* Could not determine the type of input. */
+    /* UNUSED BASE + 258 */
+    /* UNUSED BASE + 259 */
+    int NERR_TooManyEntries = NERR_BASE + 262; /* The buffer for types is not big enough. */
+
+    /*
+     *      NetProfile
+     *              Error codes BASE + 270 to BASE + 276
+     */
+
+    int NERR_ProfileFileTooBig = NERR_BASE + 270; /* Profile files cannot exceed 64K. */
+    int NERR_ProfileOffset = NERR_BASE + 271; /* The start offset is out of range. */
+    int NERR_ProfileCleanup = NERR_BASE + 272; /* The system cannot delete current connections to network resources. */
+    int NERR_ProfileUnknownCmd = NERR_BASE + 273; /* The system was unable to parse the command line in this file.*/
+    int NERR_ProfileLoadErr = NERR_BASE + 274; /* An error occurred while loading the profile file. */
+    int NERR_ProfileSaveErr = NERR_BASE + 275; /* @W Errors occurred while saving the profile file.  The profile was partially saved. */
+
+
+    /*
+     *      NetAudit and NetErrorLog
+     *              Error codes BASE + 277 to BASE + 279
+     */
+
+    int NERR_LogOverflow = NERR_BASE + 277;      /* Log file %1 is full. */
+    int NERR_LogFileChanged = NERR_BASE + 278;      /* This log file has changed between reads. */
+    int NERR_LogFileCorrupt = NERR_BASE + 279;      /* Log file %1 is corrupt. */
+
+
+    /*
+     *      NetRemote
+     *              Error codes BASE + 280 to BASE + 299
+     */
+    int NERR_SourceIsDir = NERR_BASE + 280; /* The source path cannot be a directory. */
+    int NERR_BadSource = NERR_BASE + 281; /* The source path is illegal. */
+    int NERR_BadDest = NERR_BASE + 282; /* The destination path is illegal. */
+    int NERR_DifferentServers = NERR_BASE + 283; /* The source and destination paths are on different servers. */
+    /* UNUSED BASE + 284 */
+    int NERR_RunSrvPaused = NERR_BASE + 285; /* The Run server you requested is paused. */
+    /* UNUSED BASE + 286 */
+    /* UNUSED BASE + 287 */
+    /* UNUSED BASE + 288 */
+    int NERR_ErrCommRunSrv = NERR_BASE + 289; /* An error occurred when communicating with a Run server. */
+    /* UNUSED BASE + 290 */
+    int NERR_ErrorExecingGhost = NERR_BASE + 291; /* An error occurred when starting a background process. */
+    int NERR_ShareNotFound = NERR_BASE + 292; /* The shared resource you are connected to could not be found.*/
+    /* UNUSED BASE + 293 */
+    /* UNUSED BASE + 294 */
+
+
+    /*
+     *  NetWksta.sys = redir; returned error codes.
+     *
+     *          NERR_BASE + = 300-329;
+     */
+
+    int NERR_InvalidLana = NERR_BASE + 300; /* The LAN adapter number is invalid.  */
+    int NERR_OpenFiles = NERR_BASE + 301; /* There are open files on the connection.    */
+    int NERR_ActiveConns = NERR_BASE + 302; /* Active connections still exist. */
+    int NERR_BadPasswordCore = NERR_BASE + 303; /* This share name or password is invalid. */
+    int NERR_DevInUse = NERR_BASE + 304; /* The device is being accessed by an active process. */
+    int NERR_LocalDrive = NERR_BASE + 305; /* The drive letter is in use locally. */
+
+    /*
+     *  Alert error codes.
+     *
+     *          NERR_BASE + = 330-339;
+     */
+    int NERR_AlertExists = NERR_BASE + 330; /* The specified client is already registered for the specified event. */
+    int NERR_TooManyAlerts = NERR_BASE + 331; /* The alert table is full. */
+    int NERR_NoSuchAlert = NERR_BASE + 332; /* An invalid or nonexistent alert name was raised. */
+    int NERR_BadRecipient = NERR_BASE + 333; /* The alert recipient is invalid.*/
+    int NERR_AcctLimitExceeded = NERR_BASE + 334; /* A user's session with this server has been deleted
+                                                     * because the user's logon hours are no longer valid. */
+
+    /*
+     *  Additional Error and Audit log codes.
+     *
+     *          NERR_BASE  + (340-343;
+     */
+    int NERR_InvalidLogSeek = NERR_BASE + 340; /* The log file does not contain the requested record number. */
+    /* UNUSED BASE + 341 */
+    /* UNUSED BASE + 342 */
+    /* UNUSED BASE + 343 */
+
+    /*
+     *  Additional UAS and NETLOGON codes
+     *
+     *          NERR_BASE  + (350-359;
+     */
+    int NERR_BadUasConfig = NERR_BASE + 350; /* The user accounts database is not configured correctly. */
+    int NERR_InvalidUASOp = NERR_BASE + 351; /* This operation is not permitted when the Netlogon service is running. */
+    int NERR_LastAdmin = NERR_BASE + 352; /* This operation is not allowed on the last administrative account. */
+    int NERR_DCNotFound = NERR_BASE + 353; /* Could not find domain controller for this domain. */
+    int NERR_LogonTrackingError = NERR_BASE + 354; /* Could not set logon information for this user. */
+    int NERR_NetlogonNotStarted = NERR_BASE + 355; /* The Netlogon service has not been started. */
+    int NERR_CanNotGrowUASFile = NERR_BASE + 356; /* Unable to add to the user accounts database. */
+    int NERR_TimeDiffAtDC = NERR_BASE + 357; /* This server's clock is not synchronized with the primary domain controller's clock. */
+    int NERR_PasswordMismatch = NERR_BASE + 358; /* A password mismatch has been detected. */
+
+
+    /*
+     *  Server Integration error codes.
+     *
+     *          NERR_BASE  + (360-369;
+     */
+    int NERR_NoSuchServer = NERR_BASE + 360; /* The server identification does not specify a valid server. */
+    int NERR_NoSuchSession = NERR_BASE + 361; /* The session identification does not specify a valid session. */
+    int NERR_NoSuchConnection = NERR_BASE + 362; /* The connection identification does not specify a valid connection. */
+    int NERR_TooManyServers = NERR_BASE + 363; /* There is no space for another entry in the table of available servers. */
+    int NERR_TooManySessions = NERR_BASE + 364; /* The server has reached the maximum number of sessions it supports. */
+    int NERR_TooManyConnections = NERR_BASE + 365; /* The server has reached the maximum number of connections it supports. */
+    int NERR_TooManyFiles = NERR_BASE + 366; /* The server cannot open more files because it has reached its maximum number. */
+    int NERR_NoAlternateServers = NERR_BASE + 367; /* There are no alternate servers registered on this server. */
+    /* UNUSED BASE + 368 */
+    /* UNUSED BASE + 369 */
+
+    int NERR_TryDownLevel = NERR_BASE + 370; /* Try down-level = remote admin protocol; version of API instead. */
+
+    /*
+     *  UPS error codes.
+     *
+     *          NERR_BASE + = 380-384;
+     */
+    int NERR_UPSDriverNotStarted = NERR_BASE + 380; /* The UPS driver could not be accessed by the UPS service. */
+    int NERR_UPSInvalidConfig = NERR_BASE + 381; /* The UPS service is not configured correctly. */
+    int NERR_UPSInvalidCommPort = NERR_BASE + 382; /* The UPS service could not access the specified Comm Port. */
+    int NERR_UPSSignalAsserted = NERR_BASE + 383; /* The UPS indicated a line fail or low battery situation. Service not started. */
+    int NERR_UPSShutdownFailed = NERR_BASE + 384; /* The UPS service failed to perform a system shut down. */
+
+    /*
+     *  Remoteboot error codes.
+     *
+     *          NERR_BASE + = 400-419;
+     *          Error codes 400 - 405 are used by RPLBOOT.SYS.
+     *          Error codes 403, 407 - 416 are used by RPLLOADR.COM,
+     *          Error code 417 is the alerter message of REMOTEBOOT = RPLSERVR.EXE;.
+     *          Error code 418 is for when REMOTEBOOT can't start
+     *          Error code 419 is for a disallowed 2nd rpl connection
+     *
+     */
+    int NERR_BadDosRetCode = NERR_BASE + 400; /* The program below returned an MS-DOS error code:*/
+    int NERR_ProgNeedsExtraMem = NERR_BASE + 401; /* The program below needs more memory:*/
+    int NERR_BadDosFunction = NERR_BASE + 402; /* The program below called an unsupported MS-DOS function:*/
+    int NERR_RemoteBootFailed = NERR_BASE + 403; /* The workstation failed to boot.*/
+    int NERR_BadFileCheckSum = NERR_BASE + 404; /* The file below is corrupt.*/
+    int NERR_NoRplBootSystem = NERR_BASE + 405; /* No loader is specified in the boot-block definition file.*/
+    int NERR_RplLoadrNetBiosErr = NERR_BASE + 406; /* NetBIOS returned an error: The NCB and SMB are dumped above.*/
+    int NERR_RplLoadrDiskErr = NERR_BASE + 407; /* A disk I/O error occurred.*/
+    int NERR_ImageParamErr = NERR_BASE + 408; /* Image parameter substitution failed.*/
+    int NERR_TooManyImageParams = NERR_BASE + 409; /* Too many image parameters cross disk sector boundaries.*/
+    int NERR_NonDosFloppyUsed = NERR_BASE + 410; /* The image was not generated from an MS-DOS diskette formatted with /S.*/
+    int NERR_RplBootRestart = NERR_BASE + 411; /* Remote boot will be restarted later.*/
+    int NERR_RplSrvrCallFailed = NERR_BASE + 412; /* The call to the Remoteboot server failed.*/
+    int NERR_CantConnectRplSrvr = NERR_BASE + 413; /* Cannot connect to the Remoteboot server.*/
+    int NERR_CantOpenImageFile = NERR_BASE + 414; /* Cannot open image file on the Remoteboot server.*/
+    int NERR_CallingRplSrvr = NERR_BASE + 415; /* Connecting to the Remoteboot server...*/
+    int NERR_StartingRplBoot = NERR_BASE + 416; /* Connecting to the Remoteboot server...*/
+    int NERR_RplBootServiceTerm = NERR_BASE + 417; /* Remote boot service was stopped; check the error log for the cause of the problem.*/
+    int NERR_RplBootStartFailed = NERR_BASE + 418; /* Remote boot startup failed; check the error log for the cause of the problem.*/
+    int NERR_RPL_CONNECTED = NERR_BASE + 419; /* A second connection to a Remoteboot resource is not allowed.*/
+
+    /*
+     *  FTADMIN API error codes
+     *
+     *       NERR_BASE + = 425-434;
+     *
+     * = Currently not used in NT;
+     *
+     */
+
+    /*
+     *  Browser service API error codes
+     *
+     *       NERR_BASE + = 450-475;
+     *
+     */
+    int NERR_BrowserConfiguredToNotRun = NERR_BASE + 450; /* The browser service was configured with MaintainServerList = No. */
+
+    /*
+     *  Additional Remoteboot error codes.
+     *
+     *          NERR_BASE + = 510-550;
+     */
+    int NERR_RplNoAdaptersStarted = NERR_BASE + 510; /*Service failed to start since none of the network adapters started with this service.*/
+    int NERR_RplBadRegistry = NERR_BASE + 511; /*Service failed to start due to bad startup information in the registry.*/
+    int NERR_RplBadDatabase = NERR_BASE + 512; /*Service failed to start because its database is absent or corrupt.*/
+    int NERR_RplRplfilesShare = NERR_BASE + 513; /*Service failed to start because RPLFILES share is absent.*/
+    int NERR_RplNotRplServer = NERR_BASE + 514; /*Service failed to start because RPLUSER group is absent.*/
+    int NERR_RplCannotEnum = NERR_BASE + 515; /*Cannot enumerate service records.*/
+    int NERR_RplWkstaInfoCorrupted = NERR_BASE + 516; /*Workstation record information has been corrupted.*/
+    int NERR_RplWkstaNotFound = NERR_BASE + 517; /*Workstation record was not found.*/
+    int NERR_RplWkstaNameUnavailable = NERR_BASE + 518; /*Workstation name is in use by some other workstation.*/
+    int NERR_RplProfileInfoCorrupted = NERR_BASE + 519; /*Profile record information has been corrupted.*/
+    int NERR_RplProfileNotFound = NERR_BASE + 520; /*Profile record was not found.*/
+    int NERR_RplProfileNameUnavailable = NERR_BASE + 521; /*Profile name is in use by some other profile.*/
+    int NERR_RplProfileNotEmpty = NERR_BASE + 522; /*There are workstations using this profile.*/
+    int NERR_RplConfigInfoCorrupted = NERR_BASE + 523; /*Configuration record information has been corrupted.*/
+    int NERR_RplConfigNotFound = NERR_BASE + 524; /*Configuration record was not found.*/
+    int NERR_RplAdapterInfoCorrupted = NERR_BASE + 525; /*Adapter id record information has been corrupted.*/
+    int NERR_RplInternal   = NERR_BASE + 526; /*An internal service error has occurred.*/
+    int NERR_RplVendorInfoCorrupted = NERR_BASE + 527; /*Vendor id record information has been corrupted.*/
+    int NERR_RplBootInfoCorrupted = NERR_BASE + 528; /*Boot block record information has been corrupted.*/
+    int NERR_RplWkstaNeedsUserAcct = NERR_BASE + 529; /*The user account for this workstation record is missing.*/
+    int NERR_RplNeedsRPLUSERAcct = NERR_BASE + 530; /*The RPLUSER local group could not be found.*/
+    int NERR_RplBootNotFound = NERR_BASE + 531; /*Boot block record was not found.*/
+    int NERR_RplIncompatibleProfile = NERR_BASE + 532; /*Chosen profile is incompatible with this workstation.*/
+    int NERR_RplAdapterNameUnavailable = NERR_BASE + 533; /*Chosen network adapter id is in use by some other workstation.*/
+    int NERR_RplConfigNotEmpty = NERR_BASE + 534; /*There are profiles using this configuration.*/
+    int NERR_RplBootInUse  = NERR_BASE + 535; /*There are workstations, profiles or configurations using this boot block.*/
+    int NERR_RplBackupDatabase = NERR_BASE + 536; /*Service failed to backup Remoteboot database.*/
+    int NERR_RplAdapterNotFound = NERR_BASE + 537; /*Adapter record was not found.*/
+    int NERR_RplVendorNotFound = NERR_BASE + 538; /*Vendor record was not found.*/
+    int NERR_RplVendorNameUnavailable = NERR_BASE + 539; /*Vendor name is in use by some other vendor record.*/
+    int NERR_RplBootNameUnavailable = NERR_BASE + 540; /*(boot name, vendor id; is in use by some other boot block record.*/
+    int NERR_RplConfigNameUnavailable = NERR_BASE + 541; /*Configuration name is in use by some other configuration.*/
+
+    /**INTERNAL_ONLY**/
+
+    /*
+     *  Dfs API error codes.
+     *
+     *          NERR_BASE + = 560-590;
+     */
+
+    int NERR_DfsInternalCorruption = NERR_BASE + 560; /*The internal database maintained by the DFS service is corrupt*/
+    int NERR_DfsVolumeDataCorrupt = NERR_BASE + 561; /*One of the records in the internal DFS database is corrupt*/
+    int NERR_DfsNoSuchVolume = NERR_BASE + 562; /*There is no DFS name whose entry path matches the input Entry Path*/
+    int NERR_DfsVolumeAlreadyExists = NERR_BASE + 563; /*A root or link with the given name already exists*/
+    int NERR_DfsAlreadyShared = NERR_BASE + 564; /*The server share specified is already shared in the DFS*/
+    int NERR_DfsNoSuchShare = NERR_BASE + 565; /*The indicated server share does not support the indicated DFS namespace*/
+    int NERR_DfsNotALeafVolume = NERR_BASE + 566; /*The operation is not valid on this portion of the namespace*/
+    int NERR_DfsLeafVolume = NERR_BASE + 567; /*The operation is not valid on this portion of the namespace*/
+    int NERR_DfsVolumeHasMultipleServers = NERR_BASE + 568; /*The operation is ambiguous because the link has multiple servers*/
+    int NERR_DfsCantCreateJunctionPoint = NERR_BASE + 569; /*Unable to create a link*/
+    int NERR_DfsServerNotDfsAware = NERR_BASE + 570; /*The server is not DFS Aware*/
+    int NERR_DfsBadRenamePath = NERR_BASE + 571; /*The specified rename target path is invalid*/
+    int NERR_DfsVolumeIsOffline = NERR_BASE + 572; /*The specified DFS link is offline*/
+    int NERR_DfsNoSuchServer = NERR_BASE + 573; /*The specified server is not a server for this link*/
+    int NERR_DfsCyclicalName = NERR_BASE + 574; /*A cycle in the DFS name was detected*/
+    int NERR_DfsNotSupportedInServerDfs = NERR_BASE + 575; /*The operation is not supported on a server-based DFS*/
+    int NERR_DfsDuplicateService = NERR_BASE + 576; /*This link is already supported by the specified server-share*/
+    int NERR_DfsCantRemoveLastServerShare = NERR_BASE + 577; /*Can't remove the last server-share supporting this root or link*/
+    int NERR_DfsVolumeIsInterDfs = NERR_BASE + 578; /*The operation is not supported for an Inter-DFS link*/
+    int NERR_DfsInconsistent = NERR_BASE + 579; /*The internal state of the DFS Service has become inconsistent*/
+    int NERR_DfsServerUpgraded = NERR_BASE + 580; /*The DFS Service has been installed on the specified server*/
+    int NERR_DfsDataIsIdentical = NERR_BASE + 581; /*The DFS data being reconciled is identical*/
+    int NERR_DfsCantRemoveDfsRoot = NERR_BASE + 582; /*The DFS root cannot be deleted - Uninstall DFS if required*/
+    int NERR_DfsChildOrParentInDfs = NERR_BASE + 583; /*A child or parent directory of the share is already in a DFS*/
+    int NERR_DfsInternalError = NERR_BASE + 590; /*DFS internal error*/
+
+    /*
+     *  Net setup error codes.
+     *
+     *          NERR_BASE + = 591-600;
+     */
+    int NERR_SetupAlreadyJoined = NERR_BASE + 591; /*This machine is already joined to a domain.*/
+    int NERR_SetupNotJoined = NERR_BASE + 592; /*This machine is not currently joined to a domain.*/
+    int NERR_SetupDomainController = NERR_BASE + 593; /*This machine is a domain controller and cannot be unjoined from a domain.*/
+    int NERR_DefaultJoinRequired = NERR_BASE + 594; /*The destination domain controller does not support creating machine accounts in OUs.*/
+    int NERR_InvalidWorkgroupName = NERR_BASE + 595; /*The specified workgroup name is invalid.*/
+    int NERR_NameUsesIncompatibleCodePage = NERR_BASE + 596; /*The specified computer name is incompatible with the default language used on the domain controller.*/
+    int NERR_ComputerAccountNotFound = NERR_BASE + 597; /*The specified computer account could not be found. Contact an administrator to verify the account is in the domain. If the account has been deleted unjoin, reboot, and rejoin the domain.*/
+    int NERR_PersonalSku   = NERR_BASE + 598; /*This version of Windows cannot be joined to a domain.*/
+    int NERR_SetupCheckDNSConfig = NERR_BASE + 599; /*An attempt to resolve the DNS name of a DC in the domain being joined has failed.  Please verify this client is configured to reach a DNS server that can resolve DNS names in the target domain.*/
+
+    /*
+     *  Some Password and account error results
+     *
+     *          NERR_BASE + = 601 - 608;
+    */
+    int NERR_PasswordMustChange = NERR_BASE + 601;   /* Password must change at next logon */
+    int NERR_AccountLockedOut = NERR_BASE + 602;   /* Account is locked out */
+    int NERR_PasswordTooLong = NERR_BASE + 603;   /* Password is too long */
+    int NERR_PasswordNotComplexEnough = NERR_BASE + 604;   /* Password doesn't meet the complexity policy */ 
+    int NERR_PasswordFilterError = NERR_BASE + 605;   /* Password doesn't meet the requirements of the filter dll's */
+
+    /***********WARNING ****************
+     *The range 2750-2799 has been     *
+     *allocated to the IBM LAN Server  *
+     ***********************************/
+
+    /***********WARNING ****************
+     *The range 2900-2999 has been     *
+     *reserved for Microsoft OEMs      *
+     ***********************************/
+
+    int MAX_NERR = NERR_BASE + 899; /* This is the last error in NERR range. */    
+}
+

contrib/platform/src/com/sun/jna/platform/win32/LMJoin.java

@@ -0,0 +1,34 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ * Ported from LMJoin.h.
+ * Windows SDK 6.0A.
+ * @author dblock[at]dblock.org
+ */
+public interface LMJoin extends StdCallLibrary {
+
+    /**
+     * Status of a workstation.
+     */
+    public abstract class NETSETUP_JOIN_STATUS {
+        public static final int NetSetupUnknownStatus = 0;
+        public static final int NetSetupUnjoined = 1;
+        public static final int NetSetupWorkgroupName = 2;
+        public static final int NetSetupDomainName = 3;		
+    };
+
+}

contrib/platform/src/com/sun/jna/platform/win32/Msi.java

@@ -0,0 +1,210 @@
+/* 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.
+ */
+package com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * Provides access to the w32 MSI installer library.
+ */
+public interface Msi extends StdCallLibrary {
+
+    Msi INSTANCE = (Msi)
+        Native.loadLibrary("msi", Msi.class, W32APIOptions.UNICODE_OPTIONS);
+
+    /**
+     * The component being requested is disabled on the computer.
+     */
+    static int INSTALLSTATE_NOTUSED = -7;
+
+    /**
+     * The configuration data is corrupt.
+     */
+    static int INSTALLSTATE_BADCONFIG = -6;
+
+    /**
+     * The installation is suspended or in progress.
+     */
+    static int INSTALLSTATE_INCOMPLETE = -5;
+
+    /**
+     * The feature must run from the source, and the source is unavailable.
+     */
+    static int INSTALLSTATE_SOURCEABSENT = -4;
+
+    /**
+     * The return buffer is full.
+     */
+    static int INSTALLSTATE_MOREDATA = -3;
+
+    /**
+     * An invalid parameter was passed to the function.
+     */
+    static int INSTALLSTATE_INVALIDARG = -2;
+
+    /**
+     * An unrecognized product or feature was specified.
+     */
+    static int INSTALLSTATE_UNKNOWN = -1;
+
+    /**
+     * The feature is broken.
+     */
+    static int INSTALLSTATE_BROKEN =  0;
+
+    /**
+     * The advertised feature.
+     */
+    static int INSTALLSTATE_ADVERTISED =  1;
+
+    /**
+     * The component is being removed.
+     */
+    static int INSTALLSTATE_REMOVED =  1;
+
+    /**
+     * The feature was uninstalled.
+     */
+    static int INSTALLSTATE_ABSENT =  2;
+
+    /**
+     * The feature was installed on the local drive.
+     */
+    static int INSTALLSTATE_LOCAL =  3;
+
+    /**
+     * The feature must run from the source, CD-ROM, or network.
+     */
+    static int INSTALLSTATE_SOURCE =  4;
+
+    /**
+     * The feature is installed in the default location: local or source.
+     */
+    static int INSTALLSTATE_DEFAULT =  5;
+
+    /**
+     * The MsiGetComponentPath function returns the full path to an installed component. If the key path for the
+     * component is a registry key then the registry key is returned.
+     *
+     * @param szProduct
+     *   Specifies the product code for the client product.
+     *
+     * @param szComponent
+     *   Specifies the component ID of the component to be located.
+     *
+     * @param lpPathBuf
+     *   Pointer to a variable that receives the path to the component. This parameter can be null. If the component is
+     *   a registry key, the registry roots are represented numerically. If this is a registry subkey path, there is a
+     *   backslash at the end of the Key Path. If this is a registry value key path, there is no backslash at the end.
+     *   For example, a registry path on a 32-bit operating system of HKEY_CURRENT_USER\SOFTWARE\Microsoft is returned
+     *   as "01:\SOFTWARE\Microsoft\".
+     *
+     * @param pcchBuf
+     *   Pointer to a variable that specifies the size, in characters, of the buffer pointed to by the lpPathBuf
+     *   parameter. On input, this is the full size of the buffer, including a space for a terminating null character.
+     *   If the buffer passed in is too small, the count returned does not include the terminating null character.
+     *
+     *   If lpPathBuf is null, pcchBuf can be null.
+     *
+     * @return
+     *   The MsiGetComponentPath function returns the following values.
+     *   INSTALLSTATE_NOTUSED - The component being requested is disabled on the computer.
+     *   INSTALLSTATE_ABSENT - The component is not installed.
+     *   INSTALLSTATE_INVALIDARG - One of the function parameters is invalid.
+     *   INSTALLSTATE_LOCAL - The component is installed locally.
+     *   INSTALLSTATE_SOURCE - The component is installed to run from source.
+     *   INSTALLSTATE_SOURCEABSENT - The component source is inaccessible.
+     *   INSTALLSTATE_UNKNOWN - The product code or component ID is unknown.
+     */
+    int MsiGetComponentPath(String szProduct, String szComponent, char[] lpPathBuf, IntByReference pcchBuf);
+
+    /**
+     * The MsiLocateComponent function returns the full path to an installed component without a product code. This
+     * function attempts to determine the product using MsiGetProductCode, but is not guaranteed to find the correct
+     * product for the caller. MsiGetComponentPath should always be called when possible.
+     *
+     * @param szComponent
+     *   Specifies the component ID of the component to be located.
+     *
+     * @param lpPathBuf
+     *   Pointer to a variable that receives the path to the component. The variable includes the terminating null
+     *   character.
+     *
+     * @param pcchBuf
+     *   Pointer to a variable that specifies the size, in characters, of the buffer pointed to by the lpPathBuf
+     *   parameter. On input, this is the full size of the buffer, including a space for a terminating null character.
+     *   Upon success of the MsiLocateComponent function, the variable pointed to by pcchBuf contains the count of
+     *   characters not including the terminating null character. If the size of the buffer passed in is too small, the
+     *   function returns INSTALLSTATE_MOREDATA.
+     *
+     *   If lpPathBuf is null, pcchBuf can be null.
+     *
+     * @return
+     *   The MsiGetComponentPath function returns the following values.
+     *   INSTALLSTATE_NOTUSED - The component being requested is disabled on the computer.
+     *   INSTALLSTATE_ABSENT - The component is not installed.
+     *   INSTALLSTATE_INVALIDARG - One of the function parameters is invalid.
+     *   INSTALLSTATE_LOCAL - The component is installed locally.
+     *   INSTALLSTATE_MOREDATA - The buffer provided was too small.
+     *   INSTALLSTATE_SOURCE - The component is installed to run from source.
+     *   INSTALLSTATE_SOURCEABSENT - The component source is inaccessible.
+     *   INSTALLSTATE_UNKNOWN - The product code or component ID is unknown.
+     */
+    int MsiLocateComponent(String szComponent, char[] lpPathBuf, IntByReference pcchBuf);
+
+    /**
+     * The MsiGetProductCode function returns the product code of an application by using the component code of an
+     * installed or advertised component of the application. During initialization, an application must determine under
+     * which product code it has been installed or advertised.
+     *
+     * @param szComponent
+     *   This parameter specifies the component code of a component that has been installed by the application. This
+     *   will be typically the component code of the component containing the executable file of the application.
+     *
+     * @param lpProductBuf
+     *   Pointer to a buffer that receives the product code. This buffer must be 39 characters long. The first 38
+     *   characters are for the GUID, and the last character is for the terminating null character.
+     *
+     * @return
+     * ERROR_BAD_CONFIGURATION - The configuration data is corrupt.
+     * ERROR_INSTALL_FAILURE - The product code could not be determined.
+     * ERROR_INVALID_PARAMETER - An invalid parameter was passed to the function.
+     * ERROR_SUCCESS - The function completed successfully.
+     * ERROR_UNKNOWN_COMPONENT - The specified component is unknown.
+     */
+    int MsiGetProductCode(String szComponent, char[] lpProductBuf);
+
+    /**
+     * The MsiEnumComponents function enumerates the installed components for all products. This function retrieves one
+     * component code each time it is called.
+     *
+     * @param iComponentIndex
+     *   Specifies the index of the component to retrieve. This parameter should be zero for the first call to the
+     *   MsiEnumComponents function and then incremented for subsequent calls. Because components are not ordered, any
+     *   new component has an arbitrary index. This means that the function can return components in any order.
+     *
+     * @param lpComponentBuf
+     *   Pointer to a buffer that receives the component code. This buffer must be 39 characters long. The first 38
+     *   characters are for the GUID, and the last character is for the terminating null character.
+     *
+     * @return
+     *  ERROR_BAD_CONFIGURATION - The configuration data is corrupt.
+     *  ERROR_INVALID_PARAMETER - An invalid parameter was passed to the function.
+     *  ERROR_NO_MORE_ITEMS - There are no components to return.
+     *  ERROR_NOT_ENOUGH_MEMORY - The system does not have enough memory to complete the operation. Available with
+     *    Windows Server 2003.
+     *  ERROR_SUCCESS - A value was enumerated.
+     */
+    int MsiEnumComponents(WinDef.DWORD iComponentIndex, char[] lpComponentBuf);
+}

contrib/platform/src/com/sun/jna/platform/win32/NTSecApi.java

@@ -0,0 +1,214 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Memory;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.Union;
+import com.sun.jna.platform.win32.WinNT.LARGE_INTEGER;
+import com.sun.jna.platform.win32.WinNT.PSID;
+import com.sun.jna.win32.StdCallLibrary;
+
+/**
+ * Ported from NTSecApi.h
+ * Windows SDK 6.0A.
+ * @author dblock[at]dblock.org
+ */
+public interface NTSecApi extends StdCallLibrary {
+	
+    /**
+     * The LSA_UNICODE_STRING structure is used by various Local Security Authority (LSA) 
+     * functions to specify a Unicode string.
+     */
+    public static class LSA_UNICODE_STRING extends Structure {
+        public static class ByReference extends LSA_UNICODE_STRING implements Structure.ByReference {
+
+        }
+	
+        /**
+         * Specifies the length, in bytes, of the string pointed to by the Buffer member, 
+         * not including the terminating null character, if any.
+         */
+        public short Length;
+        /**
+         * Specifies the total size, in bytes, of the memory allocated for Buffer. Up to 
+         * MaximumLength bytes can be written into the buffer without trampling memory.
+         */
+        public short MaximumLength;
+        /**
+         * Pointer to a wide character string. Note that the strings returned by the 
+         * various LSA functions might not be null terminated.
+         */
+        public Pointer Buffer;
+		
+        /**
+         * String representation of the buffer.
+         * @return
+         *  Unicode string.
+         */
+        public String getString() {
+            byte[] data = Buffer.getByteArray(0, Length);
+            if (data.length < 2 || data[data.length - 1] != 0) {
+                Memory newdata = new Memory(data.length + 2);
+                newdata.write(0, data, 0, data.length);
+                return newdata.getString(0, true);
+            }
+            return Buffer.getString(0, true);
+        }
+    }
+
+    /**
+     * Pointer to an LSA_UNICODE_STRING.
+     */
+    public static class PLSA_UNICODE_STRING {
+        public static class ByReference extends PLSA_UNICODE_STRING 
+            implements Structure.ByReference {
+
+        }
+		
+        public LSA_UNICODE_STRING.ByReference s;
+    }
+	
+    /**
+     * Record contains an included top-level name.
+     */
+    int ForestTrustTopLevelName = 0;
+    /**
+     * Record contains an excluded top-level name.
+     */
+    int ForestTrustTopLevelNameEx = 1;
+    /**
+     * Record contains an LSA_FOREST_TRUST_DOMAIN_INFO structure.
+     */
+    int ForestTrustDomainInfo = 2;
+
+    public static class LSA_FOREST_TRUST_DOMAIN_INFO extends Structure {
+        public PSID.ByReference Sid;
+        public LSA_UNICODE_STRING DnsName;
+        public LSA_UNICODE_STRING NetbiosName;
+    }
+	
+    public static class LSA_FOREST_TRUST_BINARY_DATA extends Structure {
+        public int Length;
+        public Pointer Buffer;
+    }
+	
+    public static class LSA_FOREST_TRUST_RECORD extends Structure {    
+		
+        public static class ByReference extends LSA_FOREST_TRUST_RECORD  implements Structure.ByReference {
+
+        }
+
+        public static class UNION extends Union {
+            public static class ByReference extends UNION  implements Structure.ByReference {
+
+            }
+			
+            public LSA_UNICODE_STRING TopLevelName;
+            public LSA_FOREST_TRUST_DOMAIN_INFO DomainInfo;
+            public LSA_FOREST_TRUST_BINARY_DATA Data;
+        }
+		
+        /**
+         * Flags that control the behavior of the operation.
+         */
+        public int Flags;
+		
+        /**
+         * LSA_FOREST_TRUST_RECORD_TYPE enumeration that indicates the type of the record. 
+         * The following table shows the possible values.
+         * ForestTrustTopLevelName
+         *  Record contains an included top-level name.
+         * ForestTrustTopLevelNameEx
+         *  Record contains an excluded top-level name.
+         * ForestTrustDomainInfo
+         *  Record contains an LSA_FOREST_TRUST_DOMAIN_INFO structure.
+         * ForestTrustRecordTypeLast
+         *  Marks the end of an enumeration.
+         */
+        public int ForestTrustType;
+        public LARGE_INTEGER Time;
+		
+        /**
+         * Data type depending on ForestTrustType. 
+         */
+        public UNION u;
+		
+        public void read() {
+            super.read();
+			
+            switch(ForestTrustType) {
+            case NTSecApi.ForestTrustTopLevelName:
+            case NTSecApi.ForestTrustTopLevelNameEx:
+                u.setType(LSA_UNICODE_STRING.class);
+                break;
+            case NTSecApi.ForestTrustDomainInfo:
+                u.setType(LSA_FOREST_TRUST_DOMAIN_INFO.class);
+                break;
+            default:
+                u.setType(LSA_FOREST_TRUST_BINARY_DATA.class);
+                break;
+            }
+			
+            u.read();
+        }
+    }
+	
+    public static class PLSA_FOREST_TRUST_RECORD extends Structure {
+        public static class ByReference extends PLSA_FOREST_TRUST_RECORD implements Structure.ByReference {
+			
+        }
+		
+        public LSA_FOREST_TRUST_RECORD.ByReference tr;	
+    }
+	
+    public static class LSA_FOREST_TRUST_INFORMATION extends Structure {
+		
+        public static class ByReference extends LSA_FOREST_TRUST_INFORMATION implements Structure.ByReference {
+			
+        }
+		
+        /**
+         * Number of LSA_FOREST_TRUST_RECORD structures in the array pointed to by the 
+         * Entries member.
+         */
+        public int RecordCount;
+        /**
+         * Pointer to a pointer to an array of LSA_FOREST_TRUST_RECORD structures, 
+         * each of which contains one piece of forest trust information.
+         */
+        public PLSA_FOREST_TRUST_RECORD.ByReference Entries;
+
+        /**
+         * Get an array of LSA_FOREST_TRUST_RECORD entries.
+         * @return
+         *  An array of forest trust records.
+         */
+        public PLSA_FOREST_TRUST_RECORD[] getEntries() {
+            return (PLSA_FOREST_TRUST_RECORD[]) Entries.toArray(RecordCount);
+        }
+    }
+    /**
+     * The LSA_FOREST_TRUST_INFORMATION structure contains Local Security Authority 
+     * forest trust information.
+     */
+    public static class PLSA_FOREST_TRUST_INFORMATION extends Structure {
+		
+        public static class ByReference extends PLSA_FOREST_TRUST_INFORMATION implements Structure.ByReference {
+			
+        }
+
+        public LSA_FOREST_TRUST_INFORMATION.ByReference fti;		
+    }
+}

contrib/platform/src/com/sun/jna/platform/win32/NTStatus.java

@@ -0,0 +1,89 @@
+/* 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+public interface NTStatus {
+	
+    int STATUS_SUCCESS = 0x00000000; // ntsubauth
+    int STATUS_BUFFER_TOO_SMALL  = 0xC0000023;
+
+    //
+    // MessageId: STATUS_WAIT_0
+    //
+    // MessageText:
+    //
+    //  STATUS_WAIT_0
+    //
+    int  STATUS_WAIT_0 = 0x00000000;    // winnt
+
+    //
+    // MessageId: STATUS_WAIT_1
+    //
+    // MessageText:
+    //
+    //  STATUS_WAIT_1
+    //
+    int  STATUS_WAIT_1 = 0x00000001;
+
+    //
+    // MessageId: STATUS_WAIT_2
+    //
+    // MessageText:
+    //
+    //  STATUS_WAIT_2
+    //
+    int  STATUS_WAIT_2 = 0x00000002;
+
+    //
+    // MessageId: STATUS_WAIT_3
+    //
+    // MessageText:
+    //
+    //  STATUS_WAIT_3
+    //
+    int  STATUS_WAIT_3 = 0x00000003;
+
+    //
+    // MessageId: STATUS_WAIT_63
+    //
+    // MessageText:
+    //
+    //  STATUS_WAIT_63
+    //
+    int  STATUS_WAIT_63 = 0x0000003F;
+
+    //
+    // The success status codes 128 - 191 are reserved for wait completion
+    // status with an abandoned mutant object.
+    //
+    int  STATUS_ABANDONED = 0x00000080;
+
+    //
+    // MessageId: STATUS_ABANDONED_WAIT_0
+    //
+    // MessageText:
+    //
+    //  STATUS_ABANDONED_WAIT_0
+    //
+    int  STATUS_ABANDONED_WAIT_0 = 0x00000080;    // winnt
+
+    //
+    // MessageId: STATUS_ABANDONED_WAIT_63
+    //
+    // MessageText:
+    //
+    //  STATUS_ABANDONED_WAIT_63
+    //
+    int  STATUS_ABANDONED_WAIT_63 = 0x000000BF;
+}
+

contrib/platform/src/com/sun/jna/platform/win32/Netapi32.java

@@ -0,0 +1,432 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.platform.win32.DsGetDC.PDOMAIN_CONTROLLER_INFO;
+import com.sun.jna.platform.win32.DsGetDC.PDS_DOMAIN_TRUSTS;
+import com.sun.jna.platform.win32.Guid.GUID;
+import com.sun.jna.platform.win32.NTSecApi.PLSA_FOREST_TRUST_INFORMATION;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * Netapi32.dll Interface.
+ * @author dblock[at]dblock.org
+ */
+public interface Netapi32 extends StdCallLibrary {
+	
+	Netapi32 INSTANCE = (Netapi32) Native.loadLibrary("Netapi32",
+			Netapi32.class, W32APIOptions.UNICODE_OPTIONS);
+
+	/**
+	 * Retrieves join status information for the specified computer.
+	 * 
+	 * @param lpServer
+	 *  Specifies the DNS or NetBIOS name of the computer on which to
+	 *  call the function.
+	 * @param lpNameBuffer
+	 *  Receives the NetBIOS name of the domain or workgroup to which
+	 *  the computer is joined.
+	 * @param BufferType
+	 *  Join status of the specified computer.
+	 * @return If the function succeeds, the return value is NERR_Success. If
+	 *         the function fails, the return value is a system error code.
+	 */
+	public int NetGetJoinInformation(String lpServer,
+			PointerByReference lpNameBuffer, IntByReference BufferType);
+
+	/**
+	 * Frees the memory that the NetApiBufferAllocate function allocates.
+	 * 
+	 * @param buffer
+	 * @return If the function succeeds, the return value is NERR_Success. If
+	 *         the function fails, the return value is a system error code.
+	 */
+	public int NetApiBufferFree(Pointer buffer);
+
+	/**
+	 * Returns information about each local group account on the specified
+	 * server.
+	 * 
+	 * @param serverName
+	 *  Specifies the DNS or NetBIOS name of the remote server on
+	 *  which the function is to execute. If this parameter is NULL,
+	 *  the local computer is used.
+	 * @param level
+	 *  Specifies the information level of the data.
+	 * @param bufptr
+	 *  Pointer to the address of the buffer that receives the
+	 *  information structure.
+	 * @param prefmaxlen
+	 *  Specifies the preferred maximum length of returned data, in
+	 *  bytes.
+	 * @param entriesread
+	 *  Pointer to a value that receives the count of elements
+	 *  actually enumerated.
+	 * @param totalentries
+	 *  Pointer to a value that receives the approximate total number
+	 *  of entries that could have been enumerated from the current
+	 *  resume position.
+	 * @param resume_handle
+	 *  Pointer to a value that contains a resume handle that is used
+	 *  to continue an existing local group search.
+	 * @return If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetLocalGroupEnum(String serverName, int level,
+			PointerByReference bufptr, int prefmaxlen,
+			IntByReference entriesread, IntByReference totalentries,
+			IntByReference resume_handle);
+	
+	/**
+	 * Returns the name of the primary domain controller (PDC).
+	 * 
+	 * @param serverName 
+	 * 	Specifies the DNS or NetBIOS name of the remote server on which the function is 
+	 * 	to execute. If this parameter is NULL, the local computer is used. 
+	 * @param domainName
+	 * 	Specifies the name of the domain. 
+	 * @param bufptr
+	 * 	Receives a string that specifies the server name of the PDC of the domain.
+	 * @return 
+	 * 	If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetGetDCName(String serverName, String domainName, 
+			PointerByReference bufptr);
+
+	/**
+	 * The NetGroupEnum function retrieves information about each global group 
+	 * in the security database, which is the security accounts manager (SAM) database or,
+	 * in the case of domain controllers, the Active Directory.
+	 * @param servername
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of the 
+	 *  remote server on which the function is to execute. If this parameter is NULL, 
+	 *  the local computer is used. 
+	 * @param level
+	 *  Specifies the information level of the data. 
+	 * @param bufptr
+	 *  Pointer to the buffer to receive the global group information structure. 
+	 *  The format of this data depends on the value of the level parameter. 
+	 * @param prefmaxlen
+	 *  Specifies the preferred maximum length of the returned data, in bytes. 
+	 *  If you specify MAX_PREFERRED_LENGTH, the function allocates the amount of 
+	 *  memory required to hold the data. If you specify another value in this 
+	 *  parameter, it can restrict the number of bytes that the function returns. 
+	 *  If the buffer size is insufficient to hold all entries, the function 
+	 *  returns ERROR_MORE_DATA.
+	 * @param entriesread
+	 *  Pointer to a value that receives the count of elements actually enumerated. 
+	 * @param totalentries
+	 *  Pointer to a value that receives the total number of entries that could have 
+	 *  been enumerated from the current resume position. The total number of entries 
+	 *  is only a hint.
+	 * @param resume_handle
+	 *  Pointer to a variable that contains a resume handle that is used to continue 
+	 *  the global group enumeration. The handle should be zero on the first call and 
+	 *  left unchanged for subsequent calls. If resume_handle is NULL, no resume handle 
+	 *  is stored. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetGroupEnum(String servername, int level, PointerByReference bufptr,
+			int prefmaxlen, IntByReference entriesread, IntByReference totalentries,
+			IntByReference resume_handle);
+
+	/**
+	 * The NetUserEnum function provides information about all user accounts on a server.	 
+	 * @param servername
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of the 
+	 *  remote server on which the function is to execute. If this parameter is NULL, 
+	 *  the local computer is used. 
+	 * @param level
+	 *  Specifies the information level of the data.
+	 * @param filter
+	 *  Specifies a value that filters the account types for enumeration.
+	 * @param bufptr
+	 *  Pointer to the buffer that receives the data. The format of this data depends 
+	 *  on the value of the level parameter. This buffer is allocated by the system and
+	 *  must be freed using the NetApiBufferFree function. Note that you must free the
+	 *  buffer even if the function fails with ERROR_MORE_DATA. 
+	 * @param prefmaxlen
+	 *  Specifies the preferred maximum length, in 8-bit bytes of returned data. If you 
+	 *  specify MAX_PREFERRED_LENGTH, the function allocates the amount of memory 
+	 *  required for the data. If you specify another value in this parameter, it can
+	 *  restrict the number of bytes that the function returns. If the buffer size is
+	 *  insufficient to hold all entries, the function returns ERROR_MORE_DATA. 
+	 * @param entriesread
+	 *  Pointer to a value that receives the count of elements actually enumerated. 
+	 * @param totalentries
+	 *  Pointer to a value that receives the total number of entries that could have 
+	 *  been enumerated from the current resume position. Note that applications should 
+	 *  consider this value only as a hint.
+	 * @param resume_handle
+	 *  Pointer to a value that contains a resume handle which is used to continue an 
+	 *  existing user search. The handle should be zero on the first call and left 
+	 *  unchanged for subsequent calls. If resume_handle is NULL, then no resume 
+	 *  handle is stored. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserEnum(String servername, int level, int filter, PointerByReference bufptr,
+			int prefmaxlen, IntByReference entriesread, IntByReference totalentries,
+			IntByReference resume_handle);
+
+	/**
+	 * The NetUserGetGroups function retrieves a list of global groups to which a 
+	 * specified user belongs.
+	 * @param servername
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of the 
+	 *  remote server on which the function is to execute. If this parameter is NULL, 
+	 *  the local computer is used. 
+	 * @param username
+	 *  Pointer to a constant string that specifies the name of the user to search for 
+	 *  in each group account. For more information, see the following Remarks section. 
+	 * @param level
+	 *  Specifies the information level of the data.
+	 * @param bufptr
+	 *  Pointer to the buffer that receives the data. This buffer is allocated by the 
+	 *  system and must be freed using the NetApiBufferFree function. Note that you must 
+	 *  free the buffer even if the function fails with ERROR_MORE_DATA. 
+	 * @param prefmaxlen
+	 *  Specifies the preferred maximum length of returned data, in bytes. If you specify 
+	 *  MAX_PREFERRED_LENGTH, the function allocates the amount of memory required for the 
+	 *  data. If you specify another value in this parameter, it can restrict the number 
+	 *  of bytes that the function returns. If the buffer size is insufficient to hold 
+	 *  all entries, the function returns ERROR_MORE_DATA.
+	 * @param entriesread
+	 *  Pointer to a value that receives the count of elements actually retrieved. 
+	 * @param totalentries
+	 *  Pointer to a value that receives the total number of entries that could have been retrieved. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserGetGroups(String servername, String username, int level,
+			PointerByReference bufptr, int prefmaxlen,
+			IntByReference entriesread, IntByReference totalentries);
+ 
+	/**
+	 * The NetUserGetLocalGroups function retrieves a list of local groups to which a
+	 * specified user belongs.
+	 * @param servername
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of the remote 
+	 *  server on which the function is to execute. If this parameter is NULL, the local 
+	 *  computer is used. 
+	 * @param username
+	 *  Pointer to a constant string that specifies the name of the user for which to return
+	 *  local group membership information. If the string is of the form DomainName\UserName 
+	 *  the user name is expected to be found on that domain. If the string is of the form 
+	 *  UserName, the user name is expected to be found on the server specified by the 
+	 *  servername parameter.
+	 * @param level
+	 *  Specifies the information level of the data.
+	 * @param flags
+	 *  Specifies a bitmask of flags. Currently, only the value LG_INCLUDE_INDIRECT is 
+	 *  defined. If this bit is set, the function also returns the names of the local 
+	 *  groups in which the user is indirectly a member (that is, the user has membership 
+	 *  in a global group that is itself a member of one or more local groups). 
+	 * @param bufptr
+	 *  Pointer to the buffer that receives the data. The format of this data depends on 
+	 *  the value of the level parameter. This buffer is allocated by the system and must 
+	 *  be freed using the NetApiBufferFree function. Note that you must free the buffer 
+	 *  even if the function fails with ERROR_MORE_DATA. 
+	 * @param prefmaxlen
+	 *  Specifies the preferred maximum length of returned data, in bytes. If you specify 
+	 *  MAX_PREFERRED_LENGTH, the function allocates the amount of memory required for the 
+	 *  data. If you specify another value in this parameter, it can restrict the number of 
+	 *  bytes that the function returns. If the buffer size is insufficient to hold all 
+	 *  entries, the function returns ERROR_MORE_DATA. For more information, see Network 
+	 *  Management Function Buffers and Network Management Function Buffer Lengths. 
+	 * @param entriesread
+	 *  Pointer to a value that receives the count of elements actually enumerated.
+	 * @param totalentries
+	 *  Pointer to a value that receives the total number of entries that could have been enumerated. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserGetLocalGroups(String servername, String username, int level,
+			int flags, PointerByReference bufptr, int prefmaxlen,
+			IntByReference entriesread, IntByReference totalentries);
+	
+	/**
+	 * The NetUserAdd function adds a user account and assigns a password and privilege level.
+	 * @param servername
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of the remote server 
+	 *  on which the function is to execute.
+	 * @param level
+	 *  Specifies the information level of the data.
+	 * @param buf
+	 *  Pointer to the buffer that specifies the data. The format of this data depends on the 
+	 *  value of the level parameter.
+	 * @param parm_err
+	 *  Pointer to a value that receives the index of the first member of the user information 
+	 *  structure that causes ERROR_INVALID_PARAMETER. If this parameter is NULL, the index is 
+	 *  not returned on error. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserAdd(String servername, int level, 
+			Structure buf, IntByReference parm_err);
+	
+	
+	/**
+	 * The NetUserDel function deletes a user account from a server.
+	 * @param servername
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of the remote 
+	 *  server on which the function is to execute. If this parameter is NULL, the local 
+	 *  computer is used. 
+	 * @param username
+	 *  Pointer to a constant string that specifies the name of the user account to delete. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserDel(String servername, String username);		
+	
+	/**
+	 * The NetUserChangePassword function changes a user's password for a specified
+	 * network server or domain.
+	 * @param domainname
+	 *  Pointer to a constant string that specifies the DNS or NetBIOS name of a remote 
+	 *  server or domain on which the function is to execute. If this parameter is NULL, 
+	 *  the logon domain of the caller is used. 
+	 * @param username
+	 *  Pointer to a constant string that specifies a user name. The NetUserChangePassword 
+	 *  function changes the password for the specified user. If this parameter is NULL, 
+	 *  the logon name of the caller is used.
+	 * @param oldpassword
+	 *  Pointer to a constant string that specifies the user's old password. 
+	 * @param newpassword
+	 *  Pointer to a constant string that specifies the user's new password. 
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserChangePassword(String domainname, String username, 
+			String oldpassword, String newpassword);
+	
+	/**
+	 * The DsGetDcName function returns the name of a domain controller in a specified domain. 
+	 * This function accepts additional domain controller selection criteria to indicate 
+	 * preference for a domain controller with particular characteristics.
+	 * @param ComputerName
+	 *  Pointer to a null-terminated string that specifies the name of the server to process 
+	 *  this function. Typically, this parameter is NULL, which indicates that the local 
+	 *  computer is used. 
+	 * @param DomainName
+	 *  Pointer to a null-terminated string that specifies the name of the domain or application
+	 *  partition to query. This name can either be a DNS style name, for example, fabrikam.com,
+	 *  or a flat-style name, for example, Fabrikam. If a DNS style name is specified, the name 
+	 *  may be specified with or without a trailing period.
+	 * @param DomainGuid
+	 *  Pointer to a GUID structure that specifies the GUID of the domain queried. If DomainGuid 
+	 *  is not NULL and the domain specified by DomainName or ComputerName cannot be found, 
+	 *  DsGetDcName attempts to locate a domain controller in the domain having the GUID specified 
+	 *  by DomainGuid.
+	 * @param SiteName
+	 *  Pointer to a null-terminated string that specifies the name of the site where the returned 
+	 *  domain controller should physically exist. If this parameter is NULL, DsGetDcName attempts 
+	 *  to return a domain controller in the site closest to the site of the computer specified by 
+	 *  ComputerName. This parameter should be NULL, by default.
+	 * @param Flags
+	 *  Contains a set of flags that provide additional data used to process the request.
+	 * @param DomainControllerInfo
+	 *  Pointer to a PDOMAIN_CONTROLLER_INFO value that receives a pointer to a 
+	 *  DOMAIN_CONTROLLER_INFO structure that contains data about the domain controller selected. 
+	 *  This structure is allocated by DsGetDcName. The caller must free the structure using 
+	 *  the NetApiBufferFree function when it is no longer required.
+	 * @return
+	 *  If the function returns domain controller data, the return value is ERROR_SUCCESS.
+	 *  If the function fails, the return code is one of ERROR_* values.
+	 */
+	public int DsGetDcName(String ComputerName, String DomainName, GUID DomainGuid,
+            String SiteName, int Flags, PDOMAIN_CONTROLLER_INFO.ByReference DomainControllerInfo);
+	
+	/**
+	 * The DsGetForestTrustInformationW function obtains forest trust data for a specified domain.
+	 * @param serverName
+	 *  Contains the name of the domain controller that DsGetForestTrustInformationW 
+	 *  is connected to remotely. The caller must be an authenticated user on this server. 
+	 *  If this parameter is NULL, the local server is used.
+	 * @param trustedDomainName
+	 *  Contains the NETBIOS or DNS name of the trusted domain that the forest trust data 
+	 *  is to be retrieved for. This domain must have the TRUST_ATTRIBUTE_FOREST_TRANSITIVE 
+	 *  trust attribute. If this parameter is NULL, the forest trust data for the domain 
+	 *  hosted by ServerName is retrieved.
+	 * @param Flags
+	 *  Contains a set of flags that modify the behavior of this function.
+	 *  DS_GFTI_UPDATE_TDO: If this flag is set, DsGetForestTrustInformationW will update the 
+	 *  forest trust data of the trusted domain identified by the TrustedDomainName parameter. 
+	 * @param ForestTrustInfo
+	 *  Pointer to an LSA_FOREST_TRUST_INFORMATION structure pointer that receives the forest 
+	 *  trust data that describes the namespaces claimed by the domain specified by 
+	 *  TrustedDomainName. The Time member of all returned records will be zero. 
+	 * @return
+	 *  Returns NO_ERROR if successful or a Win32 error code otherwise. 
+	 */
+	public int DsGetForestTrustInformation(String serverName, String trustedDomainName, int Flags, 
+			PLSA_FOREST_TRUST_INFORMATION.ByReference ForestTrustInfo);
+	
+	/**
+	 * The DsEnumerateDomainTrusts function obtains domain trust data for a specified domain.
+	 * @param serverName
+	 *  Pointer to a null-terminated string that specifies the name of a computer in the domain to 
+	 *  obtain the trust information for. This computer must be running the Windows 2000 or later 
+	 *  operating system. If this parameter is NULL, the name of the local computer is used. 
+	 *  The caller must be an authenticated user in this domain.
+	 * @param Flags
+	 *  Contains a set of flags that determines which domain trusts to enumerate.
+	 * @param Domains
+	 *  Receives a pointer which points to an array of DS_DOMAIN_TRUSTS structures. 
+	 *  Each structure in this array contains trust data about a domain. The caller must free this 
+	 *  memory when it is no longer required by calling NetApiBufferFree.
+	 * @param DomainCount
+	 *  Pointer to a ULONG value that receives the number of elements returned in the Domains array.
+	 * @return
+	 *  Returns ERROR_SUCCESS if successful or a Win32 error code otherwise.
+	 */
+	public int DsEnumerateDomainTrusts(String serverName, int Flags, 
+			PointerByReference Domains, IntByReference DomainCount);
+	
+	/**
+	 * The NetUserGetInfo function retrieves information about a particular user account on a server.
+	 * @param servername
+	 * A pointer to a constant string that specifies the DNS or NetBIOS name of the remote server on 
+	 * which the function is to execute. If this parameter is NULL, the local computer is used.
+	 * @param username
+	 * A pointer to a constant string that specifies the name of the user account for which to return information. 
+	 * For more information, see the following Remarks section.
+	 * @param level
+	 * The information level of the data. This parameter can be one of the following values.
+	 * Value Meaning
+	 * 0     Return the user account name. The bufptr parameter points to a USER_INFO_0 structure.
+	 * 1     Return detailed information about the user account. The bufptr parameter points to a USER_INFO_1 structure.
+	 * 2     Return detailed information and additional attributes about the user account. The bufptr parameter points to a USER_INFO_2 structure.
+	 * 3     Return detailed information and additional attributes about the user account. This level is valid only on servers. The bufptr parameter points to a USER_INFO_3 structure. Note that it is recommended that you use USER_INFO_4 instead.
+	 * 4     Return detailed information and additional attributes about the user account. This level is valid only on servers. The bufptr parameter points to a USER_INFO_4 structure. Windows 2000:  This level is not supported.
+	 * 10    Return user and account names and comments. The bufptr parameter points to a USER_INFO_10 structure.
+	 * 11    Return detailed information about the user account. The bufptr parameter points to a USER_INFO_11 structure.
+	 * 20    Return the user's name and identifier and various account attributes. The bufptr parameter points to a USER_INFO_20 structure. Note that on Windows XP and later, it is recommended that you use USER_INFO_23 instead.
+	 * 23    Return the user's name and identifier and various account attributes. The bufptr parameter points to a USER_INFO_23 structure.  Windows 2000:  This level is not supported.
+	 * @param bufptr
+	 * A pointer to the buffer that receives the data. 
+	 * The format of this data depends on the value of the level parameter. 
+	 * This buffer is allocated by the system and must be freed using the NetApiBufferFree function. 
+	 * For more information, see Network Management Function Buffers and Network Management Function Buffer Lengths.
+	 * @return
+	 *  If the function succeeds, the return value is NERR_Success.
+	 */
+	public int NetUserGetInfo( String servername, String username, int level, PointerByReference bufptr );
+	
+}

contrib/platform/src/com/sun/jna/platform/win32/Netapi32Util.java

@@ -0,0 +1,695 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import java.util.ArrayList;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.win32.DsGetDC.DS_DOMAIN_TRUSTS;
+import com.sun.jna.platform.win32.DsGetDC.PDOMAIN_CONTROLLER_INFO;
+import com.sun.jna.platform.win32.Guid.GUID;
+import com.sun.jna.platform.win32.LMAccess.GROUP_USERS_INFO_0;
+import com.sun.jna.platform.win32.LMAccess.LOCALGROUP_INFO_1;
+import com.sun.jna.platform.win32.LMAccess.LOCALGROUP_USERS_INFO_0;
+import com.sun.jna.platform.win32.LMAccess.USER_INFO_23;
+import com.sun.jna.platform.win32.Secur32.EXTENDED_NAME_FORMAT;
+import com.sun.jna.platform.win32.WinNT.PSID;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+
+/**
+ * Netapi32 Utility API.
+ * @author dblock[at]dblock.org
+ */
+public abstract class Netapi32Util {
+	
+    /**
+     * A group.
+     */
+    public static class Group {
+        /**
+         * Group name.
+         */
+        public String name;
+    }
+	
+    /**
+     * A user.
+     */
+    public static class User {
+        /**
+         * The name of the user account. 
+         */
+        public String name;
+        /**
+         * Contains a comment associated with the user account.
+         */
+        public String comment;
+    }
+	
+    public static class UserInfo extends User {
+        /**
+         * The full name belonging to the user account
+         */
+        public String fullName;
+        /**
+         * The SID of the user account
+         */
+        public String sidString;
+        /**
+         * The SID of the user account
+         */
+        public PSID sid;
+        /**
+         * The flags of the user account
+         */
+        public int flags;
+    }
+	
+    /**
+     * A local group.
+     */
+    public static class LocalGroup extends Group {
+        /**
+         * Group comment.
+         */
+        public String comment;
+    }
+	
+    /**
+     * Returns the name of the primary domain controller (PDC) on the current computer.
+     * @return The name of the primary domain controller.
+     */
+    public static String getDCName() {
+        return getDCName(null, null);
+    }
+	
+    /**
+     * Returns the name of the primary domain controller (PDC).
+     * @param serverName 
+     * 	Specifies the DNS or NetBIOS name of the remote server on which the function is 
+     * 	to execute.
+     * @param domainName
+     * 	Specifies the name of the domain.
+     * @return 
+     *  Name of the primary domain controller.
+     */
+    public static String getDCName(String serverName, String domainName) {
+        PointerByReference bufptr = new PointerByReference();
+        try {		
+            int rc = Netapi32.INSTANCE.NetGetDCName(domainName, serverName, bufptr);
+            if (LMErr.NERR_Success != rc) {
+                throw new Win32Exception(rc);
+            }
+            return bufptr.getValue().getString(0, true);
+        } finally {
+            if (W32Errors.ERROR_SUCCESS != Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue())) {
+                throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
+            }
+        }
+    }
+
+    /**
+     * Return the domain/workgroup join status for a computer. 
+     * @return Join status.
+     */
+    public static int getJoinStatus() {
+        return getJoinStatus(null);
+    }
+	
+    /**
+     * Return the domain/workgroup join status for a computer. 
+     * @param computerName Computer name.
+     * @return Join status.
+     */
+    public static int getJoinStatus(String computerName) {
+        PointerByReference lpNameBuffer = new PointerByReference();
+        IntByReference bufferType = new IntByReference();
+		
+        try {
+            int rc = Netapi32.INSTANCE.NetGetJoinInformation(computerName, lpNameBuffer, bufferType);
+            if (LMErr.NERR_Success != rc) {
+                throw new Win32Exception(rc);			
+            }
+            return bufferType.getValue();
+        } finally {
+            if (lpNameBuffer.getPointer() != null) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(lpNameBuffer.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);			
+                }
+            }
+        }		
+    }
+	
+    /**
+     * Get information about a computer.
+     * @param computerName
+     * @return Domain or workgroup name.
+     */
+    public static String getDomainName(String computerName) {
+        PointerByReference lpNameBuffer = new PointerByReference();
+        IntByReference bufferType = new IntByReference();
+		
+        try {
+            int rc = Netapi32.INSTANCE.NetGetJoinInformation(computerName, lpNameBuffer, bufferType);
+            if (LMErr.NERR_Success != rc) {
+                throw new Win32Exception(rc);			
+            }		
+            // type of domain: bufferType.getValue()
+            return lpNameBuffer.getValue().getString(0, true);
+        } finally {
+            if (lpNameBuffer.getPointer() != null) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(lpNameBuffer.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);			
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the names of local groups on the current computer.
+     * @return An array of local group names.
+     */
+    public static LocalGroup[] getLocalGroups() {
+        return getLocalGroups(null);
+    }
+		
+    /**
+     * Get the names of local groups on a computer.
+     * @param serverName Name of the computer.
+     * @return An array of local group names.
+     */
+    public static LocalGroup[] getLocalGroups(String serverName) {
+        PointerByReference bufptr = new PointerByReference();
+        IntByReference entriesRead = new IntByReference();
+        IntByReference totalEntries = new IntByReference();		
+        try {
+            int rc = Netapi32.INSTANCE.NetLocalGroupEnum(serverName, 1, bufptr, LMCons.MAX_PREFERRED_LENGTH, entriesRead, totalEntries, null);
+            if (LMErr.NERR_Success != rc || bufptr.getValue() == Pointer.NULL) {
+                throw new Win32Exception(rc);
+            }
+            LMAccess.LOCALGROUP_INFO_1 group = new LMAccess.LOCALGROUP_INFO_1(bufptr.getValue());
+            LMAccess.LOCALGROUP_INFO_1[] groups = (LOCALGROUP_INFO_1[]) group.toArray(entriesRead.getValue());
+			
+            ArrayList<LocalGroup> result = new ArrayList<LocalGroup>(); 
+            for(LOCALGROUP_INFO_1 lgpi : groups) {
+                LocalGroup lgp = new LocalGroup();
+                if (lgpi.lgrui1_name != null) {
+                	lgp.name = lgpi.lgrui1_name.toString();
+                }
+                if (lgpi.lgrui1_comment != null) {
+                	lgp.comment = lgpi.lgrui1_comment.toString();
+                }
+                result.add(lgp);
+            }
+            return result.toArray(new LocalGroup[0]);
+        } finally {			
+            if (bufptr.getValue() != Pointer.NULL) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the names of global groups on a computer.
+     * @return An array of group names.
+     */
+    public static Group[] getGlobalGroups() {
+        return getGlobalGroups(null);
+    }
+	
+    /**
+     * Get the names of global groups on a computer.
+     * @param serverName Name of the computer.
+     * @return An array of group names.
+     */
+    public static Group[] getGlobalGroups(String serverName) {
+        PointerByReference bufptr = new PointerByReference();
+        IntByReference entriesRead = new IntByReference();
+        IntByReference totalEntries = new IntByReference();		
+        try {
+            int rc = Netapi32.INSTANCE.NetGroupEnum(serverName, 1, bufptr, 
+                                                    LMCons.MAX_PREFERRED_LENGTH, entriesRead, 
+                                                    totalEntries, null);
+            if (LMErr.NERR_Success != rc || bufptr.getValue() == Pointer.NULL) {
+                throw new Win32Exception(rc);
+            }
+            LMAccess.GROUP_INFO_1 group = new LMAccess.GROUP_INFO_1(bufptr.getValue());
+            LMAccess.GROUP_INFO_1[] groups = (LMAccess.GROUP_INFO_1[]) group.toArray(entriesRead.getValue());
+			
+            ArrayList<LocalGroup> result = new ArrayList<LocalGroup>(); 
+            for(LMAccess.GROUP_INFO_1 lgpi : groups) {
+                LocalGroup lgp = new LocalGroup();
+                if (lgpi.grpi1_name != null) {
+                	lgp.name = lgpi.grpi1_name.toString();
+                }
+                if (lgpi.grpi1_comment != null) {
+                	lgp.comment = lgpi.grpi1_comment.toString();
+                }
+                result.add(lgp);
+            }
+            return result.toArray(new LocalGroup[0]);
+        } finally {			
+            if (bufptr.getValue() != Pointer.NULL) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);
+                }
+            }
+        }
+    }
+	
+    /**
+     * Get the names of users on a local computer.
+     * @return Users.
+     */
+    public static User[] getUsers() {
+        return getUsers(null);
+    }
+
+    /**
+     * Get the names of users on a computer.
+     * @param serverName Name of the computer.
+     * @return An array of users.
+     */
+    public static User[] getUsers(String serverName) {
+        PointerByReference bufptr = new PointerByReference();
+        IntByReference entriesRead = new IntByReference();
+        IntByReference totalEntries = new IntByReference();		
+        try {
+            int rc = Netapi32.INSTANCE.NetUserEnum(
+            		serverName, 1, 0, bufptr, 
+                    LMCons.MAX_PREFERRED_LENGTH, entriesRead, 
+                    totalEntries, null);
+            if (LMErr.NERR_Success != rc || bufptr.getValue() == Pointer.NULL) {
+                throw new Win32Exception(rc);
+            }
+            LMAccess.USER_INFO_1 user = new LMAccess.USER_INFO_1(bufptr.getValue());
+            LMAccess.USER_INFO_1[] users = (LMAccess.USER_INFO_1[]) user.toArray(entriesRead.getValue());
+            ArrayList<User> result = new ArrayList<User>(); 
+            for(LMAccess.USER_INFO_1 lu : users) {
+                User auser = new User();
+                if (lu.usri1_name != null) {
+                	auser.name = lu.usri1_name.toString();
+                }
+                result.add(auser);
+            }
+            return result.toArray(new User[0]);
+        } finally {			
+            if (bufptr.getValue() != Pointer.NULL) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);
+                }
+            }
+        }
+    }
+	
+    /**
+     * Get local groups of the current user.
+     * @return Local groups.
+     */
+    public static Group[] getCurrentUserLocalGroups() {
+        return getUserLocalGroups(Secur32Util.getUserNameEx(EXTENDED_NAME_FORMAT.NameSamCompatible));
+    }
+	
+    /**
+     * Get local groups of a given user.
+     * @param userName User name.
+     * @return Local groups.
+     */
+    public static Group[] getUserLocalGroups(String userName) {
+        return getUserLocalGroups(userName, null);
+    }
+	
+    /**
+     * Get local groups of a given user on a given system.
+     * @param userName User name.
+     * @param serverName Server name.
+     * @return Local groups.
+     */
+    public static Group[] getUserLocalGroups(String userName, String serverName) {
+    	PointerByReference bufptr = new PointerByReference();
+    	IntByReference entriesread = new IntByReference();
+    	IntByReference totalentries = new IntByReference();
+    	try {
+            int rc = Netapi32.INSTANCE.NetUserGetLocalGroups(
+            		serverName, userName, 
+                    0, 0, bufptr, LMCons.MAX_PREFERRED_LENGTH, entriesread, totalentries);
+            if (rc != LMErr.NERR_Success) {
+                throw new Win32Exception(rc);
+            }
+            LOCALGROUP_USERS_INFO_0 lgroup = new LOCALGROUP_USERS_INFO_0(bufptr.getValue());    	
+            LOCALGROUP_USERS_INFO_0[] lgroups = (LOCALGROUP_USERS_INFO_0[]) lgroup.toArray(entriesread.getValue());
+            ArrayList<Group> result = new ArrayList<Group>(); 
+            for (LOCALGROUP_USERS_INFO_0 lgpi : lgroups) {
+                LocalGroup lgp = new LocalGroup();
+                if (lgpi.lgrui0_name != null) {
+                	lgp.name = lgpi.lgrui0_name.toString();
+                }
+                result.add(lgp);
+            }
+            return result.toArray(new Group[0]);
+    	} finally {
+            if (bufptr.getValue() != Pointer.NULL) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);
+                }
+            }
+    	}
+    }
+	
+    /**
+     * Get groups of a given user.
+     * @param userName User name.
+     * @return Groups.
+     */
+    public static Group[] getUserGroups(String userName) {
+        return getUserGroups(userName, null);
+    }
+	
+    /**
+     * Get groups of a given user on a given system.
+     * @param userName User name.
+     * @param serverName Server name.
+     * @return Groups.
+     */
+    public static Group[] getUserGroups(String userName, String serverName) {
+    	PointerByReference bufptr = new PointerByReference();
+    	IntByReference entriesread = new IntByReference();
+    	IntByReference totalentries = new IntByReference();
+    	try {
+            int rc = Netapi32.INSTANCE.NetUserGetGroups(
+            		serverName, userName, 
+                    0, bufptr, LMCons.MAX_PREFERRED_LENGTH, entriesread, totalentries);
+            if (rc != LMErr.NERR_Success) {
+                throw new Win32Exception(rc);
+            }
+            GROUP_USERS_INFO_0 lgroup = new GROUP_USERS_INFO_0(bufptr.getValue());    	
+            GROUP_USERS_INFO_0[] lgroups = (GROUP_USERS_INFO_0[]) lgroup.toArray(entriesread.getValue());
+            ArrayList<Group> result = new ArrayList<Group>(); 
+            for (GROUP_USERS_INFO_0 lgpi : lgroups) {
+                Group lgp = new Group();
+                if (lgpi.grui0_name != null) {
+                	lgp.name = lgpi.grui0_name.toString();
+                }
+                result.add(lgp);
+            }
+            return result.toArray(new Group[0]);
+    	} finally {
+            if (bufptr.getValue() != Pointer.NULL) {
+                int rc = Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+                if (LMErr.NERR_Success != rc) {
+                    throw new Win32Exception(rc);
+                }
+            }
+    	}
+    }	
+	
+    /**
+     * A domain controller.
+     */
+    public static class DomainController {
+        /**
+         * Specifies the computer name of the discovered domain controller.
+         */
+        public String name;
+        /**
+         * Specifies the address of the discovered domain controller.
+         */
+        public String address;
+        /**
+         * Indicates the type of string that is contained in the 
+         * DomainControllerAddress member.
+         */
+        public int addressType;
+        /**
+         * The GUID of the domain.
+         */
+        public GUID domainGuid;
+        /**
+         * Pointer to a null-terminated string that specifies the name of the domain. 
+         */
+        public String domainName;
+        /**
+         * Pointer to a null-terminated string that specifies the name of the domain at the root 
+         * of the DS tree.
+         */
+        public String dnsForestName;
+        /**
+         * Contains a set of flags that describe the domain controller. 
+         */
+        public int flags;
+        /**
+         * The name of the site that the computer belongs to.
+         */
+        public String clientSiteName;
+    }
+	
+    /**
+     * Return the domain controller for a current computer.
+     * @return
+     *  Domain controller information.
+     */
+    public static DomainController getDC() {
+        PDOMAIN_CONTROLLER_INFO.ByReference pdci = new PDOMAIN_CONTROLLER_INFO.ByReference();
+        int rc = Netapi32.INSTANCE.DsGetDcName(null, null, null, null, 0, pdci);
+    	if (W32Errors.ERROR_SUCCESS != rc) {
+            throw new Win32Exception(rc);
+    	}
+    	DomainController dc = new DomainController();
+    	if (pdci.dci.DomainControllerAddress != null) {
+    		dc.address = pdci.dci.DomainControllerAddress.toString();
+    	}
+    	dc.addressType = pdci.dci.DomainControllerAddressType;
+    	if (pdci.dci.ClientSiteName != null) {
+    		dc.clientSiteName = pdci.dci.ClientSiteName.toString();
+    	}
+    	if (pdci.dci.DnsForestName != null) {
+    		dc.dnsForestName = pdci.dci.DnsForestName.toString();
+    	}
+    	dc.domainGuid = pdci.dci.DomainGuid;
+    	if (pdci.dci.DomainName != null) {
+    		dc.domainName = pdci.dci.DomainName.toString();
+    	}
+    	dc.flags = pdci.dci.Flags;
+    	if (pdci.dci.DomainControllerName != null) {
+    		dc.name = pdci.dci.DomainControllerName.toString();
+    	}
+        rc = Netapi32.INSTANCE.NetApiBufferFree(pdci.dci.getPointer());
+        if (LMErr.NERR_Success != rc) {
+            throw new Win32Exception(rc);
+        }
+        return dc;
+    }
+	
+    /**
+     * A domain trust relationship.
+     */
+    public static class DomainTrust {
+        /**
+         * NetBIOS name of the domain.
+         */
+        public String NetbiosDomainName;
+        /**
+         * DNS name of the domain.
+         */
+        public String DnsDomainName;
+        /**
+         * Contains the security identifier of the domain represented by this structure.
+         */
+        public PSID DomainSid;
+        /**
+         * Contains the string representation of the security identifier of the domain 
+         * represented by this structure.
+         */
+        public String DomainSidString;
+        /**
+         * Contains the GUID of the domain represented by this structure.
+         */
+        public GUID DomainGuid;
+        /**
+         * Contains the string representation of the GUID of the domain represented by 
+         * this structure.
+         */	
+        public String DomainGuidString;
+		
+        /**
+         * Contains a set of flags that specify more data about the domain trust.
+         */
+        private int flags;
+		
+        /**
+         * The domain represented by this structure is a member of the same forest 
+         * as the server specified in the ServerName parameter of the 
+         * DsEnumerateDomainTrusts function.
+         * @return
+         *  True or false.
+         */
+        public boolean isInForest() { 
+            return (flags & DsGetDC.DS_DOMAIN_IN_FOREST) != 0; 
+        }
+		
+        /**
+         * The domain represented by this structure is directly trusted by the domain
+         * that the server specified in the ServerName parameter of the 
+         * DsEnumerateDomainTrusts function is a member of.
+         * @return
+         *  True or false.
+         */
+        public boolean isOutbound() { 
+            return (flags & DsGetDC.DS_DOMAIN_DIRECT_OUTBOUND) != 0; 
+        }
+		
+        /**
+         * The domain represented by this structure is the root of a tree and a member 
+         * of the same forest as the server specified in the ServerName parameter of the
+         * DsEnumerateDomainTrusts function.
+         * @return
+         *  True or false.
+         */
+        public boolean isRoot() { 
+            return (flags & DsGetDC.DS_DOMAIN_TREE_ROOT) != 0; 
+        }
+	
+        /**
+         * The domain represented by this structure is the primary domain of the server
+         * specified in the ServerName parameter of the DsEnumerateDomainTrusts function.
+         * @return
+         *  True or false.
+         */
+        public boolean isPrimary() { 
+            return (flags & DsGetDC.DS_DOMAIN_PRIMARY) != 0; 
+        }
+		
+        /**
+         * The domain represented by this structure is running in the Windows 2000 native mode.
+         * @return
+         *  True or false.
+         */
+        public boolean isNativeMode() {
+            return (flags & DsGetDC.DS_DOMAIN_NATIVE_MODE) != 0; 
+        }
+		
+        /**
+         * The domain represented by this structure directly trusts the domain that
+         * the server specified in the ServerName parameter of the DsEnumerateDomainTrusts
+         * function is a member of.
+         * @return
+         *  True or false.
+         */
+        public boolean isInbound() { 
+            return (flags & DsGetDC.DS_DOMAIN_DIRECT_INBOUND) != 0; 
+        }		
+    }
+	
+    /**
+     * Retrieve all domain trusts.
+     * @return
+     *  An array of domain trusts.
+     */
+    public static DomainTrust[] getDomainTrusts() {
+        return getDomainTrusts(null);
+    }
+	
+    /**
+     * Retrieve all domain trusts for a given server.
+     * @param serverName
+     *  Server name.
+     * @return
+     *  An array of domain trusts.
+     */
+    public static DomainTrust[] getDomainTrusts(String serverName) {
+    	IntByReference domainCount = new IntByReference();
+        PointerByReference domainsPointerRef = new PointerByReference();
+        int rc = Netapi32.INSTANCE.DsEnumerateDomainTrusts(serverName, 
+                DsGetDC.DS_DOMAIN_VALID_FLAGS, domainsPointerRef, domainCount);
+    	if(W32Errors.NO_ERROR != rc) {
+            throw new Win32Exception(rc);
+    	}
+    	try {
+            DS_DOMAIN_TRUSTS domains = new DS_DOMAIN_TRUSTS(domainsPointerRef.getValue());
+            int domainCountValue = domainCount.getValue();
+            ArrayList<DomainTrust> trusts = new ArrayList<DomainTrust>(domainCountValue);
+            for(DS_DOMAIN_TRUSTS trust : (DS_DOMAIN_TRUSTS[]) domains.toArray(new DS_DOMAIN_TRUSTS[domainCountValue])) {
+                DomainTrust t = new DomainTrust();
+                if (trust.DnsDomainName != null) {
+                	t.DnsDomainName = trust.DnsDomainName.toString();
+                }
+                if (trust.NetbiosDomainName != null) {
+                	t.NetbiosDomainName = trust.NetbiosDomainName.toString();
+                }
+                t.DomainSid = trust.DomainSid;
+                if (trust.DomainSid != null) {
+                	t.DomainSidString = Advapi32Util.convertSidToStringSid(trust.DomainSid);
+                }
+                t.DomainGuid = trust.DomainGuid;
+                if (trust.DomainGuid != null) {
+                	t.DomainGuidString = Ole32Util.getStringFromGUID(trust.DomainGuid);
+                }
+                t.flags = trust.Flags;
+                trusts.add(t);
+            }
+            return trusts.toArray(new DomainTrust[0]);
+    	} finally {
+            rc = Netapi32.INSTANCE.NetApiBufferFree(domainsPointerRef.getValue());
+            if(W32Errors.NO_ERROR != rc) {
+                throw new Win32Exception(rc);
+            }
+    	}
+    }
+	
+    public static UserInfo getUserInfo(String accountName) {
+        return getUserInfo(accountName, Netapi32Util.getDCName());
+    }
+	
+    public static UserInfo getUserInfo(String accountName, String domainName) {
+        PointerByReference bufptr = new PointerByReference();
+        int rc = -1;
+        try {
+            rc = Netapi32.INSTANCE.NetUserGetInfo(domainName, accountName, (short)23, bufptr);
+            if (rc == LMErr.NERR_Success) {
+                USER_INFO_23 info_23 = new USER_INFO_23(bufptr.getValue());
+                UserInfo userInfo = new UserInfo();
+                if (info_23.usri23_comment != null) {
+                	userInfo.comment = info_23.usri23_comment.toString();
+                }
+                userInfo.flags = info_23.usri23_flags;
+                if (info_23.usri23_full_name != null) {
+                	userInfo.fullName = info_23.usri23_full_name.toString();
+                }
+                if (info_23.usri23_name != null) {
+                	userInfo.name = info_23.usri23_name.toString();
+                }
+                if (info_23.usri23_user_sid != null) {
+                	userInfo.sidString = Advapi32Util.convertSidToStringSid(info_23.usri23_user_sid);
+                }
+                userInfo.sid = info_23.usri23_user_sid;
+                return userInfo;
+            } else {
+                throw new Win32Exception(rc);
+            }
+        } finally {
+            if (bufptr.getValue() != Pointer.NULL) {
+                Netapi32.INSTANCE.NetApiBufferFree(bufptr.getValue());
+            }
+        }
+    }
+
+}

contrib/platform/src/com/sun/jna/platform/win32/NtDll.java

@@ -0,0 +1,55 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Structure;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * ntdll.dll Interface.
+ * @author dblock[at]dblock.org
+ */
+public interface NtDll extends StdCallLibrary {
+	
+	NtDll INSTANCE = (NtDll) Native.loadLibrary("NtDll",
+			NtDll.class, W32APIOptions.UNICODE_OPTIONS);
+
+	/**
+	 * The ZwQueryKey routine provides information about the class of a registry key, 
+	 * and the number and sizes of its subkeys.
+	 * @param KeyHandle
+	 *  Handle to the registry key to obtain information about. This handle is created by 
+	 *  a successful call to ZwCreateKey or ZwOpenKey. 
+	 * @param KeyInformationClass
+	 *  Specifies a KEY_INFORMATION_CLASS value that determines the type of information 
+	 *  returned in the KeyInformation buffer. 
+	 * @param KeyInformation
+	 *  Pointer to a caller-allocated buffer that receives the requested information.
+	 * @param Length
+	 *  Specifies the size, in bytes, of the KeyInformation buffer. 
+	 * @param ResultLength
+	 *  Pointer to a variable that receives the size, in bytes, of the requested key 
+	 *  information. If ZwQueryKey returns STATUS_SUCCESS, the variable contains the amount 
+	 *  of data returned. If ZwQueryKey returns STATUS_BUFFER_OVERFLOW or 
+	 *  STATUS_BUFFER_TOO_SMALL, you can use the value of the variable to determine the 
+	 *  required buffer size. 
+	 * @return
+	 *  ZwQueryKey returns STATUS_SUCCESS on success, or the appropriate error code on failure.
+	 */
+	public int ZwQueryKey(HANDLE KeyHandle, int KeyInformationClass,
+			Structure KeyInformation, int Length, IntByReference ResultLength);
+}

contrib/platform/src/com/sun/jna/platform/win32/NtDllUtil.java

@@ -0,0 +1,47 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.platform.win32.Wdm.KEY_BASIC_INFORMATION;
+import com.sun.jna.platform.win32.Wdm.KEY_INFORMATION_CLASS;
+import com.sun.jna.platform.win32.WinReg.HKEY;
+import com.sun.jna.ptr.IntByReference;
+
+/**
+ * NtDll Utility API.
+ * @author dblock[at]dblock.org
+ */
+public abstract class NtDllUtil {
+	
+	/**
+	 * Retrieve the name of an opened registry key.
+	 * @param hkey Opened registry key.
+	 * @return Basic key name, not including node information.
+	 */
+	public static String getKeyName(HKEY hkey) {
+    	IntByReference resultLength = new IntByReference();    	
+    	int rc = NtDll.INSTANCE.ZwQueryKey(hkey, KEY_INFORMATION_CLASS.KeyBasicInformation, 
+    			null, 0, resultLength);
+    	if (rc != NTStatus.STATUS_BUFFER_TOO_SMALL || resultLength.getValue() <= 0) {
+    		throw new Win32Exception(rc);
+    	}    	
+    	KEY_BASIC_INFORMATION keyInformation = new KEY_BASIC_INFORMATION(
+    			resultLength.getValue());
+    	rc = NtDll.INSTANCE.ZwQueryKey(hkey, KEY_INFORMATION_CLASS.KeyBasicInformation,
+    			keyInformation, resultLength.getValue(), resultLength);
+    	if (rc != NTStatus.STATUS_SUCCESS) {
+    		throw new Win32Exception(rc);
+    	}    	
+    	return keyInformation.getName();
+	}
+}

contrib/platform/src/com/sun/jna/platform/win32/ObjBase.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010 Digital Rapids Corp.
+ */
+
+/* Copyright (c) 2010 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.
+ *
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.platform.win32.WTypes;
+
+/**
+ * Definitions from ObjBase.h
+ * @author scott.palmer
+ */
+public interface ObjBase {
+
+    int CLSCTX_INPROC = (WTypes.CLSCTX_INPROC_SERVER | WTypes.CLSCTX_INPROC_HANDLER);
+    
+    // With DCOM, CLSCTX_REMOTE_SERVER should be included
+    int CLSCTX_ALL = (WTypes.CLSCTX_INPROC_SERVER
+                      | WTypes.CLSCTX_INPROC_HANDLER
+                      | WTypes.CLSCTX_LOCAL_SERVER
+                      | WTypes.CLSCTX_REMOTE_SERVER);
+
+    int CLSCTX_SERVER = (WTypes.CLSCTX_INPROC_SERVER
+                         | WTypes.CLSCTX_LOCAL_SERVER
+                         | WTypes.CLSCTX_REMOTE_SERVER);
+}

contrib/platform/src/com/sun/jna/platform/win32/Ole32.java

@@ -0,0 +1,106 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.win32.Guid.GUID;
+import com.sun.jna.platform.win32.WinNT.HRESULT;
+import com.sun.jna.ptr.PointerByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * Ole32.dll Interface.
+ * @author dblock[at]dblock.org
+ */
+public interface Ole32 extends StdCallLibrary {
+	
+	Ole32 INSTANCE = (Ole32) Native.loadLibrary(
+			"Ole32", Ole32.class, W32APIOptions.UNICODE_OPTIONS);
+	
+	/**
+	 * Creates a GUID, a unique 128-bit integer used for CLSIDs and interface identifiers. 
+	 * @param pguid
+	 *  A pointer to the requested GUID.
+	 * @return
+	 *  S_OK if the GUID was successfully created.
+	 */
+	HRESULT CoCreateGuid(GUID.ByReference pguid);
+	
+	/**
+	 * Converts a globally unique identifier (GUID) into a string of printable characters. 
+	 * @param rguid
+	 *  The GUID to be converted.
+	 * @param lpsz
+	 *  A pointer to a caller-allocated string variable to receive the resulting string.
+	 * @param cchMax
+	 *  The number of characters available in the lpsz buffer. 
+	 * @return
+	 *  If the function succeeds, the return value is the number of characters in the 
+	 *  returned string, including the null terminator. If the buffer is too small to contain 
+	 *  the string, the return value is 0.
+	 */
+	int StringFromGUID2(GUID.ByReference rguid, char[] lpsz, int cchMax);
+	
+	/**
+	 * Converts a string generated by the StringFromIID function back into the 
+	 * original interface identifier (IID).
+	 * @param lpsz
+	 *  A pointer to the string representation of the IID.
+	 * @param lpiid
+	 *  A pointer to the requested IID on return.
+	 * @return
+	 *  This function can return the standard return values E_INVALIDARG, E_OUTOFMEMORY, 
+	 *  and S_OK.
+	 */
+	HRESULT IIDFromString(String lpsz, GUID.ByReference lpiid);
+
+    /**
+     * Initializes the COM library for use by the calling thread, sets the thread's
+     * concurrency model, and creates a new apartment for the thread if one is required.
+     * @param reserved This parameter is reserved and must be NULL.
+     * @param dwCoInit The concurrency model and initialization options for the
+     * thread. Values for this parameter are taken from the COINIT enumeration.
+     * Any combination of values from COINIT can be used, except that the
+     * COINIT_APARTMENTTHREADED and COINIT_MULTITHREADED flags cannot both be
+     * set. The default (and only sane choice) is COINIT_MULTITHREADED.
+     * @return This function can return the standard return values E_INVALIDARG, E_OUTOFMEMORY, and E_UNEXPECTED, as well as the following values. S_OK, S_FALSE, RPC_E_CHANGED_MODE
+     */
+    HRESULT CoInitializeEx(Pointer reserved, int dwCoInit);
+    
+    /**
+     * Closes the COM library on the current thread, unloads all DLLs loaded by
+     * the thread, frees any other resources that the thread maintains, and
+     * forces all RPC connections on the thread to close.
+     * 
+     */
+    void CoUninitialize();
+
+    /**
+     * Creates a single uninitialized object of the class associated with a specified CLSID.
+     * @param rclsid The CLSID associated with the data and code that will be used to create the object.
+     * @param pUnkOuter If NULL, indicates that the object is not being created as part of an aggregate. If non-NULL, pointer to the aggregate object's IUnknown interface (the controlling IUnknown).
+     * @param dwClsContext Context in which the code that manages the newly created object will run. The values are taken from the enumeration CLSCTX defined in WTypes.
+     * @param riid A reference to the identifier of the interface to be used to communicate with the object.
+     * @param ppv Address of pointer variable that receives the interface pointer requested in riid. Upon successful return, *ppv contains the requested interface pointer. Upon failure, *ppv contains NULL.
+     * @return an HRESULT
+     */
+    HRESULT CoCreateInstance(
+            GUID rclsid,
+            Pointer pUnkOuter,
+            int dwClsContext,
+            GUID riid,
+            PointerByReference ppv);
+
+}

contrib/platform/src/com/sun/jna/platform/win32/Ole32Util.java

@@ -0,0 +1,73 @@
+/* Copyright (c) 2010 Daniel Doubrovkine, 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.platform.win32.Guid.GUID;
+import com.sun.jna.platform.win32.WinNT.HRESULT;
+
+/**
+ * Ole32 Utility API.
+ * @author dblock[at]dblock.org
+ */
+public abstract class Ole32Util {
+	
+	/**
+	 * Convert a string to a GUID.
+	 * @param guidString
+	 *  String representation of a GUID, including { }.
+	 * @return
+	 *  A GUID.
+	 */
+	public static GUID getGUIDFromString(String guidString) {
+		GUID.ByReference lpiid = new GUID.ByReference();
+    	HRESULT hr = Ole32.INSTANCE.IIDFromString(guidString, lpiid);
+    	if (! hr.equals(W32Errors.S_OK)) {
+    		throw new RuntimeException(hr.toString());
+    	}
+    	return lpiid;
+	}
+	
+	/**
+	 * Convert a GUID into a string.
+	 * @param guid
+	 *  GUID.
+	 * @return
+	 *  String representation of a GUID.
+	 */
+	public static String getStringFromGUID(GUID guid) {
+		GUID.ByReference pguid = new GUID.ByReference(guid.getPointer());
+    	int max = 39;
+    	char[] lpsz = new char[max];
+    	int len = Ole32.INSTANCE.StringFromGUID2(pguid, lpsz, max);
+    	if (len == 0) {
+    		throw new RuntimeException("StringFromGUID2");
+    	}
+    	lpsz[len - 1] = 0;    	
+    	return Native.toString(lpsz);
+	}
+	
+	/**
+	 * Generate a new GUID.
+	 * @return
+	 *  New GUID.
+	 */
+	public static GUID generateGUID() {
+		GUID.ByReference pguid = new GUID.ByReference();
+    	HRESULT hr = Ole32.INSTANCE.CoCreateGuid(pguid);
+    	if (! hr.equals(W32Errors.S_OK)) {
+    		throw new RuntimeException(hr.toString());
+    	}
+    	return pguid;
+	}
+}

contrib/platform/src/com/sun/jna/platform/win32/Oleaut32.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010 Digital Rapids Corp., All rights reserved.
+ */
+
+/* Copyright (c) 2010 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.
+ * 
+ * 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 com.sun.jna.platform.win32;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * Oleaut32.dll Interface.
+ * @author scott.palmer
+ */
+public interface Oleaut32 extends StdCallLibrary {
+	
+    Oleaut32 INSTANCE = (Oleaut32) Native.loadLibrary(
+			"Oleaut32", Oleaut32.class, W32APIOptions.UNICODE_OPTIONS);
+
+    /**
+     * This function allocates a new string and copies the passed string into it. 
+     * @param sz 
+     * 	Null-terminated UNICODE string to copy. 
+     * @return
+     *  Null if there is insufficient memory or if a null pointer is passed in.
+     */
+    Pointer SysAllocString(String sz);
+    
+    /**
+     * This function frees a string allocated previously by SysAllocString, 
+     * SysAllocStringByteLen, SysReAllocString, SysAllocStringLen, or 
+     * SysReAllocStringLen.
+     * @param bstr
+     *  Unicode string that was allocated previously, or NULL. Setting this parameter 
+     *  to NULL causes the function to simply return.
+     */
+    void SysFreeString(Pointer bstr);
+}