ffi-wingui-core 0.4.0 → 0.5.0

data/examples/Scribble.rbw

@@ -1,20 +1,17 @@
 require 'ffi-wingui-core'
-
-exit if defined?(Ocra)
+require 'ffi-wingui-core/ocra'
 
 include WinGUI
 
-APPNAME = L(File.basename(__FILE__, '.rbw'))
-
 WndExtra = Struct.new(
 	:scribbles,
 	:hpen
-).send(:include, Util::Id2RefTracking)
+)
 
 def onCreate(hwnd,
 	cs
 )
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:scribbles] = []
 
@@ -29,7 +26,7 @@ def onCreate(hwnd,
 end
 
 def onDestroy(hwnd)
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	DeleteObject(xtra[:hpen])
 
@@ -39,7 +36,7 @@ end
 def onPaint(hwnd,
 	ps
 )
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	hdefpen = SelectObject(ps[:hdc], xtra[:hpen])
 
@@ -59,7 +56,7 @@ end
 def onLButtonDown(hwnd,
 	x, y
 )
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	SetCapture(hwnd)
 
@@ -80,8 +77,6 @@ end
 def onLButtonUp(hwnd,
 	x, y
 )
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
-
 	ReleaseCapture()
 
 	0
@@ -92,7 +87,7 @@ def onMouseMove(hwnd,
 )
 	return 0 if GetCapture() != hwnd
 
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:scribbles].last << [x, y]
 
@@ -106,7 +101,7 @@ def onRButtonDown(hwnd,
 )
 	return 0 if GetCapture() == hwnd
 
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:scribbles].clear
 
@@ -151,17 +146,19 @@ begin
 		end
 
 	when WM_LBUTTONDOWN
-		onLButtonDown(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))
+		onLButtonDown(hwnd, LOSHORT(lParam), HISHORT(lParam))
 	when WM_LBUTTONUP
-		onLButtonUp(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))
+		onLButtonUp(hwnd, LOSHORT(lParam), HISHORT(lParam))
 	when WM_MOUSEMOVE
-		onMouseMove(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))
+		onMouseMove(hwnd, LOSHORT(lParam), HISHORT(lParam))
 
 	when WM_RBUTTONDOWN
-		onRButtonDown(hwnd, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))
+		onRButtonDown(hwnd, LOSHORT(lParam), HISHORT(lParam))
 	end
 
 	result || DefWindowProc(hwnd, uMsg, wParam, lParam)
+rescue SystemExit => ex
+	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
 		L(Util.FormatException($!)),
@@ -177,7 +174,7 @@ end
 }
 
 def main
-	xtra = WndExtra.new
+	Util.Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size

data/examples/WndExtra.rbw

@@ -1,19 +1,16 @@
 require 'ffi-wingui-core'
-
-exit if defined?(Ocra)
+require 'ffi-wingui-core/ocra'
 
 include WinGUI
 
-APPNAME = L(File.basename(__FILE__, '.rbw'))
-
 WndExtra = Struct.new(
 	:foo
-).send(:include, Util::Id2RefTracking)
+)
 
 def onCreate(hwnd,
 	cs
 )
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:foo] = L('Foo')
 
