windows_gui 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e7b9bc05401af4e22a70c7291a2f93a842543f
-  data.tar.gz: 78463395031583b1bf39ab74bfdc1ec1ccd4d858
+  metadata.gz: 3e0e923bcf857c772ac3991211447a2cd855220f
+  data.tar.gz: 70570896e71622bcc9910319c22b8573ad0c1de1
 SHA512:
-  metadata.gz: 6e228db38f722bbf973f2a61d00fb8f63bbeba846103f4d2d21a44e4f97b696286b9d572089651464f2cb720d896fd04d39dd643c267e09942c40375ec20c78e
-  data.tar.gz: 8d5e01c2459b05b14975755fccb9d771343306cc166c9fd65ddefee22835351e31a6dd4119836b6a34c16fbf1915e1e87f5938d8f46a84c2deb95a1b948e11a7
+  metadata.gz: 9d41d0b0068942cd263a688fc0b464690fc9ec15de71183b825c95e49f3f94693150d50fb64e2d01f4618df0fe7d8a26a6c5bc33f4f58a95ce44327e33952332
+  data.tar.gz: 10ef1d3624ebdfe89505ee90f009214d120ded80ad8d58de864ce2cde81515f6539ae3586aa862d7dbd73f3f20589485523e7933dee1bc2c5a9de8b76122562a

data/RELNOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 3.0.0
+
+Improve code (remove Util namespace and rename some constants)
+
 ## 2.0.0
 
 Rename library to windows_gui and ensure it works with recent ruby

data/examples/Command.rbw

@@ -10,7 +10,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	hsys = GetSystemMenu(hwnd, 0)
 		InsertMenu(hsys, SC_CLOSE, MF_STRING, SYSCMD[:ITEM1], L("Item&1\tAlt+S"))
