Merge pull request #1 from silverbuddy/master

Win32 issues

diff --combined serialport.c
index 8393797492a246344d3dfc3ffc6b8940bd7405c3,2580206c1a2c826519eb317565e8b9b3b2c771ea..5a88b407e42eb05baddde41d5713459f21d35f4c
--- 1/serialport.c
--- 2/serialport.c
+++ b/serialport.c
@@@ -389,7 -389,7 +389,7 @@@ enum sp_return sp_list_ports(struct sp_
                data_len = data_size / sizeof(TCHAR);
                data[data_len] = '\0';
  #ifdef UNICODE
-               name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL)
+               name_len = WideCharToMultiByte(CP_ACP, 0, data, -1, NULL, 0, NULL, NULL);
  #else
                name_len = data_len + 1;
  #endif
@@@ -626,7 -626,7 +626,7 @@@ enum sp_return sp_open(struct sp_port *
        COMSTAT status;
  
        /* Prefix port name with '\\.\' to work with ports above COM9. */
-       if (!(escaped_port_name = malloc(strlen(port->name + 5))))
+       if (!(escaped_port_name = malloc(strlen(port->name) + 5)))
                RETURN_ERROR(SP_ERR_MEM, "Escaped port name malloc failed");
        sprintf(escaped_port_name, "\\\\.\\%s", port->name);
  
@@@ -2471,45 -2471,3 +2471,45 @@@ void sp_default_debug_handler(const cha
        }
        va_end(args);
  }
 +
 +int sp_get_major_package_version(void)
 +{
 +      return SP_PACKAGE_VERSION_MAJOR;
 +}
 +
 +int sp_get_minor_package_version(void)
 +{
 +      return SP_PACKAGE_VERSION_MINOR;
 +}
 +
 +int sp_get_micro_package_version(void)
 +{
 +      return SP_PACKAGE_VERSION_MICRO;
 +}
 +
 +const char *sp_get_package_version_string(void)
 +{
 +      return SP_PACKAGE_VERSION_STRING;
 +}
 +
 +int sp_get_current_lib_version(void)
 +{
 +      return SP_LIB_VERSION_CURRENT;
 +}
 +
 +int sp_get_revision_lib_version(void)
 +{
 +      return SP_LIB_VERSION_REVISION;
 +}
 +
 +int sp_get_age_lib_version(void)
 +{
 +      return SP_LIB_VERSION_AGE;
 +}
 +
 +const char *sp_get_lib_version_string(void)
 +{
 +      return SP_LIB_VERSION_STRING;
 +}
 +
 +/** @} */