fontina-windows 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475183ef6216f5b7b1f72b687c2f026965f9fb80
-  data.tar.gz: 2f7e6de102596e7bffe1490d62e0c6195990e06b
+  metadata.gz: 55d03dfce54c89c35f52e503d565660046c4b671
+  data.tar.gz: 6ab00ce95e2af9ea45be31b0b57f41e6ae815881
 SHA512:
-  metadata.gz: 7246fcbec02d446b3b98a73aacf34b8d7f7e83ee4588d11d6cbe30fc50289281fd03be88f35c5d0704f454708a9978c8a0f08e29abd49d5d7ec82ce113404dff
-  data.tar.gz: 9af0184ecfe4375d2756c080b3fc8707d38b1cd973c83867c430eb4ac18d57dbd899b904b25025f0167d2f537511a392763285646783310074362d86154f4c98
+  metadata.gz: 2fd9d079d5086fdc370994f61545c9ae6f2390efb2202c7c3266711f5da0205a08d706b65d931a5e8132bccc95e9bf0741bb1f0e552b6160a45e2d3217b59aef
+  data.tar.gz: 45dab25148741f87fefe7ebaf7ceb7276cd1d9f2f80cd79510900f78263aecaea9d5f4d5a9ce116bc51c6067ae156160bdc3a32b44bfeff691915a382cf323a6

data/fontina-windows.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'fontina', '>= 0.2.1'
-  gem.add_dependency 'mores', '>= 0.1.5'
+  gem.add_dependency 'mores', '>= 0.3.1'
 
   gem.add_development_dependency 'bundler', '~> 1.7'
   gem.add_development_dependency 'rake', '~> 10.0'

data/lib/fontina/windows/meta_package.rb

@@ -5,6 +5,8 @@ module Fontina
       include Marshal
       Fontina::MetaPackage.include self
 
+      using Mores::Patch::FileUtils
+
       def registered_name
         @registered_name ||= begin
           name = package.preferred_name \
@@ -17,18 +19,32 @@ module Fontina
         end
       end
 
-      def install
-        conflicts = Windows.registered_fonts
-          .find_all { |(name, path)| (name == registered_name) ^ (path == file.filename) }
-        fail "Conflicting registrations found: #{conflicts.to_h}" unless conflicts.empty?
+      def installed?
+        !!(path = Windows.font_registered? registered_name) and
+        path = File.expand_path(path, Windows.fonts_directory) and
+        File.file?(path) and
+        File.open(path) { |io| FileUtils.compare_stream io.binmode, StringIO.new(file.content) }
+      end
+
+      def install(force: false)
+        return if installed? unless force
 
-        File.write File.join(Windows.fonts_directory, file.filename), file.content
+        add_times = 1
+        path = Windows.font_registered? registered_name
+
+        Dir.chdir(Windows.fonts_directory) do
+          add_times = Windows.remove_font_resource path if path and File.exist? path
+          path, = FileUtils.safe_write file.filename, file.content
+        end
 
-        unless (count = Windows.add_font_resource file.filename) == package.fonts.length
-          fail "Windows reported #{count} fonts added (expected: #{package.fonts.length})"
+        Windows.add_font_resource(path, times: add_times).tap do |count|
+          unless count == package.fonts.length
+            fail "Windows reported #{count} fonts added (expected: #{package.fonts.length})"
+          end
         end
 
-        Windows.register_font registered_name, file.filename
+        Windows.register_font registered_name, path
+        Windows.notify_fonts_changed
       end
     end
 

data/lib/fontina/windows/version.rb

@@ -1,7 +1,7 @@
 module Fontina
 
   module Windows
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 
 end

data/lib/fontina/windows/win32/advapi32.rb

@@ -48,7 +48,7 @@ module Fontina::Windows::Win32
     )
 
     extern 'long RegGetValueW(PVOID, LPCSTR, LPCSTR, DWORD, DWORD*, BYTE*, DWORD*)' \
-      do |hkey, subkey, name, flags: RRF_RT_ANY, data_len: nil|
+      do |hkey, name, subkey: nil, flags: RRF_RT_ANY, data_len: nil|
         type = dword(NULL)
         data, data_len = data_len ? [byte(0) * data_len, dword(data_len)] : [NULL, dword(NULL)]
         Error.check super(hkey, wstr(subkey), wstr(name), flags, type, data, data_len)

data/lib/fontina/windows/win32/constants.rb

@@ -3,9 +3,10 @@ module Fontina::Windows::Win32
   NULL = 0
   MAX_PATH = 260
 