@@ -21,7 +18,7 @@ def onCreate(hwnd,
 end
 
 def onDestroy(hwnd)
-	xtra = WndExtra::REFS[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	MessageBox(nil,
 		xtra[:foo],
@@ -54,6 +51,8 @@ begin
 	end
 
 	result || DefWindowProc(hwnd, uMsg, wParam, lParam)
+rescue SystemExit => ex
+	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
 		L(Util.FormatException($!)),
@@ -69,7 +68,7 @@ end
 }
 
 def main
-	xtra = WndExtra.new
+	Util.Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size

data/lib/ffi-wingui-core.rb

@@ -1,5 +1,8 @@
 require 'ffi'
 
+WINGUI_VISUAL_STYLES = true unless defined?(WINGUI_VISUAL_STYLES)
+WINGUI_DPI_AWARE = true unless defined?(WINGUI_DPI_AWARE)
+
 module WinGUI
 	extend FFI::Library
 
@@ -15,20 +18,18 @@ module WinGUI
 
 		module_function :FormatException
 
-		module Id2RefTracking
-			REFS = {}
-
-			def initialize(*args)
-				super
+		Id2Ref = {}
 
-				REFS[object_id] = self
+		def Id2RefTrack(object)
+			Id2Ref[object.object_id] = object
 
-				ObjectSpace.define_finalizer(self, -> id {
-					REFS.delete(id)
-				})
-			end
+			ObjectSpace.define_finalizer(object, -> id {
+				Id2Ref.delete(id)
+			})
 		end
 
+		module_function :Id2RefTrack
+
 		unless FFI::Struct.respond_to?(:by_ref)
 			class << FFI::Struct
 				def by_ref(*args)
@@ -89,7 +90,15 @@ module WinGUI
 		(long >> 16) & 0xffff
 	end
 
-	module_function :MAKELONG, :LOWORD, :HIWORD
+	def LOSHORT(long)
+		((loshort = LOWORD(long)) > 0x7fff) ? loshort - 0x1_0000 : loshort
+	end
+
+	def HISHORT(long)
+		((hishort = HIWORD(long)) > 0x7fff) ? hishort - 0x1_0000 : hishort
+	end
+
+	module_function :MAKELONG, :LOWORD, :HIWORD, :LOSHORT, :HISHORT
 
 	def L(str)
 		(str << "\0").encode!('utf-16le')
@@ -117,6 +126,8 @@ module WinGUI
 
 	module_function :L, :PWSTR
 
+	APPNAME = L(File.basename($0, '.rbw'))
+
 	class POINT < FFI::Struct
 		extend Util::ScopedStruct
 
@@ -259,6 +270,19 @@ module WinGUI
 
 	WINVER = HIWORD(NTDDI_VERSION)
 
+	def TARGETVER(version, message)
+		version = MAKELONG(0x0000, version) if version < 0xffff
+
+		exit(-1) if NTDDI_VERSION < version &&
+			MessageBox(nil,
+				message,
+				APPNAME,
+				MB_YESNO | MB_ICONERROR | MB_DEFBUTTON2
+			) == IDNO
+	end
+
+	module_function :TARGETVER
+
 	attach_function :GetModuleHandle, :GetModuleHandleW, [
 		:buffer_in
 	], :pointer
@@ -377,8 +401,7 @@ module WinGUI
 
 	module_function :EnableVisualStyles
 
-	EnableVisualStyles() unless
-		Object.const_defined?(:WINGUI_VISUAL_STYLES) && !WINGUI_VISUAL_STYLES
+	EnableVisualStyles() if WINGUI_VISUAL_STYLES
 
 	attach_function :MulDiv, [
 		:int,
@@ -475,6 +498,69 @@ module WinGUI
 		LOGPEN.by_ref(:in)
 	], :pointer
 
+	attach_function :CreateRectRgn, [
+		:int,
+		:int,
+		:int,
+		:int
+	], :pointer
+
+	attach_function :CreateRoundRectRgn, [
+		:int,
+		:int,
+		:int,
+		:int,
+		:int,
+		:int
+	], :pointer
+
+	attach_function :CreateEllipticRgn, [
+		:int,
+		:int,
+		:int,
+		:int
+	], :pointer
+
+	#{ POLYFILL_xxx
+	ALTERNATE = 1
+	WINDING = 2
+	#}
+
+	attach_function :CreatePolygonRgn, [
+		:pointer,
+		:int,
+		:int
+	], :pointer
+
+	attach_function :CreatePolyPolygonRgn, [
+		:pointer,
+		:pointer,
+		:int,
+		:int
+	], :pointer
+
+	#{ RGN_xxx
+	RGN_COPY = 5
+	RGN_DIFF = 4
+	RGN_AND = 1
+	RGN_OR = 2
+	RGN_XOR = 3
+	#}
+
+	#{ xxxREGION
+	ERROR = 0
+	NULLREGION = 1
+	SIMPLEREGION = 2
+	COMPLEXREGION = 3
+	#}
+
+	attach_function :CombineRgn, [
+		:pointer,
+		:pointer,
+		:pointer,
+		:int
+	], :int
+
 	attach_function :DeleteObject, [
 		:pointer
 	], :int
@@ -539,8 +625,7 @@ module WinGUI
 
 		], :int
 
-		Detonate(0, :SetProcessDPIAware) unless
-			Object.const_defined?(:WINGUI_DPI_AWARE) && !WINGUI_DPI_AWARE
+		Detonate(0, :SetProcessDPIAware) if WINGUI_DPI_AWARE
 	end
 
 	attach_function :GetDC, [
@@ -618,7 +703,7 @@ module WinGUI
 		}
 	end
 
-	SPI_SETNONCLIENTMETRICS = 0x002A
+	SPI_SETNONCLIENTMETRICS = 0x002a
 	SPI_GETNONCLIENTMETRICS = 0x0029
 	#}
 
@@ -761,6 +846,25 @@ module WinGUI
 		:buffer_in
 	], :pointer
 
+	begin
+		attach_function :PrivateExtractIcons, :PrivateExtractIconsW, [
+			:buffer_in,
+			:int,
+			:int,
+			:int,
+			:pointer,
+			:pointer,
+			:uint,
+			:uint
+		], :uint
+	rescue FFI::NotFoundError # PrivateExtractIcons is not intended for general use
+
+	end
+
+	attach_function :DestroyIcon, [
+		:pointer
+	], :int
+
 	#{ IDC_xxx
 	IDC_WAIT = FFI::Pointer.new(32514)
 	IDC_APPSTARTING = FFI::Pointer.new(32650)
@@ -784,6 +888,18 @@ module WinGUI
 		:buffer_in
 	], :pointer
 
+	attach_function :DestroyCursor, [
+		:pointer
+	], :int
+
+	attach_function :SetCursor, [
+		:pointer
+	], :pointer
+
+	attach_function :GetCursor, [
+
+	], :pointer
+
 	attach_function :SetCursorPos, [
 		:int,
 		:int
@@ -793,6 +909,10 @@ module WinGUI
 		POINT.by_ref(:out)
 	], :int
 
+	attach_function :ShowCursor, [
+		:int
+	], :int
+
 	#{ COLOR_xxx
 	COLOR_DESKTOP = 1
 	COLOR_APPWORKSPACE = 12
@@ -974,6 +1094,38 @@ module WinGUI
 		:int
 	], :long
 
+	#{ LWA_xxx
+	LWA_COLORKEY = 0x00000001
+	LWA_ALPHA = 0x00000002
+	#}
+
+	attach_function :SetLayeredWindowAttributes, [
+		:pointer,
+		:ulong,
+		:uchar,
+		:ulong
+	], :int
+
+	if WINVER >= WINXP
+		attach_function :GetLayeredWindowAttributes, [
+			:pointer,
+			:pointer,
+			:pointer,
+			:pointer
+		], :int
+	end
+
+	attach_function :SetWindowRgn, [
+		:pointer,
+		:pointer,
+		:int
+	], :int
+
+	attach_function :GetWindowRgn, [
+		:pointer,
+		:pointer
+	], :int
+
 	attach_function :IsWindowEnabled, [
 		:pointer
 	], :int
@@ -983,16 +1135,55 @@ module WinGUI
 		:int
 	], :int
 
