windows-pr 0.6.6 → 0.7.0

data/lib/windows/msvcrt/io.rb

@@ -1,80 +1,180 @@
-require 'Win32API'
-
-module Windows
-   class IO
-      S_IFMT   = 0170000 # file type mask
-      S_IFDIR  = 0040000 # directory
-      S_IFCHR  = 0020000 # character special
-      S_IFIFO  = 0010000 # pipe
-      S_IFREG  = 0100000 # regular
-      S_IREAD  = 0000400 # read permission, owner
-      S_IWRITE = 0000200 # write permission, owner
-      S_IEXEC  = 0000100 # execute/search permission, owner
-
-      Clearerr  = Win32API.new('msvcrt', 'clearerr', 'I', 'V')
-      Close     = Win32API.new('msvcrt', '_close', 'I', 'V')
-      Fclose    = Win32API.new('msvcrt', 'fclose', 'I', 'I')
-      Fcloseall = Win32API.new('msvcrt', '_fcloseall', 'V', 'I')
-      Fdopen    = Win32API.new('msvcrt', '_fdopen', 'IP', 'I')
-      Feof      = Win32API.new('msvcrt', 'feof', 'I', 'I')
-      Fflush    = Win32API.new('msvcrt', 'fflush', 'I', 'I')
-      Fileno    = Win32API.new('msvcrt', '_fileno', 'I', 'I')
-      Fopen     = Win32API.new('msvcrt', 'fopen', 'PP', 'I')
-      Open      = Win32API.new('msvcrt', '_open', 'PPI', 'I')
-      Wopen     = Win32API.new('msvcrt', '_wopen', 'PPI', 'I')
-      Wfdopen   = Win32API.new('msvcrt', '_wfdopen', 'IP', 'I')
-      Wfopen    = Win32API.new('msvcrt', '_wfopen', 'PPI', 'I')
-
-      def clearerr(stream)
-         Clearerr.call(stream)
-      end
-
-      def close
-         Close.call(fd)
-      end
-
-      def fclose(stream)
-         Fclose.call(stream)
-      end
-
-      def fcloseall
-         Fcloseall.call
-      end
-
-      def fdopen(fd, mode)
-         Fdopen.call(fd, mode)
-      end
-
-      def feof(stream)
-         Feof.call(stream)
-      end
-
-      def fflush(stream)
-         Fflush.call(stream)
-      end
-
-      def fileno(stream)
-         Fileno.call(stream)
-      end
-
-      def fopen(file, mode)
-         Fopen.call(file, mode)
-      end
-
-      def open(file, flag, mode)
-         Open.call(file, flag, mode)
-      end
-
-      def wopen(file, flag, mode)
-         Wopen.call(file, flag, mode)
-      end
-
-      def wfdopen(fd, mode)
-         Wfdopen.call(fd, mode)
-      end
-
-      def wfopen(file, mode)
-         Wfopen.call(file, mode)
-      end
-   end
-end
+require 'windows/api'
+include Windows
+
+# This module includes stream I/O, low level I/O, etc.
+module Windows
+   module MSVCRT
+      module IO
+         API.auto_constant = false
+         API.auto_method   = false
+         API.auto_unicode  = false
+
+         S_IFMT   = 0170000 # file type mask
+         S_IFDIR  = 0040000 # directory
+         S_IFCHR  = 0020000 # character special
+         S_IFIFO  = 0010000 # pipe
+         S_IFREG  = 0100000 # regular
+         S_IREAD  = 0000400 # read permission, owner
+         S_IWRITE = 0000200 # write permission, owner
+         S_IEXEC  = 0000100 # execute/search permission, owner
+
+         Clearerr  = API.new('clearerr', 'I', 'V', 'msvcrt')
+         Close     = API.new('_close', 'I', 'V', 'msvcrt')
+         Fclose    = API.new('fclose', 'I', 'I', 'msvcrt')
+         Fcloseall = API.new('_fcloseall', 'V', 'I', 'msvcrt')
+         Fdopen    = API.new('_fdopen', 'IP', 'I', 'msvcrt')
+         Feof      = API.new('feof', 'I', 'I', 'msvcrt')
+         Ferror    = API.new('ferror', 'L', 'I', 'msvcrt')
+         Fflush    = API.new('fflush', 'I', 'I', 'msvcrt')
+         Fgetc     = API.new('fgetc', 'L', 'I', 'msvcrt')
+         Fgetpos   = API.new('fgetpos', 'LP', 'I', 'msvcrt')
+         Fgetwc    = API.new('fgetwc', 'L', 'I', 'msvcrt')
+         Fgets     = API.new('fgets', 'PIL', 'P', 'msvcrt')
+         Fgetws    = API.new('fgetws', 'PIL', 'P', 'msvcrt')
+         Fileno    = API.new('_fileno', 'I', 'I', 'msvcrt')
+         Flushall  = API.new('_flushall', 'V', 'I', 'msvcrt')
+         Fopen     = API.new('fopen', 'PP', 'I', 'msvcrt')
+         Fputs     = API.new('fputs', 'PL', 'I', 'msvcrt')
+         Fputws    = API.new('fputws', 'PL', 'I', 'msvcrt')
+         Getc      = API.new('getc', 'L', 'I', 'msvcrt')
+         Getwc     = API.new('getwc', 'L', 'L', 'msvcrt')
+         Open      = API.new('_open', 'PPI', 'I', 'msvcrt')
+         Rmtmp     = API.new('_rmtmp', 'V', 'I', 'msvcrt')
+         Tempnam   = API.new('_tempnam', 'PP', 'P', 'msvcrt')
+         Tmpfile   = API.new('tmpfile', 'V', 'L', 'msvcrt')
+         Tmpnam    = API.new('tmpnam', 'P', 'P', 'msvcrt')
+         Wopen     = API.new('_wopen', 'PPI', 'I', 'msvcrt')
+         Wfdopen   = API.new('_wfdopen', 'IP', 'I', 'msvcrt')
+         Wfopen    = API.new('_wfopen', 'PPI', 'I', 'msvcrt')
+         Wtempnam  = API.new('_wtempnam', 'PP', 'P', 'msvcrt')
+         Wtmpnam   = API.new('_wtmpnam', 'P', 'P', 'msvcrt')
+
+         # VC++ 8.0 or later
+         begin
+            Tmpfile_s = API.new('_tmpfile_s', 'P', 'L', 'msvcrt')
+         rescue RuntimeError
+            # Ignore - you must check for it via 'defined?'
+         end
+
+         def clearerr(stream)
+            Clearerr.call(stream)
+         end
+
+         def close(fd)
+            Close.call(fd)
+         end
+
+         def fclose(stream)
+            Fclose.call(stream)
+         end
+
+         def fcloseall
+            Fcloseall.call
+         end
+
+         def fdopen(fd, mode)
+            Fdopen.call(fd, mode)
+         end
+
+         def feof(stream)
+            Feof.call(stream)
+         end
+
+         def ferror(stream)
+            Ferror.call(stream)
+         end
+
+         def fflush(stream)
+            Fflush.call(stream)
+         end
+
+         def fgetc(stream)
+            Fgetc.call(stream)
+         end
+
+         def fgetpos(stream, pos)
+            Fgetpos.call(stream, pos)
+         end
+
+         def fgets(str, n, stream)
+            Fgets.call(str, n, stream)
+         end
+
+         def fgetws(str, n, stream)
+            Fgetws.call(str, n, stream)
+         end
+
+         def fgetwc(stream)
+            Fgetwc.call(stream)
+         end
+
+         def fileno(stream)
+            Fileno.call(stream)
+         end
+
+         def flushall
+            Flushall.call()
+         end
+
+         def fopen(file, mode)
+            Fopen.call(file, mode)
+         end
+
+         def fputs(str, stream)
+            Fputs.call(str, stream)
+         end
+
+         def fputws(str, stream)
+            Fputws.call(str, stream)
+         end
+         
+         def getc(stream)
+            Getc.call(stream)
+         end
+         
+         def getwc(stream)
+            Getwc.call(stream)
+         end
+
+         def open(file, flag, mode)
+            Open.call(file, flag, mode)
+         end
+
+         def tmpfile()
+            Tmpfile.call
+         end
+
+         def tmpfile_s(file_ptr)
+            Tmpfile_s.call(file_ptr)
+         end
+
+         def tempnam(dir, prefix)
+            Tempnam.call(dir, prefix)
+         end
+
+         def tmpnam(template)
+            Tmpnam.call(template)
+         end
+
+         def wopen(file, flag, mode)
+            Wopen.call(file, flag, mode)
+         end
+
+         def wfdopen(fd, mode)
+            Wfdopen.call(fd, mode)
+         end
+
+         def wfopen(file, mode)
+            Wfopen.call(file, mode)
+         end
+
+         def wtempnam(dir, prefix)
+            Wtempnam.call(dir, prefix)
+         end
+
+         def wtmpnam(template)
+            Wtmpnam.call(template)
+         end
+      end
+   end
+end

