windows-pr 0.8.2 → 0.8.3

data/CHANGES

@@ -1,3 +1,13 @@
+= 0.8.3 - 26-Apr-2008
+* Now requires windows-api 0.2.3 or later to take advantage of the
+  improvements in auto constant generation.
+* Fixed a scope resolution bug in the custom memcpy method in the
+  Windows::MSVCRT::Buffer module.
+* Added some more Windows::MSVCRT::String functions.
+* Added the FSCTL_ENUM_USN_DATA macro method in Windows::DeviceIO.
+* Some modules were refactored to take advantage of the improvements in
+  windows-api 0.2.3. This resulted in a net reduction of code.
+
 = 0.8.2 - 17-Apr-2008
 * Most of the MSVCRT modules now use the MSVCRT_DLL from the Windows::API
   library. This helps resolve an obscure bug where state information from a
@@ -190,4 +200,4 @@
 * Fixed signature and dll mistakes in the File module.
 
 = 0.1.0 - 4-Apr-2006
-* Initial release
+* Initial release

data/doc/conversion_guide.txt

@@ -30,5 +30,5 @@ In practice most LPVOID types should be designated as 'L' because this
 usually means the function is looking for an address. Check the documentation
 for details.
 
-If using the win32-api library, you can use 'B' instead of 'I' for the return
+If using the windows-api library, you can use 'B' instead of 'I' for the return
 type for functions that return a BOOL. 

data/lib/windows/device_io.rb

@@ -88,6 +88,10 @@ module Windows
          CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, 3)
       end
 
+      def FSCTL_ENUM_USN_DATA
+         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44,  METHOD_NEITHER, 0)
+      end
+
       def FSCTL_READ_USN_JOURNAL
          CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46,  METHOD_NEITHER, 0)
       end

data/lib/windows/handle.rb

@@ -4,43 +4,19 @@ include Windows
 module Windows
    module Handle
       API.auto_namespace = 'Windows::Handle'
-      API.auto_constant  = false # Due to some functions with leading '_'. 
-      API.auto_method    = false
+      API.auto_constant  = true
+      API.auto_method    = true
       API.auto_unicode   = false
 
       INVALID_HANDLE_VALUE           = -1
       HANDLE_FLAG_INHERIT            = 0x00000001
       HANDLE_FLAG_PROTECT_FROM_CLOSE = 0x00000002
       
-      CloseHandle          = API.new('CloseHandle', 'L', 'I')
-      DuplicateHandle      = API.new('DuplicateHandle', 'LLLLLIL', 'I')
-      GetHandleInformation = API.new('GetHandleInformation', 'LL', 'I')
-      SetHandleInformation = API.new('SetHandleInformation', 'LLL', 'I')
-      GetOSFHandle         = API.new('_get_osfhandle', 'I', 'L', MSVCRT_DLL)
-      OpenOSFHandle        = API.new('_open_osfhandle', 'LI', 'I', MSVCRT_DLL)
-            
-      def CloseHandle(handle)
-         CloseHandle.call(handle) != 0
-      end
-      
-      def DuplicateHandle(sphandle, shandle, thandle, access, ihandle, opts)
-         DuplicateHandle.call(sphandle, shandle, thandle, access, ihandle, opts) != 0
-      end
-      
-      def GetHandleInformation(handle, flags)
-         GetHandleInformation.call(handle, flags) != 0
-      end
-      
-      def SetHandleInformation(handle, mask, flags)
-         SetHandleInformation.call(handle, mask, flags) != 0
-      end
-      
-      def get_osfhandle(fd)
-         GetOSFHandle.call(fd)
-      end
-      
-      def open_osfhandle(handle, flags)
-         OpenOSFHandle.call(handle, flags)
-      end
+      API.new('CloseHandle', 'L', 'B')
+      API.new('DuplicateHandle', 'LLLLLIL', 'B')
+      API.new('GetHandleInformation', 'LL', 'B')
+      API.new('SetHandleInformation', 'LLL', 'B')
+      API.new('_get_osfhandle', 'I', 'L', MSVCRT_DLL)
+      API.new('_open_osfhandle', 'LI', 'I', MSVCRT_DLL)
    end
 end