+	attach_function :SetActiveWindow, [
+		:pointer
+	], :pointer
+
+	attach_function :GetActiveWindow, [
+
+	], :pointer
+
+	attach_function :SetForegroundWindow, [
+		:pointer
+	], :int
+
+	attach_function :GetForegroundWindow, [
+
+	], :pointer
+
+	attach_function :SetFocus, [
+		:pointer
+	], :pointer
+
+	attach_function :GetFocus, [
+
+	], :pointer
+
 	attach_function :IsWindowVisible, [
 		:pointer
 	], :int
 
+	attach_function :IsIconic, [
+		:pointer
+	], :int
+
+	attach_function :IsZoomed, [
+		:pointer
+	], :int
+
 	#{ SW_xxx
+	SW_SHOWDEFAULT = 10
 	SW_HIDE = 0
 	SW_SHOW = 5
+	SW_SHOWNA = 8
 	SW_SHOWNORMAL = 1
+	SW_SHOWNOACTIVATE = 4
 	SW_SHOWMINIMIZED = 2
+	SW_SHOWMINNOACTIVE = 7
+	SW_MINIMIZE = 6
+	SW_FORCEMINIMIZE = 11
 	SW_SHOWMAXIMIZED = 3
+	SW_MAXIMIZE = 3
 	SW_RESTORE = 9
 	#}
 
@@ -1001,6 +1192,11 @@ module WinGUI
 		:int
 	], :int
 
+	attach_function :ShowWindowAsync, [
+		:pointer,
+		:int
+	], :int
+
 	#{ HWND_xxx
 	HWND_TOP = FFI::Pointer.new(0)
 	HWND_BOTTOM = FFI::Pointer.new(1)
@@ -1010,10 +1206,12 @@ module WinGUI
 
 	#{ SWP_xxx
 	SWP_FRAMECHANGED = 0x0020
+	SWP_NOACTIVATE = 0x0010
 	SWP_NOOWNERZORDER = 0x0200
 	SWP_NOZORDER = 0x0004
 	SWP_NOMOVE = 0x0002
 	SWP_NOSIZE = 0x0001
+	SWP_ASYNCWINDOWPOS = 0x4000
 	#}
 
 	attach_function :SetWindowPos, [
@@ -1115,6 +1313,11 @@ module WinGUI
 
 	], :pointer
 
+	attach_function :GetSystemMenu, [
+		:pointer,
+		:int
+	], :pointer
+
 	attach_function :SetMenu, [
 		:pointer,
 		:pointer
@@ -1137,14 +1340,6 @@ module WinGUI
 		:pointer
 	], :int
 
-	attach_function :SetFocus, [
-		:pointer
-	], :pointer
-
-	attach_function :GetFocus, [
-
-	], :pointer
-
 	#{ HWND_xxx
 	HWND_BROADCAST = FFI::Pointer.new(0xffff)
 	#}
@@ -1176,6 +1371,30 @@ module WinGUI
 	WM_DESTROY = 0x0002
 	WM_NCDESTROY = 0x0082
 
+	#{ ENDSESSION_xxx
+	ENDSESSION_CLOSEAPP = 0x00000001
+	ENDSESSION_CRITICAL = 0x40000000
+	ENDSESSION_LOGOFF = 0x80000000
+	#}
+
+	WM_QUERYENDSESSION = 0x0011
+	WM_ENDSESSION = 0x0016
+
+	WM_QUIT = 0x0012
+
+	class STYLESTRUCT < FFI::Struct
+		extend Util::ScopedStruct
+
+		layout \
+			:styleOld, :ulong,
+			:styleNew, :ulong
+	end
+
+	WM_STYLECHANGING = 0x007c
+	WM_STYLECHANGED = 0x007d
+
+	WM_ENABLE = 0x000a
+
 	#{ WA_xxx
 	WA_INACTIVE = 0
 	WA_ACTIVE = 1
@@ -1184,20 +1403,106 @@ module WinGUI
 
 	WM_ACTIVATE = 0x0006
 