data/lib/windows/msvcrt/string.rb

@@ -1,22 +1,27 @@
-require 'Win32API'
+require 'windows/api'
+include Windows
 
 module Windows
    module MSVCRT
       module String
-         Strcmp = Win32API.new('msvcrt', 'strcmp', 'PP', 'I')
-         Strcpy = Win32API.new('msvcrt', 'strcpy', 'PL', 'L')
-         Strlen = Win32API.new('msvcrt', 'strlen', 'P', 'L')
-         Strrev = Win32API.new('msvcrt', '_strrev', 'P', 'P')
-         
-         Mbscmp = Win32API.new('msvcrt', '_mbscmp', 'PP', 'I')
-         Mbscpy = Win32API.new('msvcrt', '_mbscpy', 'PL', 'L')
-         Mbslen = Win32API.new('msvcrt', '_mbslen', 'P', 'L')
-         Mbsrev = Win32API.new('msvcrt', '_mbsrev', 'P', 'P')
+         API.auto_constant = false
+         API.auto_method   = false
+         API.auto_unicode  = false
+
+         Strcmp = API.new('strcmp', 'PP', 'I', 'msvcrt')
+         Strcpy = API.new('strcpy', 'PL', 'L', 'msvcrt')
+         Strlen = API.new('strlen', 'P', 'L', 'msvcrt')
+         Strrev = API.new('_strrev', 'P', 'P', 'msvcrt')
+        
+         Mbscmp = API.new('_mbscmp', 'PP', 'I', 'msvcrt')
+         Mbscpy = API.new('_mbscpy', 'PL', 'L', 'msvcrt')
+         Mbslen = API.new('_mbslen', 'P', 'L', 'msvcrt')
+         Mbsrev = API.new('_mbsrev', 'P', 'P', 'msvcrt')
          