data/lib/windows/msvcrt/buffer.rb

@@ -4,9 +4,9 @@ include Windows
 module Windows
    module MSVCRT
       module Buffer
-         API.auto_constant = false
-         API.auto_method   = false
-         API.auto_unicode  = false
+         API.auto_constant  = false # We want multiple versions
+         API.auto_method    = false
+         API.auto_unicode   = false
 
          Memcpy   = API.new('memcpy', 'PLL', 'P', MSVCRT_DLL)
          Memccpy  = API.new('_memccpy', 'PPIL', 'P', MSVCRT_DLL)
@@ -27,14 +27,14 @@ module Windows
          # defaults to the length of +src+.
          # 
          def memcpy(dest, src, size = src.length)
-            if dest.is_a?(Integer)
-               if src.is_a?(String)
+            if dest.is_a?(::Integer)
+               if src.is_a?(::String)
                   MemcpyLPL.call(dest, src, size)
                else
                   MemcpyLLL.call(dest, src, size)
                end
             else
-               if src.is_a?(String)
+               if src.is_a?(::String)
                   MemcpyPPL.call(dest, src, size)
                else
                   MemcpyPLL.call(dest, src, size)

data/lib/windows/msvcrt/directory.rb

@@ -4,90 +4,27 @@ include Windows
 module Windows
    module MSVCRT
       module Directory
-         API.auto_method   = false
-         API.auto_constant = false
-         API.auto_unicode  = false 
-
-         Chdir       = API.new('_chdir', 'P', 'I', MSVCRT_DLL)
-         Wchdir      = API.new('_wchdir', 'P', 'I', MSVCRT_DLL)
-         Chdrive     = API.new('_chdrive', 'I', 'I', MSVCRT_DLL)
-         Getcwd      = API.new('_getcwd', 'PI', 'P', MSVCRT_DLL)
-         Wgetcwd     = API.new('_wgetcwd', 'PI', 'P', MSVCRT_DLL)
-         Getdcwd     = API.new('_getdcwd', 'IPI', 'P', MSVCRT_DLL)
-         Wgetdcwd    = API.new('_wgetdcwd', 'IPI', 'P', MSVCRT_DLL)
-         Getdiskfree = API.new('_getdiskfree', 'IP', 'I', MSVCRT_DLL)
-         Getdrive    = API.new('_getdrive', 'V', 'I', MSVCRT_DLL)
-         Getdrives   = API.new('_getdrives', 'V', 'L', MSVCRT_DLL)
-         Mkdir       = API.new('_mkdir', 'P', 'I', MSVCRT_DLL)
-         Wmkdir      = API.new('_wmkdir', 'P', 'I', MSVCRT_DLL)
-         Rmdir       = API.new('_rmdir', 'P', 'I', MSVCRT_DLL)
-         Wrmdir      = API.new('_wrmdir', 'P', 'I', MSVCRT_DLL)
-         Searchenv   = API.new('_searchenv', 'PPP', 'V', MSVCRT_DLL)
-         Wsearchenv  = API.new('_wsearchenv', 'PPP', 'V', MSVCRT_DLL)
-
-         def chdir(dirname)
-            Chdir.call(dirname)
-         end
-
-         def wchdir(dirname)
-            Wchdir.call(dirname)
-         end
-
-         def chdrive(drive_number)
-            Chdrive.call(drive_number)
-         end
-
-         def getcwd(buffer, maxlen)
-            Getcwd.call(buffer, maxlen)
-         end
-
-         def wgetcwd(buffer, maxlen)
-            Wgetcwd.call(buffer, maxlen)
-         end
-
-         def getdcwd(drive, buffer, maxlen)
-            Getdcwd.call(drive, buffer, maxlen)
-         end
-
-         def wgetdcwd(drive, buffer, maxlen)
-            Wgetdcwd.call(drive, buffer, maxlen)
-         end
-
-         def getdiskfree(drive, struct_ptr)
-            Getdiskfree.call(drive, struct_ptr)
-         end
-
-         def getdrive
-            Getdrive.call
-         end
-
-         def getdrives
-            Getdrives.call
-         end
-
-         def mkdir(dirname)
-            Mkdir.call(dirname)
-         end
-
-         def wmkdir(dirname)
-            Wmkdir.call(dirname)
-         end
-
-         def rmdir(dirname)
-            Rmdir.call(dirname)
-         end
-
-         def wrmdir(dirname)
-            Wrmdir.call(dirname)
-         end
-
-         def searchenv(filename, varname, pathname)
-            Searchenv.call(filename, varname, pathname)
-         end
-
-         def wsearchenv(filename, varname, pathname)
-            Wsearchenv.call(filename, varname, pathname)
-         end
+         API.auto_namespace = 'Windows::MSVCRT::Directory'
+         API.auto_method    = true
+         API.auto_constant  = true
+         API.auto_unicode   = false 
+
+         API.new('_chdir', 'P', 'I', MSVCRT_DLL)
+         API.new('_wchdir', 'P', 'I', MSVCRT_DLL)
+         API.new('_chdrive', 'I', 'I', MSVCRT_DLL)
+         API.new('_getcwd', 'PI', 'P', MSVCRT_DLL)
+         API.new('_wgetcwd', 'PI', 'P', MSVCRT_DLL)
+         API.new('_getdcwd', 'IPI', 'P', MSVCRT_DLL)
+         API.new('_wgetdcwd', 'IPI', 'P', MSVCRT_DLL)
+         API.new('_getdiskfree', 'IP', 'I', MSVCRT_DLL)
+         API.new('_getdrive', 'V', 'I', MSVCRT_DLL)
+         API.new('_getdrives', 'V', 'L', MSVCRT_DLL)
+         API.new('_mkdir', 'P', 'I', MSVCRT_DLL)
+         API.new('_wmkdir', 'P', 'I', MSVCRT_DLL)
+         API.new('_rmdir', 'P', 'I', MSVCRT_DLL)
+         API.new('_wrmdir', 'P', 'I', MSVCRT_DLL)
+         API.new('_searchenv', 'PPP', 'V', MSVCRT_DLL)
+         API.new('_wsearchenv', 'PPP', 'V', MSVCRT_DLL)
       end
    end
 end

