undll32 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d24bcf938e3a23a7e87f932a6189c7248b690a1fc5766e7907cf056b0967e6
-  data.tar.gz: 29faa69356a53024534261b815fa3f7c3bfd5d01f429877fe5c6f1f5da273572
+  metadata.gz: 59acbe9b221095472b7f22916b35b3b1c704248c8c89a0434322e59f20d05435
+  data.tar.gz: 0dcb7e45987554109eb5160d22f93f974264df6e2d0296c37f586cddfc414523
 SHA512:
-  metadata.gz: f336b0b7936b6e1dd2d744126263e00869a68500e8346ce971393f8dfbc7520d4068b70cc7c3c3cc3187a5ae809b9b934f2a6c56724fcf6919284ae046736230
-  data.tar.gz: 490a671e93edc615934ae0372731aebec5d6978c54d2e4ffba85cfd978ab7f5ccf562e42d0ac9c44b15aada37e34c24bf6ec9c455039266de5f58f19d9956c82
+  metadata.gz: 04f13a36ca8ac4eaeb8aa391e99dfd955ddff22b9a506af1ec2a591137ce7ec4ee85f7e8985bd37f7626111cf511af327d24850e2775f51236712dcf67890731
+  data.tar.gz: 37acf71e14b0eabcf9408d9c3ccc889891cf5a133c52123b1765f77fbac6ed76c3fc58fe7c3340bdc2e1c4f81e747e2540ee28687f681abb71262affabaf9407

data/Gemfile.lock

