fzeet 0.6.7 → 0.7.0

data/lib/fzeet/windows/comdlg/FindReplaceDialog.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/FontDialog.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/PrintDialog.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/ShellFileDialog.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/core/Common.rb

@@ -157,7 +157,7 @@ module Fzeet
 	def flags(flags, *prefixes)
 		return flags if flags.kind_of?(Integer)
 
-		[*flags].inject(0) { |flags, flag| flags |= constant(flag, *prefixes) }
+		[*flags].inject(0) { |result, flag| result |= constant(flag, *prefixes) }
 	end
 
 	module_function :constant, :flags

data/lib/fzeet/windows/scintilla.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'
 
 module Fzeet

data/lib/fzeet/windows/shell.rb

@@ -1,2 +1,21 @@
+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 'shell/BrowseForFolder'
 require_relative 'shell/FileDialog' if Fzeet::Windows::Version >= :vista

data/lib/fzeet/windows/shell/BrowseForFolder.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/shell/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'
 

data/lib/fzeet/windows/shell/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

data/lib/fzeet/windows/uiribbon.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 'ole'
 require_relative 'oleaut'
 require_relative 'shell'

data/lib/fzeet/windows/user.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/MessageBox'
 require_relative 'user/Window'
 require_relative 'user/Message'

data/lib/fzeet/windows/user/Control.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
+
 if __FILE__ == $0
 	require_relative 'Window/Common'
 end

data/lib/fzeet/windows/user/Control/ComboBox.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
+
 if __FILE__ == $0
 	require_relative '../Window/Common'
 end

data/lib/fzeet/windows/user/Control/ListBox.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
+
 if __FILE__ == $0
 	require_relative '../Window/Common'
 end
@@ -98,8 +117,8 @@ module Fzeet
 
 		def clear; sendmsg(:resetcontent); self end
 
-		def append(item)
-			[*item].each { |item|
+		def append(items)
+			[*items].each { |item|
 				p = FFI::MemoryPointer.from_string(item.to_s)
 
 				raise 'ADDSTRING failed.' if [-1, -2].include?(sendmsg(:addstring, 0, p).tap { p.free })

data/lib/fzeet/windows/user/SystemParametersInfo.rb

@@ -219,7 +219,7 @@ module Fzeet
 		SPI_SETMESSAGEDURATION = 0x2017
 
 		class NONCLIENTMETRICS < FFI::Struct
-			layout *[
+			layout(*[
 				:cbSize, :uint,
 				:iBorderWidth, :int,
 				:iScrollWidth, :int,
@@ -236,7 +236,7 @@ module Fzeet
 				:lfStatusFont, LOGFONT,
 				:lfMessageFont, LOGFONT,
 				(Version >= :vista) ? [:iPaddedBorderWidth, :int] : nil
-			].flatten.compact
+			].flatten.compact)
 		end
 
 		attach_function :SystemParametersInfo, :SystemParametersInfoA, [:uint, :uint, :pointer, :uint], :int

data/lib/fzeet/windows/user/Window.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 'Window/Window'
 require_relative 'Window/View'
 require_relative 'Window/Container'

data/lib/fzeet/windows/user/Window/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 'WindowMethods'
 
 module Fzeet

data/lib/fzeet/windows/user/Window/Container.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