win32-pdh 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9f57c2db43f6412bceab31740be7f3131752334ff5b9c5f1f41f634519477bd
-  data.tar.gz: 74ea0ab008113496543dc001d947cbe93b3751eef9fb65be219887eb88921b36
+  metadata.gz: e46f18c5fb8a3022b81c9e861ae65aeb1a9a86478935efb3868c51b635f851de
+  data.tar.gz: 4f8f6c8800700eda846aff5e96ad83760ed6c5996e94cea9cb49c01e7bbf8dbf
 SHA512:
-  metadata.gz: 3b569a0bf0cfe35093c065cb527dc521fc503ff40dc882e35afdbfa8ec4036da16cf5cd7ef7003609406a640f77ae97ca93367119b2105a1b890212493a7edbd
-  data.tar.gz: 14e6def409243a45b3e3a51dbf544f9e5df224cbb32252bd9c13920702ccd05f6029e690932eb07618f970977579b694c58cb7539a78f111ccf7482ed2a85077
+  metadata.gz: 000ff8756967f84acc1bd96d0408f426bab086bf81a2357923652aacf123d8a6e7a6409f14e32d78a7538d7e35f30bbe04d825b5a7f023f2bf15d0a2f73e4d0c
+  data.tar.gz: af0cfc18ec75c26400e1ee089f253a99e86c7c836124ff867ae3a49fe742b4b88d8265a73504e8c626316bcb53a1404522aeaa7f587ca4714b303290831b1157

data/lib/win32/pdh/counter.rb

@@ -74,7 +74,14 @@ module Win32
         )
         Pdh.check_status status
         @handle = handle_pointer.read_pointer
-        load_info
+
+        # Make sure we don't leak when we throw an exception
+        begin
+          load_info
+        rescue
+          remove
+          raise
+        end
       end
       
       ##

data/lib/win32/pdh.rb

@@ -20,23 +20,38 @@ module Win32
       raise PdhError, status unless status == Constants::ERROR_SUCCESS
     end
 
+    ##
+    # Gets the length of a cwstr (null-terminated UTF-16 string) in characters
+    # (16-bit units).
+    #
+    # Returns nil if the pointer is null
+    def self.strlen_cwstr(pointer)
+      return nil if pointer.null?
+
+      # Clone pointer, so we don't modify the original.
+      pointer = FFI::Pointer.new(pointer)
+      length = 0
+      until pointer.get_uint16(0) == 0
+        length += 1
+        # Need to proceed 2 bytes at a time; Ruby ffi gives no special pointer
+        # arithmetic by type.
+        pointer += 2
+      end
+
+      length
+    end
+
     ##
     # Takes a pointer to null-terminated utf-16 data and reads it into a utf-8 encoded string.
     #
     # If pointer is null, return nil instead of a string.
     def self.read_cwstr(pointer)
       return nil if pointer.null?
-      array = []
-      loop do
-        char = pointer.read_uint16
-        break if char == 0
 
-        array << char
-        # Need to proceed 2 bytes
-        pointer += 2
-      end
+      # length in wchars
+      length = strlen_cwstr(pointer)
 
-      array.pack('n*').force_encoding('UTF-16BE').encode('UTF-8')
+      pointer.read_bytes(length * 2).force_encoding('UTF-16LE').encode('UTF-8')
     end
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-pdh
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Taylor C. Richberger
@@ -14,16 +14,16 @@ dependencies:
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 description: Ruby FFI interface for Windows PDH
 email: tcr@absolute-performance.com
 executables: []