win-ffi-core 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b6199ff2041ec04c908e4a28715ede253489fd
-  data.tar.gz: 2bd9bf4e101580882935b128134bdea1225ca506
+  metadata.gz: 84c34e7d82bb265d59757931a899f9589f8ebc45
+  data.tar.gz: e58ab70df06d667c8604b5d39f63a2ee35a690cc
 SHA512:
-  metadata.gz: ad1362955f00d9cf9870f2ca1660028bb0f214491875aa4b5f9ff2bccf9b743ee4a70f9532e4959c77c0a2789d897bf8bdc874a52472a4a0545e9fa259127838
-  data.tar.gz: 5eb7492aa46d63f6e001ce6e9d6f2f5aca78e422db0cbbda98716a4a6981a86d6382046e5fcc24abb38c8b67dd66c2f6dfef85557342d00b16ae921ccaa7cc96
+  metadata.gz: 6b162af1f9b1c7074557a4fa6b4f6ec86004020f86b6eba7bf93ed4930942221cf9e0097e66163268cd23e3fb1395c5d6962da9942717cb4ac49c2a0eab57b94
+  data.tar.gz: ac005be4cc3e2c593815074facbd23e838c092cc5632f50cfa6d5310a636c733b17f3d11176bc81ed6a7e88c72acadeaed63da107c761a1ad73744b3ddd1a3c1

data/README.md

@@ -1,20 +1,20 @@
-# WinFFI
+# WinFFI Core
 
