win-ffi 0.3.1 → 0.3.2

data/lib/win-ffi/structs/gdi32/palette_entry.rb

@@ -1,10 +1,10 @@
-module WinFFI
-  module Gdi32
-    class PALETTEENTRY < FFIStruct
-      layout :peRed,   :byte,
-             :peGreen, :byte,
-             :peBlue,  :byte,
-             :peFlags, :byte
-    end
-  end
+module WinFFI
+  module Gdi32
+    class PALETTEENTRY < FFIStruct
+      layout :peRed,   :byte,
+             :peGreen, :byte,
+             :peBlue,  :byte,
+             :peFlags, :byte
+    end
+  end
 end

data/lib/win-ffi/structs/gdi32/pixel_format_descriptor.rb

@@ -1,57 +1,57 @@
-require_relative '../../enums/gdi32/pfd_flags'
-
-module WinFFI
-  module Gdi32
-    class PIXELFORMATDESCRIPTOR < FFIStruct
-      FLAGS_INV = PFDFlags.to_hash.reduce(Hash.new{|h,k| h[k] = []}){|h,(k,v)| h[v] << k; h}.freeze
-
-      layout :nSize,           :ushort,
-             :nVersion,        :ushort,
-             :dwFlags,         :uint,
-             :iPixelType,      :char,
-             :cColorBits,      :char,
-             :cRedBits,        :char,
-             :cRedShift,       :char,
-             :cGreenBits,      :char,
-             :cGreenShift,     :char,
-             :cBlueBits,       :char,
-             :cBlueShift,      :char,
-             :cAlphaBits,      :char,
-             :cAlphaShift,     :char,
-             :cAccumBits,      :char,
-             :cAccumRedBits,   :char,
-             :cAccumGreenBits, :char,
-             :cAccumBlueBits,  :char,
-             :cAccumAlphaBits, :char,
-             :cDepthBits,      :char,
-             :cStencilBits,    :char,
-             :cAuxBuffers,     :char,
-             :iLayerType,      :char,
-             :bReserved,       :char,
-             :dwLayerMask,     :uint,
-             :dwVisibleMask,   :uint,
-             :dwDamageMask,    :uint
-
-      #TODO
-      #undef_method :nSize=
-
-      def initialize
-        super
-        self[:nSize] = self.size
-      end
-
-      def dwFlags
-        val = self[:dwFlags]
-        Set.new(FLAGS_INV.select{|k,_| val & k != 0}.reduce([]) {|a,(_,v)| a << v}.flatten)
-      end
-
-      def dwFlags=(flags)
-        self[:dwFlags] = [*flags].reduce(0) {|a,f| a | PFDFlags[f].to_i}
-      end
-
-      def to_s
-        [:iPixelType, :cColorBits, :cAccumBits, :cDepthBits, :iLayerType, :dwFlags].map{|n| "#{n} = #{send(n).inspect}"}.join(', ')
-      end
-    end
-  end
+require_relative '../../enums/gdi32/pfd_flags'
+
+module WinFFI
+  module Gdi32
+    class PIXELFORMATDESCRIPTOR < FFIStruct
+      FLAGS_INV = PFDFlags.to_hash.reduce(Hash.new{|h,k| h[k] = []}){|h,(k,v)| h[v] << k; h}.freeze
+
+      layout :nSize,           :ushort,
+             :nVersion,        :ushort,
+             :dwFlags,         :uint,
+             :iPixelType,      :char,
+             :cColorBits,      :char,
+             :cRedBits,        :char,
+             :cRedShift,       :char,
+             :cGreenBits,      :char,
+             :cGreenShift,     :char,
+             :cBlueBits,       :char,
+             :cBlueShift,      :char,
+             :cAlphaBits,      :char,
+             :cAlphaShift,     :char,
+             :cAccumBits,      :char,
+             :cAccumRedBits,   :char,
+             :cAccumGreenBits, :char,
+             :cAccumBlueBits,  :char,
+             :cAccumAlphaBits, :char,
+             :cDepthBits,      :char,
+             :cStencilBits,    :char,
+             :cAuxBuffers,     :char,
+             :iLayerType,      :char,
+             :bReserved,       :char,
+             :dwLayerMask,     :uint,
+             :dwVisibleMask,   :uint,
+             :dwDamageMask,    :uint
+
+      #TODO
+      #undef_method :nSize=
+
+      def initialize
+        super
+        self.nSize = self.size
+      end
+
+      def dwFlags
+        val = self.dwFlags
+        Set.new(FLAGS_INV.select{|k,_| val & k != 0}.reduce([]) {|a,(_,v)| a << v}.flatten)
+      end
+
+      def dwFlags=(flags)
+        self.dwFlags = [*flags].reduce(0) {|a,f| a | PFDFlags[f].to_i}
+      end
+
+      def to_s
+        [:iPixelType, :cColorBits, :cAccumBits, :cDepthBits, :iLayerType, :dwFlags].map{|n| "#{n} = #{send(n).inspect}"}.join(', ')
+      end
+    end
+  end
 end