-  ERROR_SUCCESS       =   0
-  ERROR_MORE_DATA     = 234
-  ERROR_NO_MORE_ITEMS = 259
+  ERROR_SUCCESS        =   0
+  ERROR_FILE_NOT_FOUND =   2
+  ERROR_MORE_DATA      = 234
+  ERROR_NO_MORE_ITEMS  = 259
 
   FORMAT_MESSAGE_FROM_SYSTEM    = 0x1000
   FORMAT_MESSAGE_IGNORE_INSERTS = 0x0200

data/lib/fontina/windows/win32/error.rb

@@ -31,6 +31,10 @@ module Fontina::Windows::Win32
       def check_hr(code)
         raise new code unless 0 == code[31]
       end
+
+      def clear
+        Kernel32.SetLastError(ERROR_SUCCESS)
+      end
     end
   end
 

data/lib/fontina/windows/win32/gdi32.rb

@@ -7,6 +7,14 @@ module Fontina::Windows::Win32
         Error.check_last if 0 == count
         count
       end
+
+    extern 'BOOL RemoveFontResourceW(LPCSTR)' \
+      do |filename|
+        Error.clear
+        success = 0 != super(wstr filename)
+        Error.check_last unless success
+        success
+      end
   end
 
 end

data/lib/fontina/windows/win32/kernel32.rb

@@ -2,6 +2,7 @@ module Fontina::Windows::Win32
 
   dlload :Kernel32 do
     extern 'DWORD GetLastError()'
+    extern 'void SetLastError(DWORD)'
 
     extern 'DWORD FormatMessageW(DWORD, PVOID, DWORD, DWORD, LPSTR, DWORD, PVOID)' \
       do |flags, message_id, len, source: NULL, language_id: 0|

data/lib/fontina/windows.rb

@@ -1,32 +1,34 @@
 %w[
   fontina
+  fontina/windows/language_codes
   fiddle
+  fiddle/import
   fiddle/types
 ].each { |lib| require lib }
 
 %w[
   version
-  language_codes
   marshal
   win32
   package
   meta_package
   install
-].each { |file| require "fontina/windows/#{file}" }
+].each { |file| require_relative "windows/#{file}" }
 
 module Fontina::Windows
   include Win32
   extend Marshal
+  module_function
 
-  def self.system_language
+  def system_language
     @system_language ||= LANGUAGE_CODES.fetch Kernel32.GetSystemDefaultUILanguage()
   end
 
-  def self.fonts_directory
+  def fonts_directory
     @fonts_directory ||= Shell32.SHGetFolderPathW(CSIDL_FONTS).encode('filesystem').freeze
   end
 
-  def self.registered_fonts
+  def registered_fonts
     key = Advapi32.RegOpenKeyExW(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts', KEY_READ)
     begin
       Advapi32.RegQueryInfoKeyW(key)
@@ -43,13 +45,21 @@ module Fontina::Windows
     end
   end
 
-  def self.add_font_resource(path)
-    Gdi32.AddFontResourceW(path).tap do |count|
-      User32.PostMessageW(HWND_BROADCAST, WM_FONTCHANGE, 0, 0) if 0 < count
+  def font_registered?(name)
+    key = Advapi32.RegOpenKeyExW(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts', KEY_READ)
+    begin
+      Advapi32.RegGetValueW(key, name, flags: RRF_RT_REG_SZ).tap do |value|
+        value = Advapi32.RegGetValueW(key, name, data_len: value.data_len)
+        break wstr!(value.data).rstrip.encode('filesystem')
+      end
+    rescue Error => e
+      raise if e.code != ERROR_FILE_NOT_FOUND
+    ensure
+      Advapi32.RegCloseKey(key)
     end
   end
 
-  def self.register_font(name, path)
+  def register_font(name, path)
     key = Advapi32.RegOpenKeyExW(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts', KEY_WRITE)
     begin
       Advapi32.RegSetValueExW(key, name, REG_SZ, wstr(path) + wchar(0))
@@ -58,4 +68,16 @@ module Fontina::Windows
     end
   end
 
+  def add_font_resource(path, times: 1)
+    (1..times).reduce(nil) { Gdi32.AddFontResourceW(path) }
+  end
+
+  def remove_font_resource(path)
+    (0..Float::INFINITY).find { !Gdi32.RemoveFontResourceW(path) }
+  end
+
+  def notify_fonts_changed
+    User32.PostMessageW(HWND_BROADCAST, WM_FONTCHANGE, 0, 0)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontina-windows
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Petter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fontina
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement