win32-xpath 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b7fbc4af66e5ca073a64411ff6c48dcf4ab60ae
-  data.tar.gz: 2a1a3f3871c8bc63e70d133875e52760a98f6690
+  metadata.gz: 90f69c4379b494123344aafd8b6233c50517e0b4
+  data.tar.gz: 4ef3203f711bfd16ef2a8584be510c3b13cf27d0
 SHA512:
-  metadata.gz: e1353c201cd8ef54a55600f3203aa06e6b20e55bc8682a07e3822bbe7f938ea7154d67a04b00260b7ffe77b480f568d9e159952dc23c4115821706b41508f591
-  data.tar.gz: 2b357454c4bad3722db57d7fbbf25ea2697cae1af585d332200d5950daeb633688a70582697f0ad23237472a09dbc55c52c04898fca9b4a8915edf6d41ccb283
+  metadata.gz: 65817259cfad01b3cd2bd382168a9de2db81a83726181d44822ab2fc415d7e9ef987d895bbb4af1c37aa5863424ead5800492fdb9668e9f33f7d62b6ef1c771f
+  data.tar.gz: 2efba9b2ed51ca12132e86f8914aa3d03ea8eea7dce3c8f947053eb6a6331976da7d89e82aa0371804a4b06a52483c0aa7e03da0c9efcda6d9d5779d070b17c9

data/CHANGES

@@ -1,2 +1,5 @@
-= 1.0.0 - 26-Feb-2015
-  * Initial release
+= 1.0.1 - 2-Apr-2015
+* Altered internal handling of native C function failures.
+
+= 1.0.0 - 26-Feb-2015
+* Initial release

data/ext/win32/xpath.c

@@ -6,6 +6,12 @@
 
 #define MAX_WPATH MAX_PATH * sizeof(wchar_t)
 
+// Equivalent to raise SystemCallError.new(string, errnum)
+void rb_raise_syserr(const char* msg, int errnum){
+  VALUE v_sys = rb_funcall(rb_eSystemCallError, rb_intern("new"), 2, rb_str_new2(msg), INT2FIX(errnum));
+  rb_funcall(rb_mKernel, rb_intern("raise"), 1, v_sys);
+}
+
 // Helper function to find user's home directory
 wchar_t* find_user(wchar_t* str){
   SID* sid;
@@ -39,25 +45,25 @@ wchar_t* find_user(wchar_t* str){
     rb_raise(rb_eArgError, "can't find user %ls", str);
   }
 
-  ruby_xfree(dom);
+  ruby_xfree(dom); // Don't need this any more
     
   // Get the stringy version of the SID
   if (!ConvertSidToStringSidW(sid, &str_sid)){
     ruby_xfree(sid);
-    rb_sys_fail("ConvertSidToStringSid");
+    rb_raise_syserr("ConvertSidToStringSid", GetLastError());
   }
 
-  ruby_xfree(sid);
+  ruby_xfree(sid); // Don't need this any more
 
   // Mash the stringified SID onto our base key
   if(swprintf(subkey, MAX_PATH, L"%s%s", key_base, str_sid) < 0)
-    rb_sys_fail("swprintf");
+    rb_raise_syserr("swprintf", GetLastError());
 
   // Get the key handle we need
   rv = RegOpenKeyExW(HKEY_LOCAL_MACHINE, subkey, 0, KEY_QUERY_VALUE, &phkResult);
 
   if (rv != ERROR_SUCCESS)
-    rb_sys_fail("RegOpenKeyEx");
+    rb_raise_syserr("RegOpenKeyEx", GetLastError());
 
   lpData = (wchar_t*)malloc(MAX_WPATH);
   cbData = MAX_WPATH;
@@ -68,13 +74,13 @@ wchar_t* find_user(wchar_t* str){
 
   if (rv != ERROR_SUCCESS){
     ruby_xfree(lpData);
-    rb_raise(rb_eArgError, "can't find user %ls", str);
+    rb_raise(rb_eArgError, "can't find home directory for user %ls", str);
   }
 
   // Append any remaining path data that was originally present
   if (ptr){
     if (swprintf(lpData, MAX_WPATH, L"%s/%s", lpData, ptr) < 0)
-      rb_sys_fail("swprintf");
+      rb_raise_syserr("swprintf", GetLastError());
   }
   
   return lpData;
@@ -108,7 +114,7 @@ wchar_t* expand_tilde(){
 
     if(!size || !size2){
       if (GetLastError() != ERROR_ENVVAR_NOT_FOUND)
-        rb_sys_fail("GetEnvironmentVariable");
+        rb_raise_syserr("GetEnvironmentVariable", GetLastError());
       else
         rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding '~'");
     }
@@ -119,11 +125,11 @@ wchar_t* expand_tilde(){
     if(!GetEnvironmentVariableW(env, home, size) || !GetEnvironmentVariableW(env2, temp, size2)){
       ruby_xfree(home);
       ruby_xfree(temp);
-      rb_sys_fail("GetEnvironmentVariable");
+      rb_raise_syserr("GetEnvironmentVariable", GetLastError());
     }
 
     if(!PathAppendW(home, temp))
-      rb_sys_fail("PathAppend");
+      rb_raise_syserr("PathAppend", GetLastError());
   }
   else{
     home = (wchar_t*)ruby_xmalloc(MAX_WPATH);
@@ -131,7 +137,7 @@ wchar_t* expand_tilde(){
 
     if(!size){
       ruby_xfree(home);
-      rb_sys_fail("GetEnvironmentVariable");
+      rb_raise_syserr("GetEnvironmentVariable", GetLastError());
     }
   }
 
@@ -186,7 +192,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
   if(!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_path), -1, path, length)){
     ruby_xfree(path);
-    rb_sys_fail("MultiByteToWideChar");
+    rb_raise_syserr("MultibyteToWideChar", GetLastError());
   }
 
   // Convert all forward slashes to backslashes to Windows API functions work properly
@@ -206,7 +212,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
       if (!PathAppendW(home, ++ptr)){
         ruby_xfree(home);
-        rb_sys_fail("PathAppend");
+        rb_raise_syserr("PathAppend", GetLastError());
       }
     }
 
@@ -239,7 +245,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
     if (!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, dir, length)){
       ruby_xfree(dir);
-      rb_sys_fail("MultiByteToWideChar");
+      rb_raise_syserr("MultibyteToWideChar", GetLastError());
     }
 
     while (wcsstr(dir, L"/"))