data/lib/win-ffi/structs/gdi32/rgb_quad.rb

@@ -1,10 +1,10 @@
-module WinFFI
-  module Gdi32
-    class RGBQUAD < FFIStruct
-      layout :rgbBlue,     :byte,
-             :rgbGreen,    :byte,
-             :rgbRed,      :byte,
-             :rgbReserved, :byte
-    end
-  end
+module WinFFI
+  module Gdi32
+    class RGBQUAD < FFIStruct
+      layout :rgbBlue,     :byte,
+             :rgbGreen,    :byte,
+             :rgbRed,      :byte,
+             :rgbReserved, :byte
+    end
+  end
 end

data/lib/win-ffi/structs/os_version_info.rb

@@ -1,10 +1,10 @@
-module WinFFI
-  class OSVERSIONINFO < FFIStruct
-    layout :dwOSVersionInfoSize, :ulong,
-           :dwMajorVersion,      :ulong,
-           :dwMinorVersion,      :ulong,
-           :dwBuildNumber,       :ulong,
-           :dwPlatformId,        :ulong,
-           :szCSDVersion,        [:char, 128]
-  end
+module WinFFI
+  class OSVERSIONINFO < FFIStruct
+    layout :dwOSVersionInfoSize, :ulong,
+           :dwMajorVersion,      :ulong,
+           :dwMinorVersion,      :ulong,
+           :dwBuildNumber,       :ulong,
+           :dwPlatformId,        :ulong,
+           :szCSDVersion,        [:char, 128]
+  end
 end

data/lib/win-ffi/structs/point.rb

@@ -1,10 +1,10 @@
-module WinFFI
-  class POINT < FFIStruct
-    layout :x, :long,
-           :y, :long
-
-    def to_s
-      "(x = #{x}, y = #{y})"
-    end
-  end
+module WinFFI
+  class POINT < FFIStruct
+    layout :x, :long,
+           :y, :long
+
+    def to_s
+      "(x = #{x}, y = #{y})"
+    end
+  end
 end

data/lib/win-ffi/structs/rect.rb

@@ -1,28 +1,42 @@
-module WinFFI
-  class RECT < FFIStruct
-    layout :left,   :long,
-           :top,    :long,
-           :right,  :long,
-           :bottom, :long
-
-    def width
-      right - left
-    end
-
-    def width=(v)
-      self.right = left + v
-    end
-
-    def height
-      bottom - top
-    end
-
-    def height=(v)
-      self.bottom = top + v
-    end
-
-    def to_s
-      "(left = #{left}, top = #{top}, width = #{width}, height = #{height})"
-    end
-  end
+require 'win-ffi/struct'
+
+module WinFFI
+  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
+
+    def width
+      right - left
+    end
+
+    def width=(v)
+      self.right = left + v
+    end
+
+    def height
+      bottom - top
+    end
+
+    def height=(v)
+      self.bottom = top + v
+    end
+
+    def to_s
+      "(left = #{left}, top = #{top}, width = #{width}, height = #{height})"
+    end
+  end
 end

data/lib/win-ffi/structs/size.rb

@@ -1,6 +1,6 @@
-module WinFFI
-  class SIZE < FFIStruct
-    layout :cx, :long,
-           :cy, :long
-  end
+module WinFFI
+  class SIZE < FFIStruct
+    layout :cx, :long,
+           :cy, :long
+  end
 end

data/lib/win-ffi/structs/user32/controls/combobox_info.rb

@@ -1,13 +1,15 @@
-module WinFFI
-  module User32
-    class COMBOBOXINFO < FFIStruct
-      layout :cbSize,      :dword,
-             :rcItem,      RECT,
-             :rcButton,    RECT,
-             :stateButton, :dword,
-             :hwndCombo,   :hwnd,
-             :hwndItem,    :hwnd,
-             :hwndList,    :hwnd
-    end
-  end
+require 'lib/win-ffi/structs/rect'
+
+module WinFFI
+  module User32
+    class COMBOBOXINFO < FFIStruct
+      layout :cbSize,      :dword,
+             :rcItem,      RECT,
+             :rcButton,    RECT,
+             :stateButton, :dword,
+             :hwndCombo,   :hwnd,
+             :hwndItem,    :hwnd,
+             :hwndList,    :hwnd
+    end
+  end
 end