@@ -63,7 +63,7 @@ def OnCreate(hwnd,
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	DestroyAcceleratorTable(xtra[:haccel])
 	DeleteObject(xtra[:hmf])
@@ -189,7 +189,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -202,7 +202,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -252,7 +252,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/Layered.rbw

@@ -31,7 +31,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -87,7 +87,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/LifeCycle.rbw

@@ -58,7 +58,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -114,7 +114,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/LifeCycleNC.rbw

@@ -88,7 +88,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -144,7 +144,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/Menu.rbw

@@ -9,7 +9,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	hbar = CreateMenu()
 		hmenu1 = CreatePopupMenu()
@@ -45,7 +45,7 @@ def OnCreate(hwnd,
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	PostQuitMessage(0); 0
 end
@@ -206,7 +206,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -219,7 +219,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -265,7 +265,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/MenuContext.rbw

@@ -9,7 +9,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:hcm] = CreatePopupMenu()
 		AppendMenu(xtra[:hcm], MF_STRING, CMD[:ITEM1], L('Item&1'))
@@ -18,7 +18,7 @@ def OnCreate(hwnd,
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	DestroyMenu(xtra[:hcm])
 
@@ -28,7 +28,7 @@ end
 def OnContextMenu(hwnd,
 	x, y
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	POINT.new { |point|
 		GetCursorPos(point)
@@ -90,7 +90,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -103,7 +103,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -149,7 +149,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/MenuPARGB32.rbw

@@ -13,7 +13,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:hbmp] = DetonateLastError(FFI::Pointer::NULL, :LoadImage,
 		nil,
@@ -77,7 +77,7 @@ ensure
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	DeleteObject(xtra[:hbmp])
 
@@ -240,7 +240,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -253,7 +253,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -299,7 +299,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/MinMax.rbw

@@ -33,7 +33,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -89,7 +89,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/Minimal.rbw

@@ -21,7 +21,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -77,7 +77,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/Paint.rbw

@@ -9,7 +9,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	LOGFONT.new { |lf|
 		lf[:lfHeight] = DPIAwareFontHeight(16)
@@ -23,7 +23,7 @@ def OnCreate(hwnd,
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	DeleteObject(xtra[:hfont])
 
@@ -33,7 +33,7 @@ end
 def OnPaint(hwnd,
 	ps
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	SetBkColor(ps[:hdc], RGB(255, 0, 0))
 	SetTextColor(ps[:hdc], RGB(255, 255, 255))
@@ -83,7 +83,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -96,7 +96,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -142,7 +142,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/Region.rbw

@@ -34,7 +34,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -90,7 +90,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/Scribble.rbw

@@ -11,7 +11,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	LOGPEN.new { |lp|
 		lp[:lopnWidth][:x] = DPIAwareX(10)
@@ -26,7 +26,7 @@ def OnCreate(hwnd,
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	DeleteObject(xtra[:hpen])
 
@@ -36,7 +36,7 @@ end
 def OnPaint(hwnd,
 	ps
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	UseObjects(ps[:hdc], xtra[:hpen]) {
 		xtra[:scribbles].each { |scribble|
@@ -56,7 +56,7 @@ def OnLButtonDown(hwnd,
 )
 	SetCapture(hwnd)
 
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:curpos] = [x, y]
 	xtra[:scribbles] << [[x, y]]
@@ -83,7 +83,7 @@ def OnMouseMove(hwnd,
 )
 	return 0 if GetCapture() != hwnd
 
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:scribbles].last << [x, y]
 
@@ -104,7 +104,7 @@ def OnRButtonDown(hwnd,
 )
 	return 0 if GetCapture() == hwnd
 
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:scribbles].clear
 
@@ -152,7 +152,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -165,7 +165,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -211,7 +211,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/examples/WndExtra.rbw

@@ -9,7 +9,7 @@ WndExtra = Struct.new(
 def OnCreate(hwnd,
 	cs
 )
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	xtra[:foo] = L('Foo')
 
@@ -17,7 +17,7 @@ def OnCreate(hwnd,
 end
 
 def OnDestroy(hwnd)
-	xtra = Util::Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
+	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
 	MessageBox(nil,
 		xtra[:foo],
@@ -54,7 +54,7 @@ rescue SystemExit => ex
 	PostQuitMessage(ex.status)
 rescue
 	case MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ABORTRETRYIGNORE | MB_ICONERROR
 	)
@@ -67,7 +67,7 @@ end
 }
 
 def WinMain
-	Util.Id2RefTrack(xtra = WndExtra.new)
+	Id2RefTrack(xtra = WndExtra.new)
 
 	WNDCLASSEX.new { |wc|
 		wc[:cbSize] = wc.size
@@ -113,7 +113,7 @@ def WinMain
 	}
 rescue
 	MessageBox(hwnd,
-		L(Util.FormatException($!)),
+		L(FormatException($!)),
 		APPNAME,
 		MB_ICONERROR
 	); exit(1)

data/lib/windows_gui/common.rb

@@ -1,60 +1,58 @@
 require 'weakref'
 require 'ffi'
 
+WINDOWS_GUI_VERSION = '3.0.0'
+
 WINDOWS_GUI_VISUAL_STYLES = true unless defined?(WINDOWS_GUI_VISUAL_STYLES)
 WINDOWS_GUI_DPI_AWARE = true unless defined?(WINDOWS_GUI_DPI_AWARE)
 
 module WindowsGUI
 	extend FFI::Library
 
-	VERSION = '2.0.0'
-
-	module Util
-		def FormatException(ex)
-			str, trace = ex.to_s, ex.backtrace
+	def FormatException(ex)
+		str, trace = ex.to_s, ex.backtrace
 
-			str << "\n\n-- backtrace --\n\n" << trace.join("\n") if trace
-
-			str
-		end
+		str << "\n\n-- backtrace --\n\n" << trace.join("\n") if trace
 
-		module_function :FormatException
+		str
+	end
 
-		Id2Ref = {}
+	module_function :FormatException
 
-		def Id2RefTrack(object)
-			Id2Ref[object.object_id] = WeakRef.new(object)
+	Id2Ref = {}
 
-			p "Object id #{object.object_id} of #{object} stored in Id2Ref track hash" if $DEBUG
+	def Id2RefTrack(object)
+		Id2Ref[object.object_id] = WeakRef.new(object)
 
-			ObjectSpace.define_finalizer(object, -> id {
-				Id2Ref.delete(id)
+		p "Object id #{object.object_id} of #{object} stored in Id2Ref track hash" if $DEBUG
 
-				p "Object id #{id} deleted from Id2Ref track hash" if $DEBUG
-			})
-		end
+		ObjectSpace.define_finalizer(object, -> id {
+			Id2Ref.delete(id)
 
-		module_function :Id2RefTrack
+			p "Object id #{id} deleted from Id2Ref track hash" if $DEBUG
+		})
+	end
 
-		module ScopedStruct
-			def new(*args)
-				raise ArgumentError, 'Cannot accept both arguments and a block' if
-					args.length > 0 && block_given?
+	module_function :Id2RefTrack
 
-				struct = super
+	module AutoFFIStructClassSupport
+		def new(*args)
+			raise ArgumentError, 'Cannot accept both arguments and a block' if
+				args.length > 0 && block_given?
 
-				return struct unless block_given?
+			struct = super
 
-				begin
-					yield struct
-				ensure
-					struct.pointer.free
+			return struct unless block_given?
 
-					p "Native memory for #{struct} freed" if $DEBUG
-				end
+			begin
+				yield struct
+			ensure
+				struct.pointer.free
 
-				nil
+				p "Native memory for #{struct} freed" if $DEBUG
 			end
+
+			nil
 		end
 	end
 
@@ -125,7 +123,7 @@ module WindowsGUI
 	APPNAME = L(File.basename($0, '.rbw'))
 
 	class POINT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:x, :long,
@@ -133,7 +131,7 @@ module WindowsGUI
 	end
 
 	class SIZE < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:cx, :long,
@@ -141,7 +139,7 @@ module WindowsGUI
 	end
 
 	class RECT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:left, :long,

data/lib/windows_gui/gdi.rb

@@ -102,7 +102,7 @@ module WindowsGUI
 	FF_DECORATIVE = 5 << 4
 
 	class LOGFONT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:lfHeight, :long,
@@ -143,7 +143,7 @@ module WindowsGUI
 	HS_DIAGCROSS = 5
 
 	class LOGBRUSH < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:lbStyle, :uint,
@@ -177,7 +177,7 @@ module WindowsGUI
 	PS_JOIN_ROUND = 0x0000_0000
 
 	class LOGPEN < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:lopnStyle, :uint,

data/lib/windows_gui/kernel.rb

@@ -33,7 +33,7 @@ module WindowsGUI
 	module_function :Detonate, :DetonateLastError
 
 	class OSVERSIONINFOEX < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:dwOSVersionInfoSize, :ulong,
@@ -138,7 +138,7 @@ module WindowsGUI
 
 	if WINVER >= WINXP
 		class ACTCTX < FFI::Struct
-			extend Util::ScopedStruct
+			extend AutoFFIStructClassSupport
 
 			layout \
 				:cbSize, :ulong,
@@ -184,6 +184,12 @@ module WindowsGUI
 				COMMON_CONTROLS_ACTCTX[:handle] == INVALID_HANDLE_VALUE
 
 			COMMON_CONTROLS_ACTCTX[:cookie].free
+
+			COMMON_CONTROLS_ACTCTX[:handle] = INVALID_HANDLE_VALUE
+			COMMON_CONTROLS_ACTCTX[:cookie] = 0
+			COMMON_CONTROLS_ACTCTX[:activated] = false
+
+			p "Visual styles cleanup, COMMON_CONTROLS_ACTCTX is #{COMMON_CONTROLS_ACTCTX}" if $DEBUG
 		}
 	end
 
@@ -238,6 +244,8 @@ module WindowsGUI
 		}
 
 		COMMON_CONTROLS_ACTCTX[:activated] = true
+
+		p "Visual styles init, COMMON_CONTROLS_ACTCTX is #{COMMON_CONTROLS_ACTCTX}" if $DEBUG
 	end
 
 	module_function :EnableVisualStyles

data/lib/windows_gui/libc.rb

@@ -4,7 +4,7 @@ module WindowsGUI
 	ffi_lib FFI::Library::LIBC
 	ffi_convention :cdecl
 
-	attach_function :wcslen, [
+	attach_function :windows_gui_wcslen, :wcslen, [
 		:buffer_in
 	], :uint
 end

data/lib/windows_gui/user.rb

@@ -206,7 +206,7 @@ module WindowsGUI
 	], :int
 
 	class NONCLIENTMETRICS < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout(*[
 			:cbSize, :uint,
@@ -461,7 +461,7 @@ module WindowsGUI
 	COLOR_MENU = 4
 
 	class WNDCLASSEX < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:cbSize, :uint,
@@ -625,7 +625,7 @@ module WindowsGUI
 	], :pointer
 
 	class DLGTEMPLATE < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:style, :ulong,
@@ -921,7 +921,7 @@ module WindowsGUI
 	SIF_DISABLENOSCROLL = 0x0008
 
 	class SCROLLINFO < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:cbSize, :uint,
@@ -1029,7 +1029,7 @@ module WindowsGUI
 	], :int
 
 	class PAINTSTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:hdc, :pointer,
@@ -1136,7 +1136,7 @@ module WindowsGUI
 	MOUSEEVENTF_VIRTUALDESK = 0x4000
 
 	class MOUSEINPUT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:dx, :long,
@@ -1153,7 +1153,7 @@ module WindowsGUI
 	KEYEVENTF_UNICODE = 0x0004
 
 	class KEYBDINPUT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:wVk, :ushort,
@@ -1164,7 +1164,7 @@ module WindowsGUI
 	end
 
 	class HARDWAREINPUT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:uMsg, :ulong,
@@ -1173,7 +1173,7 @@ module WindowsGUI
 	end
 
 	class INPUT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:type, :ulong,
@@ -1234,7 +1234,7 @@ module WindowsGUI
 	HWND_BROADCAST = FFI::Pointer.new(0xffff)
 
 	class CREATESTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:lpCreateParams, :pointer,
@@ -1270,7 +1270,7 @@ module WindowsGUI
 	WM_ENDSESSION = 0x0016
 
 	class STYLESTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:styleOld, :ulong,
@@ -1299,7 +1299,7 @@ module WindowsGUI
 	WM_SHOWWINDOW = 0x0018
 
 	class MINMAXINFO < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:ptReserved, POINT,
@@ -1312,7 +1312,7 @@ module WindowsGUI
 	WM_GETMINMAXINFO = 0x0024
 
 	class WINDOWPOS < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:hwnd, :pointer,
@@ -1518,7 +1518,7 @@ module WindowsGUI
 	WM_COMMAND = 0x0111
 
 	class NMHDR < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:hwndFrom, :pointer,
@@ -1540,7 +1540,7 @@ module WindowsGUI
 	WM_CHARTOITEM = 0x002f
 
 	class DELETEITEMSTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:CtlType, :uint,
@@ -1553,7 +1553,7 @@ module WindowsGUI
 	WM_DELETEITEM = 0x002d
 
 	class COMPAREITEMSTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:CtlType, :uint,
@@ -1577,7 +1577,7 @@ module WindowsGUI
 	ODT_COMBOBOX = 3
 
 	class MEASUREITEMSTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:CtlType, :uint,
@@ -1610,7 +1610,7 @@ module WindowsGUI
 	ODS_COMBOBOXEDIT = 0x1000
 
 	class DRAWITEMSTRUCT < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:CtlType, :uint,
@@ -1672,7 +1672,7 @@ module WindowsGUI
 	], :void
 
 	class MSG < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:hwnd, :pointer,
@@ -1862,7 +1862,7 @@ module WindowsGUI
 	MIIM_BITMAP = 0x0000_0080
 
 	class MENUITEMINFO < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:cbSize, :uint,
@@ -2022,7 +2022,7 @@ module WindowsGUI
 	VK_VOLUME_DOWN = 0xae
 
 	class ACCEL < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:fVirt, :uchar,
@@ -2401,7 +2401,7 @@ module WindowsGUI
 	CBS_NOINTEGRALHEIGHT = 0x0400
 
 	class COMBOBOXINFO < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:cbSize, :ulong,
@@ -2530,7 +2530,7 @@ module WindowsGUI
 	OBJID_CLIENT = 0xffff_fffc - 0x1_0000_0000
 
 	class SCROLLBARINFO < FFI::Struct
-		extend Util::ScopedStruct
+		extend AutoFFIStructClassSupport
 
 		layout \
 			:cbSize, :ulong,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: windows_gui
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Radoslav Peev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi