serialport 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,8 +1,11 @@
+1.0.3 => 04/08/2010:	[FIXED] [Windows] Could not specify 10 or "COM10" or higher 
+						[FIXED] [Windows] Warning passing INT instead of LONG to GetCommModemStatus
+
 1.0.2 => 04/06/2010:	[FIXED] Passing a block into open did not properly handle a return from within the block
 
-1.0.1 => 01/20/2010:   	[FIXED] Conditional RB_SERIAL_EXPORT (Visual Studio)
+1.0.1 => 01/20/2010:   	[FIXED] Conditional RB_SERIAL_EXPORT needed for Visual Studio bonked GCC
 
-1.0.0 => 01/12/2010:    [FIXED] x86_64 segmentation fault
+1.0.0 => 01/12/2010:    [FIXED] x86_64 segmentation faults
 						[NEW] Windows Ruby 1.9 support
 
 0.7.4 => 10/12/2009:    [NEW] Conditional 1.8.6 & 1.9 support (POSIX only).

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/ext/native/serialport.h

@@ -21,7 +21,7 @@
 #ifndef _RUBY_SERIAL_PORT_H_
 #define _RUBY_SERIAL_PORT_H_
 
-#define RUBY_SERIAL_PORT_VERSION   "1.0.1"
+#define RUBY_SERIAL_PORT_VERSION   "1.0.3"
 
 #include <ruby.h>    /* ruby inclusion */
 #ifdef RUBY_1_9      /* ruby io inclusion */

data/ext/native/win_serialport_impl.c

@@ -2,6 +2,7 @@
  * Guillaume Pierronnet <moumar@netcourrier.com>
  * Alan Stern <stern@rowland.harvard.edu>
  * Daniel E. Shipton <dshipton@redshiptechnologies.com>
+ * Hector G. Parra <hector@hectorparra.com>
  *
  * This code is hereby licensed for public consumption under either the
  * GNU GPL v2 or greater.
@@ -60,12 +61,8 @@ VALUE RB_SERIAL_EXPORT sp_create_impl(class, _port)
    int fd;
    HANDLE fh;
    int num_port;
-   char *port;
-   char *ports[] = {
-      "COM1", "COM2", "COM3", "COM4",
-      "COM5", "COM6", "COM7", "COM8"
-   };
-   //int new_fd;
+   char *str_port;
+   char port[260]; /* Windows XP MAX_PATH. See http://msdn.microsoft.com/en-us/library/aa365247(VS.85).aspx */
 
    DCB dcb;
 
@@ -78,20 +75,28 @@ VALUE RB_SERIAL_EXPORT sp_create_impl(class, _port)
    {
       case T_FIXNUM:
          num_port = FIX2INT(_port);
-         if (num_port < 0 || num_port > sizeof(ports) / sizeof(ports[0]))
+         if (num_port < 0)
          {
             rb_raise(rb_eArgError, "illegal port number");
          }
-         port = ports[num_port];
+		 sprintf(port, "\\\\.\\COM%d", num_port + 1); /* '0' is actually COM1, etc. */
          break;
 
       case T_STRING:
          Check_SafeStr(_port);
 #ifdef RUBY_1_9
-         port = RSTRING_PTR(_port);
+         str_port = RSTRING_PTR(_port);
 #else
-         port = RSTRING(_port)->ptr;
+         str_port = RSTRING(_port)->ptr;
 #endif
+		 if (str_port[0] != '\\') /* Check for Win32 Device Namespace prefix "\\.\" */
+		 {
+			sprintf(port, "\\\\.\\%s", str_port);
+		 }
+		 else
+		 {
+			sprintf(port, "%s", str_port);
+	 	 }
          break;
 
       default:
@@ -99,13 +104,13 @@ VALUE RB_SERIAL_EXPORT sp_create_impl(class, _port)
          break;
    }
 
-   printf("SerialPort => %s\n", port);
    fd = open(port, O_BINARY | O_RDWR);
-   printf("        fd => %i\n", fd);
    if (fd == -1)
+   {
       rb_sys_fail(port);
+   }
+
    fh = (HANDLE) _get_osfhandle(fd);
-   printf("        fh => %i\n", fh);
    if (SetupComm(fh, 1024, 1024) == 0)
    {
       close(fd);
@@ -557,7 +562,7 @@ void RB_SERIAL_EXPORT get_line_signals_helper_impl(obj, ls)
    struct line_signals *ls;
 {
    HANDLE fh;
-   int status;
+   unsigned long status; /* DWORD */
 
    fh = get_handle_helper(obj);
    if (GetCommModemStatus(fh, &status) == 0)

data/serialport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{serialport}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guillaume Pierronnet", "Alan Stern", "Daniel E. Shipton", "Tobin Richard", "Hector Parra", "Ryan C. Payne"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-19}
   s.description = %q{Ruby/SerialPort is a Ruby library that provides a class for using RS-232 serial ports.}
   s.email = %q{hector@hectorparra.com}
   s.extensions = ["ext/native/extconf.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: serialport
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -07:00
+date: 2010-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: []