data/lib/windows/msvcrt/file.rb

@@ -4,9 +4,10 @@ include Windows
 module Windows
    module MSVCRT
       module File
-         API.auto_method   = false
-         API.auto_constant = false
-         API.auto_unicode  = false       
+         API.auto_namespace = 'Windows::MSVCRT::File'
+         API.auto_method    = true
+         API.auto_constant  = true
+         API.auto_unicode   = false       
 
          S_IFMT   = 0170000 # file type mask
          S_IFDIR  = 0040000 # directory
@@ -17,72 +18,24 @@ module Windows
          S_IWRITE = 0000200 # write permission, owner
          S_IEXEC  = 0000100 # execute/search permission, owner
 
-         Chmod   = API.new('_chmod', 'PI', 'I', MSVCRT_DLL)
-         Chsize  = API.new('_chsize', 'IL', 'I', MSVCRT_DLL)
-         Mktemp  = API.new('_mktemp', 'P', 'P', MSVCRT_DLL)
-         Stat    = API.new('_stat', 'PP', 'I', 'msvcrt')
-         Stat64  = API.new('_stat64', 'PP', 'I', MSVCRT_DLL)
-         Wchmod  = API.new('_wchmod', 'PI', 'I', MSVCRT_DLL)
-         Wmktemp = API.new('_wmktemp', 'P', 'P', MSVCRT_DLL)
-         Wstat   = API.new('_wstat', 'PP', 'I', 'msvcrt')
-         Wstat64 = API.new('_wstat64', 'PP', 'I', MSVCRT_DLL)
+         API.new('_chmod', 'PI', 'I', MSVCRT_DLL)
+         API.new('_chsize', 'IL', 'I', MSVCRT_DLL)
+         API.new('_mktemp', 'P', 'P', MSVCRT_DLL)
+         API.new('_stat', 'PP', 'I', 'msvcrt')
+         API.new('_stat64', 'PP', 'I', MSVCRT_DLL)
+         API.new('_wchmod', 'PI', 'I', MSVCRT_DLL)
+         API.new('_wmktemp', 'P', 'P', MSVCRT_DLL)
+         API.new('_wstat', 'PP', 'I', 'msvcrt')
+         API.new('_wstat64', 'PP', 'I', MSVCRT_DLL)
 
          # VC++ 8.0 or later
          begin