@@ -254,7 +260,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
         if (!PathAppendW(dir, ++ptr)){
           ruby_xfree(dir);
-          rb_sys_fail("PathAppend");
+          rb_raise_syserr("PathAppend", GetLastError());
         }
       }
     }
@@ -265,7 +271,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     if (PathIsRelativeW(path)){ 
       if(!PathAppendW(dir, path)){
         ruby_xfree(dir);
-        rb_sys_fail("PathAppend");
+        rb_raise_syserr("PathAppend", GetLastError());
       }
 
       // Remove leading slashes from relative paths
@@ -288,7 +294,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
       if(!length){
         ruby_xfree(wpwd);
-        rb_sys_fail("GetCurrentDirectory");
+        rb_raise_syserr("GetCurrentDirectory", GetLastError());
       }
 
       // Convert backslashes into forward slashes
@@ -302,7 +308,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
       if (!length){
         ruby_xfree(pwd);
-        rb_sys_fail("WideCharToMultiByte");
+        rb_raise_syserr("WideCharToMultiByte", GetLastError());
       }
 
       return rb_str_new2(pwd);
@@ -321,7 +327,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
   if (!length){
     ruby_xfree(buffer);
-    rb_sys_fail("GetFullPathName");
+    rb_raise_syserr("GetFullPathName", GetLastError());
   }
 
   // Convert backslashes into forward slashes
@@ -336,7 +342,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
   if (!length){
     ruby_xfree(final_path);
-    rb_sys_fail("WideCharToMultiByte");
+    rb_raise_syserr("WideCharToMultiByte", GetLastError());
   }
 
   v_path = rb_str_new(final_path, length - 1); // Don't count null terminator

data/win32-xpath.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'win32-xpath'
-  spec.version   = '1.0.0'
+  spec.version   = '1.0.1'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-xpath
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake