win-ffi 0.3.1 → 0.3.2

data/lib/win-ffi/structs/user32/window/luid.rb

@@ -1,8 +1,8 @@
-module WinFFI
-  module User32
-    class LUID < FFIStruct
-      layout :LowPart,  :dword,
-             :HighPart, :long
-    end
-  end
+module WinFFI
+  module User32
+    class LUID < FFIStruct
+      layout :LowPart,  :dword,
+             :HighPart, :long
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/menu_info.rb

@@ -1,13 +1,13 @@
-module WinFFI
-  module User32
-    class MENUINFO < FFIStruct
-      layout :cbSize,          :dword,
-             :fMask,           :dword,
-             :dwStyle,         :dword,
-             :cyMax,           :uint,
-             :hbrBack,         :hbrush,
-             :dwContextHelpID, :dword,
-             :dwMenuData,      :ulong
-    end
-  end
+module WinFFI
+  module User32
+    class MENUINFO < FFIStruct
+      layout :cbSize,          :dword,
+             :fMask,           :dword,
+             :dwStyle,         :dword,
+             :cyMax,           :uint,
+             :hbrBack,         :hbrush,
+             :dwContextHelpID, :dword,
+             :dwMenuData,      :ulong
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/menu_item_info.rb

@@ -1,18 +1,18 @@
-module WinFFI
-  module User32
-    class MENUITEMINFO < FFIStruct
-      layout :cbSize,        :uint,
-             :fMask,         :uint,
-             :ftype,         :uint,
-             :fState,        :uint,
-             :wID,           :uint,
-             :hSubMenu,      :hmenu,
-             :hbmpChecked,   :pointer,
-             :hbmpUnchecked, :pointer,
-             :dwItemData,    :ulong,
-             :dwTypeData,    :string,
-             :cch,           :uint,
-             :hbmpItem,      :pointer
-    end
-  end
+module WinFFI
+  module User32
+    class MENUITEMINFO < FFIStruct
+      layout :cbSize,        :uint,
+             :fMask,         :uint,
+             :ftype,         :uint,
+             :fState,        :uint,
+             :wID,           :uint,
+             :hSubMenu,      :hmenu,
+             :hbmpChecked,   :pointer,
+             :hbmpUnchecked, :pointer,
+             :dwItemData,    :ulong,
+             :dwTypeData,    :string,
+             :cch,           :uint,
+             :hbmpItem,      :pointer
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/menu_item_template.rb

@@ -1,9 +1,9 @@
-module WinFFI
-  module User32
-    class MENUITEMTEMPLATE < FFIStruct
-      layout :mtOption,  :word,
-             :mtID,      :word,
-             :mtString,  :char
-    end
-  end
+module WinFFI
+  module User32
+    class MENUITEMTEMPLATE < FFIStruct
+      layout :mtOption,  :word,
+             :mtID,      :word,
+             :mtString,  :char
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/menubar_info.rb

@@ -1,12 +1,14 @@
-module WinFFI
-  module User32
-    class MENUBARINFO < FFIStruct
-      layout :cbSize,      :dword,
-             :rcBar,       RECT,
-             :hMenu,       :hmenu,
-             :hwndMenu,    :hwnd,
-             :fBarFocused, :bool,
-             :fFocused,    :bool
-    end
-  end
+require 'win-ffi/structs/rect'
+
+module WinFFI
+  module User32
+    class MENUBARINFO < FFIStruct
+      layout :cbSize,      :dword,
+             :rcBar,       RECT,
+             :hMenu,       :hmenu,
+             :hwndMenu,    :hwnd,
+             :fBarFocused, :bool,
+             :fFocused,    :bool
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/msgbox_params.rb

@@ -1,16 +1,16 @@
-module WinFFI
-  module User32
-    class MSGBOXPARAMS < FFIStruct
-      layout :cbSize,             :uint,
-             :hwndOwner,          :hwnd,
-             :hInstance,          :hinstance,
-             :lpszText,           :string,
-             :lpszCaption,        :string,
-             :dwStyle,            :dword,
-             :lpszIcon,           :string,
-             :dwContextHelpId,    :ulong,
-             :lpfnMsgBoxCallback, :pointer,
-             :dwLanguageId,       :dword
-    end
-  end
+module WinFFI
+  module User32
+    class MSGBOXPARAMS < FFIStruct
+      layout :cbSize,             :uint,
+             :hwndOwner,          :hwnd,
+             :hInstance,          :hinstance,
+             :lpszText,           :string,
+             :lpszCaption,        :string,
+             :dwStyle,            :dword,
+             :lpszIcon,           :string,
+             :dwContextHelpId,    :ulong,
+             :lpfnMsgBoxCallback, :pointer,
+             :dwLanguageId,       :dword
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/title_bar_info.rb

@@ -1,6 +1,8 @@
+require 'win-ffi/structs/rect'
+
 module WinFFI
   module User32
-    class TitleBarInfo < FFIStruct
+    class TITLEBARINFO < FFIStruct
       layout :cbSize,        :dword,
              :rcTitleBar,    RECT,
              :rgstate,       :dword

data/lib/win-ffi/structs/user32/window/tpm_params.rb

@@ -1,8 +1,10 @@
-module WinFFI
-  module User32
-    class TPMPARAMS  < FFIStruct
-      layout :cbSize,    :uint,
-             :rcExclude, RECT
-    end
-  end
+require 'win-ffi/structs/rect'
+
+module WinFFI
+  module User32
+    class TPMPARAMS  < FFIStruct
+      layout :cbSize,    :uint,
+             :rcExclude, RECT
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/update_layered_window_info.rb

@@ -1,22 +1,22 @@
-require 'win-ffi/structs/point'
-require 'win-ffi/structs/size'
-require 'win-ffi/enums/user32/layered_window_attributes_flags'
-require 'win-ffi/structs/rect'
-
-
-module WinFFI
-  module User32
-    class UpdateLayeredWindowInfo < FFIStruct
-      layout :cbSize,   :dword,
-             :hdcDst,   :hdc,
-             :pptDst,   POINT.ptr,
-             :psize,    SIZE.ptr,
-             :hdcSrc,   :hdc,
-             :pptSrc,   POINT.ptr,
-             :crKey,    :dword,
-             :pblend,   :pointer,
-             :dwFlags,  LayeredWindowAttributesFlags,
-             :prcDirty, RECT.ptr
-    end
-  end
+require 'win-ffi/structs/point'
+require 'win-ffi/structs/size'
+require 'win-ffi/enums/user32/layered_window_attributes_flags'
+require 'win-ffi/structs/rect'
+
+
+module WinFFI
+  module User32
+    class UPDATELAYEREDWINDOWINFO < FFIStruct
+      layout :cbSize,   :dword,
+             :hdcDst,   :hdc,
+             :pptDst,   POINT.ptr,
+             :psize,    SIZE.ptr,
+             :hdcSrc,   :hdc,
+             :pptSrc,   POINT.ptr,
+             :crKey,    :dword,
+             :pblend,   :pointer,
+             :dwFlags,  LayeredWindowAttributesFlags,
+             :prcDirty, RECT.ptr
+    end
+  end
 end

data/lib/win-ffi/structs/user32/window/window_placement.rb

@@ -1,32 +1,32 @@
-module WinFFI
-  module User32
-    class WindowPlacement < FFIStruct
-      layout :length,           :uint,
-             :flags,            :uint,
-             :showCmd,          :uint,
-             :ptMinPosition,    POINT,
-             :ptMaxPosition,    POINT,
-             :rcNormalPosition, RECT
-
-      #TODO
-      #remove_method :length=
-
-      def initialize
-        super
-        self[:length] = self.size
-      end
-
-      def showCmd
-        User32::ShowWindowEnum[self[:showCmd]]
-      end
-
-      def showCmd=(v)
-        self[:showCmd] = v.is_a?(Integer) ? v : User32::ShowWindowEnum[v]
-      end
-
-      def to_s
-        "showCmd = #{showCmd}, min = #{ptMinPosition}, max = #{ptMaxPosition}, normal = #{rcNormalPosition}"
-      end
-    end
-  end
-end
+module WinFFI
+  module User32
+    class WINDOWPLACEMENT < FFIStruct
+      layout :length,           :uint,
+             :flags,            :uint,
+             :showCmd,          :uint,
+             :ptMinPosition,    POINT,
+             :ptMaxPosition,    POINT,
+             :rcNormalPosition, RECT
+
+      #TODO
+      #remove_method :length=
+
+      def initialize
+        super
+        self[:length] = self.size
+      end
+
+      def showCmd
+        User32::ShowWindowEnum[self[:showCmd]]
+      end
+
+      def showCmd=(v)
+        self[:showCmd] = v.is_a?(Integer) ? v : User32::ShowWindowEnum[v]
+      end
+
+      def to_s
+        "showCmd = #{showCmd}, min = #{ptMinPosition}, max = #{ptMaxPosition}, normal = #{rcNormalPosition}"
+      end
+    end
+  end
+end