data/lib/win-ffi/structs/user32/controls/scroll_info.rb

@@ -1,13 +1,13 @@
-module WinFFI
-  module User32
-    class SCROLLINFO < FFIStruct
-      layout :cbSize,    :uint,
-             :fMask,     :uint,
-             :nMin,      :int,
-             :nMax,      :int,
-             :nPage,     :uint,
-             :nPos,      :int,
-             :nTrackPos, :int
-    end
-  end
+module WinFFI
+  module User32
+    class SCROLLINFO < FFIStruct
+      layout :cbSize,    :uint,
+             :fMask,     :uint,
+             :nMin,      :int,
+             :nMax,      :int,
+             :nPage,     :uint,
+             :nPos,      :int,
+             :nTrackPos, :int
+    end
+  end
 end

data/lib/win-ffi/structs/user32/controls/scrollbar_info.rb

@@ -1,13 +1,15 @@
-module WinFFI
-  module User32
-    class SCROLLBARINFO < FFIStruct
-      layout :cbSize,        :dword,
-             :rcScrollBar,   RECT,
-             :dxyLineButton, :int,
-             :xyThumbTop,    :int,
-             :xyThumbBottom, :int,
-             :reserved,      :int,
-             :rgstate,       :dword
-    end
-  end
+require 'win-ffi/structs/rect'
+
+module WinFFI
+  module User32
+    class SCROLLBARINFO < FFIStruct
+      layout :cbSize,        :dword,
+             :rcScrollBar,   RECT,
+             :dxyLineButton, :int,
+             :xyThumbTop,    :int,
+             :xyThumbBottom, :int,
+             :reserved,      :int,
+             :rgstate,       :dword
+    end
+  end
 end

data/lib/win-ffi/structs/user32/cursor_info.rb

@@ -1,10 +1,12 @@
-module WinFFI
-  module User32
-    class CURSORINFO < FFIStruct
-      layout :cbSize,      :dword,
-             :flags,       :dword,
-             :hCursor,     :hcursor,
-             :ptScreenPos, WinFFI::POINT
-    end
-  end
+require 'win-ffi/structs/point'
+
+module WinFFI
+  module User32
+    class CURSORINFO < FFIStruct
+      layout :cbSize,      :dword,
+             :flags,       :dword,
+             :hCursor,     :hcursor,
+             :ptScreenPos, POINT
+    end
+  end
 end

data/lib/win-ffi/structs/user32/display_device.rb

@@ -1,12 +1,12 @@
-module WinFFI
-  module User32
-    class DISPLAY_DEVICE < FFIStruct
-      layout :cb,           :dword,
-             :DeviceName,   [:char, 32],
-             :DeviceString, [:char, 128],
-             :StateFlags,   :dword,
-             :DeviceID,     [:char, 128],
-             :DeviceKey,    [:char, 128]
-    end
-  end
+module WinFFI
+  module User32
+    class DISPLAY_DEVICE < FFIStruct
+      layout :cb,           :dword,
+             :DeviceName,   [:char, 32],
+             :DeviceString, [:char, 128],
+             :StateFlags,   :dword,
+             :DeviceID,     [:char, 128],
+             :DeviceKey,    [:char, 128]
+    end
+  end
 end

data/lib/win-ffi/structs/user32/draw_text_params.rb

@@ -1,11 +1,11 @@
-module WinFFI
-  module User32
-    class DRAWTEXTPARAMS < FFIStruct
-      layout :cbSize,        :uint,
-             :iTabLength,    :int,
-             :iLeftMargin,   :int,
-             :iRightMargin,  :int,
-             :uiLengthDrawn, :uint
-    end
-  end
+module WinFFI
+  module User32
+    class DRAWTEXTPARAMS < FFIStruct
+      layout :cbSize,        :uint,
+             :iTabLength,    :int,
+             :iLeftMargin,   :int,
+             :iRightMargin,  :int,
+             :uiLengthDrawn, :uint
+    end
+  end
 end

data/lib/win-ffi/structs/user32/icon_info.rb

@@ -1,11 +1,11 @@
-module WinFFI
-  module User32
-    class ICONINFO < FFIStruct
-      layout :fIcon,    :bool,
-             :xHotspot, :dword,
-             :yHotspot, :dword,
-             :hbmMask,  :pointer,
-             :hbmColor, :pointer
-    end
-  end
+module WinFFI
+  module User32
+    class ICONINFO < FFIStruct
+      layout :fIcon,    :bool,
+             :xHotspot, :dword,
+             :yHotspot, :dword,
+             :hbmMask,  :pointer,
+             :hbmColor, :pointer
+    end
+  end
 end