-         Wcscmp = Win32API.new('msvcrt', 'wcscmp', 'PP', 'I')
-         Wcscpy = Win32API.new('msvcrt', 'wcscpy', 'PL', 'L')
-         Wcslen = Win32API.new('msvcrt', 'wcslen', 'P', 'L')
-         Wcsrev = Win32API.new('msvcrt', '_wcsrev', 'P', 'P')       
+         Wcscmp = API.new('wcscmp', 'PP', 'I', 'msvcrt')
+         Wcscpy = API.new('wcscpy', 'PL', 'L', 'msvcrt')
+         Wcslen = API.new('wcslen', 'P', 'L', 'msvcrt')
+         Wcsrev = API.new('_wcsrev', 'P', 'P', 'msvcrt')
 
          def strcmp(str1, str2)
             if str1 == 0 || str2 == 0
@@ -85,4 +90,4 @@ module Windows
          end  
       end
    end
-end
+end

data/lib/windows/national.rb

@@ -1,7 +1,13 @@
-require 'Win32API'
+require 'windows/api'
+include Windows
 
 module Windows
    module National
+      API.auto_namespace = 'Windows::National'
+      API.auto_constant  = true
+      API.auto_method    = true
+      API.auto_unicode   = true
+
       # Code page identifiers.  Used for get_acp_string method. 
       CODE_PAGE = {
          037 => 'IBM EBCDIC = U.S./Canada',
@@ -525,43 +531,14 @@ module Windows
       LOCALE_USER_DEFAULT   = 1024
       LOCALE_INVARIANT      = 8323072
       
-      GetACP        = Win32API.new('kernel32', 'GetACP', 'V', 'I')
-      GetDateFormat = Win32API.new('kernel32', 'GetDateFormat', 'LLPPPI', 'I')
-      GetLocaleInfo = Win32API.new('kernel32', 'GetLocaleInfo', 'LLPL', 'I')
-
-      GetSystemDefaultLangID = Win32API.new('kernel32', 'GetSystemDefaultLangID', 'V', 'L')
-      GetSystemDefaultLCID   = Win32API.new('kernel32', 'GetSystemDefaultLCID', 'V', 'L')
-      GetUserDefaultLangID   = Win32API.new('kernel32', 'GetUserDefaultLangID', 'V', 'L')
-      GetUserDefaultLCID     = Win32API.new('kernel32', 'GetUserDefaultLCID', 'V', 'L')
-      
-      def GetACP()
-         GetACP.call
-      end
-      
-      def GetDateFormat(locale, flags, date, format, datestr, size)
-         GetDateFormat.call(locale, flags, date, format, datestr, size)
-      end
-      
-      def GetLocaleInfo(locale, lctype, lcdata, size)
-         GetLocaleInfo.call(locale, lctype, lcdata, size)
-      end
-
-      def GetSystemDefaultLangID()
-         GetSystemDefaultLangID.call
-      end
-
-      def GetSystemDefaultLCID()
-         GetSystemDefaultLCID.call
-      end
+      API.new('GetACP', 'V', 'I')
+      API.new('GetDateFormat', 'LLPPPI', 'I')
+      API.new('GetLocaleInfo', 'LLPL', 'I')
+      API.new('GetSystemDefaultLangID', 'V', 'L')
+      API.new('GetSystemDefaultLCID', 'V', 'L')
+      API.new('GetUserDefaultLangID', 'V', 'L')
+      API.new('GetUserDefaultLCID', 'V', 'L')
       
-      def GetUserDefaultLangID()
-         GetUserDefaultLangID.call
-      end
-
-      def GetUserDefaultLCID()
-         GetUserDefaultLCID.call
-      end
-
       # Convenience method for converting the results of the GetACP()
       # function to a human readable string.
       # 
@@ -577,8 +554,8 @@ module Windows
       
       # Equivalent of the MAKELANGID macro in WinNT.h
       # 
-      def MAKELANGID(p, s)
-         s << 10 | p
+      def MAKELANGID(x, s)
+         s << 10 | x
       end
    end
 end

data/lib/windows/network_management.rb

@@ -1,7 +1,16 @@
-require 'Win32API'
+require 'windows/api'
+include Windows
 
+# I don't use the Boolean flag for the return types of these methods because
+# they succeed, not fail, if the return value is 0.
+#
 module Windows
    module NetworkManagement
+      API.auto_namespace = 'Windows::NetworkManagement'
+      API.auto_constant  = true
+      API.auto_method    = false
+      API.auto_unicode   = false
+
       NERR_Success         = 0
       MAX_PREFERRED_LENGTH = -1
 
@@ -40,99 +49,91 @@ module Windows
       SV_TYPE_DOMAIN_ENUM       = 0x80000000
       SV_TYPE_ALL               = 0xFFFFFFFF
 
-      NetAlertRaise          = Win32API.new('netapi32', 'NetAlertRaise', 'PPL', 'L')
-      NetAlertRaiseEx        = Win32API.new('netapi32', 'NetAlertRaiseEx', 'PPLP', 'L')
-      NetApiBufferAllocate   = Win32API.new('netapi32', 'NetApiBufferAllocate', 'LP', 'L')
-      NetApiBufferFree       = Win32API.new('netapi32', 'NetApiBufferFree', 'P', 'L')
-      NetApiBufferReallocate = Win32API.new('netapi32', 'NetApiBufferReallocate', 'PLP', 'L')
-      NetApiBufferSize       = Win32API.new('netapi32', 'NetApiBufferSize', 'PP', 'L')
-      NetGetAnyDCName        = Win32API.new('netapi32', 'NetGetAnyDCName', 'PPP', 'L')
-      NetGetDCName           = Win32API.new('netapi32', 'NetGetDCName', 'PPP', 'L')
-
-      NetGetDisplayInformationIndex = Win32API.new('netapi32', 'NetGetDisplayInformationIndex', 'PLPP', 'L')
-      NetGetJoinableOUs             = Win32API.new('netapi32', 'NetGetJoinableOUs', 'PPPPPP', 'L')
-      NetGetJoinInformation         = Win32API.new('netapi32', 'NetGetJoinInformation', 'PPP', 'L')
-
-      NetGroupAdd      = Win32API.new('netapi32', 'NetGroupAdd', 'PLPP', 'L')
-      NetGroupAddUser  = Win32API.new('netapi32', 'NetGroupAddUser', 'PPP', 'L')
-      NetGroupDel      = Win32API.new('netapi32', 'NetGroupDel', 'PP', 'L')
-      NetGroupDelUser  = Win32API.new('netapi32', 'NetGroupDelUser', 'PPP', 'L')
-      NetGroupEnum     = Win32API.new('netapi32', 'NetGroupEnum', 'PLPLPPP', 'L')
-      NetGroupGetInfo  = Win32API.new('netapi32', 'NetGroupGetInfo', 'PPLP', 'L')
-      NetGroupGetUsers = Win32API.new('netapi32', 'NetGroupGetUsers', 'PPLPLPPP', 'L')
-      NetGroupSetInfo  = Win32API.new('netapi32', 'NetGroupSetInfo', 'PPLPP', 'L')
-      NetGroupSetUsers = Win32API.new('netapi32', 'NetGroupSetUsers', 'PPLPL', 'L')
-      NetJoinDomain    = Win32API.new('netapi32', 'NetJoinDomain', 'PPPPPL', 'L')
-
-      NetLocalGroupAdd        = Win32API.new('netapi32', 'NetLocalGroupAdd', 'PLPP', 'L')
-      NetLocalGroupAddMembers = Win32API.new('netapi32', 'NetLocalGroupAddMembers', 'PPLPL', 'L')
-      NetLocalGroupDel        = Win32API.new('netapi32', 'NetLocalGroupDel', 'PP', 'L')
-      NetLocalGroupDelMembers = Win32API.new('netapi32', 'NetLocalGroupDelMembers', 'PPLPL', 'L')
-      NetLocalGroupEnum       = Win32API.new('netapi32', 'NetLocalGroupEnum', 'PLPLPPP', 'L')
-      NetLocalGroupGetInfo    = Win32API.new('netapi32', 'NetLocalGroupGetInfo', 'PPLP', 'L')
-      NetLocalGroupGetMembers = Win32API.new('netapi32', 'NetLocalGroupGetMembers', 'PPLPLPPP', 'L')
-      NetLocalGroupSetInfo    = Win32API.new('netapi32', 'NetLocalGroupSetInfo', 'PPLPP', 'L')
-      NetLocalGroupSetMembers = Win32API.new('netapi32', 'NetLocalGroupSetMembers', 'PPLPP', 'L')
-      NetMessageBufferSend    = Win32API.new('netapi32', 'NetMessageBufferSend', 'PPPPL', 'L')
-      NetMessageNameAdd       = Win32API.new('netapi32', 'NetMessageNameAdd', 'PP', 'L')
-      NetMessageNameDel       = Win32API.new('netapi32', 'NetMessageNameDel', 'PP', 'L')
-      NetMessageNameEnum      = Win32API.new('netapi32', 'NetMessageNameEnum', 'PLPLPPP', 'L')
-      NetMessageNameGetInfo   = Win32API.new('netapi32', 'NetMessageNameGetInfo', 'PPLP', 'L')
-
-      NetQueryDisplayInformation = Win32API.new('netapi32', 'NetQueryDisplayInformation', 'PLLLLPP', 'L')
-      NetRemoteComputerSupports  = Win32API.new('netapi32', 'NetRemoteComputerSupports', 'PLP', 'L')
-      NetRemoteTOD               = Win32API.new('netapi32', 'NetRemoteTOD', 'PP', 'L')
-      NetRenameMachineInDomain   = Win32API.new('netapi32', 'NetRenameMachineInDomain', 'PPPPL', 'L')
-      NetScheduleJobAdd          = Win32API.new('netapi32', 'NetScheduleJobAdd', 'PPP', 'L')
-      NetScheduleJobDel          = Win32API.new('netapi32', 'NetScheduleJobDel', 'PLL', 'L')
-      NetScheduleJobEnum         = Win32API.new('netapi32', 'NetScheduleJobEnum', 'PPLPPP', 'L')
-      NetScheduleJobGetInfo      = Win32API.new('netapi32', 'NetScheduleJobGetInfo', 'PLP', 'L')
-
-      NetServerComputerNameAdd = Win32API.new('netapi32', 'NetServerComputerNameAdd', 'PPP', 'L')
-      NetServerComputerNameDel = Win32API.new('netapi32', 'NetServerComputerNameDel', 'PP', 'L')
-      NetServerDiskEnum        = Win32API.new('netapi32', 'NetServerDiskEnum', 'PLPLPPP', 'L')
-      NetServerEnum            = Win32API.new('netapi32', 'NetServerEnum', 'PLPLPPLPP', 'L')
-      NetServerGetInfo         = Win32API.new('netapi32', 'NetServerGetInfo', 'PLP', 'L')
-      NetServerSetInfo         = Win32API.new('netapi32', 'NetServerSetInfo', 'PLPP', 'L')
-      NetServerTransportAdd    = Win32API.new('netapi32', 'NetServerTransportAdd', 'PLP', 'L')
-      NetServerTransportAddEx  = Win32API.new('netapi32', 'NetServerTransportAddEx', 'PLP', 'L')
-      NetServerTransportDel    = Win32API.new('netapi32', 'NetServerTransportDel', 'PLP', 'L')
-      NetServerTransportEnum   = Win32API.new('netapi32', 'NetServerTransportEnum', 'PLPLPPP', 'L')
-      NetUnjoinDomain          = Win32API.new('netapi32', 'NetUnjoinDomain', 'PPPL', 'L')
-
-      NetUseAdd     = Win32API.new('netapi32', 'NetUseAdd', 'PLPP', 'L')
-      NetUseDel     = Win32API.new('netapi32', 'NetUseDel', 'PPL', 'L')
-      NetUseEnum    = Win32API.new('netapi32', 'NetUseEnum', 'PLPLPPP', 'L')
-      NetUseGetInfo = Win32API.new('netapi32', 'NetUseGetInfo', 'PPLP', 'L')
-
-      NetUserAdd            = Win32API.new('netapi32', 'NetUserAdd', 'PLPP', 'L')
-      NetUserChangePassword = Win32API.new('netapi32', 'NetUserChangePassword', 'PPPP', 'L')
-      NetUserDel            = Win32API.new('netapi32', 'NetUserDel', 'PP', 'L')
-      NetUserEnum           = Win32API.new('netapi32', 'NetUserEnum', 'PLLPLPPP', 'L')
-      NetUserGetGroups      = Win32API.new('netapi32', 'NetUserGetGroups', 'PPLPLPP', 'L')
-      NetUserGetInfo        = Win32API.new('netapi32', 'NetUserGetInfo', 'PPLP', 'L')
-      NetUserGetLocalGroups = Win32API.new('netapi32', 'NetUserGetLocalGroups', 'PPLLPLPP', 'L')
-
-      NetUserModalsGet = Win32API.new('netapi32', 'NetUserModalsGet', 'PLP', 'L')
-      NetUserModalsSet = Win32API.new('netapi32', 'NetUserModalsSet', 'PLPP', 'L')
-      NetUserSetGroups = Win32API.new('netapi32', 'NetUserSetGroups', 'PPLPL', 'L')
-      NetUserSetInfo   = Win32API.new('netapi32', 'NetUserSetInfo', 'PPLPP', 'L')
-      NetValidateName  = Win32API.new('netapi32', 'NetValidateName', 'PPPPP', 'L')
-
-      NetWkstaGetInfo       = Win32API.new('netapi32', 'NetWkstaGetInfo', 'PLP', 'L')
-      NetWkstaSetInfo       = Win32API.new('netapi32', 'NetWkstaSetInfo', 'PLPP', 'L')
-      NetWkstaTransportAdd  = Win32API.new('netapi32', 'NetWkstaTransportAdd', 'PLPP', 'L')
-      NetWkstaTransportDel  = Win32API.new('netapi32', 'NetWkstaTransportDel', 'PPL', 'L')
-      NetWkstaTransportEnum = Win32API.new('netapi32', 'NetWkstaTransportEnum', 'PLPLPPP', 'L')
-      NetWkstaUserEnum      = Win32API.new('netapi32', 'NetWkstaUserEnum', 'PLPLPPP', 'L')
-      NetWkstaUserGetInfo   = Win32API.new('netapi32', 'NetWkstaUserGetInfo', 'PLP', 'L')
-      NetWkstaUserSetInfo   = Win32API.new('netapi32', 'NetWkstaUserSetInfo', 'PPLP', 'L')
-
+      API.new('NetAlertRaise', 'PPL', 'L', 'netapi32')
+      API.new('NetAlertRaiseEx', 'PPLP', 'L', 'netapi32')
+      API.new('NetApiBufferAllocate', 'LP', 'L', 'netapi32')
+      API.new('NetApiBufferFree', 'P', 'L', 'netapi32')
+      API.new('NetApiBufferReallocate', 'PLP', 'L', 'netapi32')
+      API.new('NetApiBufferSize', 'PP', 'L', 'netapi32')
+      API.new('NetGetAnyDCName', 'PPP', 'L', 'netapi32')
+      API.new('NetGetDCName', 'PPP', 'L', 'netapi32')
+      API.new('NetGetDisplayInformationIndex', 'PLPP', 'L', 'netapi32')
+      API.new('NetGetJoinableOUs', 'PPPPPP', 'L', 'netapi32')
+      API.new('NetGetJoinInformation', 'PPP', 'L', 'netapi32')
+      API.new('NetGroupAdd', 'PLPP', 'L', 'netapi32')
+      API.new('NetGroupAddUser', 'PPP', 'L', 'netapi32')
+      API.new('NetGroupDel', 'PP', 'L', 'netapi32')
+      API.new('NetGroupDelUser', 'PPP', 'L', 'netapi32')
+      API.new('NetGroupEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetGroupGetInfo', 'PPLP', 'L', 'netapi32')
+      API.new('NetGroupGetUsers', 'PPLPLPPP', 'L', 'netapi32')
+      API.new('NetGroupSetInfo', 'PPLPP', 'L', 'netapi32')
+      API.new('NetGroupSetUsers', 'PPLPL', 'L', 'netapi32')
+      API.new('NetJoinDomain', 'PPPPPL', 'L', 'netapi32')
+      API.new('NetLocalGroupAdd', 'PLPP', 'L', 'netapi32')
+      API.new('NetLocalGroupAddMembers', 'PPLPL', 'L', 'netapi32')
+      API.new('NetLocalGroupDel', 'PP', 'L', 'netapi32')
+      API.new('NetLocalGroupDelMembers', 'PPLPL', 'L', 'netapi32')
+      API.new('NetLocalGroupEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetLocalGroupGetInfo', 'PPLP', 'L', 'netapi32')
+      API.new('NetLocalGroupGetMembers', 'PPLPLPPP', 'L', 'netapi32')
+      API.new('NetLocalGroupSetInfo', 'PPLPP', 'L', 'netapi32')
+      API.new('NetLocalGroupSetMembers', 'PPLPP', 'L', 'netapi32')
+      API.new('NetMessageBufferSend', 'PPPPL', 'L', 'netapi32')
+      API.new('NetMessageNameAdd', 'PP', 'L', 'netapi32')
+      API.new('NetMessageNameDel', 'PP', 'L', 'netapi32')
+      API.new('NetMessageNameEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetMessageNameGetInfo', 'PPLP', 'L', 'netapi32')
+      API.new('NetQueryDisplayInformation', 'PLLLLPP', 'L', 'netapi32')
+      API.new('NetRemoteComputerSupports', 'PLP', 'L', 'netapi32')
+      API.new('NetRemoteTOD', 'PP', 'L', 'netapi32')
+      API.new('NetRenameMachineInDomain', 'PPPPL', 'L', 'netapi32')
+      API.new('NetScheduleJobAdd', 'PPP', 'L', 'netapi32')
+      API.new('NetScheduleJobDel', 'PLL', 'L', 'netapi32')
+      API.new('NetScheduleJobEnum', 'PPLPPP', 'L', 'netapi32')
+      API.new('NetScheduleJobGetInfo', 'PLP', 'L', 'netapi32')
+      API.new('NetServerComputerNameAdd', 'PPP', 'L', 'netapi32')
+      API.new('NetServerComputerNameDel', 'PP', 'L', 'netapi32')
+      API.new('NetServerDiskEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetServerEnum', 'PLPLPPLPP', 'L', 'netapi32')
+      API.new('NetServerGetInfo', 'PLP', 'L', 'netapi32')
+      API.new('NetServerSetInfo', 'PLPP', 'L', 'netapi32')
+      API.new('NetServerTransportAdd', 'PLP', 'L', 'netapi32')
+      API.new('NetServerTransportAddEx', 'PLP', 'L', 'netapi32')
+      API.new('NetServerTransportDel', 'PLP', 'L', 'netapi32')
+      API.new('NetServerTransportEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetUnjoinDomain', 'PPPL', 'L', 'netapi32')
+      API.new('NetUseAdd', 'PLPP', 'L', 'netapi32')
+      API.new('NetUseDel', 'PPL', 'L', 'netapi32')
+      API.new('NetUseEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetUseGetInfo', 'PPLP', 'L', 'netapi32')
+      API.new('NetUserAdd', 'PLPP', 'L', 'netapi32')
+      API.new('NetUserChangePassword', 'PPPP', 'L', 'netapi32')
+      API.new('NetUserDel', 'PP', 'L', 'netapi32')
+      API.new('NetUserEnum', 'PLLPLPPP', 'L', 'netapi32')
+      API.new('NetUserGetGroups', 'PPLPLPP', 'L', 'netapi32')
+      API.new('NetUserGetInfo', 'PPLP', 'L', 'netapi32')
+      API.new('NetUserGetLocalGroups', 'PPLLPLPP', 'L', 'netapi32')
+      API.new('NetUserModalsGet', 'PLP', 'L', 'netapi32')
+      API.new('NetUserModalsSet', 'PLPP', 'L', 'netapi32')
+      API.new('NetUserSetGroups', 'PPLPL', 'L', 'netapi32')
+      API.new('NetUserSetInfo', 'PPLPP', 'L', 'netapi32')
+      API.new('NetValidateName', 'PPPPP', 'L', 'netapi32')
+      API.new('NetWkstaGetInfo', 'PLP', 'L', 'netapi32')
+      API.new('NetWkstaSetInfo', 'PLPP', 'L', 'netapi32')
+      API.new('NetWkstaTransportAdd', 'PLPP', 'L', 'netapi32')
+      API.new('NetWkstaTransportDel', 'PPL', 'L', 'netapi32')
+      API.new('NetWkstaTransportEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetWkstaUserEnum', 'PLPLPPP', 'L', 'netapi32')
+      API.new('NetWkstaUserGetInfo', 'PLP', 'L', 'netapi32')
+      API.new('NetWkstaUserSetInfo', 'PPLP', 'L', 'netapi32')
+
+      # Windows XP or later.
       begin 
-         GetNetScheduleAccountInformation = Win32API.new('mstask', 'GetNetScheduleAccountInformation', 'PLP', 'L')
-         SetNetScheduleAccountInformation = Win32API.new('netapi32', 'SetNetScheduleAccountInformation', 'PPP', 'L')
+         API.new('GetNetScheduleAccountInformation', 'PLP', 'L', 'mstask')
+         API.new('SetNetScheduleAccountInformation', 'PPP', 'L', 'netapi32')
       rescue Exception
-         # Do nothing.  Not supported on current platform
+         # Do nothing.  Not supported on current platform.
       end
 
       def NetAlertRaise(name, buf, bufsize)