-            Chsize_s  = API.new('_chsize_s', 'IL', 'I', MSVCRT_DLL)
-            Mktemp_s  = API.new('_mktemp_s', 'PL', 'L', MSVCRT_DLL)
-            Wmktemp_s = API.new('_wmktemp_s', 'PL', 'L', MSVCRT_DLL)
+            API.new('_chsize_s', 'IL', 'I', MSVCRT_DLL)
+            API.new('_mktemp_s', 'PL', 'L', MSVCRT_DLL)
+            API.new('_wmktemp_s', 'PL', 'L', MSVCRT_DLL)
          rescue RuntimeError
             # Ignore - you must check for it via 'defined?'
          end
-         
-         def chmod(file, mode)
-            Chmod.call(file, mode)
-         end
-         
-         def chsize(fd, size)
-            Chsize.call(fd, size)
-         end
-         
-         def chsize_s(fd, size)
-            Chsize_s.call(fd, size)
-         end
-
-         def mktemp(template)
-            Mktemp.call(template)
-         end
-
-         def mktemp_s(template, size)
-            Mktemp_s.call(template, size)
-         end
-         
-         def stat(path, buffer)
-            Stat.call(path, buffer)
-         end
-      
-         def stat64(path, buffer)
-            Stat64.call(path, buffer)
-         end
-         
-         def wchmod(file, mode)
-            Wchmod.call(file, mode)
-         end
-
-         def wmktemp(template)
-            Wmktemp.call(template)
-         end
-
-         def wmktemp_s(template, size)
-            Wmktemp_s.call(template, size)
-         end
-
-         def wstat(path, buffer)
-            Wstat.call(path, buffer)
-         end
-      
-         def wstat64(path, buffer)
-            Wstat64.call(path, buffer)
-         end
       end
    end
 end

data/lib/windows/msvcrt/io.rb

@@ -5,9 +5,10 @@ include Windows
 module Windows
    module MSVCRT
       module IO
-         API.auto_constant = false
-         API.auto_method   = false
-         API.auto_unicode  = false
+         API.auto_namespace = 'Windows::MSVCRT::IO'
+         API.auto_constant  = true
+         API.auto_method    = true
+         API.auto_unicode   = false
 
          S_IFMT   = 0170000 # file type mask
          S_IFDIR  = 0040000 # directory
@@ -18,168 +19,44 @@ module Windows
          S_IWRITE = 0000200 # write permission, owner
          S_IEXEC  = 0000100 # execute/search permission, owner
 