data/lib/win-ffi/structs/user32/window/window_pos.rb

@@ -1,46 +1,46 @@
-require_relative '../../../enums/user32/window/set_window_pos_flags'
-
-module WinFFI
-  module User32
-    class WindowPos < FFIStruct
-      FLAGS_INV = SetWindowPosFlags.to_hash.reduce(Hash.new{|h,k| h[k] = []}){|h,(k,v)| h[v] << k; h}.freeze
-
-      layout :hwnd,            :pointer, #HWND
-             :hwndInsertAfter, :pointer, #HWND
-             :left,            :int,
-             :top,             :int,
-             :width,           :int,
-             :height,          :int,
-             :flags,           :uint
-
-      def flags
-        val = self[:flags]
-        Set.new(FLAGS_INV.select { |k,_| val & k != 0 }.reduce([]) { |a,(_,v)| a << v }.flatten)
-      end
-
-      def flags=(flags)
-        self[:flags] = [*flags].reduce(0) { |a,f| a | SetWindowPosFlags[f].to_i }
-      end
-
-      def right
-        width + left
-      end
-
-      def right=(v)
-        self.width = v - left
-      end
-
-      def bottom
-        height + top
-      end
-
-      def bottom=(v)
-        self.height = v - top
-      end
-
-      def to_s
-        "left = #{left}, top = #{top}, width = #{width}, height = #{height}, flags = #{flags.to_a.inspect}"
-      end
-    end
-  end
-end
+require_relative '../../../enums/user32/window/set_window_pos_flags'
+
+module WinFFI
+  module User32
+    class WINDOWPOS < FFIStruct
+      FLAGS_INV = SetWindowPosFlags.to_hash.reduce(Hash.new{|h,k| h[k] = []}){|h,(k,v)| h[v] << k; h}.freeze
+
+      layout :hwnd,            :pointer, #HWND
+             :hwndInsertAfter, :pointer, #HWND
+             :left,            :int,
+             :top,             :int,
+             :width,           :int,
+             :height,          :int,
+             :flags,           :uint
+
+      def flags
+        val = self[:flags]
+        Set.new(FLAGS_INV.select { |k,_| val & k != 0 }.reduce([]) { |a,(_,v)| a << v }.flatten)
+      end
+
+      def flags=(flags)
+        self[:flags] = [*flags].reduce(0) { |a,f| a | SetWindowPosFlags[f].to_i }
+      end
+
+      def right
+        width + left
+      end
+
+      def right=(v)
+        self.width = v - left
+      end
+
+      def bottom
+        height + top
+      end
+
+      def bottom=(v)
+        self.height = v - top
+      end
+
+      def to_s
+        "left = #{left}, top = #{top}, width = #{width}, height = #{height}, flags = #{flags.to_a.inspect}"
+      end
+    end
+  end
+end

data/lib/win-ffi/version.rb

@@ -1,3 +1,3 @@
 module WinFFI
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win-ffi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - P3t3rU5
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -331,8 +331,8 @@ post_install_message: |
     Thanks for choosing WinFFI.
 
     ==========================================================================
-    0.3.1 Changes:
-      - First Official Version
+    0.3.2 Changes:
+      - Added missing requires and changed the name of some structs to be upcased
 
     ==========================================================================
 
@@ -355,9 +355,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: FFI definitions for Windows API
 test_files: []
-has_rdoc: