From b17ba1462cc4bb96be52f378dedafb50a3bc13f1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 19 Sep 2015 21:32:18 +0200 Subject: Bug 1219: Use Win32 API for test PE exe, not console Previous test PE exe, commit 0ebc5398fa20d23214a37dc4930a1fa1617293c7, was a console exe. A console exe opens a new console window if not being launched from one. New test PE exe is produced w/ '-mwindows', i.e. for Win32 API w/o a console. --- src/java/com/jogamp/common/util/IOUtil.java | 4 ++-- .../common/util/bin/exe-windows-i386-2048b.bin.305b.gz | Bin 305 -> 0 bytes .../common/util/bin/exe-windows-i386-2048b.bin.316b.gz | Bin 0 -> 316 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz create mode 100755 src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz (limited to 'src/java/com/jogamp/common/util') diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java index 88b39e6..3ed28db 100644 --- a/src/java/com/jogamp/common/util/IOUtil.java +++ b/src/java/com/jogamp/common/util/IOUtil.java @@ -731,14 +731,14 @@ public class IOUtil { if( Platform.OSType.WINDOWS == PlatformPropsImpl.OS_TYPE && Platform.CPUFamily.X86 == PlatformPropsImpl.CPU_ARCH.family ) { - final int gzipSize = 305; + final int gzipSize = 316; final int codeSize = 2048; final byte[] code; synchronized ( exeTestBytesLock ) { byte[] _code; if( null == exeTestBytesRef || null == ( _code = exeTestBytesRef.get() ) ) { // code = getBytesFromRelFile(new byte[codeSize], "bin/exe-windows-i386-2048b.bin", codeSize, 0); - code = getBytesFromRelFile(new byte[codeSize], "bin/exe-windows-i386-2048b.bin.305b.gz", codeSize, gzipSize); + code = getBytesFromRelFile(new byte[codeSize], "bin/exe-windows-i386-2048b.bin.316b.gz", codeSize, gzipSize); exeTestBytesRef = new WeakReference(code); } else { code = _code; diff --git a/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz b/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz deleted file mode 100644 index 1444ae6..0000000 Binary files a/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz and /dev/null differ diff --git a/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz b/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz new file mode 100755 index 0000000..e070061 Binary files /dev/null and b/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz differ -- cgit v1.2.3