For some reason, depenency version on jna didn't get updated in pom-platform.xml, so update now

Release 3.5.1 - dist jars, etc.

.classpath

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

.gitignore

@@ -0,0 +1,17 @@
+build
+build-d64
+build.eclipse
+build.number
+.metadata
+.DS_Store
+bin
+contrib/ntservice/dist
+contrib/platform/dist
+doc
+*~
+**/*~
+dist/*.asc
+dist/*-sources.jar
+dist/*-javadoc.jar
+dist/src-mvn.zip
+dist/out-of-date.jar

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jna</name>
+	<name>jnalib</name>
 	<comment></comment>
 	<projects>
 	</projects>

CHANGES.md

@@ -0,0 +1,602 @@
+Release 3.5.1
+====================
+
+Bug Fixes
+---------
+* [#145](https://github.com/twall/jna/pull/145): Fix `Netapi32Util.getDomainTrusts()` returns "empty" domain object - [@aikidojohn](https://github.com/aikidojohn).
+* [#145](https://github.com/twall/jna/pull/145): Fix `Netapi32.getDC()` - added missing fields in `DOMAIN_CONTROLLER_INFO` - [@aikidojohn](https://github.com/aikidojohn).
+* [#151] 'platform.jar' in the dist directory was not updated for release 3.5.0. (The 'platform.jar' published to maven central was correct.)
+
+Release 3.5.0
+=============
+
+Features
+--------
+* `Structure.getFieldOrder()` supersedes `Structure.setFieldOrder()` and is now required - [@twall](https://github.com/twall).
+* Search `~/Library/Frameworks` and `/Library/Frameworks` on OSX - [@shaneholloway](https://github.com/shaneholloway).
+* Automatic cleanup of native threads (based on suggestions from neil smith) - [@twall](https://github.com/twall).
+* Add `android-arm` target - [@ochafik](https://github.com/ochafik), [@twall](https://github.com/twall).
+* Add `jna.tmpdir` to override temporary JNA storage location - [@twall](https://github.com/twall).
+* Add `EXTRA_MAKE_OPTS` ant property to override make variables - [@twall](https://github.com/twall).
+* Add `Library.OPTION_OPEN_FLAGS` to customize dlopen behavior - [@twall](https://github.com/twall).
+* [#113](https://github.com/twall/jna/issues/113), [#114](https://github.com/twall/jna/issues/114): Add support for GNU/kFreeBSD and debian multi-arch distros - [@twall](https://github.com/twall).
+
+Bug Fixes
+---------
+* Fix `Advapi32Util.registryGetValues()` tried to allocate memory for a zero-length `REG_BINARY` value - [@phailwhale22](https://github.com/phailwhale22).
+* Fix crash in direct mode callbacks with certain type conversions - [@twall](https://github.com/twall).
+* More thoroughly propagate unexpected exceptions generated in jnidispatch - [@twall](https://github.com/twall).
+* Cleanup maven poms and publishing to central repo - [@bhamail](https://github.com/bhamail).
+* [#129](https://github.com/twall/jna/issues/129): Allow `Memory` field in structure - [@twall](https://github.com/twall).
+* Preserve `PointerType` fields on `Structure.read()` if unchanged - [@twall](https://github.com/twall).
+* [#128](https://github.com/twall/jna/issues/128): Fix masking extracting DWORD upper and lower WORD values - [@twall](https://github.com/twall).
+* [#135](https://github.com/twall/jna/issues/135): Fix for `Advapi32Util.registryGetValues()` when reading zero length values - [@danwi](https://github.com/danwi).
+
+Release 3.4.2
+=============
+
+Features
+--------
+* Add `platform.win32.Kernel32.GetEnvironmentVariable` and `platform.win32.Kernel32Util.getEnvironmentVariable` - [@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 - [@twall](https://github.com/twall).
+* Provide `ant -Dheadless=true` to run unit tests headless - [@twall](https://github.com/twall).
+* Added Windows dev environment instructions - [@twall](https://github.com/twall).
+
+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,112 @@
+![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.5.1/javadoc/).  Please read the [overview](http://twall.github.com/jna/3.5.1/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.5.1
+
+* [jna.jar](jna/blob/3.5.1/dist/jna.jar?raw=true)
+* [platform.jar](jna/blob/3.5.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/examples](https://github.com/twall/jna/tree/master/contrib)
+* 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 to 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](https://github.com/twall/jna/blob/master/www/GettingStarted.md)
+* [Mapping between Java and Native](https://github.com/twall/jna/blob/master/www/Mappings.md)
+* [Using Pointers and Arrays](https://github.com/twall/jna/blob/master/www/PointersAndArrays.md)
+* [Using Structures and Unions](https://github.com/twall/jna/blob/master/www/StructuresAndUnions.md)
+* [Using By-Reference Arguments](https://github.com/twall/jna/blob/master/www/ByRefArguments.md)
+* [Customization of Type Mapping](https://github.com/twall/jna/blob/master/www/CustomMappings.md)
+* [Callbacks/Function Pointers/Closures](https://github.com/twall/jna/blob/master/www/CallbacksAndClosures.md)
+* [Dynamically Typed Languages (JRuby/Jython)](https://github.com/twall/jna/blob/master/www/DynamicallyTypedLanguages.md)
+* [Platform Library](https://github.com/twall/jna/blob/master/www/PlatformLibrary.md)
+* [Direct Method Mapping](https://github.com/twall/jna/blob/master/www/DirectMapping.md) (Optimization)
+* [Frequently Asked Questions (FAQ)](https://github.com/twall/jna/blob/master/www/FrequentlyAskedQuestions.md)
+* [Avoiding Crashes](http://twall.github.com/jna/3.5.1/javadoc/overview-summary.html#crash-protection)
+
+Primary Documentation (JavaDoc)
+===============================
+
+The definitive JNA reference is in the [JavaDoc](http://twall.github.com/jna/3.5.1/javadoc/).
+
+Developers
+==========
+
+* [Contributing to JNA](https://github.com/twall/jna/blob/master/www/Contributing.md).
+* [Setting up a Windows Development Environment](https://github.com/twall/jna/blob/master/www/WindowsDevelopmentEnvironment.md)
+* [Setting up an Android Development Environment](https://github.com/twall/jna/blob/master/www/AndroidDevelopmentEnvironment.md)
+* [Releasing JNA](https://github.com/twall/jna/blob/master/www/ReleasingJNA.md)
+* [Publishing to Maven Central](https://github.com/twall/jna/blob/master/www/PublishingToMavenCentral.md)
+
+Contributing 
+============
+
+You're encouraged to contribute to JNA. Fork the code from [https://github.com/twall/jna](https://github.com/twall/jna) and submit pull requests.
+
+For more information on setting up a development environment see [Contributing to JNA](https://github.com/twall/jna/blob/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.*

TODO

@@ -21,38 +21,32 @@
 
 # TODO
 
-* fix setFieldOrder to *always* apply if used
-* cache structure information
-
-* 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
 
+* dispose memory/callbacks in Native finalizer to ensure they run first
+  (use referencequeue to run them when they become unreachable)
+
+* 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 (?)  
-
 * packaging: 'types', 'convert/marshal' subpackages?
   note: marshal/unmarshal vs to/fromnative: to/fromnative is more
   explicit, since marshal/unmarshal doesn't indicate src/dst.
@@ -100,6 +94,8 @@
 
 
 # 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)

contrib/alphamaskdemo/.classpath

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/jna/dist/jna.jar"/>
+	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
 	<classpathentry kind="src" path="/platform"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

contrib/alphamaskdemo/build.xml

@@ -8,7 +8,6 @@
 
     <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" />
 
@@ -37,40 +36,31 @@
     <!-- 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>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
         </javac>
+    </target>
 
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
         <!-- 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>
+            <!-- platform -->
+            <fileset dir="../platform/build/classes/com"/>
+            <!-- jna -->
+            <zipfileset src="${file.reference.jna.jar}"/>
         </jar>
     </target>
 </project>

contrib/balloonmanagerdemo/build.xml

@@ -8,7 +8,6 @@
 
     <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" />
 
@@ -37,40 +36,33 @@
     <!-- 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>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
         </javac>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
 
         <!-- 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>
+            <!-- platform -->
+            <fileset dir="../platform/build/classes/com"/>
+            <!-- jna -->
+            <zipfileset src="${file.reference.jna.jar}"/>
         </jar>
     </target>
 </project>

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

@@ -8,7 +8,6 @@
 
     <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" />
 
@@ -37,40 +36,33 @@
     <!-- 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>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
         </javac>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
 
         <!-- 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>
+            <!-- platform -->
+            <fileset dir="../platform/build/classes/com"/>
+            <!-- jna -->
+            <zipfileset src="${file.reference.jna.jar}"/>
         </jar>
     </target>
 </project>

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

@@ -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

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/jna/dist/jna.jar"/>
+	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
 	<classpathentry kind="src" path="/platform"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

contrib/dnddemo/build.xml

@@ -8,7 +8,6 @@
 
     <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" />
 
@@ -37,40 +36,33 @@
     <!-- 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>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
         </javac>
+    </target>
+
+    <!-- Create jar-file. -->
+    <target name="jar" depends="compile">
 
         <!-- 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>
+            <!-- platform -->
+            <fileset dir="../platform/build/classes/com"/>
+            <!-- jna -->
+            <zipfileset src="${file.reference.jna.jar}"/>
         </jar>
     </target>
 </project>

contrib/ntservice/.classpath

@@ -3,8 +3,8 @@
 	<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="/jna"/>
-	<classpathentry kind="lib" path="/jna/dist/jna.jar"/>
+	<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/nbproject/project.properties

@@ -24,8 +24,8 @@ javac.classpath=\
 # 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/src/jnacontrib/jna/Advapi32.java

@@ -0,0 +1,196 @@
+/*
+ * Advapi32.java
+ *
+ * Created on 6. August 2007, 11:24
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package jnacontrib.jna;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * 
+ * @author TB
+ */
+public interface Advapi32 extends StdCallLibrary {
+    Advapi32 INSTANCE = (Advapi32) Native.loadLibrary("Advapi32",
+            Advapi32.class, W32APIOptions.UNICODE_OPTIONS);
+
+    /*
+     * SC_HANDLE WINAPI OpenSCManager( LPCTSTR lpMachineName, LPCTSTR
+     * lpDatabaseName, DWORD dwDesiredAccess );
+     */
+    public Pointer OpenSCManager(String lpMachineName, WString lpDatabaseName,
+            int dwDesiredAccess);
+
+    /*
+     * BOOL WINAPI CloseServiceHandle( SC_HANDLE hSCObject );
+     */
+    public boolean CloseServiceHandle(Pointer hSCObject);
+
+    /*
+     * SC_HANDLE WINAPI OpenService( SC_HANDLE hSCManager, LPCTSTR
+     * lpServiceName, DWORD dwDesiredAccess );
+     */
+    public Pointer OpenService(Pointer hSCManager, String lpServiceName,
+            int dwDesiredAccess);
+
+    /*
+     * BOOL WINAPI StartService( SC_HANDLE hService, DWORD dwNumServiceArgs,
+     * LPCTSTR* lpServiceArgVectors );
+     */
+    public boolean StartService(Pointer hService, int dwNumServiceArgs,
+            char[] lpServiceArgVectors);
+
+    /*
+     * BOOL WINAPI ControlService( SC_HANDLE hService, DWORD dwControl,
+     * LPSERVICE_STATUS lpServiceStatus );
+     */
+    public boolean ControlService(Pointer hService, int dwControl,
+            SERVICE_STATUS lpServiceStatus);
+
+    /*
+     * BOOL WINAPI StartServiceCtrlDispatcher( const SERVICE_TABLE_ENTRY*
+     * lpServiceTable );
+     */
+    public boolean StartServiceCtrlDispatcher(Structure[] lpServiceTable);
+
+    /*
+     * SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandler( LPCTSTR
+     * lpServiceName, LPHANDLER_FUNCTION lpHandlerProc );
+     */
+    public Pointer RegisterServiceCtrlHandler(String lpServiceName,
+            Handler lpHandlerProc);
+
+    /*
+     * SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerEx( LPCTSTR
+     * lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext );
+     */
+    public Pointer RegisterServiceCtrlHandlerEx(String lpServiceName,
+            HandlerEx lpHandlerProc, Pointer lpContext);
+
+    /*
+     * BOOL WINAPI SetServiceStatus( SERVICE_STATUS_HANDLE hServiceStatus,
+     * LPSERVICE_STATUS lpServiceStatus );
+     */
+    public boolean SetServiceStatus(Pointer hServiceStatus,
+            SERVICE_STATUS lpServiceStatus);
+
+    /*
+     * SC_HANDLE WINAPI CreateService( SC_HANDLE hSCManager, LPCTSTR
+     * lpServiceName, LPCTSTR lpDisplayName, DWORD dwDesiredAccess, DWORD
+     * dwServiceType, DWORD dwStartType, DWORD dwErrorControl, LPCTSTR
+     * lpBinaryPathName, LPCTSTR lpLoadOrderGroup, LPDWORD lpdwTagId, LPCTSTR
+     * lpDependencies, LPCTSTR lpServiceStartName, LPCTSTR lpPassword );
+     */
+    public Pointer CreateService(Pointer hSCManager, String lpServiceName,
+            String lpDisplayName, int dwDesiredAccess, int dwServiceType,
+            int dwStartType, int dwErrorControl, String lpBinaryPathName,
+            String lpLoadOrderGroup, IntByReference lpdwTagId,
+            String lpDependencies, String lpServiceStartName, String lpPassword);
+
+    /*
+     * BOOL WINAPI DeleteService( SC_HANDLE hService );
+     */
+    public boolean DeleteService(Pointer hService);
+
+    /*
+     * BOOL WINAPI ChangeServiceConfig2( SC_HANDLE hService, DWORD dwInfoLevel,
+     * LPVOID lpInfo );
+     */
+    public boolean ChangeServiceConfig2(Pointer hService, int dwInfoLevel,
+            ChangeServiceConfig2Info lpInfo);
+
+    /*
+     * LONG WINAPI RegEnumValue( HKEY hKey, DWORD dwIndex, LPTSTR lpValueName,
+     * LPDWORD lpcchValueName, LPDWORD lpReserved, LPDWORD lpType, LPBYTE
+     * lpData, LPDWORD lpcbData );
+     */
+    public int RegEnumValue(int hKey, int dwIndex, char[] lpValueName,
+            IntByReference lpcchValueName, IntByReference reserved,
+            IntByReference lpType, byte[] lpData, IntByReference lpcbData);
+
+    interface SERVICE_MAIN_FUNCTION extends StdCallCallback {
+        /*
+         * VOID WINAPI ServiceMain( DWORD dwArgc, LPTSTR* lpszArgv );
+         */
+        public void callback(int dwArgc, Pointer lpszArgv);
+    }
+
+    interface Handler extends StdCallCallback {
+        /*
+         * VOID WINAPI Handler( DWORD fdwControl );
+         */
+        public void callback(int fdwControl);
+    }
+
+    interface HandlerEx extends StdCallCallback {
+        /*
+         * DWORD WINAPI HandlerEx( DWORD dwControl, DWORD dwEventType, LPVOID
+         * lpEventData, LPVOID lpContext );
+         */
+        public int callback(int dwControl, int dwEventType,
+                Pointer lpEventData, Pointer lpContext);
+    }
+
+    /*
+     * typedef struct _SERVICE_STATUS { DWORD dwServiceType; DWORD
+     * dwCurrentState; DWORD dwControlsAccepted; DWORD dwWin32ExitCode; DWORD
+     * dwServiceSpecificExitCode; DWORD dwCheckPoint; DWORD dwWaitHint; }
+     * SERVICE_STATUS,LPSERVICE_STATUS;
+     */
+    public static class SERVICE_STATUS extends Structure {
+        public int dwServiceType;
+        public int dwCurrentState;
+        public int dwControlsAccepted;
+        public int dwWin32ExitCode;
+        public int dwServiceSpecificExitCode;
+        public int dwCheckPoint;
+        public int dwWaitHint;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "dwServiceType", "dwCurrentState", "dwControlsAccepted", "dwWin32ExitCode", "dwServiceSpecificExitCode", "dwCheckPoint", "dwWaitHint" });
+        }
+    }
+
+    /*
+     * typedef struct _SERVICE_TABLE_ENTRY { LPTSTR lpServiceName;
+     * LPSERVICE_MAIN_FUNCTION lpServiceProc; } SERVICE_TABLE_ENTRY,
+     * LPSERVICE_TABLE_ENTRY;
+     */
+    public static class SERVICE_TABLE_ENTRY extends Structure {
+        public String lpServiceName;
+        public SERVICE_MAIN_FUNCTION lpServiceProc;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "lpServiceName", "lpServiceProc" });
+        }
+    }
+
+    public static abstract class ChangeServiceConfig2Info extends Structure {
+    }
+
+    /*
+     * typedef struct _SERVICE_DESCRIPTION { LPTSTR lpDescription; }
+     * SERVICE_DESCRIPTION,LPSERVICE_DESCRIPTION;
+     */
+    public static class SERVICE_DESCRIPTION extends ChangeServiceConfig2Info {
+        public String lpDescription;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "lpDescription" });
+        }
+    }
+}

