/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Mar 12 17:11:59 UTC 2019
changeset fce279b33577 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fce279b33577
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Mar 12 15:42:25 2019 +0100
Pre-release tuning
* Makefile.am: (netx-html-gen.stamp) set number of changests to 140 (since 1.7)
* NEWS: date of 1.8 set
* configure.ac: (AC_INIT) set to use 1.8
changeset 9bacada77a23 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9bacada77a23
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Mar 12 18:11:00 2019 +0100
Hidden console on Windows
* rust-launcher/src/dirs_paths_helper.rs: factory for windows os now supply third parameter
* rust-launcher/src/main.rs: (get_os) on windows now have three params. Call to get os if-windows cfged out (main) parent process is now checking ATTACH_PARENT_PROCESS before get_os on windows
* rust-launcher/src/os_access.rs: oon windows, without console, no window is enforced. Trait got win-only inside_console method windows impl of os_access. Win module made public to expose AttachConsole function.
* rust-launcher/src/utils.rs: test logger got windows-only inside_console
diffstat:
ChangeLog | 17 +++++++++++++++++
Makefile.am | 2 +-
NEWS | 2 +-
configure.ac | 2 +-
rust-launcher/src/dirs_paths_helper.rs | 2 +-
rust-launcher/src/main.rs | 22 +++++++++++++++++++---
rust-launcher/src/os_access.rs | 26 ++++++++++++++++++++++----
rust-launcher/src/utils.rs | 5 +++++
8 files changed, 67 insertions(+), 11 deletions(-)
diffs (219 lines):
diff -r ec35c20b529b -r 9bacada77a23 ChangeLog
--- a/ChangeLog Thu Mar 07 16:13:44 2019 +0100
+++ b/ChangeLog Tue Mar 12 18:11:00 2019 +0100
@@ -1,3 +1,20 @@
+2019-03-12 Lars Herschke <lhersch at dssgmbh.de>
+
+ Hidden console on Windows
+ * rust-launcher/src/dirs_paths_helper.rs: factory for windows os now supply third parameter
+ * rust-launcher/src/main.rs: (get_os) on windows now have three params. Call to get os if-windows cfged out
+ (main) parent process is now checking ATTACH_PARENT_PROCESS before get_os on windows
+ * rust-launcher/src/os_access.rs: oon windows, without console, no window is enforced. Trait got win-only inside_console method
+ windows impl of os_access. Win module made public to expose AttachConsole function.
+ * rust-launcher/src/utils.rs: test logger got windows-only inside_console
+
+2019-03-12 Jiri Vanek <jvanek at redhat.com>
+
+ Pre-release tuning
+ * Makefile.am: (netx-html-gen.stamp) set number of changests to 140 (since 1.7)
+ * NEWS: date of 1.8 set
+ * configure.ac: (AC_INIT) set to use 1.8
+
2019-03-07 Lars Herschke <lhersch at dssgmbh.de>
Native launchers now iterate through various keys of jre/jdk in registry
diff -r ec35c20b529b -r 9bacada77a23 Makefile.am
--- a/Makefile.am Thu Mar 07 16:13:44 2019 +0100
+++ b/Makefile.am Tue Mar 12 18:11:00 2019 +0100
@@ -887,7 +887,7 @@
mkdir -p html-gen; \
cp AUTHORS NEWS COPYING ChangeLog html-gen/; \
export HTML_GEN_DEBUG=true; \
- ${SHELL} html-gen.sh 236; \
+ ${SHELL} html-gen.sh 140; \
unset HTML_GEN_DEBUG)
${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR)
rm -r $(NETX_SRCDIR)/../html-gen/
diff -r ec35c20b529b -r 9bacada77a23 NEWS
--- a/NEWS Thu Mar 07 16:13:44 2019 +0100
+++ b/NEWS Tue Mar 12 18:11:00 2019 +0100
@@ -8,7 +8,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.8 (YYYY-MM-DD):
+New in release 1.8 (2019-03-12):
* added support for javafx-desc and so allwong run of pure-javafx only applications
* --nosecurity enhanced for possibility to skip invalid signatures
* enhanced to allow resources to be read also from j2se/java element (OmegaT)
diff -r ec35c20b529b -r 9bacada77a23 configure.ac
--- a/configure.ac Thu Mar 07 16:13:44 2019 +0100
+++ b/configure.ac Tue Mar 12 18:11:00 2019 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea-web],[1.8pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.8],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile netx.manifest])
AM_MAINTAINER_MODE([enable])
diff -r ec35c20b529b -r 9bacada77a23 rust-launcher/src/dirs_paths_helper.rs
--- a/rust-launcher/src/dirs_paths_helper.rs Thu Mar 07 16:13:44 2019 +0100
+++ b/rust-launcher/src/dirs_paths_helper.rs Tue Mar 12 18:11:00 2019 +0100
@@ -108,7 +108,7 @@
#[cfg(windows)]
fn get_os() -> os_access::Windows {
- os_access::Windows::new(false, false)
+ os_access::Windows::new(false, false, true)
}
diff -r ec35c20b529b -r 9bacada77a23 rust-launcher/src/main.rs
--- a/rust-launcher/src/main.rs Thu Mar 07 16:13:44 2019 +0100
+++ b/rust-launcher/src/main.rs Tue Mar 12 18:11:00 2019 +0100
@@ -1,3 +1,5 @@
+#![windows_subsystem = "windows"]
+
mod hardcoded_paths;
mod property_from_file;
mod os_access;
@@ -19,8 +21,8 @@
}
#[cfg(windows)]
-fn get_os(debug: bool, al: bool) -> os_access::Windows {
- os_access::Windows::new(debug, al)
+fn get_os(debug: bool, al: bool, ic: bool) -> os_access::Windows {
+ os_access::Windows::new(debug, al, ic)
}
fn is_debug_on() -> bool {
@@ -29,7 +31,10 @@
return val;
}
_none => {
+ #[cfg(not(windows))]
let os = get_os(false, false);
+ #[cfg(windows)]
+ let os = get_os(false, false, true);
return property_from_files_resolver::try_main_verbose_from_properties(&os);
}
}
@@ -74,7 +79,18 @@
}
fn main() {
- let os = get_os(is_debug_on(), true);
+ let os;
+ #[cfg(windows)]
+ {
+ use os_access::win;
+ let acr: i32;
+ unsafe { acr = win::AttachConsole(win::ATTACH_PARENT_PROCESS) };
+ os = get_os(is_debug_on(), true, acr != 0);
+ }
+ #[cfg(not(windows))]
+ {
+ os = get_os(is_debug_on(), true);
+ }
os.log(&dirs_paths_helper::path_to_string(&dirs_paths_helper::current_program()));
let java_dir = utils::find_jre(&os);
let mut info2 = String::new();
diff -r ec35c20b529b -r 9bacada77a23 rust-launcher/src/os_access.rs
--- a/rust-launcher/src/os_access.rs Thu Mar 07 16:13:44 2019 +0100
+++ b/rust-launcher/src/os_access.rs Tue Mar 12 18:11:00 2019 +0100
@@ -12,6 +12,13 @@
for ar in args.into_iter() {
cmd.arg(ar);
}
+ #[cfg(windows)]
+ {
+ if !os.inside_console() {
+ use std::os::windows::process::CommandExt;
+ cmd.creation_flags(win::CREATE_NO_WINDOW);
+ }
+ }
let mut info = String::new();
write!(&mut info, "itw-rust-debug: command {}", format!("{:?}", cmd)).expect("unwrap failed");
os.log(&info);
@@ -54,6 +61,8 @@
fn get_classpath_separator(&self) -> char;
fn get_exec_suffixes(&self) -> &'static [&'static str];
fn is_verbose(&self) -> bool;
+ #[cfg(windows)]
+ fn inside_console(&self) -> bool;
}
#[cfg(not(windows))]
@@ -188,15 +197,16 @@
pub struct Windows {
verbose: bool,
al: log_helper::AdvancedLogging,
+ ic: bool
}
#[cfg(windows)]
impl Windows {
- pub fn new(debug: bool, load_advanced: bool) -> Windows {
+ pub fn new(debug: bool, load_advanced: bool, ic: bool) -> Windows {
if ! load_advanced {
- Windows { verbose: debug, al: log_helper::AdvancedLogging::default() }
+ Windows { verbose: debug, al: log_helper::AdvancedLogging::default(), ic: ic }
} else {
- Windows { verbose: debug, al: log_helper::AdvancedLogging::load(&Windows::new(debug, false)) }
+ Windows { verbose: debug, al: log_helper::AdvancedLogging::load(&Windows::new(debug, false, ic)), ic: ic }
}
}
}
@@ -226,6 +236,10 @@
return self.verbose;
}
+ fn inside_console(&self) -> bool {
+ return self.ic;
+ }
+
fn get_registry_java(&self) -> Option<std::path::PathBuf> {
std::panic::catch_unwind(|| {
match win::java_registry_path() {
@@ -293,7 +307,7 @@
#[cfg(windows)]
#[allow(non_snake_case)]
#[allow(non_camel_case_types)]
-mod win {
+pub mod win {
// https://crates.io/crates/scopeguard
macro_rules! defer {
($e:expr) => {
@@ -347,6 +361,8 @@
use std::ptr::{null, null_mut};
// constants
+ pub const ATTACH_PARENT_PROCESS: c_ulong = 0xFFFFFFFF;
+ pub const CREATE_NO_WINDOW: c_ulong = 0x08000000;
const CP_UTF8: c_ulong = 65001;
const FORMAT_MESSAGE_ALLOCATE_BUFFER: c_ulong = 0x00000100;
const FORMAT_MESSAGE_FROM_SYSTEM: c_ulong = 0x00001000;
@@ -372,6 +388,8 @@
// function declarations
extern "system" {
+ pub fn AttachConsole(dwProcessId: c_ulong) -> c_int;
+
fn MultiByteToWideChar(
CodePage: c_uint,
dwFlags: c_ulong,
diff -r ec35c20b529b -r 9bacada77a23 rust-launcher/src/utils.rs
--- a/rust-launcher/src/utils.rs Thu Mar 07 16:13:44 2019 +0100
+++ b/rust-launcher/src/utils.rs Tue Mar 12 18:11:00 2019 +0100
@@ -241,6 +241,11 @@
return true;
}
+ #[cfg(windows)]
+ fn inside_console(&self) -> bool {
+ return true;
+ }
+
fn log(&self, s: &str) {
let ss = String::from(s);
self.vec.borrow_mut().push(ss);
More information about the distro-pkg-dev
mailing list