-	WM_SETFONT = 0x0030
-	WM_GETFONT = 0x0031
+	WM_SETFOCUS = 0x0007
+	WM_KILLFOCUS = 0x0008
 
-	WM_PAINT = 0x000F
+	#{ SW_xxx
+	SW_PARENTOPENING = 3
+	SW_PARENTCLOSING = 1
+	SW_OTHERZOOM = 2
+	SW_OTHERUNZOOM = 4
+	#}
+
+	WM_SHOWWINDOW = 0x0018
+
+	class MINMAXINFO < FFI::Struct
+		extend Util::ScopedStruct
 
-	def GET_X_LPARAM(lParam)
-		((x = LOWORD(lParam)) > 0x7fff) ? x - 0x1_0000 : x
+		layout \
+			:ptReserved, POINT,
+			:ptMaxSize, POINT,
+			:ptMaxPosition, POINT,
+			:ptMinTrackSize, POINT,
+			:ptMaxTrackSize, POINT
 	end
 
-	def GET_Y_LPARAM(lParam)
-		((y = HIWORD(lParam)) > 0x7fff) ? y - 0x1_0000 : y
+	WM_GETMINMAXINFO = 0x0024
+
+	class WINDOWPOS < FFI::Struct
+		extend Util::ScopedStruct
+
+		layout \
+			:hwnd, :pointer,
+			:hwndInsertAfter, :pointer,
+			:x, :int,
+			:y, :int,
+			:cx, :int,
+			:cy, :int,
+			:flags, :int
+	end
+
+	WM_WINDOWPOSCHANGING = 0x0046
+	WM_WINDOWPOSCHANGED = 0x0047
+
+	WM_MOVING = 0x0216
+	WM_MOVE = 0x0003
+
+	#{ WMSZ_xxx
+	WMSZ_LEFT = 1
+	WMSZ_TOP = 3
+	WMSZ_RIGHT = 2
+	WMSZ_BOTTOM = 6
+	WMSZ_TOPLEFT = 4
+	WMSZ_TOPRIGHT = 5
+	WMSZ_BOTTOMLEFT = 7
+	WMSZ_BOTTOMRIGHT = 8
+	#}
+
+	WM_SIZING = 0x0214
+
+	#{ SIZE_xxx
+	SIZE_MINIMIZED = 1
+	SIZE_MAXIMIZED = 2
+	SIZE_RESTORED = 0
+	SIZE_MAXHIDE = 4
+	SIZE_MAXSHOW = 3
+	#}
+
+	WM_SIZE = 0x0005
+
+	#{ ICON_xxx
+	ICON_SMALL = 0
+	ICON_BIG = 1
+	if WINVER >= WINXP
+		ICON_SMALL2 = 2
 	end
+	#}
 
-	module_function :GET_X_LPARAM, :GET_Y_LPARAM
+	WM_SETICON = 0x0080
+	WM_GETICON = 0x007f
+
+	WM_SETTEXT = 0x000c
+	WM_GETTEXT = 0x000d
+	WM_GETTEXTLENGTH = 0x000e
+
+	WM_SETFONT = 0x0030
+	WM_GETFONT = 0x0031
+
+	WM_ERASEBKGND = 0x0014
+
+	WM_PAINT = 0x000f
+
+	WM_CAPTURECHANGED = 0x0215
+
+	#{ MK_xxx
+	MK_LBUTTON = 0x0001
+	MK_RBUTTON = 0x0002
+	MK_MBUTTON = 0x0010
+	MK_XBUTTON1 = 0x0020
+	MK_XBUTTON2 = 0x0040
+	MK_CONTROL = 0x0008
+	MK_SHIFT = 0x0004
+	#}
 
 	WM_LBUTTONDOWN = 0x0201
 	WM_LBUTTONUP = 0x0202
