fzeet 0.5.2 → 0.5.3

data/lib/fzeet/windows/uiribbon.rb

@@ -38,12 +38,12 @@ module Fzeet
  call "#{opts[:vcvars]}" >> "#{name}.log" &\
  "#{opts[:link]}" /nologo /machine:x86 /dll /noentry /out:"#{name}.dll" "#{ENV['TEMP']}/#{name}.res" >> "#{name}.log"
 				CMD
-#			system <<-CMD
+#				system <<-CMD
 #@echo off &\
 # "#{opts[:uicc]}" "#{name}.xml" "#{name}.bml" /header:"#{name}.h" /res:"#{name}.rc" > "#{name}.log" &\
 # "#{opts[:windres]}" -o"#{ENV['TEMP']}/#{name}.o" "#{name}.rc" >> "#{name}.log" &\
 # "#{opts[:gcc]}" -shared -o"#{name}.dll" "#{ENV['TEMP']}/#{name}.o" >> "#{name}.log"
-#			CMD
+#				CMD
 
 				raise "Ribbon build failed - see #{path}/#{name}.log for details." if File.read("#{path}/#{name}.log") =~ /error/i
 
@@ -71,32 +71,187 @@ module Fzeet
 		module_function :LoadRibbonDll
 
 		UI_PKEY_Enabled = PROPERTYKEY[VT_BOOL, 1]
+		UI_PKEY_LabelDescription = PROPERTYKEY[VT_LPWSTR, 2]
+		UI_PKEY_Keytip = PROPERTYKEY[VT_LPWSTR, 3]
+		UI_PKEY_Label = PROPERTYKEY[VT_LPWSTR, 4]
+		UI_PKEY_TooltipDescription = PROPERTYKEY[VT_LPWSTR, 5]
+		UI_PKEY_TooltipTitle = PROPERTYKEY[VT_LPWSTR, 6]
+		UI_PKEY_LargeImage = PROPERTYKEY[VT_UNKNOWN, 7]
+		UI_PKEY_LargeHighContrastImage = PROPERTYKEY[VT_UNKNOWN, 8]
+		UI_PKEY_SmallImage = PROPERTYKEY[VT_UNKNOWN, 9]
+		UI_PKEY_SmallHighContrastImage = PROPERTYKEY[VT_UNKNOWN, 10]
 
-		LIBID_UIRibbon = GUID['942f35c2-e83b-45ef-b085-ac295dd63d5b']
+		UI_PKEY_CommandId = PROPERTYKEY[VT_UI4, 100]
+		UI_PKEY_ItemsSource = PROPERTYKEY[VT_UNKNOWN, 101]
+		UI_PKEY_Categories = PROPERTYKEY[VT_UNKNOWN, 102]
+		UI_PKEY_CategoryId = PROPERTYKEY[VT_UI4, 103]
+		UI_PKEY_SelectedItem = PROPERTYKEY[VT_UI4, 104]
+		UI_PKEY_CommandType = PROPERTYKEY[VT_UI4, 105]
+		UI_PKEY_ItemImage = PROPERTYKEY[VT_UNKNOWN, 106]
 
-		CLSID_UIRibbonFramework = GUID['926749fa-2615-4987-8845-c33e65f2b957']
+		UI_PKEY_BooleanValue = PROPERTYKEY[VT_BOOL, 200]
+		UI_PKEY_DecimalValue = PROPERTYKEY[VT_DECIMAL, 201]
+		UI_PKEY_StringValue = PROPERTYKEY[VT_LPWSTR, 202]
+		UI_PKEY_MaxValue = PROPERTYKEY[VT_DECIMAL, 203]
+		UI_PKEY_MinValue = PROPERTYKEY[VT_DECIMAL, 204]
+		UI_PKEY_Increment = PROPERTYKEY[VT_DECIMAL, 205]
+		UI_PKEY_DecimalPlaces = PROPERTYKEY[VT_UI4, 206]
+		UI_PKEY_FormatString = PROPERTYKEY[VT_LPWSTR, 207]
+		UI_PKEY_RepresentativeString = PROPERTYKEY[VT_LPWSTR, 208]
 
