6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7 6845973: Update JDK7 with deployment changes in 6u13, 6u14 4802695: Support 64-bit Java Plug-in and Java webstart on Windows/Linux on AMD64 6825019: DownloadManager should not be loaded and referenced for full JRE 6738770: REGRESSION:JSException throws when use LiveConnect javascript facility 6772884: plugin2 : java.lang.OutOfMemoryError or crash 6707535: Crossing domain hole affecting multiple sites/domains using plug-in 6728071: Non-verification of Update files may allow unintended updates 6704154: Code loaded from local filesystem should not get access to localhost 6727081: Web Start security restrictions bypass using special extension jnlp 6727079: Java Web Start Socket() restriction bypass 6727071: Cache location/user name information disclosure in SingleInstanceImpl. 6716217: AppletClassLoader adds permissions based on codebase regardless of CS 6694892: Java Webstart inclusion via system properties override [CVE-2008-2086] 6704074: localhost socket access due to cache location exposed 6703909: Java webstart arbitrary file creation using nativelib 6665315: browser crashes when deployment.properties has more slashes ( / ) 6660121: Encoding values in JNLP files can cause buffer overflow 6606110: URLConnection.setProxiedHost for resources that are loaded via proxy 6581221: SSV(VISTA): Redirection FAILS to work if user does a downgrade install 6609756: Buffer Overflow in Java ActiveX component 6608712: Bypassing the same origin policy in Java with crafted names 6534630: "gnumake clobber" doesn't 6849953: JDK7 - replacement of bufferoverflowU.lib on amd64 breaks build 6849029: Need some JDK7 merge clean-up after comments on the webrev 6847582: Build problem on JDK7 with isSecureProperty in merge 6827935: JDK 7 deployment merging - problem in Compiler-msvm.gmk 6823215: latest merge fixes from 6u12 -> JDK7 6816153: further mergers for JDK7 deployment integration 6807074: Fix Java Kernel and JQS in initial JDK7 builds Summary: Initial changeset for implementing 6uX Deployment Features into JDK7 Reviewed-by: dgu, billyh

     1

//

     2

// Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.

     3

// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

     4

//

     5

// This code is free software; you can redistribute it and/or modify it

     6

// under the terms of the GNU General Public License version 2 only, as

     7

// published by the Free Software Foundation.  Sun designates this

     8

// particular file as subject to the "Classpath" exception as provided

     9

// by Sun in the LICENSE file that accompanied this code.

    10

//

    11

// This code is distributed in the hope that it will be useful, but WITHOUT

    12

// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

    13

// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

    14

// version 2 for more details (a copy is included in the LICENSE file that

    15

// accompanied this code).

    16

//

    17

// You should have received a copy of the GNU General Public License version

    18

// 2 along with this work; if not, write to the Free Software Foundation,

    19

// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

    20

//

    21

// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,

    22

// CA 95054 USA or visit www.sun.com if you need additional information or

    23

// have any questions.

    24

//

    25

    26

#include "windows.h"

    27

    28

// Need 2 defines so macro argument to XSTR will get expanded before quoting.

    29

#define XSTR(x) STR(x)

    30

#define STR(x)  #x

    31

    32

LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

    33

    34

/////////////////////////////////////////////////////////////////////////////

    35

//

    36

// Version

    37

//

    38

    39

VS_VERSION_INFO VERSIONINFO

    40

 FILEVERSION    JDK_FVER

    41

 PRODUCTVERSION JDK_FVER

    42

 FILEFLAGSMASK 0x3fL

    43

#ifdef _DEBUG

    44

 FILEFLAGS 0x1L

    45

#else

    46

 FILEFLAGS 0x0L

    47

#endif

    48

 // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only

    49

 FILEOS 0x4L

    50

 // FILETYPE should be 0x1 for .exe and 0x2 for .dll

    51

 FILETYPE JDK_FTYPE

    52

 FILESUBTYPE 0x0L

    53

BEGIN

    54

    BLOCK "StringFileInfo"

    55

    BEGIN

    56

        BLOCK "000004b0"

    57

        BEGIN

    58

            VALUE "CompanyName",      XSTR(JDK_COMPANY)       "\0"

    59

            VALUE "FileDescription",  XSTR(JDK_COMPONENT)     "\0"

    60

            VALUE "FileVersion",      XSTR(JDK_VER)           "\0"

    61

            VALUE "Full Version",     XSTR(JDK_BUILD_ID)      "\0"

    62

	    VALUE "InternalName",     XSTR(JDK_INTERNAL_NAME) "\0"

    63

            VALUE "LegalCopyright",   XSTR(JDK_COPYRIGHT)     "\0"

    64

            VALUE "OriginalFilename", XSTR(JDK_FNAME)         "\0"

    65

            VALUE "ProductName",      XSTR(JDK_NAME)          "\0"

    66

            VALUE "ProductVersion",   XSTR(JDK_VER)           "\0"

    67

        END

    68

    END

    69

    BLOCK "VarFileInfo"

    70

    BEGIN

    71

        VALUE "Translation", 0x0, 1200

    72

    END

    73

END