@@ -1211,9 +1516,93 @@ module WinGUI
 	WM_MBUTTONUP = 0x0208
 	WM_MBUTTONDBLCLK = 0x0209
 
+	#{ XBUTTONxxx
+	XBUTTON1 = 0x0001
+	XBUTTON2 = 0x0002
+	#}
+
+	WM_XBUTTONDOWN = 0x020b
+	WM_XBUTTONUP = 0x020c
+	WM_XBUTTONDBLCLK = 0x020d
+
+	#{ WHEEL_xxx
+	WHEEL_DELTA = 120
+	#}
+
+	WM_MOUSEWHEEL = 0x020a
+	if WINVER >= WINVISTA
+		WM_MOUSEHWHEEL = 0x020e
+	end
+
 	WM_MOUSEMOVE = 0x0200
 
-	WM_CONTEXTMENU = 0x007B
+	WM_CONTEXTMENU = 0x007b
+
+	WM_INITMENU = 0x0116
+	WM_INITMENUPOPUP = 0x0117
+
+	WM_USER = 0x0400
+	WM_APP = 0x8000
+
+	#{ SC_xxx
+	SC_DEFAULT = 0xf160
+
+	SC_MOVE = 0xf010
+	SC_SIZE = 0xf000
+	SC_MINIMIZE = 0xf020
+	SC_MAXIMIZE = 0xf030
+	SC_RESTORE = 0xf120
+	SC_CLOSE = 0xf060
+
+	SC_HSCROLL = 0xf080
+	SC_VSCROLL = 0xf070
+
+	SC_NEXTWINDOW = 0xf040
+	SC_PREVWINDOW = 0xf050
+	SC_ARRANGE = 0xf110
+
+	SC_MOUSEMENU = 0xf090
+	SC_KEYMENU = 0xf100
+	SC_HOTKEY = 0xf150
+
+	SC_TASKLIST = 0xf130
+	SC_SCREENSAVE = 0xf140
+	SC_MONITORPOWER = 0xf170
+
+	SC_CONTEXTHELP = 0xf180
+	#}
+
+	(SYSID = {}).
+		instance_variable_set(:@last, 0xf00)
+
+	class << SYSID
+		private :[]=, :store
+
+		def [](key)
+			return key if key.is_a?(Integer)
+
+			(id = fetch(key, nil)) ?
+				id :
+				self[key] = (@last -= 1) << 4
+		end
+	end
+
+	WM_SYSCOMMAND = 0x0112
+
+	(ID = {}).
+		instance_variable_set(:@last, WM_APP)
+
+	class << ID
+		private :[]=, :store
+
+		def [](key)
+			return key if key.is_a?(Integer)
+
+			(id = fetch(key, nil)) ?
+				id :
+				self[key] = @last += 1
+		end
+	end
 
 	WM_COMMAND = 0x0111
 
@@ -1226,10 +1615,11 @@ module WinGUI
 			:code, :uint
 	end
 
-	WM_NOTIFY = 0x004E
+	WM_NOTIFY = 0x004e
 
-	WM_USER = 0x0400
-	WM_APP = 0x8000
+	attach_function :RegisterWindowMessage, :RegisterWindowMessageW, [
+		:buffer_in
+	], :uint
 	#}
 
 	attach_function :SendMessage, :SendMessageW, [
@@ -1246,6 +1636,10 @@ module WinGUI
 		:long
 	], :int
 
+	attach_function :PostQuitMessage, [
+		:int
+	], :void
+
 	class MSG < FFI::Struct
 		extend Util::ScopedStruct
 
@@ -1258,6 +1652,20 @@ module WinGUI
 			:pt, POINT
 	end
 
