fzeet 0.6.7 → 0.7.0

data/lib/fzeet/windows/comctl/DateTimePicker.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comctl/Edit.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comctl/Header.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet
@@ -101,7 +120,7 @@ module Fzeet
 		HDIS_FOCUSED = 0x00000001
 
 		class HDITEM < FFI::Struct
-			layout *[
+			layout(*[
 				:mask, :uint,
 				:cxy, :int,
 				:pszText, :pointer,
@@ -114,7 +133,7 @@ module Fzeet
 				:type, :uint,
 				:pvFilter, :pointer,
 				(Version >= :vista) ? [:state, :uint] : nil
-			].flatten.compact
+			].flatten.compact)
 		end
 
 		class NMHEADER < FFI::Struct

data/lib/fzeet/windows/comctl/ListView.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet
@@ -242,7 +261,7 @@ module Fzeet
 		LVCFMT_SPLITBUTTON = 0x1000000
 
 		class LVCOLUMN < FFI::Struct
-			layout *[
+			layout(*[
 				:mask, :uint,
 				:fmt, :int,
 				:cx, :int,
@@ -256,7 +275,7 @@ module Fzeet
 					:cxDefault, :int,
 					:cxIdeal, :int
 				] : nil
-			].flatten.compact
+			].flatten.compact)
 		end
 
 		LVIF_TEXT = 0x00000001
@@ -279,7 +298,7 @@ module Fzeet
 		LVIS_STATEIMAGEMASK = 0xF000
 
 		class LVITEM < FFI::Struct
-			layout *[
+			layout(*[
 				:mask, :uint,
 				:iItem, :int,
 				:iSubItem, :int,
@@ -299,7 +318,7 @@ module Fzeet
 					:piColFmt, :pointer,
 					:iGroup, :int
 				] : nil
-			].flatten.compact
+			].flatten.compact)
 		end
 
 		class NMLISTVIEW < FFI::Struct

data/lib/fzeet/windows/comctl/MonthCalendar.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comctl/ProgressBar.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comctl/PropertySheet.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet
@@ -20,7 +39,7 @@ module Fzeet
 		callback :PSPCALLBACK, [:pointer, :uint, :pointer], :uint
 
 		class PROPSHEETPAGE < FFI::Struct
-			layout *[
+			layout(*[
 				:dwSize, :ulong,
 				:dwFlags, :ulong,
 				:hInstance, :pointer,
@@ -51,7 +70,7 @@ module Fzeet
 							:pszbmHeader, :pointer
 					}
 				] : nil
-			].flatten.compact
+			].flatten.compact)
 		end
 
 		attach_function :CreatePropertySheetPage, :CreatePropertySheetPageA, [:pointer], :pointer

data/lib/fzeet/windows/comctl/SysLink.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comctl/Tab.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comctl/TreeView.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet
@@ -145,7 +164,7 @@ module Fzeet
 		end
 
 		class TVITEMEX < FFI::Struct
-			layout *[
+			layout(*[
 				:mask, :uint,
 				:hItem, :pointer,
 				:state, :uint,
@@ -165,7 +184,7 @@ module Fzeet
 				(Version >= 7) ? [
 					:iReserved, :int
 				] : nil
-			].flatten.compact
+			].flatten.compact)
 		end
 
 		TVI_ROOT = FFI::Pointer.new(-0x10000)

data/lib/fzeet/windows/comctl/UpDown.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comdlg.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'comdlg/FileDialog'
 require_relative 'comdlg/ShellFileDialog' if Fzeet::Windows::Version >= :vista
 require_relative 'comdlg/FontDialog'

data/lib/fzeet/windows/comdlg/ColorDialog.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet

data/lib/fzeet/windows/comdlg/Common.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative '../user'
 require_relative '../com'
 require_relative '../shell'

data/lib/fzeet/windows/comdlg/FileDialog.rb

@@ -1,3 +1,22 @@
+if __FILE__ == $0
+	require 'ffi'
+
+	# FIXME: dirty fix to propagate FFI structs layout down the inheritance hierarchy
+	# TODO: switch to composition instead inheriting FFI structs
+	module PropagateFFIStructLayout
+		def inherited(child_class)
+			child_class.instance_variable_set '@layout', layout
+		end
+	end
+
+	class FFI::Struct
+		def self.inherited(child_class)
+			child_class.extend PropagateFFIStructLayout
+		end
+	end
+	# END FIXME
+end
+
 require_relative 'Common'
 
 module Fzeet
@@ -172,7 +191,7 @@ module Fzeet
 				tip += name.length + 1
 			end
 
-			result.map! { |name| "#{path}\\#{name}" }
+			result.map! { |last| "#{path}\\#{last}" }
 		end
 
 		def multiselect=(multiselect)