-         Clearerr  = API.new('clearerr', 'I', 'V', MSVCRT_DLL)
-         Close     = API.new('_close', 'I', 'V', MSVCRT_DLL)
-         Fclose    = API.new('fclose', 'I', 'I', MSVCRT_DLL)
-         Fcloseall = API.new('_fcloseall', 'V', 'I', MSVCRT_DLL)
-         Fdopen    = API.new('_fdopen', 'IP', 'I', MSVCRT_DLL)
-         Feof      = API.new('feof', 'I', 'I', MSVCRT_DLL)
-         Ferror    = API.new('ferror', 'L', 'I', MSVCRT_DLL)
-         Fflush    = API.new('fflush', 'I', 'I', MSVCRT_DLL)
-         Fgetc     = API.new('fgetc', 'L', 'I', MSVCRT_DLL)
-         Fgetpos   = API.new('fgetpos', 'LP', 'I', MSVCRT_DLL)
-         Fgetwc    = API.new('fgetwc', 'L', 'I', MSVCRT_DLL)
-         Fgets     = API.new('fgets', 'PIL', 'P', MSVCRT_DLL)
-         Fgetws    = API.new('fgetws', 'PIL', 'P', MSVCRT_DLL)
-         Fileno    = API.new('_fileno', 'I', 'I', MSVCRT_DLL)
-         Flushall  = API.new('_flushall', 'V', 'I', MSVCRT_DLL)
-         Fopen     = API.new('fopen', 'PP', 'I', MSVCRT_DLL)
-         Fputs     = API.new('fputs', 'PL', 'I', MSVCRT_DLL)
-         Fputws    = API.new('fputws', 'PL', 'I', MSVCRT_DLL)
-         Getc      = API.new('getc', 'L', 'I', MSVCRT_DLL)
-         Getwc     = API.new('getwc', 'L', 'L', MSVCRT_DLL)
-         Open      = API.new('_open', 'PPI', 'I', MSVCRT_DLL)
-         Rmtmp     = API.new('_rmtmp', 'V', 'I', MSVCRT_DLL)
-         Setmode   = API.new('_setmode', 'II', 'I', MSVCRT_DLL)
-         Tempnam   = API.new('_tempnam', 'PP', 'P', MSVCRT_DLL)
-         Tmpfile   = API.new('tmpfile', 'V', 'L', MSVCRT_DLL)
-         Tmpnam    = API.new('tmpnam', 'P', 'P', MSVCRT_DLL)
-         Wopen     = API.new('_wopen', 'PPI', 'I', MSVCRT_DLL)
-         Wfdopen   = API.new('_wfdopen', 'IP', 'I', MSVCRT_DLL)
-         Wfopen    = API.new('_wfopen', 'PPI', 'I', MSVCRT_DLL)
-         Wtempnam  = API.new('_wtempnam', 'PP', 'P', MSVCRT_DLL)
-         Wtmpnam   = API.new('_wtmpnam', 'P', 'P', MSVCRT_DLL)
+         API.new('clearerr', 'I', 'V', MSVCRT_DLL)
+         API.new('_close', 'I', 'V', MSVCRT_DLL)
+         API.new('fclose', 'I', 'I', MSVCRT_DLL)
+         API.new('_fcloseall', 'V', 'I', MSVCRT_DLL)
+         API.new('_fdopen', 'IP', 'I', MSVCRT_DLL)
+         API.new('feof', 'I', 'I', MSVCRT_DLL)
+         API.new('ferror', 'L', 'I', MSVCRT_DLL)
+         API.new('fflush', 'I', 'I', MSVCRT_DLL)
+         API.new('fgetc', 'L', 'I', MSVCRT_DLL)
+         API.new('fgetpos', 'LP', 'I', MSVCRT_DLL)
+         API.new('fgetwc', 'L', 'I', MSVCRT_DLL)
+         API.new('fgets', 'PIL', 'P', MSVCRT_DLL)
+         API.new('fgetws', 'PIL', 'P', MSVCRT_DLL)
+         API.new('_fileno', 'I', 'I', MSVCRT_DLL)
+         API.new('_flushall', 'V', 'I', MSVCRT_DLL)
+         API.new('fopen', 'PP', 'I', MSVCRT_DLL)
+         API.new('fputs', 'PL', 'I', MSVCRT_DLL)
+         API.new('fputws', 'PL', 'I', MSVCRT_DLL)
+         API.new('getc', 'L', 'I', MSVCRT_DLL)
+         API.new('getwc', 'L', 'L', MSVCRT_DLL)
+         API.new('_open', 'PPI', 'I', MSVCRT_DLL)
+         API.new('_rmtmp', 'V', 'I', MSVCRT_DLL)
+         API.new('_setmode', 'II', 'I', MSVCRT_DLL)
+         API.new('_tempnam', 'PP', 'P', MSVCRT_DLL)
+         API.new('tmpfile', 'V', 'L', MSVCRT_DLL)
+         API.new('tmpnam', 'P', 'P', MSVCRT_DLL)
+         API.new('_wopen', 'PPI', 'I', MSVCRT_DLL)
+         API.new('_wfdopen', 'IP', 'I', MSVCRT_DLL)
+         API.new('_wfopen', 'PPI', 'I', MSVCRT_DLL)
+         API.new('_wtempnam', 'PP', 'P', MSVCRT_DLL)
+         API.new('_wtmpnam', 'P', 'P', MSVCRT_DLL)
 
          # VC++ 8.0 or later
          begin
-            Tmpfile_s = API.new('_tmpfile_s', 'P', 'L', MSVCRT_DLL)
+            API.new('_tmpfile_s', 'P', 'L', MSVCRT_DLL)
          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 setmode(fd, mode)