@@ -1,20 +1,21 @@
-PATH
-  remote: .
-  specs:
-    undll32 (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    rake (10.5.0)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  rake (~> 10.0)
-  undll32!
-
-BUNDLED WITH
-   1.16.2
+PATH
+  remote: .
+  specs:
+    undll32 (0.3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (13.0.3)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 2.2.9)
+  rake (~> 13.0)
+  undll32!
+
+BUNDLED WITH
+   2.2.9

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 hyrious
+Copyright (c) 2019 hyrious
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -22,9 +22,15 @@ Or install it yourself as:
 
 ## Usage
 
-- `undll32`: `undll32 User32,MessageBox 0 hello world 0`
-- `ruby -r`: `ruby -rundll32 -e Undll32.exe -- User32,MessageBox 0 hello world 0`
-- Program: `Undll32.run('User32', 'MessageBox', 0, 'hello', 'world', 0)`
+- Command line:
+  ```
+  undll32 User32,MessageBox 0 hello world 0
+  ruby -rundll32 -e Undll32.exe -- User32,MessageBox 0 hello world 0
+  ```
+- Program:
+  ```ruby
+  Undll32.run('User32', 'MessageBox', 0, 'hello', 'world', 0)
+  ```
 
 ## Development
 

data/lib/undll32.rb

@@ -1,13 +1,57 @@
 require "undll32/version"
-require 'win32api'
+require 'fiddle/import'
 
 ##
 # Undll32
 # replacement of Windows' rundll32.exe
 module Undll32
 
+  class Win32API
+    DLL = {}
+    TYPEMAP = {
+      '0' => Fiddle::TYPE_VOID,
+      'S' => Fiddle::TYPE_VOIDP,
+      'I' => Fiddle::TYPE_LONG,
+    }
+    POINTER_TYPE =
+      Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
+    WIN32_TYPES = 'VPpNnLlIi'
+    DL_TYPES = '0SSI'
+
+    def initialize(dllname, func, import, export = '0', calltype = :stdcall)
+      @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
+      import = @proto.chars.map { |e| TYPEMAP[e.tr(WIN32_TYPES, DL_TYPES)] }
+      export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
+      calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
+      handle = DLL[dllname] ||=
+        begin
+          Fiddle.dlopen(dllname)
+        rescue Fiddle::DLError
+          raise unless File.extname(dllname).empty?
+          Fiddle.dlopen("#{dllname}.dll")
+        end
+      @func = Fiddle::Function.new(handle[func], import, export, calltype)
+    rescue Fiddle::DLError => e
+      raise LoadError, e.message, e.backtrace
+    end
+
+    def call(*args)
+      import = @proto.split('')
+      args.each_with_index do |x, i|
+        if import[i] == 'S'
+          args[i], = [x == 0 ? nil : x].pack('p').unpack(POINTER_TYPE)
+        end
+        args[i], = [x].pack('I').unpack('i') if import[i] == 'I'
+      end
+      ret, = @func.call(*args)
+      ret || 0
+    end
+
+    alias Call call
+  end
+
   ##
-  # represents a string/struct
+  # represents a string/struct.
   # Buffer.new({ :x => :L, :y => 4 })
   # Buffer.new([ :L, 4 ])
   # Buffer.new(:L)
@@ -15,6 +59,8 @@ module Undll32
   # buffer.buffer => "\0\0\0\0"
   # buffer.unpack => 0
   class Buffer
+    attr_accessor :struct
+
     def initialize struct
       case struct
       when Hash, Array, Symbol, Integer
@@ -33,22 +79,63 @@ module Undll32
       _unpack @struct
     end
 
-    def _unpack x
+    def load v
+      @_i = 0
+      _load @struct, v
+      unpack
+    end
+
+    def _load x, v
       case x
       when Integer
-        buffer[(@_i += x) - x, x].sub(/\0+$/, '')
+        return @_i += x if v.nil?
+        unless String === v
+          raise ArgumentError, "expected str, got #{v}"
+        end
+        x = [x, v.length].min
+        buffer[(@_i += x) - x, x] = v[0, x]
       when Symbol
         n = { C: 1, S: 2, L: 4, Q: 8 }[x]
         if n.nil?
           raise ArgumentError, "expected CSLQ, got #{x}"
         end
+        return @_i += n if v.nil?
+        unless Integer === v
+          raise ArgumentError, "expected int, got #{v}"
+        end
+        buffer[(@_i += n) - n, n] = [v].pack("#{x}")
+      when Array
+        return x.each { |a| _load a, nil } if v.nil?
+        unless Array === v and v.size == x.size
+          raise ArgumentError, "expected array[#{x.size}], got #{v}"
+        end
+        x.zip(v) { |a, b| _load a, b }
+      when Hash
+        return x.each { |k, y| _load y, nil } if v.nil?
+        unless Hash === v
+          raise ArgumentError, "expected hash, got #{v}"
+        end
+        x.each { |k, y| _load y, v[k] }
+      else
+        raise ArgumentError, "expected hash, array, sym, int, got #{x}"
+      end
+    ensure
+      $@.shift if $@
+    end
+
+    def _unpack x
+      case x
+      when Integer
+        buffer[(@_i += x) - x, x].sub(/\0+$/, '')
+      when Symbol
+        n = { C: 1, S: 2, L: 4, Q: 8 }[x]
         buffer[(@_i += n) - n, n].unpack1("#{x}")
       when Array
         x.map { |e| _unpack e }
       when Hash
         Hash[x.map { |k, v| [k, _unpack(v)] }]
       else
-        raise ArgumentError, "expected hash, array, sym, int, got #{struct}"
+        raise ArgumentError, "expected hash, array, sym, int, got #{x}"
       end
     ensure
       $@.shift if $@
@@ -69,50 +156,135 @@ module Undll32
       when Hash
         _buffer x.values
       else
-        raise ArgumentError, "expected hash, array, sym, int, got #{struct}"
+        raise ArgumentError, "expected hash, array, sym, int, got #{x}"
       end
     ensure
       $@.shift if $@
     end
+
+    def self.from_array code
+      unless code =~ /^\[[CSLQ]+\]$/
+        raise ArgumentError, "expected [CSLQ], got #{code}"
+      end
+      return new(code[1..-2].chars.map(&:to_sym))
+    end
+
+    def self.from_size code
+      m = code.match(/^\:(?<size>[^=]+)=?(?<value>.+)?$/)
+      if m.nil?
+        raise ArgumentError, "expected <number> or CSLQ, got #{code}"
+      end
+      if m[:size] =~ /^[CSLQ]+$/
+        s = m[:size].chars.map(&:to_sym)
+        if s.size == 1
+          return new(s[0]).tap { |b| b.load(m[:value].to_i) if m[:value] }
+        else
+          b = new(s)
+          b.load(m[:value].split(':').map(&:to_i)) if m[:value]
+          return b
+        end
+      end
+      if (n = m[:size].to_i)
+        return new(n).tap { |b| b.load(m[:value]) if m[:value] }
+      end
+      raise ArgumentError, "expected <number> or CSLQ, got #{code}"
+    end
+
+    def self.next_placeholder
+      @_placeholder_counter ||= 0
+      "__#{@_placeholder_counter += 1}__"
+    end
+
+    def self.from_struct code
+      default = {}
+      # code := '{' [name] [:type] [=value] [,...] '}'
+      env, keys, key = [], [], ''
+      seq = code.scan /\w+|\:[[:digit:]]+|\:[CSLQ:]+|=[^,\}]+|./
+      ret = while (token = seq.shift)
+        case token[0]
+        when '{'
+          keys.push(key.to_sym) unless key.empty?
+          env.push({})
+          key = ''
+        when '}'
+          env[-1][key.to_sym] = :L unless key.empty?
+          x = env.pop
+          break x if env.empty?
+          env[-1][keys.pop] = x
+          key = ''
+        when ':'
+          token << seq.shift if seq.first&.start_with?('=')
+          b = from_size(token)
+          key = next_placeholder if key.empty?
+          env[-1][key.to_sym] = b.struct
+          d = default
+          keys.each { |k| d[k] ||= {}; d = d[k] }
+          d[key.to_sym] = b.unpack
+          key = ''
+        when '='
+          e = token[1..-1]
+          e = Integer(e) rescue nil
+          type = Integer === e ? :L : (e.length + 1)
+          env[-1][key.to_sym] = type
+          d = default
+          keys.each { |k| d[k] ||= {}; d = d[k] }
+          if Integer === type
+            e = "\"#{e}\"".undump rescue e.undump
+          end
+          d[key.to_sym] = e
+          key = ''
+        when ','
+          next if key.empty?
+          env[-1][key.to_sym] = :L
+          key = ''
+        else
+          key << token
+        end
+      end
+      if ret.nil?
+        raise ArgumentError, 'expected }, got end-of-input'
+      end
+      new(ret).tap { |b| b.load(default) }
+    end
+
+    def self.from code
+      return from_array(code) if code.start_with?('[')
+      return from_size(code) if code.start_with?(':')
+      code = "{#{code}}" unless code.start_with?('{')
+      return from_struct(code)
+    end
   end
 
   # Undll32.run 'user32', 'MessageBox', 0, 'hello', 'world', 0