+	#{ PM_xxx
+	PM_NOREMOVE = 0x0000
+	PM_REMOVE = 0x0001
+	PM_NOYIELD = 0x0002
+	#}
+
+	attach_function :PeekMessage, :PeekMessageW, [
+		MSG.by_ref(:out),
+		:pointer,
+		:uint,
+		:uint,
+		:uint
+	], :int
+
 	attach_function :GetMessage, :GetMessageW, [
 		MSG.by_ref(:out),
 		:pointer,
@@ -1284,10 +1692,6 @@ module WinGUI
 		MSG.by_ref(:in)
 	], :long
 
-	attach_function :PostQuitMessage, [
-		:int
-	], :void
-
 	attach_function :CreateMenu, [
 
 	], :pointer
@@ -1300,33 +1704,68 @@ module WinGUI
 		:pointer
 	], :int
 
-	#{ MF/MFT_xxx
+	#{ MF_xxx
+	MF_BYCOMMAND = 0x00000000
+	MF_BYPOSITION = 0x00000400
+
 	MF_POPUP = 0x00000010
 	MF_STRING = 0x00000000
 	MF_BITMAP = 0x00000004
 	MF_OWNERDRAW = 0x00000100
 	MF_SEPARATOR = 0x00000800
+
 	MF_MENUBARBREAK = 0x00000020
 	MF_MENUBREAK = 0x00000040
 	MF_RIGHTJUSTIFY = 0x00004000
 
+	MF_DEFAULT = 0x00001000
 	MF_ENABLED = 0x00000000
 	MF_DISABLED = 0x00000002
 	MF_GRAYED = 0x00000001
 	MF_CHECKED = 0x00000008
-	MFT_RADIOCHECK = 0x00000200
 	MF_UNCHECKED = 0x00000000
 	MF_HILITE = 0x00000080
 	MF_UNHILITE = 0x00000000
 	#}
 
-	attach_function :AppendMenu, :AppendMenuW, [
+	#{ MFT_xxx
+	MFT_RADIOCHECK = 0x00000200
+	#}
+
+	#{ MFS_xxx
+	MFS_GRAYED = 0x00000003
+	#}
+
+	attach_function :InsertMenu, :InsertMenuW, [
 		:pointer,
 		:uint,
 		:uint,
+		:uint,
 		:buffer_in
 	], :int
 
+	attach_function :GetMenuItemID, [
+		:pointer,
+		:int
+	], :uint
+
+	attach_function :GetSubMenu, [
+		:pointer,
+		:int
+	], :pointer
+
+	attach_function :RemoveMenu, [
+		:pointer,
+		:uint,
+		:uint
+	], :int
+
+	attach_function :DeleteMenu, [
+		:pointer,
+		:uint,
+		:uint
+	], :int
+
 	attach_function :SetMenuDefaultItem, [
 		:pointer,
 		:uint,
@@ -1344,11 +1783,6 @@ module WinGUI
 		:uint
 	], :uint
 
-	#{ MF_xxx
-	MF_BYCOMMAND = 0x00000000
-	MF_BYPOSITION = 0x00000400
-	#}
-
 	attach_function :EnableMenuItem, [
 		:pointer,
 		:uint,
@@ -1382,15 +1816,16 @@ module WinGUI
 		:uint
 	], :uint
 
+	#{ MIIM_xxx
+	MIIM_FTYPE = 0x00000100
 	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
 		extend Util::ScopedStruct
@@ -1410,6 +1845,13 @@ module WinGUI
 			:hbmpItem, :pointer
 	end
 
+	attach_function :InsertMenuItem, :InsertMenuItemW, [
+		:pointer,
+		:uint,
+		:int,
+		MENUITEMINFO.by_ref(:in)
+	], :int
+
 	attach_function :SetMenuItemInfo, :SetMenuItemInfoW, [
 		:pointer,
 		:uint,
@@ -1455,6 +1897,10 @@ module WinGUI
 		RECT.by_ref(:in)
 	], :int
 
+	attach_function :EndMenu, [
+
+	], :int
+
 	#{ Fxxx
 	FVIRTKEY = 1
 	FCONTROL = 0x08