-            Setmode.call(fd, 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

@@ -4,17 +4,21 @@ include Windows
 module Windows
    module MSVCRT
       module String
-         API.auto_constant = false
-         API.auto_method   = false
-         API.auto_unicode  = false
+         API.auto_constant  = false # We want multiple versions
+         API.auto_method    = false # We need to handle 0 & nil explicitly
+         API.auto_unicode   = false
 
+         Strchr   = API.new('strchr', 'PI', 'P', MSVCRT_DLL)
          Strcmp   = API.new('strcmp', 'PP', 'I', MSVCRT_DLL)
          Strcpy   = API.new('strcpy', 'PL', 'L', MSVCRT_DLL)
          Strcspn  = API.new('strcspn', 'PP', 'L', MSVCRT_DLL)
          Strlen   = API.new('strlen', 'P', 'L', MSVCRT_DLL)
          Strncpy  = API.new('strncpy', 'PPL', 'P', MSVCRT_DLL)
+         Strpbrk  = API.new('strpbrk',  'PP', 'P', MSVCRT_DLL)
          Strrchr  = API.new('strrchr', 'PI', 'P', MSVCRT_DLL)
          Strrev   = API.new('_strrev', 'P', 'P', MSVCRT_DLL)
+         Strspn   = API.new('strspn', 'PP', 'L', MSVCRT_DLL)
+         Strstr   = API.new('strstr', 'PP', 'P', MSVCRT_DLL)
          Strtok   = API.new('strtok', 'PP', 'P', MSVCRT_DLL)
         
          Mbscmp   = API.new('_mbscmp', 'PP', 'I', 'msvcrt')
@@ -33,6 +37,11 @@ module Windows
          rescue RuntimeError
             # Do nothing. Not supported on your system.
          end
+         
+         def strchr(string, char)
+            return nil if string == 0 || char == 0
+            Strchr.call(string, char)
+         end
 
          def strcmp(str1, str2)
             if str1 == 0 || str2 == 0
@@ -59,7 +68,12 @@ module Windows
          def strncpy(dest, source, count)
             return nil if source == 0
             Strncpy.call(dest, source, count)
-         end         
+         end
+
+         def strpbrk(string, charset)
+            return nil if string == 0 || charset == 0
+            Strpbrk.call(string, charset)
+         end
          
          def strrchr(string, int)
             return nil if string == 0
@@ -70,6 +84,16 @@ module Windows
             return nil if str == 0
             Strrev.call(str)
          end
+
+         def strspn(string, charset)
+            return nil if string == 0 || charset == 0
+            Strspn.call(string, charset)
+         end
+
+         def strstr(string, search)
+            return nil if string == 0 || search == 0
+            Strstr.call(string, search)
+         end
          
          def strtok(token, delimeter)
             return nil if token == 0 || delimeter == 0

data/lib/windows/msvcrt/time.rb

@@ -4,9 +4,9 @@ include Windows
 module Windows
    module MSVCRT
       module Time
-         API.auto_constant = false
-         API.auto_method   = false
-         API.auto_unicode  = false
+         API.auto_constant  = false # Avoid name clash with Ruby
+         API.auto_method    = false
+         API.auto_unicode   = false
 
          Asctime     = API.new('asctime', 'P', 'P', MSVCRT_DLL)
          Clock       = API.new('clock', 'V', 'L', MSVCRT_DLL)

data/lib/windows/sound.rb

@@ -4,9 +4,9 @@ include Windows
 module Windows  
    module Sound
       API.auto_namespace = 'Windows::Sound'
-      API.auto_constant  = false  # Because of lowercase method names
+      API.auto_constant  = true
       API.auto_method    = true
-      API.auto_unicode   = true
+      API.auto_unicode   = false
 
       SND_SYNC          = 0x0000  # play synchronously (default)
       SND_ASYNC         = 0x0001  # play asynchronously
@@ -24,15 +24,15 @@ module Windows
       SND_PURGE         = 0x0040  # purge non-static events for task
       SND_APPLICATION   = 0x0080  # look for application specific association
       
-      Beep              = API.new('Beep', 'LL', 'B')
-      PlaySound         = API.new('PlaySound', 'PPL', 'B', 'winmm')
-      WaveOutSetVolume  = API.new('waveOutSetVolume', 'PL', 'I', 'winmm')
-      WaveOutGetVolume  = API.new('waveOutGetVolume', 'IP', 'I', 'winmm')
-      WaveOutGetNumDevs = API.new('waveOutGetNumDevs', 'V', 'I', 'winmm')
-      WaveInGetNumDevs  = API.new('waveInGetNumDevs', 'V', 'I', 'winmm')
-      MidiOutGetNumDevs = API.new('midiOutGetNumDevs', 'V', 'I', 'winmm')
-      MidiInGetNumDevs  = API.new('midiInGetNumDevs', 'V', 'I', 'winmm')
-      AuxGetNumDevs     = API.new('auxGetNumDevs', 'V', 'I', 'winmm')
-      MixerGetNumDevs   = API.new('mixerGetNumDevs', 'V', 'I', 'winmm')
+      API.new('Beep', 'LL', 'B')
+      API.new('PlaySound', 'PPL', 'B', 'winmm')
+      API.new('waveOutSetVolume', 'PL', 'I', 'winmm')
+      API.new('waveOutGetVolume', 'LP', 'I', 'winmm')
+      API.new('waveOutGetNumDevs', 'V', 'I', 'winmm')
+      API.new('waveInGetNumDevs', 'V', 'I', 'winmm')
+      API.new('midiOutGetNumDevs', 'V', 'I', 'winmm')
+      API.new('midiInGetNumDevs', 'V', 'I', 'winmm')
+      API.new('auxGetNumDevs', 'V', 'I', 'winmm')
+      API.new('mixerGetNumDevs', 'V', 'I', 'winmm')
    end
 end

data/test/tc_handle.rb

@@ -26,8 +26,8 @@ class TC_Windows_Handle < Test::Unit::TestCase
       assert_not_nil(HandleFoo::CloseHandle)
       assert_not_nil(HandleFoo::DuplicateHandle)
       assert_not_nil(HandleFoo::GetHandleInformation)
-      assert_not_nil(HandleFoo::GetOSFHandle)
-      assert_not_nil(HandleFoo::OpenOSFHandle)
+      assert_not_nil(HandleFoo::Get_osfhandle)
+      assert_not_nil(HandleFoo::Open_osfhandle)
    end
    
    def teardown

data/test/tc_msvcrt_buffer.rb

@@ -17,6 +17,10 @@ class TC_Windows_MSVCRT_Buffer < Test::Unit::TestCase
    
    def test_method_constants
       assert_not_nil(BufferFoo::Memcpy)
+      assert_not_nil(BufferFoo::MemcpyPLL)
+      assert_not_nil(BufferFoo::MemcpyLPL)
+      assert_not_nil(BufferFoo::MemcpyLLL)
+      assert_not_nil(BufferFoo::MemcpyPPL)
       assert_not_nil(BufferFoo::Memccpy)
       assert_not_nil(BufferFoo::Memchr)
       assert_not_nil(BufferFoo::Memcmp)
@@ -25,7 +29,7 @@ class TC_Windows_MSVCRT_Buffer < Test::Unit::TestCase
       assert_not_nil(BufferFoo::Memset)
       assert_not_nil(BufferFoo::Swab)
    end
-   
+
    def test_memcpy
       assert_respond_to(@foo, :memcpy)
    end
@@ -61,4 +65,4 @@ class TC_Windows_MSVCRT_Buffer < Test::Unit::TestCase
    def teardown
       @foo  = nil
    end
-end
+end

data/windows-pr.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "windows-pr"
-   gem.version     = "0.8.2"
+   gem.version     = "0.8.3"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |gem|
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
    gem.extra_rdoc_files = ["MANIFEST", "README", "CHANGES"]
-   gem.add_dependency("windows-api", ">= 0.2.2")
+   gem.add_dependency("windows-api", ">= 0.2.3")
 end
 
 if $0 == __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: windows-pr
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-18 00:00:00 -06:00
+date: 2008-04-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 0.2.3
     version: 
 description: Windows functions and constants bundled via Win32::API
 email: djberg96@gmail.com