pdk 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67003e5136efb1f7b88aad41126a684fdf905fea
-  data.tar.gz: 53cf697acf1097eef065e18235c71a2e82c6adfc
+  metadata.gz: '08eefaca77036460baaf59107c23f00582b61244'
+  data.tar.gz: '078a7e34d073f5e9571642188d4983d046284fa1'
 SHA512:
-  metadata.gz: 292950f888d8e292e246b251f8a5df637b6f9c20e0ea7cd2c53a92e5ca5303196638b797742e8de7c37445c6e00f3740f06ea945c9fef0c38d064af414029970
-  data.tar.gz: 282a942a3866dcd3c99b86ae3837095507c677ccb93652cd6f526868dbfea25b8f32cf764117c17e3608719651d10ce02fa82714955e96417703de3223a95ea6
+  metadata.gz: 89d63ff36f12e738d768c1fc592fd6bc8835ff0dd4306f9d5ea10a6cf285d532e3bff21c1075420c7114f557e5fb713874615e13a1749a653c225a945aea1bac
+  data.tar.gz: 58ebcc413564a0866efc92af272b0d7fe26e5f961a9b7625be38c75969a4f2307b8e9339b564916aa9cd3beda8849b93016921c6ba491192e9d0932cb583ef29

data/CHANGELOG.md

@@ -4,7 +4,27 @@ All changes to this repo will be documented in this file.
 See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) for a high-level summary.
 
 