contrib/ntservice/test/placeholder.txt

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

contrib/platform/.classpath

@@ -3,8 +3,8 @@
 	<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="/jna"/>
+	<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="lib" path="/jna/dist/jna.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

contrib/platform/build.xml

@@ -66,17 +66,24 @@
     <condition property="tests.platform" value="test-win32">
       <os family="windows"/>
     </condition>
-    <target name="test" description="Run unit tests." if="tests.platform">
+    <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>
-	  	<echo message="View test report in file://${build.test.results.dir}/index.html" />
-	</target>
-    <target name="test-win32" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" />
+    <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/src/com/sun/jna/platform/WindowUtils.java

@@ -71,14 +71,14 @@ 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.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.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;
@@ -898,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);
@@ -1140,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;
@@ -1363,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];
                 }

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

@@ -0,0 +1,91 @@
+/*
+ * 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 java.nio.IntBuffer;
+import java.util.Arrays;
+import java.util.List;
+
+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;
+
+/**
+ * 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;
+        protected List getFieldOrder() {
+            return Arrays.asList(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 { }
+        protected List getFieldOrder() {
+            return Arrays.asList(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

@@ -17,14 +17,27 @@ 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 {
-        // 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()) {
@@ -33,8 +46,7 @@ public class MacFileUtils extends FileUtils {
         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());
-            if (!src.renameTo(target)) {
+            if (FileManager.INSTANCE.FSPathMoveObjectToTrashSync(src.getAbsolutePath(), null, 0) != 0) {
                 failed.add(src);
             }
         }

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

@@ -12,6 +12,10 @@
  */
 package com.sun.jna.platform.unix;
 
+import java.util.Arrays;
+import java.util.List;
+
+import com.sun.jna.Callback;
 import com.sun.jna.FromNativeContext;
 import com.sun.jna.Library;
 import com.sun.jna.Native;
@@ -276,9 +280,12 @@ public interface X11 extends Library {
             public short green, greenMask;
             public short blue, blueMask;
             public short alpha, alphaMask;
+            protected List getFieldOrder() {
+                return Arrays.asList(new String[] { "red", "redMask", "green", "greenMask", "blue", "blueMask", "alpha", "alphaMask" }); 
+            }
         }
         class PictFormat extends NativeLong {
-    		private static final long serialVersionUID = 1L;
+            private static final long serialVersionUID = 1L;
             public PictFormat(long value) { super(value); }
             public PictFormat() { }
         }
@@ -288,6 +295,9 @@ public interface X11 extends Library {
             public int depth;
             public XRenderDirectFormat direct;
             public Colormap colormap;
+            protected List getFieldOrder() {
+                return Arrays.asList(new String[] { "id", "type", "depth", "direct", "colormap" }); 
+            }
         }
         int PictTypeIndexed = 0x0;
         int PictTypeDirect = 0x1;
@@ -336,12 +346,18 @@ public interface X11 extends Library {
     class XInputClassInfoByReference extends Structure implements Structure.ByReference {
         public byte input_class;
         public byte event_type_base;
+        protected List getFieldOrder() {
+            return Arrays.asList(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;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "device_id", "num_classes", "classes" }); 
+        }
     }
 
     X11 INSTANCE = (X11)Native.loadLibrary("X11", X11.class);
@@ -369,6 +385,9 @@ public interface X11 extends Library {
         public int icon_x, icon_y;
         public Pixmap icon_mask;
         public XID window_group;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "flags", "input", "initial_state", "icon_pixmap", "icon_window", "icon_x", "icon_y", "icon_mask", "window_group" }); 