-[![Join the chat at https://gitter.im/P3t3rU5/winffi](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/P3t3rU5/winffi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/P3t3rU5/win-ffi-core](https://badges.gitter.im/P3t3rU5/win-ffi-core.svg)](https://gitter.im/P3t3rU5/win-ffi-core?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-WinFFI is a gem to use the windows API using the ffi gem inspired by windows-pr gem.
+WinFFI Core is the core gem for all WinFFI components. It defines some common functionality to all WinFFI component gems
 This gem is work in progress
 To install:
 
 ```
-gem install win-ffi
+gem install win-ffi-core
 ```
 
 # License
 
 (The MIT License)
 
-Copyright © 2013 Pedro Miranda
+Copyright © 2016 Pedro Miranda
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -33,4 +33,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/win-ffi/core.rb

@@ -1,10 +1,13 @@
-# require 'facets/pathname'
+require 'win-ffi/logger'
 require 'win-ffi/core/version'
+
+require 'ffi-additions/struct'
+
+require 'win-ffi/core/lib_base'
 require 'win-ffi/core/string_utils'
 require 'win-ffi/core/boolean_utils'
 require 'win-ffi/core/macro/util'
-require 'win-ffi/core/lib_base'
 
 module WinFFI
-  extend LibBase
+  MAX_PATH = 260
 end

data/lib/win-ffi/core/enum/error/set_last_error_ex_code.rb

@@ -0,0 +1,12 @@
+require 'win-ffi/core'
+
+module WinFFI
+  # SetLastErrorEx() types.
+  SetLastErrorExCode = enum :set_last_error_ex_code, [
+      :ERROR,      0x00000001,
+      :MINORERROR, 0x00000002,
+      :WARNING,    0x00000003,
+  ]
+
+  define_prefix(:SLE, SetLastErrorExCode)
+end

data/lib/win-ffi/core/lib_base.rb

@@ -1,16 +1,10 @@
 require 'ffi'
-require 'logger'
+require 'win-ffi/core/version'
 
 module WinFFI
-  @logger = Logger.new(STDOUT)
-  @logger.info "WinFFI #{VERSION}"
-  def self.logger
-    @logger
-  end
+  LOGGER.info "WinFFI v#{WinFFI::VERSION}"
 
-  WinFFI.logger.debug 'Getting Encoding...'
   @encoding = (__ENCODING__.name =~ /ASCII/ ? 'A' : 'W')
-  WinFFI.logger.debug 'Got Encoding: ' + @encoding
 
   def self.encoding
     @encoding
@@ -23,20 +17,30 @@ module WinFFI
   module LibBase
     extend FFI::Library
     ffi_convention :stdcall
+  end
+end
 
+require 'win-ffi/core/struct'
+require 'win-ffi/core/typedef/core'
+
+module WinFFI
+  module LibBase
     def encoded_function(name, *args, ruby_name: nil)
       ruby_name = name unless ruby_name
       attach_function ruby_name, name + WinFFI.encoding, *args
     end
 
-    if WinFFI.encoding == 'A'
-      def self.string_from_byte_array(array)
-        array[0, array.index(0) || array.length].pack('C*').encode(Encoding::UTF_8)
+    def define_prefix(prefix, target_enum, without_underscore = false)
+      target_enum.to_h.each do |k, v|
+        name = "#{prefix}#{without_underscore ? '' : '_'}#{k}"
+        const_set(name, v) unless const_defined? name
       end
-    else
-      def self.string_from_byte_array(array)
-        array = array[0, array.index(0) || array.length]
-        array.pack('S*').force_encoding(Encoding::UTF_16LE).encode(Encoding::UTF_8)
+    end
+
+    def define_suffix(suffix, target_enum, without_underscore = false)
+      target_enum.to_h.each do |k, v|
+        name = "#{k}#{without_underscore ? '' : '_'}#{suffix}"
+        const_set(name, v) unless const_defined? name
       end
     end
 
@@ -44,35 +48,34 @@ module WinFFI
       c.extend FFI::Library
       instance_variables.each do |v|
         value = instance_variable_get(v)
-        value = value.dup unless value.is_a?(Fixnum) || value.is_a?(Symbol)
+        value = value.dup unless value.is_a?(Integer) || value.is_a?(Symbol)
         c.instance_variable_set(v, value)
       end
     end
   end
+  extend LibBase
+end
 
-  require 'win-ffi/core/typedef/core'
-
-  require 'win-ffi/kernel32/struct/os_version_info_ex'
-
+module WinFFI
   module Kernel32
     extend LibBase
 
-    ffi_lib 'kernel32'
+    ffi_lib 'kernel32', 'KernelBase'
+  end
+
+  require 'win-ffi/kernel32/struct/system_info/os_version_info_ex'
 
-    #BOOL WINAPI GetVersionEx( _Inout_  LPOSVERSIONINFO lpVersionInfo )
+  module Kernel32
+    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx
+    # BOOL WINAPI GetVersionEx( _Inout_  LPOSVERSIONINFO lpVersionInfo )
     encoded_function 'GetVersionEx', [OSVERSIONINFOEX.ptr], :bool
   end
 
-  WinFFI.logger.debug 'Getting Architecture...'
-  Architecture = RbConfig::CONFIG['arch'] # "i386-mingw32" | "x64-mingw32"
-  WinFFI.logger.debug 'Got Architecture: ' + Architecture
+  Architecture = FFI::Platform::CPU # "i386-mingw32" | "x64-mingw32"
 
-  WinFFI.logger.debug 'Getting Windows Version...'
   WindowsVersion = OSVERSIONINFOEX.new.get!
-  WinFFI.logger.debug "Got Windows Version: #{WindowsVersion.hex}-> #{WindowsVersion.to_s}"
 
   WindowsVersion.major, WindowsVersion.minor, WindowsVersion.build = `ver`.match(/\d+\.\d+\.\d+/)[0].split('.').map(&:to_i)
 
-  @logger.info "#{WindowsVersion.to_s} #{Architecture} #{__ENCODING__.to_s}"
-end
-
+  LOGGER.info "#{WindowsVersion.to_s} #{Architecture} #{__ENCODING__.to_s}"
+end

data/lib/win-ffi/core/macro/util.rb

@@ -1,38 +1,74 @@
+require 'win-ffi/core'
+
 module WinFFI
-  def makeword(a, b)
-    ((a & 0xff) | ((b & 0xff) << 8))
-  end
+  HANDLE = WinFFI.find_type(:handle)
+  class << self
+    def MAKEWORD(a, b)
+      ((a & 0xff) | ((b & 0xff) << 8))
+    end
 
-  def makelong(a, b)
-    ((a & 0xffff) | ((b & 0xffff) << 16))
-  end
+    def MAKELONG(a, b)
+      ((a & 0xffff) | ((b & 0xffff) << 16))
+    end
 
-  def loword(l)
-    l & 0xffff
-  end
+    def MAKELCID(lgid, srtid) # ulong
+      srtid << 16 | lgid
+    end
 
-  def hiword(l)
-    l >> 16
-  end
+    #define LOWORD(_dw)     ((WORD)(((DWORD_PTR)(_dw)) & 0xffff))
+    def LOWORD(l)
+      l & 0xffff
+    end
 
-  def lobyte(w)
-    w & 0xff
-  end
+    #define HIWORD(_dw)     ((WORD)((((DWORD_PTR)(_dw)) >> 16) & 0xffff))
+    def HIWORD(l)
+      l >> 16
+    end
 
-  def hibyte(w)
-    w >> 8
-  end
+    #define LODWORD(_qw)    ((DWORD)(_qw))
 
-  def points_to_point(pt, pts)
-    pt.x = loword(pts)
-    pt.y = hiword(pts)
-  end
+    #define HIDWORD(_qw)    ((DWORD)(((_qw) >> 32) & 0xffffffff))
 
-  def point_to_points(pt)
-    makelong(pt.x, pt.y)
-  end
+    #define LOBYTE(w)           ((BYTE)(((DWORD_PTR)(w)) & 0xff))
+    def LOBYTE(w)
+      w & 0xff
+    end
+
+    #define HIBYTE(w)           ((BYTE)((((DWORD_PTR)(w)) >> 8) & 0xff))
+    def HIBYTE(w)
+      w >> 8
+    end
+
+    #define HandleToULong( h ) ((ULONG)(ULONG_PTR)(h) )
+    def HandleToULong(h)
+      h.address
+    end
+
+    #define HandleToLong( h )  ((LONG)(LONG_PTR) (h) )
+    def HandleToLong(h)
+      h.address
+    end
 
-  alias_method :makelresult, :makelong
-  alias_method :makelparam,  :makelong
-  alias_method :makewparam,  :makelong
+    #define ULongToHandle( ul ) ((HANDLE)(ULONG_PTR) (ul) )
+    def ULongToHandle(ul)
+      FFI::Pointer.new(HANDLE, ul)
+    end
+
+    #define LongToHandle( h )   ((HANDLE)(LONG_PTR) (h) )
+    def LongToHandle(h)
+      FFI::Pointer.new(HANDLE, h)
+    end
+
+    #define PtrToUlong( p ) ((ULONG)(ULONG_PTR) (p) )
+    #define PtrToLong( p )  ((LONG)(LONG_PTR) (p) )
+    #define PtrToUint( p ) ((UINT)(UINT_PTR) (p) )
+    #define PtrToInt( p )  ((INT)(INT_PTR) (p) )
+    #define PtrToUshort( p ) ((unsigned short)(ULONG_PTR)(p) )
+    #define PtrToShort( p )  ((short)(LONG_PTR)(p) )
+    #define IntToPtr( i )    ((VOID *)(INT_PTR)((int)i))
+    #define UIntToPtr( ui )  ((VOID *)(UINT_PTR)((unsigned int)ui))
+    #define LongToPtr( l )   ((VOID *)(LONG_PTR)((long)l))
+    #define ULongToPtr( ul ) ((VOID *)(ULONG_PTR)((unsigned long)ul))
+
+  end
 end

data/lib/win-ffi/core/string_utils.rb

@@ -1,6 +1,36 @@
 module WinFFI
   module StringUtils
+    refine ::String.singleton_class do
+      if WinFFI.encoding == 'A'
+        def from_byte_array(array)
+          array[0, array.index(0) || array.length].pack('C*').encode(Encoding::UTF_8)
+        end
+
+        def from_pointer(pointer, _)
+          pointer.read_string
+        end
+      else
+        def from_byte_array(array)
+          array = array[0, array.index(0) || array.length]
+          array.pack('S*').force_encoding(Encoding::UTF_16LE).encode(Encoding::UTF_8)
+        end
+
+        def from_pointer(pointer, size)
+          from_byte_array pointer.read_array_of_uint16(size)
+        end
+      end
+    end
+
     refine ::String do
+      if WinFFI.encoding == 'W'
+        def to_byte_array
+          FFI::MemoryPointer.new(WinFFI.find_type(:tchar), @size).write_string(string)
+        end
+      else
+        def to_byte_array
+          FFI::MemoryPointer.new(WinFFI.find_type(:tchar), @size).write_array_of_uint16(string.unpack('S*'))
+        end
+      end
 
       def to_utf8
         encode('utf-8')

data/lib/win-ffi/core/struct.rb

@@ -1,17 +1,17 @@
-require 'ffi'
-require 'win-ffi/core/lib_base'
+require 'win-ffi/core/string_utils'
 
-module WinFFI
-  extend LibBase
-  class FFIStruct < FFI::Struct
-    def self.layout(*args)
-      super
-      members.each do |name|
-        unless method_defined?(name)
-          define_method name, ->{ self[name] }
-          define_method "#{name}=", ->(v){ self[name] = v }
+using WinFFI::StringUtils
+
+module FFIAdditions
+  class Struct
+    def self.encoded_setter(name)
+      define_method("#{name}=", ->(string) do
+        if WinFFI.encoding == 'A'
+          (to_ptr + offset_of(name)).write_string(string)
+        else
+          (to_ptr + offset_of(name)).write_array_of_uint16(string.to_w.unpack('S*'))
         end
-      end
+      end)
     end
   end
-end
+end

data/lib/win-ffi/core/struct/guid.rb

@@ -1,10 +1,10 @@
 module WinFFI
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa373931(v=vs.85).aspx
-  class GUID < FFIStruct
-    layout :Data1, :dword,
-           :Data2, :word,
-           :Data3, :word,
-           :Data4, [:byte, 8]
+  class GUID < FFIAdditions::Struct
+    layout Data1: :dword,
+           Data2: :word,
+           Data3: :word,
+           Data4: [:byte, 8]
 
     def from_str(guid)
       data = [guid.gsub(/[{\-}]/, '')].pack('H*').unpack('L>S>2C8')

data/lib/win-ffi/core/struct/large_integer.rb

@@ -0,0 +1,16 @@
+module WinFFI
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa383713(v=vs.85).aspx
+  # class LARGE_INTEGER_STRUCT < FFIAdditions::Struct
+  #   layout LowPart:  :dword,
+  #          HighPart: :long
+  # end
+  #
+  # class LARGE_INTEGER < FFIAdditions::Union
+  #   layout s: LARGE_INTEGER_STRUCT,
+  #          u: LARGE_INTEGER_STRUCT
+  # end
+
+  class LARGE_INTEGER < FFIAdditions::Struct
+    layout QuadPart: :long_long
+  end
+end

data/lib/win-ffi/core/struct/luid.rb

@@ -1,9 +1,10 @@
 module WinFFI
   if WindowsVersion >= :xp
+    # Locally Unique Identifier
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379261(v=vs.85).aspx
-    class LUID < FFIStruct
-      layout :LowPart,  :dword,
-             :HighPart, :long
+    class LUID < FFIAdditions::Struct
+      layout LowPart: :dword,
+             HighPart: :long
     end
   end
 end

data/lib/win-ffi/core/struct/point.rb

@@ -1,10 +1,14 @@
 module WinFFI
-  class POINT < FFIStruct
-    layout :x, :long,
-           :y, :long
+  class POINT < FFIAdditions::Struct
+    layout x: :long,
+           y: :long
 
     def to_s
       "POINT x = #{x}, y = #{y}"
     end
+
+    def to_a
+      [x, y]
+    end
   end
 end

data/lib/win-ffi/core/struct/points.rb

@@ -0,0 +1,10 @@
+module WinFFI
+  class POINTS < FFIAdditions::Struct
+    layout x: :short,
+           y: :short
+
+    def to_s
+      "POINT x = #{x}, y = #{y}"
+    end
+  end
+end

data/lib/win-ffi/core/struct/rect.rb

@@ -1,22 +1,12 @@
+require 'win-ffi/core'
+
 module WinFFI
   # https://msdn.microsoft.com/en-us/library/windows/desktop/dd162897(v=vs.85).aspx
-  class RECT < FFIStruct
-    layout :left,   :long,
-           :top,    :long,
-           :right,  :long,
-           :bottom, :long
-
-    # def initialize(left, top, right, bottom)
-    #   self.left, self.top, self.right, self.bottom = left, top, right, bottom
-    # end
-
-    def area
-      width * height
-    end
-
-    def perimeter
-      2 * width + 2 * height
-    end
+  class RECT < FFIAdditions::Struct
+    layout left:   :long,
+           top:    :long,
+           right:  :long,
+           bottom: :long
 
     def width
       right - left
@@ -35,7 +25,12 @@ module WinFFI
     end
 
     def to_s
-      "(left = #{left}, top = #{top}, width = #{width}, height = #{height})"
+      "(left = #{left}, top = #{top}, width = #{right - left}, height = #{bottom - top})"
+    end
+
+    def ==(other)
+      return false unless other.is_a?(self.class)
+      left == other.left &&  top == other.top && right == other.right&& bottom == other.bottom
     end
   end
 end

data/lib/win-ffi/core/struct/security_attributes.rb

@@ -1,7 +1,12 @@
 module WinFFI
-  class SECURITY_ATTRIBUTES < FFIStruct
-    layout :nLength,              :dword,
-           :lpSecurityDescriptor, :pointer,
-           :bInheritHandle,       :bool
+  class SECURITY_ATTRIBUTES < FFIAdditions::Struct
+    layout nLength:                :dword,
+           lpSecurityDescriptor: :pointer,
+           bInheritHandle:          :bool
+
+    def initialize
+      super
+      self[:nLength] = self.size
+    end
   end
 end

data/lib/win-ffi/core/struct/size.rb

@@ -1,8 +1,8 @@
 module WinFFI
   # https://msdn.microsoft.com/en-us/library/windows/desktop/dd145106(v=vs.85).aspx
-  class SIZE < FFIStruct
-    layout :cx, :long,
-           :cy, :long
+  class SIZE < FFIAdditions::Struct
+    layout cx: :long,
+           cy: :long
 
     def to_s
       "Size x=#{x}, y=#{y}"

data/lib/win-ffi/core/struct/sizel.rb

@@ -0,0 +1,16 @@
+module WinFFI
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/dd145106(v=vs.85).aspx
+  class SIZEL < FFIAdditions::Struct
+    layout cx: :long,
+           cy: :long
+
+    def to_s
+      "Size x=#{x}, y=#{y}"
+    end
+
+    alias_method :x,  :cx
+    alias_method :x=, :cx=
+    alias_method :y,  :cy
+    alias_method :y=, :cy=
+  end
+end

data/lib/win-ffi/core/struct/ularge_integer.rb

@@ -0,0 +1,19 @@
+require 'win-ffi/kernel32'
+
+module WinFFI
+  module Kernel32
+    # class ULARGE_INTEGER_UNION < FFIAdditions::Struct
+    #   layout LowPart:  :dword,
+    #          HighPart: :dword
+    # end
+    #
+    # class ULARGE_INTEGER < FFIAdditions::Union
+    #   layout s: ULARGE_INTEGER_UNION,
+    #          u: ULARGE_INTEGER_UNION
+    # end
+
+    class ULARGE_INTEGER < FFIAdditions::Struct
+      layout QuadPart: :ulong_long
+    end
+  end
+end

data/lib/win-ffi/core/typedef/core.rb

@@ -1,30 +1,71 @@
-require 'win-ffi/core/lib_base'
-
 module WinFFI
   module LibBase
     typedef (WinFFI.encoding == 'A' ? :char : :ushort), :tchar
-    typedef :ushort, :atom
-    typedef :uchar,  :byte
-    typedef :ushort, :word
-    typedef :uint,   :dword
-    typedef :uint,   :colorref
-    typedef :uint,   :wparam
-    typedef :long,   :lparam
-    typedef :long,   :lresult
-    typedef :long,   :hresult
-    typedef :ushort, :langid
-    %i'
-      handle
-      hbitmap
-      hbrush
-      hdc
-      hglobal
-      hicon
-      hinstance
-      hmodule
-      hwnd
-    '.each do |s|
-      typedef :pointer, s
-    end
+    typedef :ushort,     :wchar
+    typedef :ushort,     :atom
+    typedef :uchar,      :byte
+    typedef :ushort,     :word
+    typedef :ulong,      :dword
+    typedef :int64,      :dword64
+    typedef :ulong_long, :dword_long
+    typedef :ulong_long, :dwordlong
+    typedef :ulong_long, :ulonglong
+    typedef :uint64,     :dword64
+    typedef :uint,       :wparam
+    typedef :long,       :lparam
+    typedef :long,       :lresult
+    typedef :long,       :hresult
+    typedef :ushort,     :langid
+    typedef :size_t,     :ulong_ptr
+    typedef :ulong,      :lcid
+
+    typedef :dword,      :colorref
+
+    typedef :pointer, :handle
+    typedef :pointer, :hbitmap
+    typedef :pointer, :hbrush
+    typedef :pointer, :hhook
+    typedef :pointer, :hdc
+    typedef :pointer, :hevent
+    typedef :pointer, :hglobal
+    typedef :pointer, :hicon
+    typedef :pointer, :hinstance
+    typedef :pointer, :hmenu
+    typedef :pointer, :hmodule
+    typedef :pointer, :hpen
+    typedef :pointer, :hwnd
+    typedef :pointer, :humpd
+
+    typedef :pointer, :puint
+    typedef :pointer, :plong
+    typedef :pointer, :pulong
+    typedef :pointer, :pshort
+    typedef :pointer, :pushort
+    typedef :pointer, :puchar
+    typedef :pointer, :psz
+    typedef :pointer, :pfloat
+
+    typedef :pointer, :pbool
+    typedef :pointer, :lpbool
+
+    typedef :pointer, :pbyte
+    typedef :pointer, :lpbyte
+    typedef :pointer, :ppbyte
+
+    typedef :pointer, :pint
+    typedef :pointer, :lpint
+
+    typedef :pointer, :pword
+    typedef :pointer, :lpword
+
+    typedef :pointer, :lplong
+
+    typedef :pointer, :pdword
+    typedef :pointer, :lpdword
+
+    typedef :pointer, :lpvoid
+    typedef :pointer, :lpcvoid
+
+    typedef :pointer, :callback
   end
 end

data/lib/win-ffi/core/version.rb

@@ -1,3 +1,3 @@
 module WinFFI
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/win-ffi/core/wide_inline_string.rb

@@ -1,3 +1,8 @@
+require 'win-ffi/core'
+require 'win-ffi/core/string_utils'
+
+using WinFFI::StringUtils
+
 module WinFFI
   class WideInlineString
     include FFI::DataConverter
@@ -9,12 +14,13 @@ module WinFFI
       @native_type = FFI::ArrayType.new(WinFFI.find_type(:tchar), size)
     end
 
-    def to_native(_value, _context)
-      raise NotImplementedError
+
+    def to_native(value, _context)
+      value.to_byte_array
     end
 
     def from_native(value, _context)
-      LibBase.string_from_byte_array(value.to_a)
+      String.from_byte_array(value.to_a)
     end
 
     alias_method :length, :size

data/lib/win-ffi/core/wide_string_pointer.rb

@@ -3,17 +3,17 @@ module WinFFI
     extend FFI::DataConverter
     native_type FFI::Type::POINTER
     # TODO
-    class << self
+      def initialize(size)
+        @size = size
+      end
 
       def to_native(value, _context)
-
+        value.address
       end
 
       def from_native(pointer, _context)
-
+        pointer.read_bytes(@size)
       end
 
-    end
-
   end
 end

data/lib/win-ffi/kernel32.rb

@@ -1,10 +1 @@
 require 'win-ffi/core/lib_base'
-
-module WinFFI
-  module Kernel32
-    extend WinFFI::LibBase
-
-    ffi_lib 'kernel32'
-  end
-end
-

data/lib/win-ffi/kernel32/enum/{version → system_info}/win32_winnt.rb

@@ -2,7 +2,7 @@ require 'win-ffi/kernel32'
 
 module WinFFI
   module Kernel32
-    # _WIN32_WINNT version constants
+    # _WIN32_WINNT system_info constants
     WIN32_WINNT = enum :win32_winnt, [
         :NT4,          0x0400,
         :WIN2K,        0x0500,

data/lib/win-ffi/kernel32/struct/{os_version_info_ex.rb → system_info/os_version_info_ex.rb}

@@ -1,25 +1,23 @@
 require 'win-ffi/core/wide_inline_string'
 
-require 'win-ffi/core/struct'
-
-require 'win-ffi/kernel32/enum/version/win32_winnt'
+require 'win-ffi/kernel32/enum/system_info/win32_winnt'
 
 module WinFFI
-  class OSVERSIONINFOEX < FFIStruct
+  class OSVERSIONINFOEX < FFIAdditions::Struct
 
     include Kernel32, Comparable
 
-    layout :dwOSVersionInfoSize, :ulong,
-           :dwMajorVersion,      :ulong,
-           :dwMinorVersion,      :ulong,
-           :dwBuildNumber,       :ulong,
-           :dwPlatformId,        :ulong,
-           :szCSDVersion,        WideInlineString.new(128),
-           :wServicePackMajor,   :ushort,
-           :wServicePackMinor,   :ushort,
-           :wSuiteMask,          :ushort,
-           :wProductType,        :uchar,
-           :wReserved,           :uchar
+    layout dwOSVersionInfoSize:                    :ulong,
+           dwMajorVersion:                         :ulong,
+           dwMinorVersion:                         :ulong,
+           dwBuildNumber:                          :ulong,
+           dwPlatformId:                           :ulong,
+           szCSDVersion:        WideInlineString.new(128),
+           wServicePackMajor:                     :ushort,
+           wServicePackMinor:                     :ushort,
+           wSuiteMask:                            :ushort,
+           wProductType:                          :uchar,
+           wReserved:                             :uchar
 
     def initialize
       super

data/lib/win-ffi/logger.rb

@@ -0,0 +1,5 @@
+require 'logger'
+
+module WinFFI
+  LOGGER = Logger.new(STDOUT)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win-ffi-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - P3t3rU5
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.10
+- !ruby/object:Gem::Dependency
+  name: ffi-additions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
@@ -68,25 +82,29 @@ files:
 - README.md
 - lib/win-ffi/core.rb
 - lib/win-ffi/core/boolean_utils.rb
-- lib/win-ffi/core/enum/firmware_type.rb
-- lib/win-ffi/core/enum/load_resource_flags.rb
+- lib/win-ffi/core/enum/error/set_last_error_ex_code.rb
 - lib/win-ffi/core/lib_base.rb
 - lib/win-ffi/core/macro/util.rb
 - lib/win-ffi/core/string_utils.rb
 - lib/win-ffi/core/struct.rb
 - lib/win-ffi/core/struct/guid.rb
+- lib/win-ffi/core/struct/large_integer.rb
 - lib/win-ffi/core/struct/luid.rb
 - lib/win-ffi/core/struct/point.rb
+- lib/win-ffi/core/struct/points.rb
 - lib/win-ffi/core/struct/rect.rb
 - lib/win-ffi/core/struct/security_attributes.rb
 - lib/win-ffi/core/struct/size.rb
+- lib/win-ffi/core/struct/sizel.rb
+- lib/win-ffi/core/struct/ularge_integer.rb
 - lib/win-ffi/core/typedef/core.rb
 - lib/win-ffi/core/version.rb
 - lib/win-ffi/core/wide_inline_string.rb
 - lib/win-ffi/core/wide_string_pointer.rb
 - lib/win-ffi/kernel32.rb
-- lib/win-ffi/kernel32/enum/version/win32_winnt.rb
-- lib/win-ffi/kernel32/struct/os_version_info_ex.rb
+- lib/win-ffi/kernel32/enum/system_info/win32_winnt.rb
+- lib/win-ffi/kernel32/struct/system_info/os_version_info_ex.rb
+- lib/win-ffi/logger.rb
 homepage: https://github.com/P3t3rU5/win-ffi-core
 licenses:
 - MIT
@@ -96,7 +114,7 @@ post_install_message: |
     Thanks for choosing WinFFI.
 
     ==========================================================================
-    1.0.0 Changes:
+    1.0.1 Changes:
       - Refactored Directory Structure
 
     ==========================================================================
@@ -120,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: FFI definitions for Windows API

data/lib/win-ffi/core/enum/firmware_type.rb

@@ -1,13 +0,0 @@
-require 'win-ffi/core/lib_base'
-
-module WinFFI
-  extend LibBase
-
-  FirmwareType = enum :firmware_type,
-  [
-    :Unknown, 0,
-    :Bios,    1,
-    :Uefi,    2,
-    :Max,     3
-  ]
-end

data/lib/win-ffi/core/enum/load_resource_flags.rb

@@ -1,47 +0,0 @@
-require 'win-ffi/core/lib_base'
-
-module WinFFI
-  extend LibBase
-
-  LoadResourceFlags = enum :load_resource_flags,
-                           [
-      :DEFAULTCOLOR, 0x00000000, # The default flag; it does nothing. All it means is "not :MONOCHROME".
-
-      :MONOCHROME,    0x00000001, # Loads the image in black and white.
-      :COLOR,         0x00000002,
-      :COPYRETURNORG, 0x00000004,
-      :COPYDELETEORG, 0x00000008,
-      :LOADFROMFILE,  0x00000010, # Loads the stand-alone image from the file specified by lpszName (icon, cursor, or
-      # bitmap file).
-      :LOADTRANSPARENT, 0x00000020, # Retrieves the color value of the first pixel in the image and replaces the
-      # corresponding entry in the color table with the default window_class color (COLOR_WINDOW). All pixels in the image
-      # that use that entry become the default window_class color. This value applies only to images that have corresponding
-      # color tables.
-      :DEFAULTSIZE, 0x00000040, # Uses the width or height specified by the system metric values for cursors or icons,
-      # if the cxDesired or cyDesired values are set to zero. If this flag is not specified and cxDesired and
-      # cyDesired are set to zero, the function uses the actual resource size. If the resource contains multiple
-      # images, the function uses the size of the first image.
-      :VGACOLOR,        0x00000080, # Uses true VGA colors.
-      :LOADMAP3DCOLORS, 0x00001000, # Searches the color table for the image and replaces the following shades of gray
-      # with the corresponding 3-D color.
-      #Dk Gray, RGB(128,128,128) with COLOR_3DSHADOW
-      #Gray, RGB(192,192,192) with COLOR_3DFACE
-      #Lt Gray, RGB(223,223,223) with COLOR_3DLIGHT
-      # Do not use this option if you are loading a bitmap with a color depth greater than 8bpp.
-
-      :CREATEDIBSECTION, 0x00002000, # When the uType parameter specifies IMAGE_BITMAP, causes the function to return
-      # a DIB section bitmap rather than a compatible bitmap. This flag is useful for loading a bitmap without mapping
-      # it to the colors of the display device.
-      # Do not use this option if you are loading a bitmap with a color depth greater than 8bpp.
-      # If fuLoad includes both the :LOADTRANSPARENT and :LOADMAP3DCOLORS values, :LOADTRANSPARENT takes precedence.
-      # However, the color table entry is replaced with COLOR_3DFACE rather than COLOR_WINDOW.
-      :COPYFROMRESOURCE, 0x00004000,
-      :SHARED,           0x00008000, # Shares the image handle if the image is loaded multiple times. If :SHARED is not set, a
-      # second call to LoadImage for the same resource will load the image again and return a different handle.
-      # When you use this flag, the system will destroy the resource when it is no longer needed.
-      # Do not use :SHARED for images that have non-standard sizes, that may change after loading, or that are loaded
-      # from a file. When loading a system icon or cursor, you must use :SHARED or the function will fail to load the
-      # resource. This function finds the first image in the cache with the requested resource name, regardless of the
-      # size requested.
-  ]
-end