-## [v1.7.0](https://github.com/puppetlabs/pdk/tree/v1.7.0) (2018-08-14)
+## [v1.7.1](https://github.com/puppetlabs/pdk/tree/v1.7.1) (2018-10-05)
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.7.0...v1.7.1)
+
+**Implemented enhancements:**
+
+- \(PDK-1100\) Exclude known artifacts from build instead of cleaning [\#575](https://github.com/puppetlabs/pdk/pull/575) ([rodjek](https://github.com/rodjek))
+- \(PDK-1056\) Adds support for Ruby 2.5.1 in packaged PDK version [\#568](https://github.com/puppetlabs/pdk/pull/568) ([bmjen](https://github.com/bmjen))
+- \(PDK-1099\) Merge Puppet::Util::Windows into PDK namespace [\#565](https://github.com/puppetlabs/pdk/pull/565) ([rodjek](https://github.com/rodjek))
+
+**Fixed bugs:**
+
+- \(PDK-1181\) Display error when metadata.json missing or unreadable [\#574](https://github.com/puppetlabs/pdk/pull/574) ([rodjek](https://github.com/rodjek))
+- \(PDK-1173\) Update pdk validate help output for powershell [\#573](https://github.com/puppetlabs/pdk/pull/573) ([rodjek](https://github.com/rodjek))
+
+**Merged pull requests:**
+
+- \(maint\) Update PDK metadata defaults to include Puppet 6 [\#572](https://github.com/puppetlabs/pdk/pull/572) ([bmjen](https://github.com/bmjen))
+- \(maint\) Update package tests for ruby 2.5.1 as the new default [\#571](https://github.com/puppetlabs/pdk/pull/571) ([bmjen](https://github.com/bmjen))
+- Bump version to 1.8.0.pre [\#564](https://github.com/puppetlabs/pdk/pull/564) ([bmjen](https://github.com/bmjen))
+
+## [v1.7.0](https://github.com/puppetlabs/pdk/tree/v1.7.0) (2018-08-15)
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v1.6.1...v1.7.0)
 
 **Implemented enhancements:**
@@ -17,6 +37,7 @@ See the [release notes](https://puppet.com/docs/pdk/latest/release_notes.html) f
 
 **Merged pull requests:**
 
+- Release 1.7.0 [\#563](https://github.com/puppetlabs/pdk/pull/563) ([bmjen](https://github.com/bmjen))
 - \(maint\) Fix package tests [\#562](https://github.com/puppetlabs/pdk/pull/562) ([bmjen](https://github.com/bmjen))
 - \(PDK-1083\) Bump PDK version to 1.7.0.pre [\#556](https://github.com/puppetlabs/pdk/pull/556) ([rodjek](https://github.com/rodjek))
 - \(PDK-1077\) Expand the package acceptance test suite [\#554](https://github.com/puppetlabs/pdk/pull/554) ([rodjek](https://github.com/rodjek))

data/lib/pdk/cli/validate.rb

@@ -8,7 +8,8 @@ module PDK::CLI
     description _(
       "Run metadata, Puppet, or Ruby validation.\n\n" \
       '[validators] is an optional comma-separated list of validators to use. ' \
-      "If not specified, all validators are used.\n\n" \
+      'If not specified, all validators are used. ' \
+      "Note that when using PowerShell, the list of validators must be enclosed in single quotes.\n\n" \
       '[targets] is an optional space-separated list of files or directories to be validated. ' \
       'If not specified, validators are run against all applicable files in the module.',
     )

data/lib/pdk/module/build.rb

@@ -8,6 +8,16 @@ require 'pdk/tests/unit'
 module PDK
   module Module
     class Build
+      DEFAULT_IGNORED = [
+        '/pkg/',
+        '.*',
+        '~*',
+        '/coverage',
+        '/checksums.json',
+        '/REVISION',
+        '/spec/fixtures/modules/',
+      ].freeze
+
       def self.invoke(options = {})
         new(options).build
       end
@@ -37,7 +47,6 @@ module PDK
       #
       # @return [String] The path to the built package file.
       def build
-        cleanup_module
         create_build_dir
 
         stage_module_in_build_dir
@@ -83,17 +92,6 @@ module PDK
         FileUtils.rm_rf(build_dir, secure: true)
       end
 
-      # Clean up any files created during use of the PDK that shouldn't be part
-      # of the built module (e.g. test fixtures).
-      #
-      # @return nil
-      def cleanup_module
-        PDK::Util::Bundler.ensure_bundle!
-        PDK::Util::Bundler.ensure_binstubs!('rake')
-
-        PDK::Test::Unit.tear_down
-      end
-
       # Combine the module name and version into a Forge-compatible dash
       # separated string.
       #
@@ -215,6 +213,8 @@ module PDK
               ignored = ignored.add("\/#{File.basename(target_dir)}\/")
             end
 
+            DEFAULT_IGNORED.each { |r| ignored.add(r) }
+
             ignored
           end
       end

data/lib/pdk/module/metadata.rb

@@ -77,7 +77,7 @@ module PDK
           OPERATING_SYSTEMS[os_name]
         }.flatten,
         'requirements' => [
-          { 'name' => 'puppet', 'version_requirement' => '>= 4.7.0 < 6.0.0' },
+          { 'name' => 'puppet', 'version_requirement' => '>= 4.7.0 < 7.0.0' },
         ],
       }.freeze
 

data/lib/pdk/util.rb

@@ -58,7 +58,7 @@ module PDK
         unless File.exist?(path)
           raise PDK::CLI::FatalError, _("Cannot resolve a full path to '%{path}', as it does not currently exist.") % { path: path }
         end
-        Puppet::Util::Windows::File.get_long_pathname(path)
+        PDK::Util::Windows::File.get_long_pathname(path)
       else
         File.expand_path(path)
       end
@@ -261,6 +261,9 @@ module PDK
       else
         nil
       end
+    rescue ArgumentError => e
+      PDK.logger.error(e)
+      nil
     end
     module_function :module_pdk_version
   end

data/lib/pdk/util/puppet_version.rb

@@ -23,7 +23,7 @@ module PDK
       def puppet_dev_env
         {
           gem_version: 'file://%{path}' % { path: puppet_dev_path },
-          ruby_version: PDK::Util::RubyVersion.default_ruby_version,
+          ruby_version: PDK::Util::RubyVersion.latest_ruby_version,
         }
       end
 

data/lib/pdk/util/ruby_version.rb

@@ -45,7 +45,14 @@ module PDK
         end
 
         def default_ruby_version
+          # For now, the packaged versions will be using default of 2.4.4.
+          return '2.4.4' if PDK::Util.package_install?
+
           # TODO: may not be a safe assumption that highest available version should be default
+          latest_ruby_version
+        end
+
+        def latest_ruby_version
           versions.keys.sort { |a, b| Gem::Version.new(b) <=> Gem::Version.new(a) }.first
         end
 

data/lib/pdk/util/windows.rb

@@ -1,6 +1,13 @@
-module Puppet
+module PDK
   module Util
+    module Windows
+      module File; end
+
+      if Gem.win_platform?
+        require 'pdk/util/windows/api_types'
+        require 'pdk/util/windows/string'
+        require 'pdk/util/windows/file'
+      end
+    end
   end
 end
-
-require 'puppet/util/windows'

data/lib/pdk/util/windows/api_types.rb

@@ -0,0 +1,57 @@
+require 'ffi'
+require 'pdk/util/windows/string'
+
+module PDK::Util::Windows::APITypes
+  module ::FFI
+    WIN32_FALSE = 0
+
+    # standard Win32 error codes
+    ERROR_SUCCESS = 0
+  end
+
+  class ::FFI::Pointer
+    def self.from_string_to_wide_string(str, &_block)
+      str = PDK::Util::Windows::String.wide_string(str)
+      FFI::MemoryPointer.new(:byte, str.bytesize) do |ptr|
+        # uchar here is synonymous with byte
+        ptr.put_array_of_uchar(0, str.bytes.to_a)
+
+        yield ptr
+      end
+
+      # ptr has already had free called, so nothing to return
+      nil
+    end
+
+    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8, encode_options = {})
+      # char_length is number of wide chars (typically excluding NULLs), *not* bytes
+      str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
+      str.encode(dst_encoding, str.encoding, encode_options)
+    rescue StandardError => e
+      PDK.logger.debug _('Unable to convert value %{string} to encoding %{encoding} due to %{error}') % {
+        string:   str.dump,
+        encoding: dst_encoding,
+        error:    e.inspect,
+      }
+      raise
+    end
+  end
+
+  # FFI Types
+  # https://github.com/ffi/ffi/wiki/Types
+
+  # Windows - Common Data Types
+  # https://msdn.microsoft.com/en-us/library/cc230309.aspx
+
+  # Windows Data Types
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
+
+  FFI.typedef :uint32, :dword
+  # buffer_inout is similar to pointer (platform specific), but optimized for buffers
+  FFI.typedef :buffer_inout, :lpwstr
+  # buffer_in is similar to pointer (platform specific), but optimized for CONST read only buffers
+  FFI.typedef :buffer_in, :lpcwstr
+  # 8 bits per byte
+  FFI.typedef :uchar, :byte
+  FFI.typedef :uint16, :wchar
+end

data/lib/pdk/util/windows/file.rb

@@ -0,0 +1,36 @@
+require 'pdk/util/windows'
+
+module PDK::Util::Windows::File
+  require 'ffi'
+  extend FFI::Library
+  extend PDK::Util::Windows::String
+
+  def get_long_pathname(path)
+    converted = ''
+    FFI::Pointer.from_string_to_wide_string(path) do |path_ptr|
+      # includes terminating NULL
+      buffer_size = GetLongPathNameW(path_ptr, FFI::Pointer::NULL, 0)
+      FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
+        if GetLongPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
+          raise _('Failed to call GetLongPathName')
+        end
+
+        converted = converted_ptr.read_wide_string(buffer_size - 1)
+      end
+    end
+
+    converted
+  end
+  module_function :get_long_pathname
+
+  ffi_convention :stdcall
+
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx
+  # DWORD WINAPI GetLongPathName(
+  #   _In_  LPCTSTR lpszShortPath,
+  #   _Out_ LPTSTR  lpszLongPath,
+  #   _In_  DWORD   cchBuffer
+  # );
+  ffi_lib :kernel32
+  attach_function :GetLongPathNameW, [:lpcwstr, :lpwstr, :dword], :dword
+end

data/lib/{puppet → pdk}/util/windows/string.rb

@@ -1,6 +1,6 @@
-require 'puppet/util/windows'
+require 'pdk/util/windows'
 
-module Puppet::Util::Windows::String
+module PDK::Util::Windows::String
   def wide_string(str)
     # if given a nil string, assume caller wants to pass a nil pointer to win32
     return nil if str.nil?

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
   TEMPLATE_REF = VERSION
 end

data/locales/pdk.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: puppet development kit v1.6.1-11-g2632a3b30\n"
+"Project-Id-Version: puppet development kit v1.7.0-16-g810d1d3be\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
-"POT-Creation-Date: 2018-08-14 16:41-0700\n"
-"PO-Revision-Date: 2018-08-14 16:41-0700\n"
+"POT-Creation-Date: 2018-10-05 11:07-0700\n"
+"PO-Revision-Date: 2018-10-05 11:07-0700\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -531,40 +531,40 @@ msgstr ""
 msgid ""
 "Run metadata, Puppet, or Ruby validation.\n"
 "\n"
-"[validators] is an optional comma-separated list of validators to use. If not specified, all validators are used.\n"
+"[validators] is an optional comma-separated list of validators to use. If not specified, all validators are used. Note that when using PowerShell, the list of validators must be enclosed in single quotes.\n"
 "\n"
 "[targets] is an optional space-separated list of files or directories to be validated. If not specified, validators are run against all applicable files in the module."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:18
+#: ../lib/pdk/cli/validate.rb:19
 msgid "List all available validators."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:19
+#: ../lib/pdk/cli/validate.rb:20
 msgid "Automatically correct problems where possible."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:20
+#: ../lib/pdk/cli/validate.rb:21
 msgid "Run validations in parallel."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:33
+#: ../lib/pdk/cli/validate.rb:34
 msgid "Available validators: %{validator_names}"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:40
+#: ../lib/pdk/cli/validate.rb:41
 msgid "Code validation can only be run from inside a valid module directory"
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:56
+#: ../lib/pdk/cli/validate.rb:57
 msgid "Unknown validator '%{v}'. Available validators: %{validators}."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:66 ../lib/pdk/cli/validate.rb:70
+#: ../lib/pdk/cli/validate.rb:67 ../lib/pdk/cli/validate.rb:71
 msgid "Running all available validators..."
 msgstr ""
 
-#: ../lib/pdk/cli/validate.rb:97
+#: ../lib/pdk/cli/validate.rb:98
 msgid "Validating module using %{num_of_threads} threads"
 msgstr ""
 
@@ -798,7 +798,7 @@ msgstr ""
 msgid "A task named '%{name}' already exists in this module; defined in %{file}"
 msgstr ""
 
-#: ../lib/pdk/module/build.rb:160
+#: ../lib/pdk/module/build.rb:158
 msgid "Symlinks in modules are not supported and will not be included in the package. Please investigate symlink %{from} -> %{to}."
 msgstr ""
 
@@ -1198,6 +1198,14 @@ msgstr ""
 msgid "Unable to download %{url}. Check internet connectivity and try again. %{error}"
 msgstr ""
 
+#: ../lib/pdk/util/windows/api_types.rb:31
+msgid "Unable to convert value %{string} to encoding %{encoding} due to %{error}"
+msgstr ""
+
+#: ../lib/pdk/util/windows/file.rb:15
+msgid "Failed to call GetLongPathName"
+msgstr ""
+
 #: ../lib/pdk/validate/base_validator.rb:83
 msgid "Invoking %{cmd}"
 msgstr ""
@@ -1257,23 +1265,3 @@ msgstr ""
 #: ../lib/pdk/validate/ruby/rubocop.rb:24
 msgid "Checking Ruby code style (%{pattern})."
 msgstr ""
-
-#: ../lib/puppet/util/windows/api_types.rb:72
-msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
-msgstr ""
-
-#: ../lib/puppet/util/windows/api_types.rb:203
-msgid "Bad GUID format."
-msgstr ""
-
-#: ../lib/puppet/util/windows/file.rb:158
-msgid "Failed to set file attributes"
-msgstr ""
-
-#: ../lib/puppet/util/windows/file.rb:193
-msgid "out_buffer is required"
-msgstr ""
-
-#: ../lib/puppet/util/windows/file.rb:274
-msgid "Failed to call GetLongPathName"
-msgstr ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,6 +258,9 @@ files:
 - lib/pdk/util/vendored_file.rb
 - lib/pdk/util/version.rb
 - lib/pdk/util/windows.rb
+- lib/pdk/util/windows/api_types.rb
+- lib/pdk/util/windows/file.rb
+- lib/pdk/util/windows/string.rb
 - lib/pdk/validate.rb
 - lib/pdk/validate/base_validator.rb
 - lib/pdk/validate/metadata/metadata_json_lint.rb
@@ -270,10 +273,6 @@ files:
 - lib/pdk/validate/ruby/rubocop.rb
 - lib/pdk/validate/ruby_validator.rb
 - lib/pdk/version.rb
-- lib/puppet/util/windows.rb
-- lib/puppet/util/windows/api_types.rb
-- lib/puppet/util/windows/file.rb
-- lib/puppet/util/windows/string.rb
 - locales/config.yaml
 - locales/pdk.pot
 homepage: https://github.com/puppetlabs/pdk

data/lib/puppet/util/windows.rb

@@ -1,14 +0,0 @@
-module Puppet
-  module Util
-    module Windows
-      module File; end
-
-      if Gem.win_platform?
-        # these reference platform specific gems
-        require 'puppet/util/windows/api_types'
-        require 'puppet/util/windows/string'
-        require 'puppet/util/windows/file'
-      end
-    end
-  end
-end

data/lib/puppet/util/windows/api_types.rb

@@ -1,282 +0,0 @@
-require 'ffi'
-require 'puppet/util/windows/string'
-
-module Puppet::Util::Windows::APITypes
-  module ::FFI
-    WIN32_FALSE = 0
-
-    # standard Win32 error codes
-    ERROR_SUCCESS = 0
-  end
-
-  module ::FFI::Library
-    # Wrapper method for attach_function + private
-    def attach_function_private(*args)
-      attach_function(*args)
-      private args[0]
-    end
-  end
-
-  class ::FFI::Pointer
-    NULL_HANDLE = 0
-
-    def self.from_string_to_wide_string(str, &block)
-      str = Puppet::Util::Windows::String.wide_string(str)
-      FFI::MemoryPointer.new(:byte, str.bytesize) do |ptr|
-        # uchar here is synonymous with byte
-        ptr.put_array_of_uchar(0, str.bytes.to_a)
-
-        yield ptr
-      end
-
-      # ptr has already had free called, so nothing to return
-      nil
-    end
-
-    def read_win32_bool
-      # BOOL is always a 32-bit integer in Win32
-      # some Win32 APIs return 1 for true, while others are non-0
-      read_int32 != FFI::WIN32_FALSE
-    end
-
-    alias_method :read_dword, :read_uint32
-    alias_method :read_win32_ulong, :read_uint32
-    alias_method :read_qword, :read_uint64
-
-    alias_method :read_hresult, :read_int32
-
-    def read_handle
-      type_size == 4 ? read_uint32 : read_uint64
-    end
-
-    alias_method :read_wchar, :read_uint16
-    alias_method :read_word,  :read_uint16
-    alias_method :read_array_of_wchar, :read_array_of_uint16
-
-    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8, encode_options = {})
-      # char_length is number of wide chars (typically excluding NULLs), *not* bytes
-      str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
-      str.encode(dst_encoding, str.encoding, encode_options)
-    rescue Exception => e
-      Puppet.debug "Unable to convert value #{str.dump} to encoding #{dst_encoding} due to #{e.inspect}"
-      raise
-    end
-
-    # @param max_char_length [Integer] Maximum number of wide chars to return (typically excluding NULLs), *not* bytes
-    # @param null_terminator [Symbol] Number of number of null wchar characters, *not* bytes, that determine the end of the string
-    #   null_terminator = :single_null, then the terminating sequence is two bytes of zero.   This is UNIT16 = 0
-    #   null_terminator = :double_null, then the terminating sequence is four bytes of zero.  This is UNIT32 = 0
-    # @param encode_options [Hash] Accepts the same option hash that may be passed to String#encode in Ruby
-    def read_arbitrary_wide_string_up_to(max_char_length = 512, null_terminator = :single_null, encode_options = {})
-      if null_terminator != :single_null && null_terminator != :double_null
-        raise _("Unable to read wide strings with %{null_terminator} terminal nulls") % { null_terminator: null_terminator }
-      end
-
-      terminator_width = null_terminator == :single_null ? 1 : 2
-      reader_method = null_terminator == :single_null ? :get_uint16 : :get_uint32
-
-      # Look for a null terminating characters; if found, read up to that null (exclusive)
-      (0...max_char_length - terminator_width).each do |i|
-        return read_wide_string(i, Encoding::UTF_8, encode_options) if send(reader_method, (i * 2)) == 0
-      end
-
-      # String is longer than the max; read just to the max
-      read_wide_string(max_char_length, Encoding::UTF_8, encode_options)
-    end
-
-    def read_win32_local_pointer(&block)
-      ptr = nil
-      begin
-        ptr = read_pointer
-        yield ptr
-      ensure
-        if ptr && ! ptr.null?
-          if FFI::WIN32::LocalFree(ptr.address) != FFI::Pointer::NULL_HANDLE
-            Puppet.debug "LocalFree memory leak"
-          end
-        end
-      end
-
-      # ptr has already had LocalFree called, so nothing to return
-      nil
-    end
-
-    def read_com_memory_pointer(&block)
-      ptr = nil
-      begin
-        ptr = read_pointer
-        yield ptr
-      ensure
-        FFI::WIN32::CoTaskMemFree(ptr) if ptr && ! ptr.null?
-      end
-
-      # ptr has already had CoTaskMemFree called, so nothing to return
-      nil
-    end
-
-
-    alias_method :write_dword, :write_uint32
-    alias_method :write_word, :write_uint16
-  end
-
-  # FFI Types
-  # https://github.com/ffi/ffi/wiki/Types
-
-  # Windows - Common Data Types
-  # https://msdn.microsoft.com/en-us/library/cc230309.aspx
-
-  # Windows Data Types
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
-
-  FFI.typedef :uint16, :word
-  FFI.typedef :uint32, :dword
-  # uintptr_t is defined in an FFI conf as platform specific, either
-  # ulong_long on x64 or just ulong on x86
-  FFI.typedef :uintptr_t, :handle
-  FFI.typedef :uintptr_t, :hwnd
-
-  # buffer_inout is similar to pointer (platform specific), but optimized for buffers
-  FFI.typedef :buffer_inout, :lpwstr
-  # buffer_in is similar to pointer (platform specific), but optimized for CONST read only buffers
-  FFI.typedef :buffer_in, :lpcwstr
-  FFI.typedef :buffer_in, :lpcolestr
-
-  # string is also similar to pointer, but should be used for const char *
-  # NOTE that this is not wide, useful only for A suffixed functions
-  FFI.typedef :string, :lpcstr
-
-  # pointer in FFI is platform specific
-  # NOTE: for API calls with reserved lpvoid parameters, pass a FFI::Pointer::NULL
-  FFI.typedef :pointer, :lpcvoid
-  FFI.typedef :pointer, :lpvoid
-  FFI.typedef :pointer, :lpword
-  FFI.typedef :pointer, :lpbyte
-  FFI.typedef :pointer, :lpdword
-  FFI.typedef :pointer, :pdword
-  FFI.typedef :pointer, :phandle
-  FFI.typedef :pointer, :ulong_ptr
-  FFI.typedef :pointer, :pbool
-  FFI.typedef :pointer, :lpunknown
-
-  # any time LONG / ULONG is in a win32 API definition DO NOT USE platform specific width
-  # which is what FFI uses by default
-  # instead create new aliases for these very special cases
-  # NOTE: not a good idea to redefine FFI :ulong since other typedefs may rely on it
-  FFI.typedef :uint32, :win32_ulong
-  FFI.typedef :int32, :win32_long
-  # FFI bool can be only 1 byte at times,
-  # Win32 BOOL is a signed int, and is always 4 bytes, even on x64
-  # https://blogs.msdn.com/b/oldnewthing/archive/2011/03/28/10146459.aspx
-  FFI.typedef :int32, :win32_bool
-
-  # BOOLEAN (unlike BOOL) is a BYTE - typedef unsigned char BYTE;
-  FFI.typedef :uchar, :boolean
-
-  # Same as a LONG, a 32-bit signed integer
-  FFI.typedef :int32, :hresult
-
-  # NOTE: FFI already defines (u)short as a 16-bit (un)signed like this:
-  # FFI.typedef :uint16, :ushort
-  # FFI.typedef :int16, :short
-
-  # 8 bits per byte
-  FFI.typedef :uchar, :byte
-  FFI.typedef :uint16, :wchar
-
-  module ::FFI::WIN32
-    extend ::FFI::Library
-
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/aa373931(v=vs.85).aspx
-    # typedef struct _GUID {
-    #   DWORD Data1;
-    #   WORD  Data2;
-    #   WORD  Data3;
-    #   BYTE  Data4[8];
-    # } GUID;
-    class GUID < FFI::Struct
-      layout :Data1, :dword,
-             :Data2, :word,
-             :Data3, :word,
-             :Data4, [:byte, 8]
-
-      def self.[](s)
-        raise _('Bad GUID format.') unless s =~ /^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/i
-
-        new.tap do |guid|
-          guid[:Data1] = s[0, 8].to_i(16)
-          guid[:Data2] = s[9, 4].to_i(16)
-          guid[:Data3] = s[14, 4].to_i(16)
-          guid[:Data4][0] = s[19, 2].to_i(16)
-          guid[:Data4][1] = s[21, 2].to_i(16)
-          s[24, 12].split('').each_slice(2).with_index do |a, i|
-            guid[:Data4][i + 2] = a.join('').to_i(16)
-          end
-        end
-      end
-
-      def ==(other) Windows.memcmp(other, self, size) == 0 end
-    end
-
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724950(v=vs.85).aspx
-    # typedef struct _SYSTEMTIME {
-    #   WORD wYear;
-    #   WORD wMonth;
-    #   WORD wDayOfWeek;
-    #   WORD wDay;
-    #   WORD wHour;
-    #   WORD wMinute;
-    #   WORD wSecond;
-    #   WORD wMilliseconds;
-    # } SYSTEMTIME, *PSYSTEMTIME;
-    class SYSTEMTIME < FFI::Struct
-      layout :wYear, :word,
-             :wMonth, :word,
-             :wDayOfWeek, :word,
-             :wDay, :word,
-             :wHour, :word,
-             :wMinute, :word,
-             :wSecond, :word,
-             :wMilliseconds, :word
-
-      def to_local_time
-        Time.local(self[:wYear], self[:wMonth], self[:wDay],
-          self[:wHour], self[:wMinute], self[:wSecond], self[:wMilliseconds] * 1000)
-      end
-    end
-
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724284(v=vs.85).aspx
-    # Contains a 64-bit value representing the number of 100-nanosecond
-    # intervals since January 1, 1601 (UTC).
-    # typedef struct _FILETIME {
-    #   DWORD dwLowDateTime;
-    #   DWORD dwHighDateTime;
-    # } FILETIME, *PFILETIME;
-    class FILETIME < FFI::Struct
-      layout :dwLowDateTime, :dword,
-             :dwHighDateTime, :dword
-    end
-
-    ffi_convention :stdcall
-
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/aa366730(v=vs.85).aspx
-    # HLOCAL WINAPI LocalFree(
-    #   _In_  HLOCAL hMem
-    # );
-    ffi_lib :kernel32
-    attach_function :LocalFree, [:handle], :handle
-
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724211(v=vs.85).aspx
-    # BOOL WINAPI CloseHandle(
-    #   _In_  HANDLE hObject
-    # );
-    ffi_lib :kernel32
-    attach_function_private :CloseHandle, [:handle], :win32_bool
-
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms680722(v=vs.85).aspx
-    # void CoTaskMemFree(
-    #   _In_opt_  LPVOID pv
-    # );
-    ffi_lib :ole32
-    attach_function :CoTaskMemFree, [:lpvoid], :void
-  end
-end

data/lib/puppet/util/windows/file.rb

@@ -1,488 +0,0 @@
-require 'puppet/util/windows'
-
-module Puppet::Util::Windows::File
-  require 'ffi'
-  extend FFI::Library
-  extend Puppet::Util::Windows::String
-
-  FILE_ATTRIBUTE_READONLY      = 0x00000001
-
-  SYNCHRONIZE                 = 0x100000
-  STANDARD_RIGHTS_REQUIRED    = 0xf0000
-  STANDARD_RIGHTS_READ        = 0x20000
-  STANDARD_RIGHTS_WRITE       = 0x20000
-  STANDARD_RIGHTS_EXECUTE     = 0x20000
-  STANDARD_RIGHTS_ALL         = 0x1F0000
-  SPECIFIC_RIGHTS_ALL         = 0xFFFF
-
-  FILE_READ_DATA               = 1
-  FILE_WRITE_DATA              = 2
-  FILE_APPEND_DATA             = 4
-  FILE_READ_EA                 = 8
-  FILE_WRITE_EA                = 16
-  FILE_EXECUTE                 = 32
-  FILE_DELETE_CHILD            = 64
-  FILE_READ_ATTRIBUTES         = 128
-  FILE_WRITE_ATTRIBUTES        = 256
-
-  FILE_ALL_ACCESS = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF
-
-  FILE_GENERIC_READ =
-     STANDARD_RIGHTS_READ |
-     FILE_READ_DATA |
-     FILE_READ_ATTRIBUTES |
-     FILE_READ_EA |
-     SYNCHRONIZE
-
-  FILE_GENERIC_WRITE =
-     STANDARD_RIGHTS_WRITE |
-     FILE_WRITE_DATA |
-     FILE_WRITE_ATTRIBUTES |
-     FILE_WRITE_EA |
-     FILE_APPEND_DATA |
-     SYNCHRONIZE
-
-  FILE_GENERIC_EXECUTE =
-     STANDARD_RIGHTS_EXECUTE |
-     FILE_READ_ATTRIBUTES |
-     FILE_EXECUTE |
-     SYNCHRONIZE
-
-  REPLACEFILE_WRITE_THROUGH         = 0x1
-  REPLACEFILE_IGNORE_MERGE_ERRORS   = 0x2
-  REPLACEFILE_IGNORE_ACL_ERRORS     = 0x3
-
-  def replace_file(target, source)
-    target_encoded = wide_string(target.to_s)
-    source_encoded = wide_string(source.to_s)
-
-    flags = REPLACEFILE_IGNORE_MERGE_ERRORS
-    backup_file = nil
-    result = ReplaceFileW(
-      target_encoded,
-      source_encoded,
-      backup_file,
-      flags,
-      FFI::Pointer::NULL,
-      FFI::Pointer::NULL
-    )
-
-    return true if result != FFI::WIN32_FALSE
-    raise Puppet::Util::Windows::Error.new("ReplaceFile(#{target}, #{source})")
-  end
-  module_function :replace_file
-
-  def move_file_ex(source, target, flags = 0)
-    result = MoveFileExW(wide_string(source.to_s),
-                         wide_string(target.to_s),
-                         flags)
-
-    return true if result != FFI::WIN32_FALSE
-    raise Puppet::Util::Windows::Error.
-      new("MoveFileEx(#{source}, #{target}, #{flags.to_s(8)})")
-  end
-  module_function :move_file_ex
-
-  def symlink(target, symlink)
-    flags = File.directory?(target) ? 0x1 : 0x0
-    result = CreateSymbolicLinkW(wide_string(symlink.to_s),
-      wide_string(target.to_s), flags)
-    return true if result != FFI::WIN32_FALSE
-    raise Puppet::Util::Windows::Error.new(
-      "CreateSymbolicLink(#{symlink}, #{target}, #{flags.to_s(8)})")
-  end
-  module_function :symlink
-
-
-  def exist?(path)
-    path = path.to_str if path.respond_to?(:to_str) # support WatchedFile
-    path = path.to_s # support String and Pathname
-
-    seen_paths = []
-    # follow up to 64 symlinks before giving up
-    0.upto(64) do |depth|
-      # return false if this path has been seen before.  This is protection against circular symlinks
-      return false if seen_paths.include?(path.downcase)
-
-      result = get_attributes(path,false)
-
-      # return false for path not found
-      return false if result == INVALID_FILE_ATTRIBUTES
-
-      # return true if path exists and it's not a symlink
-      # Other file attributes are ignored. https://msdn.microsoft.com/en-us/library/windows/desktop/gg258117(v=vs.85).aspx
-      return true if (result & FILE_ATTRIBUTE_REPARSE_POINT) != FILE_ATTRIBUTE_REPARSE_POINT
-
-      # walk the symlink and try again...
-      seen_paths << path.downcase
-      path = readlink(path)
-    end
-
-    false
-  end
-  module_function :exist?
-
-
-  INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF #define INVALID_FILE_ATTRIBUTES (DWORD (-1))
-
-  def get_attributes(file_name, raise_on_invalid = true)
-    result = GetFileAttributesW(wide_string(file_name.to_s))
-    if raise_on_invalid && result == INVALID_FILE_ATTRIBUTES
-      raise Puppet::Util::Windows::Error.new("GetFileAttributes(#{file_name})")
-    end
-
-    result
-  end
-  module_function :get_attributes
-
-  def add_attributes(path, flags)
-    oldattrs = get_attributes(path)
-
-    if (oldattrs | flags) != oldattrs
-      set_attributes(path, oldattrs | flags)
-    end
-  end
-  module_function :add_attributes
-
-  def remove_attributes(path, flags)
-    oldattrs = get_attributes(path)
-
-    if (oldattrs & ~flags) != oldattrs
-      set_attributes(path, oldattrs & ~flags)
-    end
-  end
-  module_function :remove_attributes
-
-  def set_attributes(path, flags)
-    success = SetFileAttributesW(wide_string(path), flags) != FFI::WIN32_FALSE
-    raise Puppet::Util::Windows::Error.new(_("Failed to set file attributes")) if !success
-
-    success
-  end
-  module_function :set_attributes
-
-  #define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
-  INVALID_HANDLE_VALUE = FFI::Pointer.new(-1).address
-  def self.create_file(file_name, desired_access, share_mode, security_attributes,
-    creation_disposition, flags_and_attributes, template_file_handle)
-
-    result = CreateFileW(wide_string(file_name.to_s),
-      desired_access, share_mode, security_attributes, creation_disposition,
-      flags_and_attributes, template_file_handle)
-
-    return result unless result == INVALID_HANDLE_VALUE
-    raise Puppet::Util::Windows::Error.new(
-      "CreateFile(#{file_name}, #{desired_access.to_s(8)}, #{share_mode.to_s(8)}, " +
-        "#{security_attributes}, #{creation_disposition.to_s(8)}, " +
-        "#{flags_and_attributes.to_s(8)}, #{template_file_handle})")
-  end
-
-  def self.get_reparse_point_data(handle, &block)
-    # must be multiple of 1024, min 10240
-    FFI::MemoryPointer.new(REPARSE_DATA_BUFFER.size) do |reparse_data_buffer_ptr|
-      device_io_control(handle, FSCTL_GET_REPARSE_POINT, nil, reparse_data_buffer_ptr)
-      yield REPARSE_DATA_BUFFER.new(reparse_data_buffer_ptr)
-    end
-
-    # underlying struct MemoryPointer has been cleaned up by this point, nothing to return
-    nil
-  end
-
-  def self.device_io_control(handle, io_control_code, in_buffer = nil, out_buffer = nil)
-    if out_buffer.nil?
-      raise Puppet::Util::Windows::Error.new(_("out_buffer is required"))
-    end
-
-    FFI::MemoryPointer.new(:dword, 1) do |bytes_returned_ptr|
-      result = DeviceIoControl(
-        handle,
-        io_control_code,
-        in_buffer, in_buffer.nil? ? 0 : in_buffer.size,
-        out_buffer, out_buffer.size,
-        bytes_returned_ptr,
-        nil
-      )
-
-      if result == FFI::WIN32_FALSE
-        raise Puppet::Util::Windows::Error.new(
-          "DeviceIoControl(#{handle}, #{io_control_code}, " +
-          "#{in_buffer}, #{in_buffer ? in_buffer.size : ''}, " +
-          "#{out_buffer}, #{out_buffer ? out_buffer.size : ''}")
-      end
-    end
-
-    out_buffer
-  end
-
-  FILE_ATTRIBUTE_REPARSE_POINT = 0x400
-  def symlink?(file_name)
-    attributes = get_attributes(file_name, false)
-
-    return false if (attributes == INVALID_FILE_ATTRIBUTES)
-    (attributes & FILE_ATTRIBUTE_REPARSE_POINT) == FILE_ATTRIBUTE_REPARSE_POINT
-  end
-  module_function :symlink?
-
-  GENERIC_READ                  = 0x80000000
-  GENERIC_WRITE                 = 0x40000000
-  GENERIC_EXECUTE               = 0x20000000
-  GENERIC_ALL                   = 0x10000000
-  FILE_SHARE_READ               = 1
-  FILE_SHARE_WRITE              = 2
-  OPEN_EXISTING                 = 3
-  FILE_FLAG_OPEN_REPARSE_POINT  = 0x00200000
-  FILE_FLAG_BACKUP_SEMANTICS    = 0x02000000
-
-  def self.open_symlink(link_name)
-    begin
-      yield handle = create_file(
-      link_name,
-      GENERIC_READ,
-      FILE_SHARE_READ,
-      nil, # security_attributes
-      OPEN_EXISTING,
-      FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS,
-      0) # template_file
-    ensure
-      FFI::WIN32.CloseHandle(handle) if handle
-    end
-
-    # handle has had CloseHandle called against it, so nothing to return
-    nil
-  end
-
-  def readlink(link_name)
-    link = nil
-    open_symlink(link_name) do |handle|
-      link = resolve_symlink(handle)
-    end
-
-    link
-  end
-  module_function :readlink
-
-  ERROR_FILE_NOT_FOUND = 2
-  ERROR_PATH_NOT_FOUND = 3
-
-  def get_long_pathname(path)
-    converted = ''
-    FFI::Pointer.from_string_to_wide_string(path) do |path_ptr|
-      # includes terminating NULL
-      buffer_size = GetLongPathNameW(path_ptr, FFI::Pointer::NULL, 0)
-      FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
-        if GetLongPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new(_("Failed to call GetLongPathName"))
-        end
-
-        converted = converted_ptr.read_wide_string(buffer_size - 1)
-      end
-    end
-
-    converted
-  end
-  module_function :get_long_pathname
-
-  def get_short_pathname(path)
-    converted = ''
-    FFI::Pointer.from_string_to_wide_string(path) do |path_ptr|
-      # includes terminating NULL
-      buffer_size = GetShortPathNameW(path_ptr, FFI::Pointer::NULL, 0)
-      FFI::MemoryPointer.new(:wchar, buffer_size) do |converted_ptr|
-        if GetShortPathNameW(path_ptr, converted_ptr, buffer_size) == FFI::WIN32_FALSE
-          raise Puppet::Util::Windows::Error.new("Failed to call GetShortPathName")
-        end
-
-        converted = converted_ptr.read_wide_string(buffer_size - 1)
-      end
-    end
-
-    converted
-  end
-  module_function :get_short_pathname
-
-  def stat(file_name)
-    file_name = file_name.to_s # accommodate PathName or String
-    stat = File.stat(file_name)
-    singleton_class = class << stat; self; end
-    target_path = file_name
-
-    if symlink?(file_name)
-      target_path = readlink(file_name)
-      link_ftype = File.stat(target_path).ftype
-
-      # sigh, monkey patch instance method for instance, and close over link_ftype
-      singleton_class.send(:define_method, :ftype) do
-        link_ftype
-      end
-    end
-
-    singleton_class.send(:define_method, :mode) do
-      Puppet::Util::Windows::Security.get_mode(target_path)
-    end
-
-    stat
-  end
-  module_function :stat
-
-  def lstat(file_name)
-    file_name = file_name.to_s # accommodate PathName or String
-    # monkey'ing around!
-    stat = File.lstat(file_name)
-
-    singleton_class = class << stat; self; end
-    singleton_class.send(:define_method, :mode) do
-      Puppet::Util::Windows::Security.get_mode(file_name)
-    end
-
-    if symlink?(file_name)
-      def stat.ftype
-        "link"
-      end
-    end
-    stat
-  end
-  module_function :lstat
-
-  private
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364571(v=vs.85).aspx
-  FSCTL_GET_REPARSE_POINT = 0x900a8
-
-  def self.resolve_symlink(handle)
-    path = nil
-    get_reparse_point_data(handle) do |reparse_data|
-      offset = reparse_data[:PrintNameOffset]
-      length = reparse_data[:PrintNameLength]
-
-      ptr = reparse_data.pointer + reparse_data.offset_of(:PathBuffer) + offset
-      path = ptr.read_wide_string(length / 2) # length is bytes, need UTF-16 wchars
-    end
-
-    path
-  end
-
-  ffi_convention :stdcall
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa365512(v=vs.85).aspx
-  # BOOL WINAPI ReplaceFile(
-  #   _In_        LPCTSTR lpReplacedFileName,
-  #   _In_        LPCTSTR lpReplacementFileName,
-  #   _In_opt_    LPCTSTR lpBackupFileName,
-  #   _In_        DWORD dwReplaceFlags - 0x1 REPLACEFILE_WRITE_THROUGH,
-  #                                      0x2 REPLACEFILE_IGNORE_MERGE_ERRORS,
-  #                                      0x4 REPLACEFILE_IGNORE_ACL_ERRORS
-  #   _Reserved_  LPVOID lpExclude,
-  #   _Reserved_  LPVOID lpReserved
-  # );
-  ffi_lib :kernel32
-  attach_function_private :ReplaceFileW,
-    [:lpcwstr, :lpcwstr, :lpcwstr, :dword, :lpvoid, :lpvoid], :win32_bool
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa365240(v=vs.85).aspx
-  # BOOL WINAPI MoveFileEx(
-  #   _In_      LPCTSTR lpExistingFileName,
-  #   _In_opt_  LPCTSTR lpNewFileName,
-  #   _In_      DWORD dwFlags
-  # );
-  ffi_lib :kernel32
-  attach_function_private :MoveFileExW,
-    [:lpcwstr, :lpcwstr, :dword], :win32_bool
-
-  # BOOLEAN WINAPI CreateSymbolicLink(
-  #   _In_  LPTSTR lpSymlinkFileName, - symbolic link to be created
-  #   _In_  LPTSTR lpTargetFileName, - name of target for symbolic link
-  #   _In_  DWORD dwFlags - 0x0 target is a file, 0x1 target is a directory
-  # );
-  # rescue on Windows < 6.0 so that code doesn't explode
-  begin
-    ffi_lib :kernel32
-    attach_function_private :CreateSymbolicLinkW,
-      [:lpwstr, :lpwstr, :dword], :boolean
-  rescue LoadError
-  end
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364944(v=vs.85).aspx
-  # DWORD WINAPI GetFileAttributes(
-  #   _In_  LPCTSTR lpFileName
-  # );
-  ffi_lib :kernel32
-  attach_function_private :GetFileAttributesW,
-    [:lpcwstr], :dword
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa365535(v=vs.85).aspx
-  # BOOL WINAPI SetFileAttributes(
-  #   _In_  LPCTSTR lpFileName,
-  #   _In_  DWORD dwFileAttributes
-  # );
-  ffi_lib :kernel32
-  attach_function_private :SetFileAttributesW,
-    [:lpcwstr, :dword], :win32_bool
-
-  # HANDLE WINAPI CreateFile(
-  #   _In_      LPCTSTR lpFileName,
-  #   _In_      DWORD dwDesiredAccess,
-  #   _In_      DWORD dwShareMode,
-  #   _In_opt_  LPSECURITY_ATTRIBUTES lpSecurityAttributes,
-  #   _In_      DWORD dwCreationDisposition,
-  #   _In_      DWORD dwFlagsAndAttributes,
-  #   _In_opt_  HANDLE hTemplateFile
-  # );
-  ffi_lib :kernel32
-  attach_function_private :CreateFileW,
-    [:lpcwstr, :dword, :dword, :pointer, :dword, :dword, :handle], :handle
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa363216(v=vs.85).aspx
-  # BOOL WINAPI DeviceIoControl(
-  #   _In_         HANDLE hDevice,
-  #   _In_         DWORD dwIoControlCode,
-  #   _In_opt_     LPVOID lpInBuffer,
-  #   _In_         DWORD nInBufferSize,
-  #   _Out_opt_    LPVOID lpOutBuffer,
-  #   _In_         DWORD nOutBufferSize,
-  #   _Out_opt_    LPDWORD lpBytesReturned,
-  #   _Inout_opt_  LPOVERLAPPED lpOverlapped
-  # );
-  ffi_lib :kernel32
-  attach_function_private :DeviceIoControl,
-    [:handle, :dword, :lpvoid, :dword, :lpvoid, :dword, :lpdword, :pointer], :win32_bool
-
-  MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
-
-  # REPARSE_DATA_BUFFER
-  # https://msdn.microsoft.com/en-us/library/cc232006.aspx
-  # https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
-  # struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
-  class REPARSE_DATA_BUFFER < FFI::Struct
-    layout :ReparseTag, :win32_ulong,
-           :ReparseDataLength, :ushort,
-           :Reserved, :ushort,
-           :SubstituteNameOffset, :ushort,
-           :SubstituteNameLength, :ushort,
-           :PrintNameOffset, :ushort,
-           :PrintNameLength, :ushort,
-           :Flags, :win32_ulong,
-           # max less above fields dword / uint 4 bytes, ushort 2 bytes
-           # technically a WCHAR buffer, but we care about size in bytes here
-           :PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 20]
-  end
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx
-  # DWORD WINAPI GetLongPathName(
-  #   _In_  LPCTSTR lpszShortPath,
-  #   _Out_ LPTSTR  lpszLongPath,
-  #   _In_  DWORD   cchBuffer
-  # );
-  ffi_lib :kernel32
-  attach_function_private :GetLongPathNameW,
-    [:lpcwstr, :lpwstr, :dword], :dword
-
-  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
-  # DWORD WINAPI GetShortPathName(
-  #   _In_  LPCTSTR lpszLongPath,
-  #   _Out_ LPTSTR  lpszShortPath,
-  #   _In_  DWORD   cchBuffer
-  # );
-  ffi_lib :kernel32
-  attach_function_private :GetShortPathNameW,
-    [:lpcwstr, :lpwstr, :dword], :dword
-end