Rewrite DeleteVolumeMountPoint to use FFI

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/chef/util/windows/volume.rb b/lib/chef/util/windows/volume.rb
index 08c3a53793..15780d61a1 100644
--- a/lib/chef/util/windows/volume.rb
+++ b/lib/chef/util/windows/volume.rb
@@ -18,6 +18,7 @@
 
 #simple wrapper around Volume APIs. might be possible with WMI, but possibly more complex.
 
+require 'chef/win32/api/file'
 require 'chef/util/windows'
 require 'windows/volume'
 
@@ -25,9 +26,6 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows
 
   private
   include Windows::Volume
-  #XXX not defined in the current windows-pr release
-  DeleteVolumeMountPoint =
-    Windows::API.new('DeleteVolumeMountPoint', 'S', 'B') unless defined? DeleteVolumeMountPoint
 
   public
 
@@ -46,8 +44,10 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows
   end
 
   def delete
-    unless DeleteVolumeMountPoint.call(@name)
-      raise ArgumentError, get_last_error
+    begin
+      Chef::ReservedNames::Win32::File.delete_volume_mount_point(@name)
+    rescue Chef::Exceptions::Win32APIError => e
+      raise ArgumentError, e
     end
   end