-		IID_IUICommandHandler = GUID['75ae0a2d-dc03-4c9f-8883-069660d0beb6']
-		IID_IUIApplication = GUID['D428903C-729A-491d-910D-682A08FF2522']
-		IID_IUIFramework = GUID['F4F0385D-6872-43a8-AD09-4C339CB3F5C5']
+		UI_PKEY_FontProperties = PROPERTYKEY[VT_UNKNOWN, 300]
+		UI_PKEY_FontProperties_Family = PROPERTYKEY[VT_LPWSTR, 301]
+		UI_PKEY_FontProperties_Size = PROPERTYKEY[VT_DECIMAL, 302]
+		UI_PKEY_FontProperties_Bold = PROPERTYKEY[VT_UI4, 303]
+		UI_PKEY_FontProperties_Italic = PROPERTYKEY[VT_UI4, 304]
+		UI_PKEY_FontProperties_Underline = PROPERTYKEY[VT_UI4, 305]
+		UI_PKEY_FontProperties_Strikethrough = PROPERTYKEY[VT_UI4, 306]
+		UI_PKEY_FontProperties_VerticalPositioning = PROPERTYKEY[VT_UI4, 307]
+		UI_PKEY_FontProperties_ForegroundColor = PROPERTYKEY[VT_UI4, 308]
+		UI_PKEY_FontProperties_BackgroundColor = PROPERTYKEY[VT_UI4, 309]
+		UI_PKEY_FontProperties_ForegroundColorType = PROPERTYKEY[VT_UI4, 310]
+		UI_PKEY_FontProperties_BackgroundColorType = PROPERTYKEY[VT_UI4, 311]
+		UI_PKEY_FontProperties_ChangedProperties = PROPERTYKEY[VT_UNKNOWN, 312]
+		UI_PKEY_FontProperties_DeltaSize = PROPERTYKEY[VT_UI4, 313]
 
