windows_com 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cd9c67d4242830c8724e54bbcb687ab72c9f156
-  data.tar.gz: 9adf8c76beffe573a5787b49b8d81e2c801618b2
+  metadata.gz: 2cf9e8a660759ec930af827e7e189d0f2ca8cd96
+  data.tar.gz: 4d0195894da766f1ec56e1d66eb422c52e2ffe72
 SHA512:
-  metadata.gz: 47aa923cfadab2b1573e2dfb038ed4a4852cebedbf54a916aadb5bdf5d98bb3ff61affe7c3acd2abd61bbc7140ba36791b0f2624d3570e7fe09f7e0492532e51
-  data.tar.gz: 7e434696d7c42f29696e7cbf6668f1d46613caa70e2d96e99c6f1507f87f74aa05f2bcc9118104cf33cc8e68c89d4d2413f9fb960aab6d3544232d80686edb1f
+  metadata.gz: 6b6fa145975b6469efef29eee55bb70c6b734619492ffa98b1970748e13238a57bcff5726209055920d1d204112414490ba6ab5f8c59adb3bc986aa58991e440
+  data.tar.gz: d0ab45045ea7207551f392caf37d71ae148113f392c2c851c0962952e7d097ebdbde8cba9c40e26927d24070b7a7740f44c56b6a72ce18adef31f021e2eb91fc

data/RELNOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.1.1
+
+Sync important example with changes in related gem (windows_gui)
+
 ## 2.1.0
 
 `COMVtbl_` doesn't prepend `this` pointers to vtbl specs
@@ -14,7 +18,7 @@ Allow `COMInterface_` instances to be passed to code expecting pointers without
 
 ## 2.0.0
 
-- Add `COMCallback` module for __implementing__ COM objects in Ruby
+- Add `COMCallback` module for __implementing__ COM interfaces in Ruby
 - enhance some bound FFI structs with useful methods
 - improve code
 

data/examples/UIRibbon/Command.rb

@@ -28,3 +28,7 @@ CmdButton1_SmallImages_RESID = 60019
 CmdButton1_SmallImages_120__RESID = 60020
 CmdButton1_LargeImages_RESID = 60021
 CmdButton1_LargeImages_120__RESID = 60022
+CmdAOT = 8
+CmdAOT_LabelTitle_RESID = 60023
+CmdAOT_LabelDescription_RESID = 60024
+CmdAOT_TooltipDescription_RESID = 60025

data/examples/UIRibbon/Command.rbw

@@ -26,6 +26,16 @@ class UICH < IUICommandHandlerImpl
 
 	attr_reader :uif
 