+        }
     }
 
     /*
@@ -384,6 +403,9 @@ public interface X11 extends Library {
         public Atom encoding;
         public int format;
         public NativeLong nitems;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "value", "encoding", "format", "nitems" }); 
+        }
     }
 
     /*
@@ -412,10 +434,14 @@ public interface X11 extends Library {
         public static class Aspect extends Structure {
             public int x; // numerator
             public int y; // denominator
+            protected List getFieldOrder() {
+                return Arrays.asList(new String[] { "x", "y" }); }
         }
         public Aspect min_aspect, max_aspect;
         public int base_width, base_height;
         public int win_gravity;
+        protected List getFieldOrder() {
+            return Arrays.asList(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" }); }
     }
 
     /*
@@ -469,6 +495,9 @@ public interface X11 extends Library {
         public NativeLong do_not_propagate_mask;
         public boolean override_redirect;
         public Screen screen;
+        protected List getFieldOrder() {
+            return Arrays.asList(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" }); 
+        }
     }
 
     /*
@@ -506,6 +535,9 @@ public interface X11 extends Library {
         public boolean override_redirect;
         public Colormap colormap;
         public Cursor cursor;
+        protected List getFieldOrder() {
+            return Arrays.asList(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;
@@ -548,10 +580,16 @@ public interface X11 extends Library {
         public NativeLong blue_mask;
         public int colormap_size;
         public int bits_per_rgb;
+        protected List getFieldOrder() {
+            return Arrays.asList(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() { }
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "x", "y" });
+        }
+        public XPoint() { this((short)0, (short)0); }
         public XPoint(short x, short y) {
             this.x = x;
             this.y = y;
@@ -560,7 +598,10 @@ public interface X11 extends Library {
     class XRectangle extends Structure {
         public short x, y;
         public short width, height;
-        public XRectangle() { }
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "x", "y", "width", "height" });
+        }
+        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;
@@ -704,6 +745,9 @@ 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;
+        protected List getFieldOrder() {
+            return Arrays.asList(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);
@@ -942,8 +986,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;
 
     /*****************************************************************
@@ -1329,6 +1373,9 @@ 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
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window" }); 
+        }
     }
 
     class XKeyEvent extends Structure {
@@ -1345,6 +1392,9 @@ public interface X11 extends Library {
         public int state;           // key or button mask
         public int keycode;         // detail
         public int same_screen;     // same screen flag
+        protected List getFieldOrder() {
+            return Arrays.asList(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 {
@@ -1361,6 +1411,9 @@ public interface X11 extends Library {
         public int state;           // key or button mask
         public int button;          // detail
         public int same_screen;     // same screen flag
+        protected List getFieldOrder() {
+            return Arrays.asList(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 {
@@ -1378,6 +1431,9 @@ public interface X11 extends Library {
         public Atom message_type;
         public int format;
         public Data data;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "message_type", "format", "data" }); 
+        }
 
         public static class Data extends Union {
             public byte b[] = new byte[20];
@@ -1400,6 +1456,9 @@ public interface X11 extends Library {
         public int state;           // key or button mask
         public byte is_hint;        // detail
         public int same_screen;     // same screen flag
+        protected List getFieldOrder() {
+            return Arrays.asList(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 {
@@ -1423,8 +1482,11 @@ 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
+        protected List getFieldOrder() {
+            return Arrays.asList(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 {
@@ -1446,6 +1508,9 @@ public interface X11 extends Library {
         * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
         * NotifyPointerRoot, NotifyDetailNone
         */
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "mode", "detail" }); 
+        }
     }
 
     class XFocusInEvent extends XFocusChangeEvent {
@@ -1463,6 +1528,9 @@ public interface X11 extends Library {
         public int x, y;
         public int width, height;
         public int count;           // if non-zero, at least this many more
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "width", "height", "count" }); 
+        }
     }
 
     class XGraphicsExposeEvent extends Structure {
@@ -1476,6 +1544,9 @@ 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
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "drawable", "x", "y", "width", "height", "count", "major_code", "minor_code" }); 
+        }
     }
 
     class XNoExposeEvent extends Structure {
@@ -1486,6 +1557,9 @@ 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
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "drawable", "major_code", "minor_code" }); 
+        }
     }
 
     class XVisibilityEvent extends Structure {
@@ -1495,6 +1569,9 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window window;
         public int state;           // Visibility state
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "state" }); 
+        }
     }
 
     class XCreateWindowEvent extends Structure {
@@ -1508,6 +1585,9 @@ 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
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "parent", "window", "x", "y", "width", "height", "border_width", "override_redirect" }); 
+        }
     }
 
     class XDestroyWindowEvent extends Structure {
@@ -1517,6 +1597,8 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window event;
         public Window window;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window" }); }
     }
 
     class XUnmapEvent extends Structure {
@@ -1527,6 +1609,9 @@ public interface X11 extends Library {
         public Window event;
         public Window window;
         public int from_configure;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "from_configure" }); 
+        }
     }
 
     class XMapEvent extends Structure {
@@ -1536,7 +1621,10 @@ 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...
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "override_redirect" }); 
+        }
     }
 
     class XMapRequestEvent extends Structure {
@@ -1546,6 +1634,9 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window parent;
         public Window window;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window" }); 
+        }
     }
 
     class XReparentEvent extends Structure {
@@ -1558,6 +1649,9 @@ public interface X11 extends Library {
         public Window parent;
         public int x, y;
         public int override_redirect;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "override_redirect" }); 
+        }
     }
 
     class XConfigureEvent extends Structure {
@@ -1572,6 +1666,9 @@ public interface X11 extends Library {
         public int border_width;
         public Window above;
         public int override_redirect;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "width", "height", "border_width", "above", "override_redirect" }); 
+        }
     }
 
     class XGravityEvent extends Structure {
@@ -1582,6 +1679,9 @@ public interface X11 extends Library {
         public Window event;
         public Window window;
         public int x, y;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "x", "y" }); 
+        }
     }
 
     class XResizeRequestEvent extends Structure {
@@ -1591,6 +1691,9 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window window;
         public int width, height;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "width", "height" }); 
+        }
     }
 
     class XConfigureRequestEvent extends Structure {
@@ -1606,6 +1709,9 @@ public interface X11 extends Library {
         public Window above;
         public int detail;          // Above, Below, TopIf, BottomIf, Opposite
         public NativeLong value_mask;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "x", "y", "width", "height", "above", "detail", "value_mask" }); 
+        }
     }
 
     class XCirculateEvent extends Structure {
@@ -1616,6 +1722,9 @@ public interface X11 extends Library {
         public Window event;
         public Window window;
         public int place;           // PlaceOnTop, PlaceOnBottom
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "event", "window", "place" }); 
+        }
     }
 
     class XCirculateRequestEvent extends Structure {
@@ -1626,6 +1735,9 @@ public interface X11 extends Library {
         public Window parent;
         public Window window;
         public int place;           // PlaceOnTop, PlaceOnBottom
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "parent", "window", "place" }); 
+        }
     }
 
     class XPropertyEvent extends Structure {
@@ -1637,6 +1749,9 @@ public interface X11 extends Library {
         public Atom atom;
         public NativeLong time;
         public int state;           // NewValue, Deleted
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "atom", "time", "state" }); 
+        }
     }
 
     class XSelectionClearEvent extends Structure {
@@ -1647,6 +1762,9 @@ public interface X11 extends Library {
         public Window window;
         public Atom selection;
         public NativeLong time;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "selection", "time" }); 
+        }
     }
 
     class XSelectionRequestEvent extends Structure {
@@ -1658,8 +1776,11 @@ public interface X11 extends Library {
         public Window requestor;
         public Atom selection;
         public Atom target;
-        Atom property;
+        public Atom property;
         public NativeLong time;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "owner", "requestor", "selection", "target", "property", "time" }); 
+        }
     }
 
     class XSelectionEvent extends Structure {
@@ -1672,6 +1793,9 @@ public interface X11 extends Library {
         public Atom target;
         public Atom property;       // ATOM or None
         public NativeLong time;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "requestor", "selection", "target", "property", "time" }); 
+        }
     }
 
     class XColormapEvent extends Structure {
@@ -1683,6 +1807,9 @@ public interface X11 extends Library {
         public Colormap colormap;   // COLORMAP or None
         public int c_new;           // C++
         public int state;           // ColormapInstalled, ColormapUninstalled
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "colormap", "c_new", "state" }); 
+        }
     }
 
     class XMappingEvent extends Structure {
@@ -1694,16 +1821,22 @@ 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*/
+        protected List getFieldOrder() {
+            return Arrays.asList(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
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "display", "serial", "error_code", "request_code", "minor_code", "resourceid" }); 
+        }
     }
 
     // generated on EnterWindow and FocusIn  when KeyMapState selected
@@ -1714,6 +1847,9 @@ public interface X11 extends Library {
         public Display display;     // Display the event was read from
         public Window window;
         public byte key_vector[] = new byte[32];
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "type", "serial", "send_event", "display", "window", "key_vector" }); 
+        }
     }
 
     int XSelectInput(Display display, Window window, NativeLong eventMask);