+  # Undll32.run 'user32', 'GetCursorPos', Buffer.new({:x => :L, :y => :L})
+  # Undll32.run 'user32', 'GetCursorPos', Buffer.from('x,y')
   def self.run(dll, func, *args)
     types = args.map { |e| Integer === e ? 'L' : 'p' }
     input = args.map { |e| Buffer === e ? e.buffer : e }
     Win32API.new(dll, func, types, 'i').call(*input)
   end
 
-  def self.parse xs
-    case x = xs.shift
-    when ':' then Buffer.new xs.shift.to_i
-    when '[' then Buffer.new xs.shift.chars.map(&:to_sym)
-    when '{'
-      x = Hash[xs.each_slice(4).map { |k, _, v, _| [k.to_sym, v.to_sym] }]
-      Buffer.new x
-    else
-      raise ArgumentError, "expected : [ {, got #{x}"
-    end
-  end
-
   def self.exe(argv=ARGV)
     return help if ARGV.include? '-h' or ARGV.include? '--help'
     dllfunc, *args = argv
     return help if dllfunc.nil?
     dll, func = dllfunc.split(',')
     return help if func.nil?
-    args.map! { |e|
+    dll += '.dll' unless dll.end_with? '.dll'
+    realpath = File.expand_path dll
+    dll = realpath if File.exist? realpath
+    args.map! do |e|
       e = e.dup
       if e.start_with?('+')
         e.slice!(0)
         next e if e.start_with?('+')
-        parse e.scan(/\w+|./)
+        Buffer.from(e)
       else
         n = Integer(e) rescue nil
         next n if n
         e
       end
-    }
+    end
     ret = run(dll, func, *args)
     args.each { |e| pp e.unpack if Buffer === e }
     ret
@@ -126,10 +298,10 @@ module Undll32
     EXAMPLE
       undll32 user32,MessageBox 0 hello world 0
       undll32 user32,GetCursorPos +[LL]
-      undll32 user32,GetCursorPos +{x:L,y:L}
+      undll32 user32,GetCursorPos +x,y
       undll32 user32,GetCursorPos +:8 # will be converted to string
 
-    EXPLAIN
+    ARGUMENTS
       0   => (Integer) 0
       str => 'str'
       +0  => '0'
@@ -138,6 +310,9 @@ module Undll32
       +{x:L,y:L} => Buffer.new({:x => :L, :y => :L})
       +:256      => Buffer.new(256)
 
+    VERSION
+      #{VERSION}
+
     USAGE
   end
 end

data/lib/undll32/version.rb

@@ -1,3 +1,3 @@
 module Undll32
-  VERSION = "0.2.0"
+  VERSION = "0.3.4"
 end

data/undll32.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.2.9"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: undll32
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - hyrious
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: undll32 User32,MessageBoxA 0 hello world 0
 email:
 - hyrious@outlook.com
@@ -62,7 +62,7 @@ homepage: https://github.com/hyrious/undll32
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,9 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: Windows rundll32 replacement.
 test_files: []