+	def OnAOT(*args)
+		UsingFFIStructs(PROPVARIANT.new) { |v|
+			uif.GetUICommandProperty(CmdAOT, UI_PKEY_BooleanValue, v)
+
+			SetWindowPos(uif.hwnd,
+				(v[:boolVal] == -1) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE
+			)
+		}
+	end
+
 	def OnItem1(*args)
 		MessageBox(uif.hwnd,
 			L("#{self}.#{__method__}"),
@@ -50,6 +60,8 @@ class UICH < IUICommandHandlerImpl
 
 	def Execute(*args)
 		case args[0]
+		when CmdAOT
+			OnAOT(*args)
 		when CmdItem1
 			OnItem1(*args)
 		when CmdButton1
@@ -87,12 +99,18 @@ def OnCreate(hwnd,
 )
 	xtra = Id2Ref[GetWindowLong(hwnd, GWL_USERDATA)]
 
+	UIResources.Build(clean: true) if UIResources.BuildNeeded?()
+
 	xtra[:uif] = UIF.new(hwnd)
 	xtra[:uich] = UICH.new(xtra[:uif])
 	xtra[:uia] = UIA.new(xtra[:uich])
 
 	xtra[:uif].Initialize(hwnd, xtra[:uia])
-	xtra[:uif].LoadUI(LoadUIDll(), L('APPLICATION_RIBBON'))
+	xtra[:uif].LoadUI(UIResources.Load(), L('APPLICATION_RIBBON'))
+
+	UsingFFIStructs(PROPVARIANT[VT_BOOL, :boolVal, -1]) { |v|
+		xtra[:uif].SetUICommandProperty(CmdAOT, UI_PKEY_BooleanValue, v)
+	}
 
 	0
 end
@@ -179,6 +197,7 @@ def WinMain
 	exit(0) if hwnd.null?
 
 	ShowWindow(hwnd, SW_SHOWNORMAL)
+	SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE)
 	UpdateWindow(hwnd)
 
 	UsingFFIStructs(MSG.new) { |msg|

data/examples/UIRibbon/Command.xml

@@ -8,35 +8,38 @@
 <Command Name='cmdTab1' LabelTitle='Tab1' />
 	<Command Name='cmdTab1Group1' LabelTitle='&amp;Group1' LabelDescription='LabelDescription...' TooltipDescription='TooltipDescription...'>
 		<Command.SmallImages>
-			<Image>../../res/go-next-small.bmp</Image>
-			<Image MinDPI='120'>../../res/go-next.bmp</Image>
+			<Image>../res/go-next-small.bmp</Image>
+			<Image MinDPI='120'>../res/go-next.bmp</Image>
 		</Command.SmallImages>
 		<Command.LargeImages>
-			<Image>../../res/go-next.bmp</Image>
-			<Image MinDPI='120'>../../res/go-next-big.bmp</Image>
+			<Image>../res/go-next.bmp</Image>
+			<Image MinDPI='120'>../res/go-next-big.bmp</Image>
 		</Command.LargeImages>
 	</Command>
 
 <Command Name='cmdItem1' LabelTitle='&amp;Item1' LabelDescription='LabelDescription...' TooltipDescription='TooltipDescription...'>
 	<Command.SmallImages>
-		<Image>../../res/go-previous-small.bmp</Image>
-		<Image MinDPI='120'>../../res/go-previous.bmp</Image>
+		<Image>../res/go-previous-small.bmp</Image>
+		<Image MinDPI='120'>../res/go-previous.bmp</Image>
 	</Command.SmallImages>
 	<Command.LargeImages>
-		<Image>../../res/go-previous.bmp</Image>
-		<Image MinDPI='120'>../../res/go-previous-big.bmp</Image>
+		<Image>../res/go-previous.bmp</Image>
+		<Image MinDPI='120'>../res/go-previous-big.bmp</Image>
 	</Command.LargeImages>
 </Command>
 
 <Command Name='cmdButton1' LabelTitle='&amp;Button1' LabelDescription='LabelDescription...' TooltipDescription='TooltipDescription...'>
 	<Command.SmallImages>
-		<Image>../../res/go-next-small.bmp</Image>
-		<Image MinDPI='120'>../../res/go-next.bmp</Image>
+		<Image>../res/go-next-small.bmp</Image>
+		<Image MinDPI='120'>../res/go-next.bmp</Image>
 	</Command.SmallImages>
 	<Command.LargeImages>
-		<Image>../../res/go-next.bmp</Image>
-		<Image MinDPI='120'>../../res/go-next-big.bmp</Image>
+		<Image>../res/go-next.bmp</Image>
+		<Image MinDPI='120'>../res/go-next-big.bmp</Image>
 	</Command.LargeImages>
+</Command>
+
+<Command Name='cmdAOT' LabelTitle='&amp;Always On Top' LabelDescription='LabelDescription...' TooltipDescription='TooltipDescription...'>
 </Command>
 	</Application.Commands>
 
@@ -53,6 +56,7 @@
 			<Ribbon.QuickAccessToolbar>
 <QuickAccessToolbar CommandName='cmdQAT'>
 	<QuickAccessToolbar.ApplicationDefaults>
+		<CheckBox CommandName='cmdAOT' />
 		<Button CommandName='cmdItem1' />
 		<Button CommandName='cmdButton1' />
 	</QuickAccessToolbar.ApplicationDefaults>

data/lib/windows_com/common.rb

@@ -1,6 +1,6 @@
 require 'ffi'
 
-WINDOWS_COM_VERSION = '2.1.0'
+WINDOWS_COM_VERSION = '2.1.1'
 
 WINDOWS_COM_OLE_INIT = true unless defined?(WINDOWS_COM_OLE_INIT)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: windows_com
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Radoslav Peev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,6 +39,12 @@ files:
 - examples/UIRibbon/Command.rb
 - examples/UIRibbon/Command.rbw
 - examples/UIRibbon/Command.xml
+- examples/res/go-next-big.bmp
+- examples/res/go-next-small.bmp
+- examples/res/go-next.bmp
+- examples/res/go-previous-big.bmp
+- examples/res/go-previous-small.bmp
+- examples/res/go-previous.bmp
 - lib/windows_com.rb
 - lib/windows_com/common.rb
 - lib/windows_com/libc.rb