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.

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

Embed Windows application manifests #10878

Merged
merged 2 commits into from
Dec 13, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/librustc/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use back::archive::{Archive, METADATA_FILENAME};
use back::rpath;
use back::manifest;
use driver::driver::CrateTranslation;
use driver::session::Session;
use driver::session;
Expand Down Expand Up @@ -800,6 +801,12 @@ fn link_binary_output(sess: Session,
}
session::OutputExecutable => {
link_natively(sess, false, obj_filename, &out_filename);
// Windows linker will add an ".exe" extension if there was none
let out_filename = match out_filename.extension() {
Some(_) => out_filename.clone(),
None => out_filename.with_extension(win32::EXE_EXTENSION)
};
manifest::postprocess_executable(sess, &out_filename);
}
session::OutputDylib => {
link_natively(sess, true, obj_filename, &out_filename);
Expand Down
108 changes: 108 additions & 0 deletions src/librustc/back/manifest.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
// Copyright 2013 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.


// To avoid problems with Windows UAC installer detection heuristics,
// Rust-produced executables need an application manifest.
// For details, see issue #10512.

// No-op on other platforms.

use driver::session::Session;
use std::path::Path;

#[cfg(not(windows))]
pub fn postprocess_executable(_sess: Session, _filename: &Path) {}

#[cfg(windows)]
pub fn postprocess_executable(sess: Session, filename: &Path) {

let default_manifest = concat!(
"<?xml version='1.0' encoding='UTF-8' standalone='yes'?>",
"<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>",
" <trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>",
" <security>",
" <requestedPrivileges>",
" <requestedExecutionLevel level='asInvoker' uiAccess='false' />",
" </requestedPrivileges>",
" </security>",
" </trustInfo>",
"</assembly>");

match windows::embed_manifest(filename, default_manifest) {
Ok(_) => (),
Err(msg) => sess.err(format!("Could not embed application manifest: {}", msg))
}
}

#[cfg(windows)]
mod windows {
use std::libc::types::os::arch::extra::{BOOL,WORD,DWORD,HANDLE,LPCWSTR,LPCVOID};
use std::libc::consts::os::extra::FALSE;
use std::cast::transmute;
use std::os;

// FIXME #9053: should import as_utf16_p from std rather than re-defining here
//use std::os::win32::as_utf16_p;
fn as_utf16_p<T>(s: &str, f: |*u16| -> T) -> T {
let mut t = s.to_utf16();
// Null terminate before passing on.
t.push(0u16);
t.as_imm_buf(|buf, _len| f(buf))
}

#[link_name = "kernel32"]
extern "system" {
pub fn BeginUpdateResourceW(pFileName: LPCWSTR,
bDeleteExistingResources: BOOL) -> HANDLE;
pub fn UpdateResourceW(hUpdate: HANDLE,
lpType: LPCWSTR,
lpName: LPCWSTR,
wLanguage: WORD,
lpData: LPCVOID,
cbData: DWORD) -> BOOL;
pub fn EndUpdateResourceW(hUpdate: HANDLE,
fDiscard: BOOL) -> BOOL;
}

fn MAKEINTRESOURCEW(id: int) -> LPCWSTR {
unsafe{ transmute(id) }
}

pub fn embed_manifest(filename: &Path,
manifest: &str) -> Result<(),~str> {
unsafe {
let hUpdate = as_utf16_p(filename.as_str().unwrap(), |path| {
BeginUpdateResourceW(path, FALSE)
});
if hUpdate.is_null() {
return Err(format!("failure in BeginUpdateResourceW: {}", os::last_os_error()));
}

let ok = manifest.as_imm_buf(|p, len| {
UpdateResourceW(hUpdate,
MAKEINTRESOURCEW(24), // RT_MANIFEST
MAKEINTRESOURCEW(1), // CREATEPROCESS_MANIFEST_RESOURCE_ID
0, // LANG_NEUTRAL, SUBLANG_NEUTRAL
p as LPCVOID,
len as u32)
});
if ok == FALSE {
return Err(format!("failure in UpdateResourceW: {}", os::last_os_error()));
}

let ok = EndUpdateResourceW(hUpdate, FALSE);
if ok == FALSE {
return Err(format!("failure in EndUpdateResourceW: {}", os::last_os_error()));
}
Ok(())
}
}
}
1 change: 1 addition & 0 deletions src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ pub mod front {
pub mod back {
pub mod archive;
pub mod link;
pub mod manifest;
pub mod abi;
pub mod upcall;
pub mod arm;
Expand Down
19 changes: 19 additions & 0 deletions src/test/run-pass/setup.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2013 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.

// On Windows this test checks that Rust binaries have an embedded
// application manifest and don't trip UAC installer detection
// heuristics ("setup" is one of the "installer" keywords).
// For details, see issue #10512.

// On other platforms this is a no-op.

pub fn main() {
}