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

Use Ref for lpMsgBuf #20051

Merged
merged 2 commits into from
Jan 17, 2017
Merged

Use Ref for lpMsgBuf #20051

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4a0980
Use Ref for lpMsgBuf
musm Jan 15, 2017
1324d37
Prettify
musm Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use Ref for lpMsgBuf
  • Loading branch information
@musm
musm committed Jan 15, 2017
commit f4a0980b7313dec9ac7f9151d9d828f20762571d
6 changes: 3 additions & 3 deletions base/libc.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,12 @@ if is_windows()
const FORMAT_MESSAGE_FROM_SYSTEM = UInt32(0x1000)
const FORMAT_MESSAGE_IGNORE_INSERTS = UInt32(0x200)
const FORMAT_MESSAGE_MAX_WIDTH_MASK = UInt32(0xFF)
lpMsgBuf = Array{Ptr{UInt16},0}()
lpMsgBuf[1] = 0
lpMsgBuf = Ref{Ptr{UInt16}}()
lpMsgBuf[] = 0
len = ccall(:FormatMessageW,stdcall,UInt32,(Cint, Ptr{Void}, Cint, Cint, Ptr{Ptr{UInt16}}, Cint, Ptr{Void}),
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
C_NULL, e, 0, lpMsgBuf, 0, C_NULL)
p = lpMsgBuf[1]
p = lpMsgBuf[]
len == 0 && return ""
buf = Array{UInt16}(len)
unsafe_copy!(pointer(buf), p, len)
Expand Down