Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(PUP-2843) Fix constants on Windows x64 #2809

Merged
merged 1 commit into from Jun 26, 2014
Merged

(PUP-2843) Fix constants on Windows x64 #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/puppet/util/windows/file.rb
View file
Open in desktop
Expand Up @@ -130,7 +130,8 @@ def set_attributes(path, flags)
end
module_function :set_attributes

INVALID_HANDLE_VALUE = -1 #define INVALID_HANDLE_VALUE ((HANDLE)(LONG_PTR)-1)
#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)

Expand Down
7 changes: 4 additions & 3 deletions lib/puppet/util/windows/security.rb
View file
Open in desktop
Expand Up @@ -474,8 +474,6 @@ def parse_dacl(dacl_ptr)
dacl
end

INVALID_HANDLE_VALUE = FFI::Pointer.new(-1).address

# Open an existing file with the specified access mode, and execute a
# block with the opened file HANDLE.
def open_file(path, access, &block)
Expand All @@ -488,7 +486,10 @@ def open_file(path, access, &block)
FILE::FILE_FLAG_OPEN_REPARSE_POINT | FILE::FILE_FLAG_BACKUP_SEMANTICS,
FFI::Pointer::NULL_HANDLE) # template

raise Puppet::Util::Windows::Error.new("Failed to open '#{path}'") if handle == INVALID_HANDLE_VALUE
if handle == Puppet::Util::Windows::File::INVALID_HANDLE_VALUE
raise Puppet::Util::Windows::Error.new("Failed to open '#{path}'")
end

begin
yield handle
ensure
Expand Down