-		IUICommandHandler = COM::Interface[IUnknown,
-			IID_IUICommandHandler,
+		UI_PKEY_RecentItems = PROPERTYKEY[VT_ARRAY | VT_UNKNOWN, 350]
+		UI_PKEY_Pinned = PROPERTYKEY[VT_BOOL, 351]
 
-			Execute: [[:uint, :int, :pointer, :pointer, :pointer], :long],
-			UpdateProperty: [[:uint, :pointer, :pointer, :pointer], :long]
+		UI_PKEY_Color = PROPERTYKEY[VT_UI4, 400]
+		UI_PKEY_ColorType = PROPERTYKEY[VT_UI4, 401]
+		UI_PKEY_ColorMode = PROPERTYKEY[VT_UI4, 402]
+		UI_PKEY_ThemeColorsCategoryLabel = PROPERTYKEY[VT_LPWSTR, 403]
+		UI_PKEY_StandardColorsCategoryLabel = PROPERTYKEY[VT_LPWSTR, 404]
+		UI_PKEY_RecentColorsCategoryLabel = PROPERTYKEY[VT_LPWSTR, 405]
+		UI_PKEY_AutomaticColorLabel = PROPERTYKEY[VT_LPWSTR, 406]
+		UI_PKEY_NoColorLabel = PROPERTYKEY[VT_LPWSTR, 407]
+		UI_PKEY_MoreColorsLabel = PROPERTYKEY[VT_LPWSTR, 408]
+		UI_PKEY_ThemeColors = PROPERTYKEY[VT_VECTOR | VT_UI4, 409]
+		UI_PKEY_StandardColors = PROPERTYKEY[VT_VECTOR | VT_UI4, 410]
+		UI_PKEY_ThemeColorsTooltips = PROPERTYKEY[VT_VECTOR | VT_LPWSTR, 411]
+		UI_PKEY_StandardColorsTooltips = PROPERTYKEY[VT_VECTOR | VT_LPWSTR, 412]
+
+		UI_PKEY_Viewable = PROPERTYKEY[VT_BOOL, 1000]
+		UI_PKEY_Minimized = PROPERTYKEY[VT_BOOL, 1001]
+		UI_PKEY_QuickAccessToolbarDock = PROPERTYKEY[VT_UI4, 1002]
+
+		UI_PKEY_ContextAvailable = PROPERTYKEY[VT_UI4, 1100]
+
+		UI_PKEY_GlobalBackgroundColor = PROPERTYKEY[VT_UI4, 2000]
+		UI_PKEY_GlobalHighlightColor = PROPERTYKEY[VT_UI4, 2001]
+		UI_PKEY_GlobalTextColor = PROPERTYKEY[VT_UI4, 2002]
+
+		def UI_GetHValue(hsb) LOBYTE(hsb) end
+		def UI_GetSValue(hsb) LOBYTE(hsb >> 8) end
+		def UI_GetBValue(hsb) LOBYTE(hsb >> 16) end
+		def UI_HSB(h, s, b) h | (s << 8) | (b << 16) end
+
+		def UI_RGB2HSB(r, g, b)
+			r, g, b = r.to_f / 255, g.to_f / 255, b.to_f / 255
+
+			max, min = [r, g, b].max, [r, g, b].min
+
+			l = (max + min) / 2
+
+			s = if max == min
+				0
+			elsif l < 0.5
+				(max - min) / (max + min)
+			else
+				(max - min) / (2 - (max + min))
+			end
+
+			h = if max == min
+				0
+			elsif r == max
+				    (g - b) / (max - min)
+			elsif g == max
+				2 + (b - r) / (max - min)
+			else
+				4 + (r - g) / (max - min)
+			end * 60
+
+			h += 360 if h < 0
+
+			h = h / 360
+
+			[
+				# hue
+				(255 * h).round,
+
+				# saturation
+				(255 * s).round,
+
+				# brightness
+				(l < 0.1793) ?
+					0 :
+					(l > 0.9821) ?
+						255 :
+						(257.7 + 149.9 * Math.log(l)).round
+			]
+		end
+
+		module_function \
+			:UI_GetHValue, :UI_GetSValue, :UI_GetBValue, :UI_HSB,
+			:UI_RGB2HSB
+
+		UI_CONTEXTAVAILABILITY_NOTAVAILABLE = 0
+		UI_CONTEXTAVAILABILITY_AVAILABLE = 1
+		UI_CONTEXTAVAILABILITY_ACTIVE = 2
+
+		UI_FONTPROPERTIES_NOTAVAILABLE = 0
+		UI_FONTPROPERTIES_NOTSET = 1
+		UI_FONTPROPERTIES_SET = 2
+
+		UI_FONTVERTICALPOSITION_NOTAVAILABLE = 0
+		UI_FONTVERTICALPOSITION_NOTSET = 1
+		UI_FONTVERTICALPOSITION_SUPERSCRIPT = 2
+		UI_FONTVERTICALPOSITION_SUBSCRIPT = 3
+
+		UI_FONTUNDERLINE_NOTAVAILABLE = 0
+		UI_FONTUNDERLINE_NOTSET = 1
+		UI_FONTUNDERLINE_SET = 2
+
+		UI_FONTDELTASIZE_GROW = 0
+		UI_FONTDELTASIZE_SHRINK = 1
+
+		UI_CONTROLDOCK_TOP = 1
+		UI_CONTROLDOCK_BOTTOM = 3
+
+		UI_SWATCHCOLORTYPE_NOCOLOR = 0
+		UI_SWATCHCOLORTYPE_AUTOMATIC = 1
+		UI_SWATCHCOLORTYPE_RGB = 2
+
+		UI_SWATCHCOLORMODE_NORMAL = 0
+		UI_SWATCHCOLORMODE_MONOCHROME = 1
+
+		IUISimplePropertySet = COM::Interface[IUnknown,
+			GUID['c205bb48-5b1c-4219-a106-15bd0a5f24e2'],
+
+			GetValue: [[:pointer, :pointer], :long]
 		]
 
-		IUIApplication = COM::Interface[IUnknown,
-			IID_IUIApplication,
+		UISimplePropertySet = COM::Instance[IUISimplePropertySet]
 
-			OnViewChanged: [[:uint, :int, :pointer, :int, :int], :long],
-			OnCreateUICommand: [[:uint, :int, :pointer], :long],
-			OnDestroyUICommand: [[:uint, :int, :pointer], :long]
+		IUIRibbon = COM::Interface[IUnknown,
+			GUID['803982ab-370a-4f7e-a9e7-8784036a6e26'],
+
+			GetHeight: [[:pointer], :long],
+			LoadSettingsFromStream: [[:pointer], :long],
+			SaveSettingsToStream: [[:pointer], :long]
 		]
 
+		UIRibbon = COM::Instance[IUIRibbon]
+
+		UI_INVALIDATIONS_STATE = 0x00000001
+		UI_INVALIDATIONS_VALUE = 0x00000002
+		UI_INVALIDATIONS_PROPERTY = 0x00000004
+		UI_INVALIDATIONS_ALLPROPERTIES = 0x00000008
+
+		UI_ALL_COMMANDS = 0
+
 		IUIFramework = COM::Interface[IUnknown,
-			IID_IUIFramework,
+			GUID['F4F0385D-6872-43a8-AD09-4C339CB3F5C5'],
 
 			Initialize: [[:pointer, :pointer], :long],
 			Destroy: [[], :long],
@@ -109,8 +264,110 @@ module Fzeet
 			SetModes: [[:int], :long]
 		]
 
+		UIFramework = COM::Factory[IUIFramework, GUID['926749fa-2615-4987-8845-c33e65f2b957']]
+
+		IUIContextualUI = COM::Interface[IUnknown,
+			GUID['EEA11F37-7C46-437c-8E55-B52122B29293'],
+
+			ShowAtLocation: [[:int, :int], :long]
+		]
+
+		UIContextualUI = COM::Instance[IUIContextualUI]
+
+		IUICollection = COM::Interface[IUnknown,
+			GUID['DF4F45BF-6F9D-4dd7-9D68-D8F9CD18C4DB'],
+
+			GetCount: [[:pointer], :long],
+			GetItem: [[:uint, :pointer], :long],
+			Add: [[:pointer], :long],
+			Insert: [[:uint, :pointer], :long],
+			RemoveAt: [[:uint], :long],
+			Replace: [[:uint, :pointer], :long],
+			Clear: [[], :long]
+		]
+
+		UICollection = COM::Instance[IUICollection]
+
+		UI_COLLECTIONCHANGE_INSERT = 0
+		UI_COLLECTIONCHANGE_REMOVE = 1
+		UI_COLLECTIONCHANGE_REPLACE = 2
+		UI_COLLECTIONCHANGE_RESET = 3
+
+		UI_COLLECTION_INVALIDINDEX = 0xffffffff
+
+		IUICollectionChangedEvent = COM::Interface[IUnknown,
+			GUID['6502AE91-A14D-44b5-BBD0-62AACC581D52'],
+
+			OnChanged: [[:int, :uint, :pointer, :uint, :pointer], :long]
+		]
+
+		UICollectionChangedEvent = COM::Callback[IUICollectionChangedEvent]
+
+		UI_EXECUTIONVERB_EXECUTE = 0
+		UI_EXECUTIONVERB_PREVIEW = 1
+		UI_EXECUTIONVERB_CANCELPREVIEW = 2
+
+		IUICommandHandler = COM::Interface[IUnknown,
+			GUID['75ae0a2d-dc03-4c9f-8883-069660d0beb6'],
+
+			Execute: [[:uint, :int, :pointer, :pointer, :pointer], :long],
+			UpdateProperty: [[:uint, :pointer, :pointer, :pointer], :long]
+		]
+
 		UICommandHandler = COM::Callback[IUICommandHandler]
+
+		UI_COMMANDTYPE_UNKNOWN = 0
+		UI_COMMANDTYPE_GROUP = 1
+		UI_COMMANDTYPE_ACTION = 2
+		UI_COMMANDTYPE_ANCHOR = 3
+		UI_COMMANDTYPE_CONTEXT = 4
+		UI_COMMANDTYPE_COLLECTION = 5
+		UI_COMMANDTYPE_COMMANDCOLLECTION = 6
+		UI_COMMANDTYPE_DECIMAL = 7
+		UI_COMMANDTYPE_BOOLEAN = 8
+		UI_COMMANDTYPE_FONT = 9
+		UI_COMMANDTYPE_RECENTITEMS = 10
+		UI_COMMANDTYPE_COLORANCHOR = 11
+		UI_COMMANDTYPE_COLORCOLLECTION = 12
+
+		UI_VIEWTYPE_RIBBON = 1
+
+		UI_VIEWVERB_CREATE = 0
+		UI_VIEWVERB_DESTROY = 1
+		UI_VIEWVERB_SIZE = 2
+		UI_VIEWVERB_ERROR = 3
+
+		IUIApplication = COM::Interface[IUnknown,
+			GUID['D428903C-729A-491d-910D-682A08FF2522'],
+
+			OnViewChanged: [[:uint, :int, :pointer, :int, :int], :long],
+			OnCreateUICommand: [[:uint, :int, :pointer], :long],
+			OnDestroyUICommand: [[:uint, :int, :pointer], :long]
+		]
+
 		UIApplication = COM::Callback[IUIApplication]
-		UIFramework = COM::Factory[IUIFramework, CLSID_UIRibbonFramework]
+
+		IUIImage = COM::Interface[IUnknown,
+			GUID['23c8c838-4de6-436b-ab01-5554bb7c30dd'],
+
+			GetBitmap: [[:pointer], :long]
+		]
+
+		UIImage = COM::Instance[IUIImage]
+
+		UI_OWNERSHIP_TRANSFER = 0
+		UI_OWNERSHIP_COPY = 1
+
+		IUIImageFromBitmap = COM::Interface[IUnknown,
+			GUID['18aba7f3-4c1c-4ba2-bf6c-f5c3326fa816'],
+
+			CreateImage: [[:pointer, :int, :pointer], :long]
+		]
+
+		UIImageFromBitmap = COM::Factory[IUIImageFromBitmap, GUID['0f7434b6-59b6-4250-999e-d168d6ae4293']]
+
+		def UI_MAKEAPPMODE(x) 1 << x end
+
+		module_function :UI_MAKEAPPMODE
 	end
 end

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

@@ -0,0 +1,182 @@
+require_relative 'Common'
+
+module Fzeet
+	module Windows
+		FVIRTKEY = 1
+		FNOINVERT = 0x02
+		FSHIFT = 0x04
+		FCONTROL = 0x08
+		FALT = 0x10
+
+		VK_LBUTTON = 0x01
+		VK_RBUTTON = 0x02
+		VK_CANCEL = 0x03
+		VK_MBUTTON = 0x04
+		VK_XBUTTON1 = 0x05
+		VK_XBUTTON2 = 0x06
+		VK_BACK = 0x08
+		VK_TAB = 0x09
+		VK_CLEAR = 0x0C
+		VK_RETURN = 0x0D
+		VK_SHIFT = 0x10
+		VK_CONTROL = 0x11
+		VK_MENU = 0x12
+		VK_PAUSE = 0x13
+		VK_CAPITAL = 0x14
+		VK_KANA = 0x15
+		VK_HANGEUL = 0x15
+		VK_HANGUL = 0x15
+		VK_JUNJA = 0x17
+		VK_FINAL = 0x18
+		VK_HANJA = 0x19
+		VK_KANJI = 0x19
+		VK_ESCAPE = 0x1B
+		VK_CONVERT = 0x1C
+		VK_NONCONVERT = 0x1D
+		VK_ACCEPT = 0x1E
+		VK_MODECHANGE = 0x1F
+		VK_SPACE = 0x20
+		VK_PRIOR = 0x21
+		VK_NEXT = 0x22
+		VK_END = 0x23
+		VK_HOME = 0x24
+		VK_LEFT = 0x25
+		VK_UP = 0x26
+		VK_RIGHT = 0x27
+		VK_DOWN = 0x28
+		VK_SELECT = 0x29
+		VK_PRINT = 0x2A
+		VK_EXECUTE = 0x2B
+		VK_SNAPSHOT = 0x2C
+		VK_INSERT = 0x2D
+		VK_DELETE = 0x2E
+		VK_HELP = 0x2F
+		VK_LWIN = 0x5B
+		VK_RWIN = 0x5C
+		VK_APPS = 0x5D
+		VK_SLEEP = 0x5F
+		VK_NUMPAD0 = 0x60
+		VK_NUMPAD1 = 0x61
+		VK_NUMPAD2 = 0x62
+		VK_NUMPAD3 = 0x63
+		VK_NUMPAD4 = 0x64
+		VK_NUMPAD5 = 0x65
+		VK_NUMPAD6 = 0x66
+		VK_NUMPAD7 = 0x67
+		VK_NUMPAD8 = 0x68
+		VK_NUMPAD9 = 0x69
+		VK_MULTIPLY = 0x6A
+		VK_ADD = 0x6B
+		VK_SEPARATOR = 0x6C
+		VK_SUBTRACT = 0x6D
+		VK_DECIMAL = 0x6E
+		VK_DIVIDE = 0x6F
+		VK_F1 = 0x70
+		VK_F2 = 0x71
+		VK_F3 = 0x72
+		VK_F4 = 0x73
+		VK_F5 = 0x74
+		VK_F6 = 0x75
+		VK_F7 = 0x76
+		VK_F8 = 0x77
+		VK_F9 = 0x78
+		VK_F10 = 0x79
+		VK_F11 = 0x7A
+		VK_F12 = 0x7B
+		VK_F13 = 0x7C
+		VK_F14 = 0x7D
+		VK_F15 = 0x7E
+		VK_F16 = 0x7F
+		VK_F17 = 0x80
+		VK_F18 = 0x81
+		VK_F19 = 0x82
+		VK_F20 = 0x83
+		VK_F21 = 0x84
+		VK_F22 = 0x85
+		VK_F23 = 0x86
+		VK_F24 = 0x87
+		VK_NUMLOCK = 0x90
+		VK_SCROLL = 0x91
+		VK_OEM_NEC_EQUAL = 0x92
+		VK_OEM_FJ_JISHO = 0x92
+		VK_OEM_FJ_MASSHOU = 0x93
+		VK_OEM_FJ_TOUROKU = 0x94
+		VK_OEM_FJ_LOYA = 0x95
+		VK_OEM_FJ_ROYA = 0x96
+		VK_LSHIFT = 0xA0
+		VK_RSHIFT = 0xA1
+		VK_LCONTROL = 0xA2
+		VK_RCONTROL = 0xA3
+		VK_LMENU = 0xA4
+		VK_RMENU = 0xA5
+		VK_BROWSER_BACK = 0xA6
+		VK_BROWSER_FORWARD = 0xA7
+		VK_BROWSER_REFRESH = 0xA8
+		VK_BROWSER_STOP = 0xA9
+		VK_BROWSER_SEARCH = 0xAA
+		VK_BROWSER_FAVORITES = 0xAB
+		VK_BROWSER_HOME = 0xAC
+		VK_VOLUME_MUTE = 0xAD
+		VK_VOLUME_DOWN = 0xAE
+		VK_VOLUME_UP = 0xAF
+		VK_MEDIA_NEXT_TRACK = 0xB0
+		VK_MEDIA_PREV_TRACK = 0xB1
+		VK_MEDIA_STOP = 0xB2
+		VK_MEDIA_PLAY_PAUSE = 0xB3
+		VK_LAUNCH_MAIL = 0xB4
+		VK_LAUNCH_MEDIA_SELECT = 0xB5
+		VK_LAUNCH_APP1 = 0xB6
+		VK_LAUNCH_APP2 = 0xB7
+		VK_OEM_1 = 0xBA
+		VK_OEM_PLUS = 0xBB
+		VK_OEM_COMMA = 0xBC
+		VK_OEM_MINUS = 0xBD
+		VK_OEM_PERIOD = 0xBE
+		VK_OEM_2 = 0xBF
+		VK_OEM_3 = 0xC0
+		VK_OEM_4 = 0xDB
+		VK_OEM_5 = 0xDC
+		VK_OEM_6 = 0xDD
+		VK_OEM_7 = 0xDE
+		VK_OEM_8 = 0xDF
+		VK_OEM_AX = 0xE1
+		VK_OEM_102 = 0xE2
+		VK_ICO_HELP = 0xE3
+		VK_ICO_00 = 0xE4
+		VK_PROCESSKEY = 0xE5
+		VK_ICO_CLEAR = 0xE6
+		VK_PACKET = 0xE7
+		VK_OEM_RESET = 0xE9
+		VK_OEM_JUMP = 0xEA
+		VK_OEM_PA1 = 0xEB
+		VK_OEM_PA2 = 0xEC
+		VK_OEM_PA3 = 0xED
+		VK_OEM_WSCTRL = 0xEE
+		VK_OEM_CUSEL = 0xEF
+		VK_OEM_ATTN = 0xF0
+		VK_OEM_FINISH = 0xF1
+		VK_OEM_COPY = 0xF2
+		VK_OEM_AUTO = 0xF3
+		VK_OEM_ENLW = 0xF4
+		VK_OEM_BACKTAB = 0xF5
+		VK_ATTN = 0xF6
+		VK_CRSEL = 0xF7
+		VK_EXSEL = 0xF8
+		VK_EREOF = 0xF9
+		VK_PLAY = 0xFA
+		VK_ZOOM = 0xFB
+		VK_NONAME = 0xFC
+		VK_PA1 = 0xFD
+		VK_OEM_CLEAR = 0xFE
+
+		class ACCEL < FFI::Struct
+			layout \
+				:fVirt, :uchar,
+				:key, :ushort,
+				:cmd, :ushort
+		end
+
+		attach_function :CreateAcceleratorTable, :CreateAcceleratorTableA, [:pointer, :int], :pointer
+		attach_function :DestroyAcceleratorTable, [:pointer], :int
+	end
+end

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

@@ -0,0 +1,33 @@
+require_relative '../common'
+
+module Fzeet
+	module Windows
+		ffi_lib 'user32'
+		ffi_convention :stdcall
+
+		if WINVER.AtLeastWindowsVista?
+			attach_function :SetProcessDPIAware, [], :int
+		end
+
+		IMAGE_BITMAP = 0
+		IMAGE_ICON = 1
+		IMAGE_CURSOR = 2
+		IMAGE_ENHMETAFILE = 3
+
+		LR_DEFAULTCOLOR = 0x00000000
+		LR_MONOCHROME = 0x00000001
+		LR_COLOR = 0x00000002
+		LR_COPYRETURNORG = 0x00000004
+		LR_COPYDELETEORG = 0x00000008
+		LR_LOADFROMFILE = 0x00000010
+		LR_LOADTRANSPARENT = 0x00000020
+		LR_DEFAULTSIZE = 0x00000040
+		LR_VGACOLOR = 0x00000080
+		LR_LOADMAP3DCOLORS = 0x00001000
+		LR_CREATEDIBSECTION = 0x00002000
+		LR_COPYFROMRESOURCE = 0x00004000
+		LR_SHARED = 0x00008000
+
+		attach_function :LoadImage, :LoadImageA, [:pointer, :string, :uint, :int, :int, :uint], :pointer
+	end
+end

data/lib/fzeet/windows/{userctlbutton.rb → user/Control/Button.rb}

@@ -1,4 +1,4 @@
-require_relative 'userctlcommon'
+require_relative 'Common'
 
 module Fzeet
 	module Windows

data/lib/fzeet/windows/{userctlcommon.rb → user/Control/Common.rb}

@@ -1,4 +1,4 @@
-require_relative 'usercommon'
+require_relative '../Common'
 
 module Fzeet
 	module Windows

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

@@ -0,0 +1 @@
+require_relative 'Control/Button'

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

@@ -0,0 +1,115 @@
+require_relative 'Common'
+
+module Fzeet
+	module Windows
+		attach_function :CreateMenu, [], :pointer
+		attach_function :CreatePopupMenu, [], :pointer
+		attach_function :DestroyMenu, [:pointer], :int
+
+		MF_INSERT = 0x00000000
+		MF_CHANGE = 0x00000080
+		MF_APPEND = 0x00000100
+		MF_DELETE = 0x00000200
+		MF_REMOVE = 0x00001000
+		MF_BYCOMMAND = 0x00000000
+		MF_BYPOSITION = 0x00000400
+		MF_SEPARATOR = 0x00000800
+		MF_ENABLED = 0x00000000
+		MF_GRAYED = 0x00000001
+		MF_DISABLED = 0x00000002
+		MF_UNCHECKED = 0x00000000
+		MF_CHECKED = 0x00000008
+		MF_USECHECKBITMAPS = 0x00000200
+		MF_STRING = 0x00000000
+		MF_BITMAP = 0x00000004
+		MF_OWNERDRAW = 0x00000100
+		MF_POPUP = 0x00000010
+		MF_MENUBARBREAK = 0x00000020
+		MF_MENUBREAK = 0x00000040
+		MF_UNHILITE = 0x00000000
+		MF_HILITE = 0x00000080
+		MF_DEFAULT = 0x00001000
+		MF_SYSMENU = 0x00002000
+		MF_HELP = 0x00004000
+		MF_RIGHTJUSTIFY = 0x00004000
+		MF_MOUSESELECT = 0x00008000
+		MF_END = 0x00000080
+
+		MFT_STRING = MF_STRING
+		MFT_BITMAP = MF_BITMAP
+		MFT_MENUBARBREAK = MF_MENUBARBREAK
+		MFT_MENUBREAK = MF_MENUBREAK
+		MFT_OWNERDRAW = MF_OWNERDRAW
+		MFT_RADIOCHECK = 0x00000200
+		MFT_SEPARATOR = MF_SEPARATOR
+		MFT_RIGHTORDER = 0x00002000
+		MFT_RIGHTJUSTIFY = MF_RIGHTJUSTIFY
+
+		MFS_GRAYED = 0x00000003
+		MFS_DISABLED = MFS_GRAYED
+		MFS_CHECKED = MF_CHECKED
+		MFS_HILITE = MF_HILITE
+		MFS_ENABLED = MF_ENABLED
+		MFS_UNCHECKED = MF_UNCHECKED
+		MFS_UNHILITE = MF_UNHILITE
+		MFS_DEFAULT = MF_DEFAULT
+
+		attach_function :AppendMenu, :AppendMenuA, [:pointer, :uint, :uint, :string], :int
+		attach_function :GetMenuState, [:pointer, :uint, :uint], :uint
+		attach_function :EnableMenuItem, [:pointer, :uint, :uint], :int
+		attach_function :CheckMenuItem, [:pointer, :uint, :uint], :ulong
+		attach_function :CheckMenuRadioItem, [:pointer, :uint, :uint, :uint, :uint], :int
+
+		MIIM_STATE = 0x00000001
+		MIIM_ID = 0x00000002
+		MIIM_SUBMENU = 0x00000004
+		MIIM_CHECKMARKS = 0x00000008
+		MIIM_TYPE = 0x00000010
+		MIIM_DATA = 0x00000020
+		MIIM_STRING = 0x00000040
+		MIIM_BITMAP = 0x00000080
+		MIIM_FTYPE = 0x00000100
+
+		class MENUITEMINFO < FFI::Struct
+			layout \
+				:cbSize, :uint,
+				:fMask, :uint,
+				:fType, :uint,
+				:fState, :uint,
+				:wID, :uint,
+				:hSubMenu, :pointer,
+				:hbmpChecked, :pointer,
+				:hbmpUnchecked, :pointer,
+				:dwItemData, :ulong,
+				:dwTypeData, :pointer,
+				:cch, :uint,
+				:hbmpItem, :pointer
+		end
+
+		attach_function :GetMenuItemInfo, :GetMenuItemInfoA, [:pointer, :uint, :int, :pointer], :int
+		attach_function :SetMenuItemInfo, :SetMenuItemInfoA, [:pointer, :uint, :int, :pointer], :int
+
+		TPM_LEFTBUTTON = 0x0000
+		TPM_RIGHTBUTTON = 0x0002
+		TPM_LEFTALIGN = 0x0000
+		TPM_CENTERALIGN = 0x0004
+		TPM_RIGHTALIGN = 0x0008
+		TPM_TOPALIGN = 0x0000
+		TPM_VCENTERALIGN = 0x0010
+		TPM_BOTTOMALIGN = 0x0020
+		TPM_HORIZONTAL = 0x0000
+		TPM_VERTICAL = 0x0040
+		TPM_NONOTIFY = 0x0080
+		TPM_RETURNCMD = 0x0100
+		TPM_RECURSE = 0x0001
+		TPM_HORPOSANIMATION = 0x0400
+		TPM_HORNEGANIMATION = 0x0800
+		TPM_VERPOSANIMATION = 0x1000
+		TPM_VERNEGANIMATION = 0x2000
+		TPM_NOANIMATION = 0x4000
+		TPM_LAYOUTRTL = 0x8000
+		TPM_WORKAREA = 0x10000
+
+		attach_function :TrackPopupMenu, [:pointer, :uint, :int, :int, :int, :pointer, :pointer], :int
+	end
+end

data/lib/fzeet/windows/{usermsg.rb → user/Message.rb}

@@ -1,8 +1,7 @@
-require_relative 'usercommon'
+require_relative 'Common'
 
 module Fzeet
 	module Windows
-		#{ WM_xxx
 		WM_NULL = 0x0000
 		WM_CREATE = 0x0001
 		WM_DESTROY = 0x0002
@@ -236,7 +235,6 @@ module Fzeet
 		WM_PENWINLAST = 0x038F
 		WM_APP = 0x8000
 		WM_USER = 0x0400
-		#}
 
 		class MSG < FFI::Struct
 			layout \