@@ -1768,6 +1904,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
@@ -1778,6 +1926,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);
@@ -1819,6 +1994,9 @@ 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 */
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "max_keypermod", "modifiermap" }); 
+        }
     }
     
     class XKeyboardControlRef extends Structure implements Structure.ByReference {
@@ -1839,6 +2017,10 @@ public interface X11 extends Library {
         /** AutoRepeatModeOff, AutoRepeatModeOn, AutoRepeatModeDefault. */
         public int auto_repeat_mode;
 
+        protected List getFieldOrder() {
+            return Arrays.asList(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 +
@@ -1869,6 +2051,10 @@ 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];
 
+        protected List getFieldOrder() {
+            return Arrays.asList(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/win32/Advapi32.java

@@ -15,6 +15,7 @@ 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.WString;
 import com.sun.jna.platform.win32.WinBase.SECURITY_ATTRIBUTES;
 import com.sun.jna.platform.win32.WinNT.HANDLE;
 import com.sun.jna.platform.win32.WinNT.HANDLEByReference;
@@ -26,6 +27,7 @@ import com.sun.jna.platform.win32.Winsvc.SC_HANDLE;
 import com.sun.jna.platform.win32.Winsvc.SERVICE_STATUS;
 import com.sun.jna.platform.win32.Winsvc.SERVICE_STATUS_PROCESS;
 import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.LongByReference;
 import com.sun.jna.ptr.PointerByReference;
 import com.sun.jna.win32.StdCallLibrary;
 import com.sun.jna.win32.W32APIOptions;
@@ -468,6 +470,9 @@ public interface Advapi32 extends StdCallLibrary {
 	public int RegQueryValueEx(HKEY hKey, String lpValueName, int lpReserved, 
 			IntByReference lpType, IntByReference lpData, IntByReference lpcbData);
 
+	public int RegQueryValueEx(HKEY hKey, String lpValueName, int lpReserved, 
+			IntByReference lpType, LongByReference lpData, IntByReference lpcbData);
+
 	public int RegQueryValueEx(HKEY hKey, String lpValueName, int lpReserved, 
 			IntByReference lpType, Pointer lpData, IntByReference lpcbData);
 	
@@ -1157,4 +1162,30 @@ public interface Advapi32 extends StdCallLibrary {
 		String lpName,
 		WinNT.LUID lpLuid);
 	
+	/**
+	 * The function obtains specified information about the security of a file or directory. 
+	 * The information obtained is constrained by the caller's access rights and privileges.
+	 * @param lpFileName
+	 *   A pointer to a null-terminated string that specifies the file or directory for which security information is retrieved.
+	 * @param RequestedInformation
+	 *   A SECURITY_INFORMATION value that identifies the security information being requested. See WinNT *_SECURITY_INFORMATION
+	 * @param pointer
+	 *   A pointer to a buffer that receives a copy of the security descriptor of the object specified by the lpFileName parameter. 
+	 *   The calling process must have permission to view the specified aspects of the object's security status. 
+	 *   The SECURITY_DESCRIPTOR structure is returned in self-relative format.
+	 * @param nLength
+	 *   Specifies the size, in bytes, of the buffer pointed to by the pSecurityDescriptor parameter.
+	 * @param lpnLengthNeeded
+	 *   A pointer to the variable that receives the number of bytes necessary to store the complete security descriptor. 
+	 *   If the returned number of bytes is less than or equal to nLength, the entire security descriptor is returned in the output buffer; 
+	 *   otherwise, none of the descriptor is returned.
+	 * @return whether the call succeeded
+	 */
+	public boolean GetFileSecurity(
+	    WString lpFileName,
+	    int RequestedInformation,
+	    Pointer pointer,
+	    int nLength,
+	    IntByReference lpnLengthNeeded);
+	
 }

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/DsGetDC.java

@@ -0,0 +1,220 @@
+/* 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.Arrays;
+import java.util.List;
+
+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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "DomainControllerName", "DomainControllerAddress", "DomainControllerAddressType", "DomainGuid", "DomainName", "DnsForestName", "Flags", "DcSiteName", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+        
+        protected List getFieldOrder() { 
+            return Arrays.asList(new String[] { "NetbiosDomainName", "DnsDomainName", "Flags", "ParentIndex", "TrustType", "TrustAttributes", "DomainSid", "DomainGuid" });
+        }
+
+        public DS_DOMAIN_TRUSTS() {
+        }
+
+        public DS_DOMAIN_TRUSTS(Pointer p) {
+            super(p);
+            read();
+        }
+    };
+}

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

@@ -0,0 +1,100 @@
+/* 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.Arrays;
+import java.util.List;
+
+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];
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "Data1", "Data2", "Data3", "Data4" });
+        }
+    }    
+}

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

@@ -16,27 +16,93 @@ import java.nio.Buffer;
 
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
-import com.sun.jna.platform.win32.WinBase.MEMORYSTATUSEX;
-import com.sun.jna.platform.win32.WinBase.SYSTEM_INFO;
-import com.sun.jna.platform.win32.WinDef.DWORD;
-import com.sun.jna.platform.win32.WinDef.HMODULE;
-import com.sun.jna.platform.win32.WinNT.HANDLE;
-import com.sun.jna.platform.win32.WinNT.HANDLEByReference;
-import com.sun.jna.platform.win32.WinNT.LARGE_INTEGER;
-import com.sun.jna.platform.win32.WinNT.OSVERSIONINFO;
-import com.sun.jna.platform.win32.WinNT.OSVERSIONINFOEX;
-import com.sun.jna.ptr.ByReference;
 import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.LongByReference;
 import com.sun.jna.ptr.PointerByReference;
-import com.sun.jna.win32.StdCallLibrary;
 import com.sun.jna.win32.W32APIOptions;
 
-/** Definition (incomplete) of <code>kernel32.dll</code>. */
-public interface Kernel32 extends StdCallLibrary {
+/** Interface definitions for <code>kernel32.dll</code>.
+ * Includes additional alternate mappings from {@link WinNT} which make use
+ * of NIO buffers.
+ */
+public interface Kernel32 extends WinNT {
 
     Kernel32 INSTANCE = (Kernel32) Native.loadLibrary("kernel32", Kernel32.class, 
     		W32APIOptions.UNICODE_OPTIONS);
 
+    /**
+     * The FormatMessage function formats a message string. The function requires a
+     * message definition as input. The message definition can come from a buffer 
+     * passed into the function. It can come from a message table resource in an 
+     * already-loaded module. Or the caller can ask the function to search the 
+     * system's message table resource(s) for the message definition. The function 
+     * finds the message definition in a message table resource based on a message 
+     * identifier and a language identifier. The function copies the formatted message 
+     * text to an output buffer, processing any embedded insert sequences if requested.
+     * @param dwFlags
+     *  Formatting options, and how to interpret the lpSource parameter. The low-order
+     *  byte of dwFlags specifies how the function handles line breaks in the output 
+     *  buffer. The low-order byte can also specify the maximum width of a formatted
+     *  output line. <p/>
+     * This version of the function assumes FORMAT_MESSAGE_ALLOCATE_BUFFER is
+     *  <em>not</em> set.
+     * @param lpSource
+     *  Location of the message definition.
+     * @param dwMessageId
+     *  Message identifier for the requested message.
+     * @param dwLanguageId
+     *  Language identifier for the requested message.
+     * @param lpBuffer
+     *  Pointer to a buffer that receives the null-terminated string that specifies the 
+     *  formatted message.
+     * @param nSize
+     *  This this parameter specifies the size of the output buffer, in TCHARs. If FORMAT_MESSAGE_ALLOCATE_BUFFER is 
+     * @param va_list
+     *  Pointer to an array of values that are used as insert values in the formatted message.
+     * @return
+     * 	If the function succeeds, the return value is the number of TCHARs stored in 
+     * 	the output buffer, excluding the terminating null character. If the function 
+     * 	fails, the return value is zero. To get extended error information, call 
+     *  GetLastError.
+     */
+    int FormatMessage(int dwFlags, Pointer lpSource, int dwMessageId,
+                      int dwLanguageId, Buffer lpBuffer,
+                      int nSize, Pointer va_list);
+    
+
+    /**
+     * Reads data from the specified file or input/output (I/O) device. Reads
+     * occur at the position specified by the file pointer if supported by the
+     * device.
+     * 
+     * This function is designed for both synchronous and asynchronous
+     * operations. For a similar function designed solely for asynchronous
+     * operation, see ReadFileEx
+     * 
+     * @param hFile A handle to the device (for example, a file, file stream,
+     *  physical disk, volume, console buffer, tape drive, socket, communications
+     *  resource, mailslot, or pipe).
+     * @param lpBuffer A pointer to the buffer that receives the data read from a file or device.
+     * @param nNumberOfBytesToRead The maximum number of bytes to be read.
+     * @param lpNumberOfBytesRead A pointer to the variable that receives the number of bytes
+     *  read when using a synchronous hFile parameter
+     * @param lpOverlapped A pointer to an OVERLAPPED structure is required if the hFile
+     *  parameter was opened with FILE_FLAG_OVERLAPPED, otherwise it can be NULL.
+     * @return If the function succeeds, the return value is nonzero (TRUE).
+     *  If the function fails, or is completing asynchronously, the return value is zero (FALSE).
+     *  To get extended error information, call the GetLastError function.
+     *  
+     *  Note  The GetLastError code ERROR_IO_PENDING is not a failure; it designates the read
+     *  operation is pending completion asynchronously. For more information, see Remarks.
+     */
+    boolean ReadFile(
+    		HANDLE hFile,
+    		Buffer lpBuffer,
+    		int nNumberOfBytesToRead,
+    		IntByReference lpNumberOfBytesRead,
+    		WinBase.OVERLAPPED lpOverlapped);
+    
+
     /**
      * Frees the specified local memory object and invalidates its handle.
      * @param hLocal
@@ -205,7 +271,9 @@ public interface Kernel32 extends StdCallLibrary {
      *  Formatting options, and how to interpret the lpSource parameter. The low-order
      *  byte of dwFlags specifies how the function handles line breaks in the output 
      *  buffer. The low-order byte can also specify the maximum width of a formatted
-     *  output line. 
+     *  output line. <p/>
+     * This version of the function assumes FORMAT_MESSAGE_ALLOCATE_BUFFER is
+     *  <em>not</em> set.
      * @param lpSource
      *  Location of the message definition.
      * @param dwMessageId
@@ -216,10 +284,7 @@ public interface Kernel32 extends StdCallLibrary {
      *  Pointer to a buffer that receives the null-terminated string that specifies the 
      *  formatted message.
      * @param nSize
-     *  If the FORMAT_MESSAGE_ALLOCATE_BUFFER flag is not set, this parameter specifies
-     *  the size of the output buffer, in TCHARs. If FORMAT_MESSAGE_ALLOCATE_BUFFER is 
-     *  set, this parameter specifies the minimum number of TCHARs to allocate for an 
-     *  output buffer.
+     *  This this parameter specifies the size of the output buffer, in TCHARs. If FORMAT_MESSAGE_ALLOCATE_BUFFER is 
      * @param va_list
      *  Pointer to an array of values that are used as insert values in the formatted message.
      * @return
@@ -229,7 +294,7 @@ public interface Kernel32 extends StdCallLibrary {
      *  GetLastError.
      */
     int FormatMessage(int dwFlags, Pointer lpSource, int dwMessageId,
-                      int dwLanguageId, PointerByReference lpBuffer,
+                      int dwLanguageId, Pointer lpBuffer,
                       int nSize, Pointer va_list);
     
     /**
@@ -245,7 +310,9 @@ public interface Kernel32 extends StdCallLibrary {
      *  Formatting options, and how to interpret the lpSource parameter. The low-order
      *  byte of dwFlags specifies how the function handles line breaks in the output 
      *  buffer. The low-order byte can also specify the maximum width of a formatted
-     *  output line. 
+     *  output line. <p/>
+     * This version of the function assumes FORMAT_MESSAGE_ALLOCATE_BUFFER is
+     *  set.
      * @param lpSource
      *  Location of the message definition.
      * @param dwMessageId
@@ -253,12 +320,10 @@ public interface Kernel32 extends StdCallLibrary {
      * @param dwLanguageId
      *  Language identifier for the requested message.
      * @param lpBuffer
-     *  Pointer to a buffer that receives the null-terminated string that specifies the 
-     *  formatted message.
+     *  Pointer to a pointer that receives the allocated buffer in which the
+     *  null-terminated string that specifies the formatted message is written.
      * @param nSize
-     *  If the FORMAT_MESSAGE_ALLOCATE_BUFFER flag is not set, this parameter specifies
-     *  the size of the output buffer, in TCHARs. If FORMAT_MESSAGE_ALLOCATE_BUFFER is 
-     *  set, this parameter specifies the minimum number of TCHARs to allocate for an 
+     *  This parameter specifies the minimum number of TCHARs to allocate for an 
      *  output buffer.
      * @param va_list
      *  Pointer to an array of values that are used as insert values in the formatted message.
@@ -269,9 +334,9 @@ public interface Kernel32 extends StdCallLibrary {
      *  GetLastError.
      */
     int FormatMessage(int dwFlags, Pointer lpSource, int dwMessageId,
-                      int dwLanguageId, Buffer lpBuffer,
+                      int dwLanguageId, PointerByReference lpBuffer,
                       int nSize, Pointer va_list);
-
+    
     /**
      * The CreateFile function creates or opens a file, file stream, directory, physical
      * disk, volume, console buffer, tape drive, communications resource, mailslot, or 
@@ -307,6 +372,99 @@ public interface Kernel32 extends StdCallLibrary {
     		int dwFlagsAndAttributes, HANDLE hTemplateFile);
         
     
+    /**
+     * Copies an existing file to a new file.
+     * 
+     * @param lpExistingFileName
+     *   The name of an existing file.
+     *
+     *   The name is limited to MAX_PATH characters. To extend this limit to 32,767 wide characters, prepend "\\?\" to
+     *   the path. For more information, see Naming a File.
+     *
+     *   If lpExistingFileName does not exist, CopyFile fails, and GetLastError returns ERROR_FILE_NOT_FOUND.
+     *
+     * @param lpNewFileName
+     *   The name of the new file.
+     *
+     *   The name is limited to MAX_PATH characters. To extend this limit to 32,767 wide characters, prepend "\\?\" to
+     *   the path. For more information, see Naming a File.
+     * 
+     * @param bFailIfExists
+     *   If this parameter is TRUE and the new file specified by lpNewFileName already exists, the function fails. If
+     *   this parameter is FALSE and the new file already exists, the function overwrites the existing file and succeeds.
+     * 
+     * @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 CopyFile(String lpExistingFileName, String lpNewFileName, boolean bFailIfExists);
+
+    /**
+     * Moves an existing file or a directory, including its children.
+     *
+     * @param lpExistingFileName
+     *
+     *   The current name of the file or directory on the local computer.
+     *
+     *   The name is limited to MAX_PATH characters. To extend this limit to 32,767 wide characters, prepend "\\?\" to
+     *   the path. For more information, see Naming a File.
+     *
+     * @param lpNewFileName
+     *
+     *   The new name for the file or directory. The new name must not already exist. A new file may be on a different
+     *   file system or drive. A new directory must be on the same drive.
+     *
+     *   The name is limited to MAX_PATH characters. To extend this limit to 32,767 wide characters, prepend "\\?\" to
+     *   the path. For more information, see Naming a File.
+     *
+     * @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 MoveFile(String lpExistingFileName, String lpNewFileName);
+
+    /**
+     * Moves an existing file or directory, including its children, with various move options.
+     *
+     * @param lpExistingFileName
+     *
+     *   The current name of the file or directory on the local computer.
+     *
+     *   If dwFlags specifies MOVEFILE_DELAY_UNTIL_REBOOT, the file cannot exist on a remote share, because delayed
+     *   operations are performed before the network is available.
+     *
+     *   The name is limited to MAX_PATH characters. To extend this limit to 32,767 wide characters, prepend "\\?\" to
+     *   the path. For more information, see Naming a File
+     *
+     *   Windows 2000:  If you prepend the file name with "\\?\", you cannot also specify the
+     *   MOVEFILE_DELAY_UNTIL_REBOOT flag for dwFlags.
+     *
+     * @param lpNewFileName
+     *
+     *   The new name of the file or directory on the local computer.
+     *
+     *   When moving a file, the destination can be on a different file system or volume. If the destination is on
+     *   another drive, you must set the MOVEFILE_COPY_ALLOWED flag in dwFlags.
+     *
+     *   When moving a directory, the destination must be on the same drive.
+     *
+     *   If dwFlags specifies MOVEFILE_DELAY_UNTIL_REBOOT and lpNewFileName is NULL, MoveFileEx registers the
+     *   lpExistingFileName file to be deleted when the system restarts. If lpExistingFileName refers to a directory,
+     *   the system removes the directory at restart only if the directory is empty.
+     *
+     * @param dwFlags
+     *   This parameter can be one or more of the following values.
+     *
+     * @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 MoveFileEx(String lpExistingFileName, String lpNewFileName, DWORD dwFlags);
+
     /**
      * The CreateDirectory function creates a new directory. If the underlying file
      * system supports security on files and directories, the function applies a 
@@ -352,7 +510,7 @@ public interface Kernel32 extends StdCallLibrary {
 	 */
     boolean ReadFile(
     		HANDLE hFile,
-    		Buffer lpBuffer,
+    		Pointer lpBuffer,
     		int nNumberOfBytesToRead,
     		IntByReference lpNumberOfBytesRead,
     		WinBase.OVERLAPPED lpOverlapped);
@@ -402,8 +560,10 @@ public interface Kernel32 extends StdCallLibrary {
      *  Returns nonzero (TRUE) if successful or zero (FALSE) otherwise.
      */
     boolean GetQueuedCompletionStatus(HANDLE CompletionPort, 
-    		IntByReference lpNumberOfBytes, ByReference lpCompletionKey, 
-    		PointerByReference lpOverlapped, int dwMilliseconds);
+                                      IntByReference lpNumberOfBytes,
+                                      ULONG_PTRByReference lpCompletionKey, 
+                                      PointerByReference lpOverlapped,
+                                      int dwMilliseconds);
 
     /**
      * Posts an I/O completion packet to an I/O completion port.
@@ -507,12 +667,6 @@ public interface Kernel32 extends StdCallLibrary {
      */
     boolean CloseHandle(HANDLE hObject);
     
-    // TODO: figure out how OVERLAPPED is used and apply an appropriate mapping
-    interface OVERLAPPED_COMPLETION_ROUTINE extends StdCallCallback {
-        void callback(int errorCode, int nBytesTransferred,
-        		WinBase.OVERLAPPED overlapped);
-    }
-    
     /**
      * Retrieves information that describes the changes within the specified directory. 
      * The function does not report changes to the specified directory itself.
@@ -746,6 +900,41 @@ public interface Kernel32 extends StdCallLibrary {
      */
     HANDLE OpenThread(int dwDesiredAccess, boolean bInheritHandle, int dwThreadId);
     
+    /**
+     * Creates a new process and its primary thread. The new process runs in the security context of the calling
+     * process.
+     * 
+     * @param lpApplicationName The name of the module to be executed.
+     * @param lpCommandLine The command line to be executed.
+     * @param lpProcessAttributes
+     *   A pointer to a SECURITY_ATTRIBUTES structure that determines whether the returned handle to the new process
+     *   object can be inherited by child processes. If lpProcessAttributes is NULL, the handle cannot be inherited.
+     *
+     * @param lpThreadAttributes
+     *   A pointer to a SECURITY_ATTRIBUTES structure that determines whether the returned handle to the new thread
+     *   object can be inherited by child processes. If lpThreadAttributes is NULL, the handle cannot be inherited.
+     *
+     * @param bInheritHandles
+     *   If this parameter TRUE, each inheritable handle in the calling process is inherited by the new process. If the
+     *   parameter is FALSE, the handles are not inherited. Note that inherited handles have the same value and access
+     *   rights as the original handles.
+     *
+     * @param dwCreationFlags The flags that control the priority class and the creation of the process.
+     * @param lpEnvironment
+     *   A pointer to the environment block for the new process. If this parameter is NULL, the new process uses the
+     *   environment of the calling process.
+     *
+     * @param lpCurrentDirectory The full path to the current directory for the process.
+     * @param lpStartupInfo A pointer to a STARTUPINFO or STARTUPINFOEX structure.
+     * @param lpProcessInformation
+     *   A pointer to a PROCESS_INFORMATION structure that receives identification information about the new process.
+     * @return If the function succeeds, the return value is nonzero.
+     */
+    boolean CreateProcess(String lpApplicationName, String lpCommandLine, WinBase.SECURITY_ATTRIBUTES lpProcessAttributes,
+                          WinBase.SECURITY_ATTRIBUTES lpThreadAttributes, boolean bInheritHandles, DWORD dwCreationFlags,
+                          Pointer lpEnvironment, String lpCurrentDirectory, WinBase.STARTUPINFO lpStartupInfo,
+                          WinBase.PROCESS_INFORMATION.ByReference lpProcessInformation);
+
     /**
      * This function returns a handle to an existing process object.
      * @param fdwAccess
@@ -781,6 +970,7 @@ public interface Kernel32 extends StdCallLibrary {
      */
     DWORD GetTempPath(DWORD nBufferLength, char[] buffer);
     
+
     /**
      * The GetVersion function returns the current version number of the operating system.
      * @return
@@ -858,6 +1048,82 @@ public interface Kernel32 extends StdCallLibrary {
      */
     boolean GlobalMemoryStatusEx(MEMORYSTATUSEX lpBuffer);
     
+    /**
+     * Retrieves the date and time that a file or directory was created, last accessed, and last modified.
+     * 
+     * @param hFile
+     *   A handle to the file or directory for which dates and times are to be retrieved. The handle must have been
+     *   created using the CreateFile function with the GENERIC_READ access right.
+     *
+     * @param lpCreationTime
+     *   A pointer to a FILETIME structure to receive the date and time the file or directory was created. This
+     *   parameter can be NULL if the application does not require this information.
+     * 
+     * @param lpLastAccessTime
+     *   A pointer to a FILETIME structure to receive the date and time the file or directory was last accessed. The
+     *   last access time includes the last time the file or directory was written to, read from, or, in the case of
+     *   executable files, run. This parameter can be NULL if the application does not require this information.
+     * 
+     * @param lpLastWriteTime
+     *   A pointer to a FILETIME structure to receive the date and time the file or directory was last written to,
+     *   truncated, or overwritten (for example, with WriteFile or SetEndOfFile). This date and time is not updated when
+     *   file attributes or security descriptors are changed. This parameter can be NULL if the application does not
+     *   require this information.
+     *
+     * @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 GetFileTime(HANDLE hFile, WinBase.FILETIME.ByReference lpCreationTime,
+                        WinBase.FILETIME.ByReference lpLastAccessTime, WinBase.FILETIME.ByReference lpLastWriteTime);
+
+    /**
+     * Sets the date and time that the specified file or directory was created, last accessed, or last modified.
+     *
+     * @param hFile
+     *  A handle to the file or directory. The handle must have been created using the CreateFile function with the
+     *  FILE_WRITE_ATTRIBUTES access right. For more information, see File Security and Access Rights.
+     * @param lpCreationTime
+     *  A pointer to a FILETIME structure that contains the new creation date and time for the file or directory. This
+     *  parameter can be NULL if the application does not need to change this information.
+     * @param lpLastAccessTime
+     *  A pointer to a FILETIME structure that contains the new last access date and time for the file or directory. The
+     *  last access time includes the last time the file or directory was written to, read from, or (in the case of
+     *  executable files) run. This parameter can be NULL if the application does not need to change this information.
+     *
+     *  To preserve the existing last access time for a file even after accessing a file, call SetFileTime immediately
+     *  after opening the file handle with this parameter's FILETIME structure members initialized to 0xFFFFFFFF.
+     * @param lpLastWriteTime
+     *  A pointer to a FILETIME structure that contains the new last modified date and time for the file or directory.
+     *  This parameter can be NULL if the application does not need to change this information.
+     * @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.
+     */
+    int SetFileTime(HANDLE hFile, WinBase.FILETIME lpCreationTime, WinBase.FILETIME lpLastAccessTime,
+                        WinBase.FILETIME lpLastWriteTime);
+
+    /**
+     * Sets the attributes for a file or directory.
+     * 
+     * @param lpFileName
+     *   The name of the file whose attributes are to be set.
+     *
+     *   The name is limited to MAX_PATH characters. To extend this limit to 32,767 wide characters, prepend "\\?\" to
+     *   the path.
+     *
+     * @param dwFileAttributes
+     *   The file attributes to set for the file. This parameter can be one or more values, combined using the
+     *   bitwise-OR operator. However, all other values override FILE_ATTRIBUTE_NORMAL.
+     * 
+     * @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 SetFileAttributes(String lpFileName, DWORD dwFileAttributes);
+
     /**
      * The GetLogicalDriveStrings function fills a buffer with strings that specify 
      * valid drives in the system.
@@ -954,4 +1220,172 @@ public interface Kernel32 extends StdCallLibrary {
      * @return INVALID_FILE_ATTRIBUTES if the function fails, otherwise the file attributes WinNT.FILE_ATTRIBUTE_*
      */
     public int GetFileAttributes(String lpFileName);
+
+    /**
+     * Retrieves the file type of the specified file.
+     * @param hFile A handle to the file.
+     * @return FILE_TYPE_UNKNOWN if the function fails, or if the type is unknown.
+     *  You can distinguish between a "valid" return of FILE_TYPE_UNKNOWN and its return due to a calling error (for example,
+     *  passing an invalid handle to GetFileType) by calling GetLastError. If the function worked properly and
+     *  FILE_TYPE_UNKNOWN was returned, a call to GetLastError will return NO_ERROR.
+     */
+    public int GetFileType(HANDLE hFile);
+
+    /**
+     * Sends a control code directly to a specified device driver, causing the corresponding device to perform the
+     * corresponding operation.
+     *
+     * @param hDevice A handle to the device on which the operation is to be performed. The device is typically a
+     *   volume, directory, file, or stream. To retrieve a device handle, use the CreateFile function. For more
+     *   information, see Remarks.
+     *
+     * @param dwIoControlCode The control code for the operation. This value identifies the specific operation to be
+     *   performed and the type of device on which to perform it. For a list of the control codes, see Remarks. The
+     *   documentation for each control code provides usage details for the lpInBuffer, nInBufferSize, lpOutBuffer, and
+     *   nOutBufferSize parameters.
+     *
+     * @param lpInBuffer A pointer to the input buffer that contains the data required to perform the operation. The
+     *   format of this data depends on the value of the dwIoControlCode parameter. This parameter can be NULL if
+     *   dwIoControlCode specifies an operation that does not require input data.
+     *
+     * @param nInBufferSize The size of the input buffer, in bytes.
+     *
+     * @param lpOutBuffer A pointer to the output buffer that is to receive the data returned by the operation. The
+     *   format of this data depends on the value of the dwIoControlCode parameter. This parameter can be NULL if
+     *   dwIoControlCode specifies an operation that does not return data.
+     *
+     * @param nOutBufferSize The size of the output buffer, in bytes.
+     *
+     * @param lpBytesReturned A pointer to a variable that receives the size of the data stored in the output buffer,
+     *   in bytes. If the output buffer is too small to receive any data, the call fails, GetLastError returns
+     *   ERROR_INSUFFICIENT_BUFFER, and lpBytesReturned is zero. If the output buffer is too small to hold all of the
+     *   data but can hold some entries, some drivers will return as much data as fits. In this case, the call fails,
+     *   GetLastError returns ERROR_MORE_DATA, and lpBytesReturned indicates the amount of data received. Your
+     *   application should call DeviceIoControl again with the same operation, specifying a new starting point. If
+     *   lpOverlapped is NULL, lpBytesReturned cannot be NULL. Even when an operation returns no output data and
+     *   lpOutBuffer is NULL, DeviceIoControl makes use of lpBytesReturned. After such an operation, the value of
+     *   lpBytesReturned is meaningless. If lpOverlapped is not NULL, lpBytesReturned can be NULL. If this parameter is
+     *   not NULL and the operation returns data, lpBytesReturned is meaningless until the overlapped operation has
+     *   completed. To retrieve the number of bytes returned, call GetOverlappedResult. If hDevice is associated with
+     *   an I/O completion port, you can retrieve the number of bytes returned by calling GetQueuedCompletionStatus.
+     *
+     * @param lpOverlapped A pointer to an OVERLAPPED structure. If hDevice was opened without specifying
+     *   FILE_FLAG_OVERLAPPED, lpOverlapped is ignored. If hDevice was opened with the FILE_FLAG_OVERLAPPED flag, the
+     *   operation is performed as an overlapped (asynchronous) operation. In this case, lpOverlapped must point to a
+     *   valid OVERLAPPED structure that contains a handle to an event object. Otherwise, the function fails in
+     *   unpredictable ways. For overlapped operations, DeviceIoControl returns immediately, and the event object is
+     *   signaled when the operation has been completed. Otherwise, the function does not return until the operation has
+     *   been completed or an error occurs.
+     *
+     * @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 DeviceIoControl(HANDLE hDevice, int dwIoControlCode, Pointer lpInBuffer, int nInBufferSize,
+        Pointer lpOutBuffer, int nOutBufferSize, IntByReference lpBytesReturned, Pointer lpOverlapped);
+	
+    /**
+     * Retrieves information about the amount of space that is available on a disk volume, which is the total amount of 
+     * space, the total amount of free space, and the total amount of free space available to the user that is 
+     * associated with the calling thread.
+     *
+     * @param lpDirectoryName
+     * @param lpFreeBytesAvailable
+     * @param lpTotalNumberOfBytes
+     * @param lpTotalNumberOfFreeBytes
+     * @return
+     *  If the function succeeds, the return value is nonzero.
+     * 
+     *  If the function fails, the return value is zero (0). To get extended error information, 
+     *  call GetLastError.
+     */
+     boolean GetDiskFreeSpaceEx(String lpDirectoryName, LongByReference lpFreeBytesAvailable, LongByReference lpTotalNumberOfBytes, LongByReference lpTotalNumberOfFreeBytes);
+
+    /**
+     * Takes a snapshot of the specified processes, as well as the heaps, modules, and threads used by these processes.
+     *  
+     * @param dwFlags
+     *   The portions of the system to be included in the snapshot.
+     * 
+     * @param th32ProcessID
+     *   The process identifier of the process to be included in the snapshot. This parameter can be zero to indicate
+     *   the current process. This parameter is used when the TH32CS_SNAPHEAPLIST, TH32CS_SNAPMODULE,
+     *   TH32CS_SNAPMODULE32, or TH32CS_SNAPALL value is specified. Otherwise, it is ignored and all processes are
+     *   included in the snapshot.
+     *
+     *   If the specified process is the Idle process or one of the CSRSS processes, this function fails and the last
+     *   error code is ERROR_ACCESS_DENIED because their access restrictions prevent user-level code from opening them.
+     *
+     *   If the specified process is a 64-bit process and the caller is a 32-bit process, this function fails and the
+     *   last error code is ERROR_PARTIAL_COPY (299).
+     *
+     * @return
+     *   If the function succeeds, it returns an open handle to the specified snapshot.
+     *
+     *   If the function fails, it returns INVALID_HANDLE_VALUE. To get extended error information, call GetLastError.
+     *   Possible error codes include ERROR_BAD_LENGTH.
+     */
+    HANDLE CreateToolhelp32Snapshot(DWORD dwFlags, DWORD th32ProcessID);
+
+    /**
+     * Retrieves information about the first process encountered in a system snapshot.
+     *
+     * @param hSnapshot A handle to the snapshot returned from a previous call to the CreateToolhelp32Snapshot function.
+     * @param lppe A pointer to a PROCESSENTRY32 structure. It contains process information such as the name of the
+     *   executable file, the process identifier, and the process identifier of the parent process.
+     * @return
+     *   Returns TRUE if the first entry of the process list has been copied to the buffer or FALSE otherwise. The
+     *   ERROR_NO_MORE_FILES error value is returned by the GetLastError function if no processes exist or the snapshot
+     *   does not contain process information.
+     */
+    boolean Process32First(HANDLE hSnapshot, Tlhelp32.PROCESSENTRY32.ByReference lppe);
+
+    /**
+     * Retrieves information about the next process recorded in a system snapshot.
+     *
+     * @param hSnapshot A handle to the snapshot returned from a previous call to the CreateToolhelp32Snapshot function.
+     * @param lppe A pointer to a PROCESSENTRY32 structure.
+     * @return
+     *   Returns TRUE if the next entry of the process list has been copied to the buffer or FALSE otherwise. The
+     *   ERROR_NO_MORE_FILES error value is returned by the GetLastError function if no processes exist or the snapshot
+     *   does not contain process information.
+     */
+    boolean Process32Next(HANDLE hSnapshot, Tlhelp32.PROCESSENTRY32.ByReference lppe);
+    
+    /**
+     * The SetEnvironmentVariable function sets the contents of the specified environment
+     * variable for the current process.
+     * @param lpName
+     *  Pointer to a string containing the name of the environment variable to set.
+     * @param lpValue
+     *  Pointer to a string containing the value to set it to.
+     *  if this value is NULL, the variable is deleted from the current process' environment.
+     *
+     * @return
+     *  If the function succeeds, the return value is non-zero.
+     *  If the function fails, the return value is zero. To get extended error information,
+     *  call GetLastError.
+     */
+    boolean SetEnvironmentVariable(String lpName, String lpValue);
+    
+    /**
+     * Retrieves the contents of the specified variable from the environment block of the calling process.
+     * @param lpName
+     *  The name of the environment variable.
+     * @param lpBuffer
+     * 	A pointer to a buffer that receives the contents of the specified environment variable as a null-terminated string. 
+     * 	An environment variable has a maximum size limit of 32,767 characters, including the null-terminating character.
+     * @param nSize
+     * 	The size of the buffer pointed to by the lpBuffer parameter, including the null-terminating character, in characters.
+     * @return
+     * 	If the function succeeds, the return value is the number of characters stored in the buffer pointed to by lpBuffer, 
+     * 	not including the terminating null character.
+     * 	If lpBuffer is not large enough to hold the data, the return value is the buffer size, in characters, 
+     * 	required to hold the string and its terminating null character and the contents of lpBuffer are undefined.
+     *  If the function fails, the return value is zero.  To get extended error information,
+     *  call GetLastError.
+     */
+    int GetEnvironmentVariable(String lpName, char[] lpBuffer, int nSize);
 }

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

@@ -10,14 +10,17 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.  
  */
-package com.sun.jna.platform.win32;
+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.WinDef.DWORD;
+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;
@@ -26,7 +29,7 @@ import com.sun.jna.ptr.PointerByReference;
  * Kernel32 utility API.
  * @author dblock[at]dblock.org
  */
-public abstract class Kernel32Util {
+public abstract class Kernel32Util implements WinDef {
 	
 	/**
 	 * Get current computer NetBIOS name.
@@ -34,7 +37,7 @@ public abstract class Kernel32Util {
 	 *  Netbios name.
 	 */
 	public static String getComputerName() {
-    	char buffer[] = new char[WinBase.MAX_COMPUTERNAME_LENGTH() + 1];
+    	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());
@@ -64,9 +67,8 @@ public abstract class Kernel32Util {
         	throw new LastErrorException(Kernel32.INSTANCE.GetLastError());
         }	       
     	String s = buffer.getValue().getString(0, ! Boolean.getBoolean("w32.ascii"));
-    	s = s.replace(".\r",".").replace(".\n",".");
     	Kernel32.INSTANCE.LocalFree(buffer.getValue());
-    	return s;		
+    	return s.trim();		
 	}
 	
 	/**
@@ -145,4 +147,82 @@ public abstract class Kernel32Util {
 		}
 		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,426 @@
+/* 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.Arrays;
+import java.util.List;
+
+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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "lgrui1_name", "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;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "usri1_name", "usri1_password", "usri1_password_age", "usri1_priv", "usri1_home_dir", "usri1_comment", "usri1_flags", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "usri23_name", "usri23_full_name", "usri23_comment", "usri23_flags", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "grpi1_name", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "grpi2_name", "grpi2_comment", "grpi2_group_id", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "grpi3_name", "grpi3_comment", "grpi3_group_id", "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

@@ -13,18 +13,18 @@
 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 {
-	public static final 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."
-	 */
-	public static final int  MAX_PREFERRED_LENGTH = -1;
-}
+
+/**
+ * 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

@@ -13,22 +13,22 @@
 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;		
-	};
-
-}
+
+/**
+ * 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,244 @@
+/* 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.Arrays;
+import java.util.List;
+
+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;
+		
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "Length", "MaximumLength", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "Sid", "DnsName", "NetbiosName" });
+        }
+    }
+	
+    public static class LSA_FOREST_TRUST_BINARY_DATA extends Structure {
+        public int Length;
+        public Pointer Buffer;
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "Length", "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;
+		
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "Flags", "ForestTrustType", "Time", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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;
+
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "RecordCount", "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;
+        
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "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

@@ -13,15 +13,12 @@
 package com.sun.jna.platform.win32;
 
 import com.sun.jna.Native;
-import com.sun.jna.NativeLong;
 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.NativeLongByReference;
 import com.sun.jna.ptr.PointerByReference;
 import com.sun.jna.win32.StdCallLibrary;
 import com.sun.jna.win32.W32APIOptions;
@@ -390,7 +387,7 @@ public interface Netapi32 extends StdCallLibrary {
 	 * @param Flags
 	 *  Contains a set of flags that determines which domain trusts to enumerate.
 	 * @param Domains
-	 *  Pointer to a PDS_DOMAIN_TRUSTS value that receives an array of DS_DOMAIN_TRUSTS structures. 
+	 *  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
@@ -398,6 +395,37 @@ public interface Netapi32 extends StdCallLibrary {
 	 * @return
 	 *  Returns ERROR_SUCCESS if successful or a Win32 error code otherwise.
 	 */
-	public int DsEnumerateDomainTrusts(String serverName, NativeLong Flags, 
-			PDS_DOMAIN_TRUSTS.ByReference Domains, NativeLongByReference DomainCount);
+	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 domainTrustCount = new IntByReference();
+        PointerByReference domainsPointerRef = new PointerByReference();
+        int rc = Netapi32.INSTANCE.DsEnumerateDomainTrusts(serverName, 
+                DsGetDC.DS_DOMAIN_VALID_FLAGS, domainsPointerRef, domainTrustCount);
+    	if(W32Errors.NO_ERROR != rc) {
+            throw new Win32Exception(rc);
+    	}
+    	try {
+            DS_DOMAIN_TRUSTS domainTrustRefs = new DS_DOMAIN_TRUSTS(domainsPointerRef.getValue());
+            DS_DOMAIN_TRUSTS[] domainTrusts = (DS_DOMAIN_TRUSTS[]) domainTrustRefs.toArray(new DS_DOMAIN_TRUSTS[domainTrustCount.getValue()]);
+            ArrayList<DomainTrust> trusts = new ArrayList<DomainTrust>(domainTrustCount.getValue());
+            for(DS_DOMAIN_TRUSTS domainTrust : domainTrusts) {
+                DomainTrust t = new DomainTrust();
+                if (domainTrust.DnsDomainName != null) {
+                	t.DnsDomainName = domainTrust.DnsDomainName.toString();
+                }
+                if (domainTrust.NetbiosDomainName != null) {
+                	t.NetbiosDomainName = domainTrust.NetbiosDomainName.toString();
+                }
+                t.DomainSid = domainTrust.DomainSid;
+                if (domainTrust.DomainSid != null) {
+                	t.DomainSidString = Advapi32Util.convertSidToStringSid(domainTrust.DomainSid);
+                }
+                t.DomainGuid = domainTrust.DomainGuid;
+                if (domainTrust.DomainGuid != null) {
+                	t.DomainGuidString = Ole32Util.getStringFromGUID(domainTrust.DomainGuid);
+                }
+                t.flags = domainTrust.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/ObjBase.java

@@ -23,15 +23,15 @@ import com.sun.jna.platform.win32.WTypes;
  */
 public interface ObjBase {
 
-public static final int CLSCTX_INPROC = (WTypes.CLSCTX_INPROC_SERVER | WTypes.CLSCTX_INPROC_HANDLER);
+    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);
 
-// With DCOM, CLSCTX_REMOTE_SERVER should be included
-public static final int CLSCTX_ALL = (WTypes.CLSCTX_INPROC_SERVER
-        | WTypes.CLSCTX_INPROC_HANDLER
-        | WTypes.CLSCTX_LOCAL_SERVER
-        | WTypes.CLSCTX_REMOTE_SERVER);
-
-public static final int CLSCTX_SERVER = (WTypes.CLSCTX_INPROC_SERVER
-        | 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/Secur32.java

@@ -0,0 +1,313 @@
+/* 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.Sspi.CredHandle;
+import com.sun.jna.platform.win32.Sspi.CtxtHandle;
+import com.sun.jna.platform.win32.Sspi.PSecPkgInfo;
+import com.sun.jna.platform.win32.Sspi.SecBufferDesc;
+import com.sun.jna.platform.win32.Sspi.TimeStamp;
+import com.sun.jna.platform.win32.WinNT.HANDLEByReference;
+import com.sun.jna.platform.win32.WinNT.LUID;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+/**
+ * Secur32.dll Interface.
+ * @author dblock[at]dblock.org
+ */
+public interface Secur32 extends StdCallLibrary {
+    Secur32 INSTANCE = (Secur32) Native.loadLibrary("Secur32", Secur32.class, W32APIOptions.UNICODE_OPTIONS);
+	
+    /**
+     * Specifies a format for a directory service object name.
+     * http://msdn.microsoft.com/en-us/library/ms724268(VS.85).aspx
+     */
+    public abstract class EXTENDED_NAME_FORMAT {
+        public static final int NameUnknown = 0;
+        public static final int NameFullyQualifiedDN = 1;
+        public static final int NameSamCompatible = 2;
+        public static final int NameDisplay = 3;
+        public static final int NameUniqueId = 6;
+        public static final int NameCanonical = 7;
+        public static final int NameUserPrincipal = 8;
+        public static final int NameCanonicalEx = 9;
+        public static final int NameServicePrincipal = 10;
+        public static final int NameDnsDomain = 12;
+    };
+	
+    /**
+     * Retrieves the name of the user or other security principal associated with 
+     * the calling thread. You can specify the format of the returned name.
+     * @param nameFormat The format of the name. 
+     * @param lpNameBuffer A pointer to a buffer that receives the name in the specified format. 
+     * @param len On input, the size of the buffer, on output the number of characters copied into the buffer, not including the terminating null character.
+     * @return True if the function succeeds. False otherwise.
+     */
+    public boolean GetUserNameEx(int nameFormat, char[] lpNameBuffer, IntByReference len);
+
+    /**
+     * The AcquireCredentialsHandle function acquires a handle to preexisting credentials 
+     * of a security principal. This handle is required by the AcceptSecurityContext 
+     * and InitializeSecurityContext functions. These can be either preexisting credentials, 
+     * which are established through a system logon that is not described here, or the 
+     * caller can provide alternative credentials.
+     * @param pszPrincipal
+     *  A pointer to a null-terminated string that specifies the name of the principal whose 
+     *  credentials the handle will reference.
+     * @param pszPackage
+     *   A pointer to a null-terminated string that specifies the name of the security package 
+     *   with which these credentials will be used.
+     * @param fCredentialUse
+     *  A flag that indicates how these credentials will be used.
+     * @param pvLogonID
+     *  A pointer to a locally unique identifier (LUID) that identifies the user. 
+     * @param pAuthData
+     *  A pointer to package-specific data. This parameter can be NULL, which indicates 
+     *  that the default credentials for that package must be used. To use supplied 
+     *  credentials, pass a SEC_WINNT_AUTH_IDENTITY structure that includes those credentials 
+     *  in this parameter.
+     * @param pGetKeyFn
+     *  This parameter is not used and should be set to NULL. 
+     * @param pvGetKeyArgument
+     *  This parameter is not used and should be set to NULL.
+     * @param phCredential
+     *  A pointer to a CredHandle structure to receive the credential handle. 
+     * @param ptsExpiry
+     *  A pointer to a TimeStamp structure that receives the time at which the returned 
+     *  credentials expire. The value returned in this TimeStamp structure depends on 
+     *  the security package. The security package must return this value in local time.
+     * @return
+     *  If the function succeeds, the function returns one of the SEC_I_ success codes.
+     *  If the function fails, the function returns one of the SEC_E_ error codes.
+     */
+    public int AcquireCredentialsHandle(String pszPrincipal, String pszPackage,
+                                        int fCredentialUse, LUID pvLogonID,
+                                        Pointer pAuthData, Pointer pGetKeyFn, // TODO: SEC_GET_KEY_FN
+                                        Pointer pvGetKeyArgument, CredHandle phCredential, 
+                                        TimeStamp ptsExpiry);
+	
+    /**
+     * The InitializeSecurityContext function initiates the client side, outbound security 
+     * context from a credential handle. The function is used to build a security context 
+     * between the client application and a remote peer. InitializeSecurityContext returns 
+     * a token that the client must pass to the remote peer, which the peer in turn submits 
+     * to the local security implementation through the AcceptSecurityContext call. The 
+     * token generated should be considered opaque by all callers.
+     * 
+     * Typically, the InitializeSecurityContext function is called in a loop until a 
+     * sufficient security context is established.
+     * 
+     * @param phCredential
+     *  A handle to the credentials returned by AcquireCredentialsHandle. This handle is 
+     *  used to build the security context. The InitializeSecurityContext function requires 
+     *  at least OUTBOUND credentials. 
+     * @param phContext
+     *  A pointer to a CtxtHandle structure. On the first call to InitializeSecurityContext,
+     *  this pointer is NULL. On the second call, this parameter is a pointer to the handle 
+     *  to the partially formed context returned in the phNewContext parameter by the first 
+     *  call.
+     * @param pszTargetName
+     *  A pointer to a null-terminated string that indicates the target of the context. 
+     *  The string contents are security-package specific.
+     * @param fContextReq
+     *  Bit flags that indicate requests for the context. Not all packages can support all 
+     *  requirements. Flags used for this parameter are prefixed with ISC_REQ_, for example,
+     *  ISC_REQ_DELEGATE. 
+     * @param Reserved1
+     *  This parameter is reserved and must be set to zero.
+     * @param TargetDataRep
+     *  The data representation, such as byte ordering, on the target. This parameter can be 
+     *  either SECURITY_NATIVE_DREP or SECURITY_NETWORK_DREP.
+     * @param pInput
+     *  A pointer to a SecBufferDesc structure that contains pointers to the buffers supplied 
+     *  as input to the package. The pointer must be NULL on the first call to the function. 
+     *  On subsequent calls to the function, it is a pointer to a buffer allocated with enough 
+     *  memory to hold the token returned by the remote peer.
+     * @param Reserved2
+     *  This parameter is reserved and must be set to zero. 
+     * @param phNewContext
+     *  A pointer to a CtxtHandle structure. On the first call to InitializeSecurityContext, 
+     *  this pointer receives the new context handle. On the second call, phNewContext can be 
+     *  the same as the handle specified in the phContext parameter.
+     * @param pOutput
+     *  A pointer to a SecBufferDesc structure that contains pointers to the SecBuffer structure 
+     *  that receives the output data. If a buffer was typed as SEC_READWRITE in the input, it 
+     *  will be there on output. The system will allocate a buffer for the security token if 
+     *  requested (through ISC_REQ_ALLOCATE_MEMORY) and fill in the address in the buffer 
+     *  descriptor for the security token.
+     * @param pfContextAttr
+     *  A pointer to a variable to receive a set of bit flags that indicate the attributes of 
+     *  the established context. Flags used for this parameter are prefixed with ISC_RET, 
+     *  such as ISC_RET_DELEGATE.
+     * @param ptsExpiry
+     *  A pointer to a TimeStamp structure that receives the expiration time of the context.
+     *  It is recommended that the security package always return this value in local time. 
+     *  This parameter is optional and NULL should be passed for short-lived clients.
+     * @return
+     *  If the function succeeds, the function returns one of the SEC_I_ success codes.
+     *  If the function fails, the function returns one of the SEC_E_ error codes.
+     */
+    public int InitializeSecurityContext(CredHandle phCredential, CtxtHandle phContext,
+                                         String pszTargetName, int fContextReq, int Reserved1,
+                                         int TargetDataRep, SecBufferDesc pInput, int Reserved2,
+                                         CtxtHandle phNewContext, SecBufferDesc pOutput, IntByReference pfContextAttr,
+                                         TimeStamp ptsExpiry);
+	
+    /**
+     * The DeleteSecurityContext function deletes the local data structures associated 
+     * with the specified security context.
+     * @param phContext
+     *  Handle of the security context to delete. 
+     * @return
+     *  If the function succeeds, the return value is SEC_E_OK.
+     *  If the function fails, the return value is SEC_E_INVALID_HANDLE;
+     */
+    public int DeleteSecurityContext(CtxtHandle phContext);
+	
+    /**
+     * The FreeCredentialsHandle function notifies the security system that the 
+     * credentials are no longer needed. An application calls this function to free 
+     * the credential handle acquired in the call to the AcquireCredentialsHandle 
+     * function. When all references to this credential set have been removed, the 
+     * credentials themselves can be removed.
+     * @param phCredential
+     *  A pointer to the credential handle obtained by using the AcquireCredentialsHandle
+     *  function. 
+     * @return
+     *  If the function succeeds, the return value is SEC_E_OK.
+     *  If the function fails, the return value is SEC_E_INVALID_HANDLE;
+     */
+    public int FreeCredentialsHandle(CredHandle phCredential);
+	
+    /**
+     * The AcceptSecurityContext function enables the server component of a transport 
+     * application to establish a security context between the server and a remote client.
+     * The remote client uses the InitializeSecurityContext function to start the process 
+     * of establishing a security context. The server can require one or more reply tokens
+     * from the remote client to complete establishing the security context.
+     * @param phCredential
+     *  A handle to the credentials of the server. The server calls the AcquireCredentialsHandle 
+     *  function with either the SECPKG_CRED_INBOUND or SECPKG_CRED_BOTH flag set to retrieve 
+     *  this handle. 
+     * @param phContext
+     *  A pointer to a CtxtHandle structure. On the first call to AcceptSecurityContext, 
+     *  this pointer is NULL. On subsequent calls, phContext is the handle to the partially 
+     *  formed context that was returned in the phNewContext parameter by the first call. 
+     * @param pInput
+     *  A pointer to a SecBufferDesc structure generated by a client call to 
+     *  InitializeSecurityContext that contains the input buffer descriptor. 
+     * @param fContextReq
+     *  Bit flags that specify the attributes required by the server to establish the 
+     *  context. Bit flags can be combined by using bitwise-OR operations.
+     * @param TargetDataRep
+     *  The data representation, such as byte ordering, on the target. This parameter can 
+     *  be either SECURITY_NATIVE_DREP or SECURITY_NETWORK_DREP.
+     * @param phNewContext
+     *  A pointer to a CtxtHandle structure. On the first call to AcceptSecurityContext, 
+     *  this pointer receives the new context handle. On subsequent calls, phNewContext 
+     *  can be the same as the handle specified in the phContext parameter. 
+     * @param pOutput
+     *  A pointer to a SecBufferDesc structure that contains the output buffer descriptor. 
+     *  This buffer is sent to the client for input into additional calls to 
+     *  InitializeSecurityContext. An output buffer may be generated even if the function 
+     *  returns SEC_E_OK. Any buffer generated must be sent back to the client application. 
+     * @param pfContextAttr
+     *  A pointer to a variable that receives a set of bit flags that indicate the 
+     *  attributes of the established context. For a description of the various attributes, 
+     *  see Context Requirements. Flags used for this parameter are prefixed with ASC_RET, 
+     *  for example, ASC_RET_DELEGATE.
+     * @param ptsTimeStamp
+     *  A pointer to a TimeStamp structure that receives the expiration time of the context. 
+     * @return
+     *  This function returns one of SEC_* values.
+     */
+    public int AcceptSecurityContext(CredHandle phCredential, CtxtHandle phContext,
+                                     SecBufferDesc pInput, int fContextReq, int TargetDataRep,
+                                     CtxtHandle phNewContext, SecBufferDesc pOutput, IntByReference pfContextAttr,
+                                     TimeStamp ptsTimeStamp);
+
+    /**
+     * The EnumerateSecurityPackages function returns an array of SecPkgInfo structures that 
+     * describe the security packages available to the client.
+     * @param pcPackages
+     *  A pointer to a int variable that receives the number of packages returned.
+     * @param ppPackageInfo
+     *  A pointer to a variable that receives a pointer to an array of SecPkgInfo structures. 
+     *  Each structure contains information from the security support provider (SSP) that 
+     *  describes a security package that is available within that SSP. 
+     * @return
+     *  If the function succeeds, the function returns SEC_E_OK.
+     *  If the function fails, it returns a nonzero error code.
+     */
+    public int EnumerateSecurityPackages(IntByReference pcPackages, 
+                                         PSecPkgInfo.ByReference ppPackageInfo);
+	
+    /**
+     * The FreeContextBuffer function enables callers of security package functions to free a memory 
+     * buffer that was allocated by the security package as a result of calls to InitializeSecurityContext 
+     * and AcceptSecurityContext.
+     * @param buffer
+     *  A pointer to memory allocated by the security package.
+     * @return
+     *  If the function succeeds, the function returns SEC_E_OK.
+     *  If the function fails, it returns a nonzero error code.
+     */
+    public int FreeContextBuffer(Pointer buffer);
+	
+    /**
+     * The QuerySecurityContextToken function obtains the access token for a client security context
+     * and uses it directly.
+     * @param phContext
+     *  Handle of the context to query. 
+     * @param phToken
+     *  Returned handle to the access token. 
+     * @return
+     *  If the function succeeds, the function returns SEC_E_OK.
+     *  If the function fails, it returns a nonzero error code. One possible error code return is 
+     *  SEC_E_INVALID_HANDLE.
+     */
+    public int QuerySecurityContextToken(CtxtHandle phContext, 
+                                         HANDLEByReference phToken);
+	
+    /**
+     * The ImpersonateSecurityContext function allows a server to impersonate a client by using 
+     * a token previously obtained by a call to AcceptSecurityContext or QuerySecurityContextToken. 
+     * This function allows the application server to act as the client, and thus all necessary 
+     * access controls are enforced.
+     * @param phContext
+     *  The handle of the context to impersonate. This handle must have been obtained by a call 
+     *  to the AcceptSecurityContext function.
+     * @return
+     *  If the function succeeds, the function returns SEC_E_OK.
+     *  If the function fails, it returns a SEC_E_INVALID_HANDLE, SEC_E_NO_IMPERSONATION or 
+     *  SEC_E_UNSUPPORTED_FUNCTION error code.
+     */
+    public int ImpersonateSecurityContext(CtxtHandle phContext);
+	
+    /**
+     * Allows a security package to discontinue the impersonation of the caller and restore its 
+     * own security context.
+     * @param phContext
+     *  Handle of the security context being impersonated. This handle must have been obtained in 
+     *  the call to the AcceptSecurityContext function and used in the call to the 
+     *  ImpersonateSecurityContext function.
+     * @return
+     *  If the function succeeds, the return value is SEC_E_OK.
+     *  If the function fails, the return value can be either SEC_E_INVALID_HANDLE or SEC_E_UNSUPPORTED_FUNCTION.
+     */
+    public int RevertSecurityContext(CtxtHandle phContext);
+}