Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
42 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,48 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
extern crate libc; | ||
use libc::{c_void, LPVOID, DWORD}; | ||
use libc::types::os::arch::extra::LPWSTR; | ||
|
||
extern "system" { | ||
fn FormatMessageW(flags: DWORD, | ||
lpSrc: LPVOID, | ||
msgId: DWORD, | ||
langId: DWORD, | ||
buf: LPWSTR, | ||
nsize: DWORD, | ||
args: *const c_void) | ||
-> DWORD; | ||
#[cfg(windows)] | ||
mod imp { | ||
use libc::{c_void, LPVOID, DWORD}; | ||
use libc::types::os::arch::extra::LPWSTR; | ||
|
||
extern "system" { | ||
fn FormatMessageW(flags: DWORD, | ||
lpSrc: LPVOID, | ||
msgId: DWORD, | ||
langId: DWORD, | ||
buf: LPWSTR, | ||
nsize: DWORD, | ||
args: *const c_void) | ||
-> DWORD; | ||
} | ||
|
||
pub fn test() { | ||
let mut buf: [u16, ..50] = [0, ..50]; | ||
let ret = unsafe { | ||
FormatMessageW(0x1000, 0 as *mut c_void, 1, 0x400, | ||
buf.as_mut_ptr(), buf.len() as u32, 0 as *const c_void) | ||
}; | ||
// On some 32-bit Windowses (Win7-8 at least) this will fail with segmented | ||
// stacks taking control of pvArbitrary | ||
assert!(ret != 0); | ||
} | ||
} | ||
|
||
fn test() { | ||
let mut buf: [u16, ..50] = [0, ..50]; | ||
let ret = unsafe { | ||
FormatMessageW(0x1000, 0 as *mut c_void, 1, 0x400, | ||
buf.as_mut_ptr(), buf.len() as u32, 0 as *const c_void) | ||
}; | ||
// On some 32-bit Windowses (Win7-8 at least) this will fail with segmented | ||
// stacks taking control of pvArbitrary | ||
assert!(ret != 0); | ||
#[cfg(not(windows))] | ||
mod imp { | ||
pub fn test() { } | ||
} | ||
|
||
fn main() { | ||
test() | ||
} | ||
imp::test() | ||
} |
bdeb1d7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from thestinger
at brson@bdeb1d7
bdeb1d7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging brson/rust/wintcbfix = bdeb1d7 into auto
bdeb1d7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
brson/rust/wintcbfix = bdeb1d7 merged ok, testing candidate = d2f8d4c
bdeb1d7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1591
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1588
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1582
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1588
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1585
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1584
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1584
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1588
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1582
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1581
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1584
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1239
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1237
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1241
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/74
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/72
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/72
bdeb1d7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = d2f8d4c